4.14修改，设备连接去掉ftms骑行台

Assets/Scripts/UI/Prefab/Panel/HomeController.cs

@@ -45,7 +45,7 @@ public class HomeController : PFUIPanel
         nav.SetButtonActive(new List<int> { 1, 3, 4, 6 },null,new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/RowerNew/ICON_mode_44"), () => 
         {
             UIManager.ShowRowerSelector();
-        }));
+        },false));
         newNav = nav;
         UIManager.AddEvent(transform.Find("TodayData/Datas/Distance").gameObject, EventTriggerType.PointerClick, b =>
         {

Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs

@@ -227,6 +227,26 @@ public class RowerHomeScript : PFUIPanel
         }
         Init();
     }
+
+    RowerResultModel reRowData = null;
+    public void ReRow(RowerResultModel r)
+    {
+        this.reRowData = r;
+        if (r!= null && r.Type.HasValue)
+        {
+            rowerType = new RowerType { type = r.Type.Value,value = (float)r.TypeValue.Value };
+            if (Rower != null)
+            {
+                Rower.Reset();
+            }
+            //RowerPanel/Rower/Bottom/Expected/Title
+            //var dw = rowerType.type == 1 ? $"{rowerType.value}M" : $"{(rowerType.value / 60).ToString("#0.00")}Min";
+            //bottom.Find("Expected/Title").GetComponent<Text>().text = $"EST\n/ {dw}";
+            var dw = rowerType.type == 1 ? $"" : $"\nM";
+            bottom.Find("Expected/Title").GetComponent<Text>().text = $"{App.GetLocalString("EST")}{dw}";
+        }
+    }
+
     private void Discard() 
     {
         transform.Find("Stopped").gameObject.SetActive(false);
@@ -264,8 +284,8 @@ public class RowerHomeScript : PFUIPanel
         //mainNav.ShowRowerTab();
 
         transform.MyDOFade();
-        Debug.Log("140,开始扫描");
-        App.MainDeviceAdapter.StartScan();
+        //Debug.Log("140,开始扫描");
+        //App.MainDeviceAdapter.StartScan();
         Init();
         //transform.Find("Left/Rower").GetComponent<RowerAnimation>().StartAnimation();
     }
@@ -484,7 +504,7 @@ public class RowerHomeScript : PFUIPanel
         {
             Rower.Reset();
         }
-        GetComponent<RowerMultiModeScript>().GetShadowList(rowerType);
+        GetComponent<RowerMultiModeScript>().GetShadowList(rowerType, reRowData);
         btnStart.tag = "Start";
         btnStart.GetComponent<Image>().sprite = spriteDict["Start"];
         left.Find("Rower").GetComponent<Image>().sprite = spriteDict[0];
@@ -558,7 +578,7 @@ public class RowerHomeScript : PFUIPanel
     private void ResChanged(object sender, EventArgs e)
     {
         print("收到阻力" + sender);
-        if ((Convert.ToSingle(sender) > 50) && slider)
+        if ((Convert.ToSingle(sender) >= 50) && slider)
         {
             slider.GetComponent<PFUISlider>().SetValue((Convert.ToSingle(sender) - 50) / 300f);
         }
@@ -578,7 +598,7 @@ public class RowerHomeScript : PFUIPanel
     private void ReturnHome() 
     {
         if (checkRowing()) return;
-        Disconnect();
+        //Disconnect();
         UIManager.ShowHomePanel();
         UIManager.ShowRowerSelector();
     }