Merge remote-tracking branch 'origin/dev_cyp' into dev_ani3

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

@@ -229,8 +229,13 @@ public class EditUserController : PFUIPanel, INativeOnMobileImageSelect
             {"ContactPhone",mPhone.GetComponent<InputField>() },
             {"ContactAddress",mAddr.GetComponent<InputField>() },
         };
-        
-        
+        #region 划船机功能：隐藏骑行相关的
+        if (App.IsRowerMode == true) 
+        {
+            transform.Find("Panel/MainPanel/BW").gameObject.SetActive(false);
+            transform.Find("Panel/MainPanel/WD").gameObject.SetActive(false);
+        }
+        #endregion
     }
     async Task Login() 
     {

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

@@ -39,7 +39,7 @@ public class RowerHomeScript : PFUIPanel
     {
         get
         {
-            return Rower != null ? (C2RowerData.IsEnabled == true ? (IRowerCommonData)Rower.c2RowerData : (IRowerCommonData)Rower.rowerData) : null;
+            return Rower != null ? (C2RowerData.IsEnabled == true ? (IRowerCommonData)(Rower.c2RowerData) : (IRowerCommonData)(Rower.rowerData)) : null;
             //var device = App.MainDeviceAdapter.GetDevices().FirstOrDefault(d => (d.State == DeviceState.Connected) && d.Sensor == SensorType.Rower);
             //if (device != null)
             //{
@@ -118,7 +118,8 @@ public class RowerHomeScript : PFUIPanel
     protected override void Awake()
     {
         Id = Guid.NewGuid().ToString();
-        rowerType = new RowerType();
+        rowerType = new RowerType() { type = 1, value = 500 };
+        
         spriteDict = new Dictionary<object, Sprite>()
         {
             {"Start",Resources.Load<Sprite>("Images/RowerNew/ICON_continue_44") },
@@ -216,7 +217,8 @@ public class RowerHomeScript : PFUIPanel
         {
             //UIManager.ShowRowerWelldone("33171855-66FC-4121-935C-0F4DA98E5BB2", Init);
             //return;
-            //UIManager.ShowRowerWelldone("1915400E-A6E5-4FB7-B371-7240BEA20A54", Init);
+            
+            //UIManager.ShowRowerWelldone("C0F81E83-120B-4A2C-AD0E-8BC1B8EB3E74", Init);
             //return;
             if (checkRowing()) return;
             if (C2RowerData.IsEnabled == true && C2RowerData.rowerType != null) return;
@@ -226,13 +228,17 @@ public class RowerHomeScript : PFUIPanel
                 HandleSelectType();
             },rowerType);
         }, false);
-        btnStart = transform.Find("MainNav-mobile/Custom2").gameObject;
-        var c3 = new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/RowerNew/ICON_mode_44"), () =>
+        var c2 = new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/RowerNew/记录"), () => 
         {
-            ReturnHome();
+            UIManager.ShowResultListPanel();
         }, false);
+        btnStart = transform.Find("MainNav-mobile/Custom2").gameObject;
+        //var c3 = new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/RowerNew/ICON_mode_44"), () =>
+        //{
+        //    ReturnHome();
+        //}, false);
         //隐藏骑行
-        nav.SetButtonActive(new List<int> { 3, 7 }, null, c1, null, null, false);
+        nav.SetButtonActive(new List<int> { 3, 7 }, null, c1, null, c2, false);
         newNav = nav;
 #endif
         UIManager.AddEvent(transform.Find("Stopped/Confirm/BtnSave").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
@@ -251,6 +257,8 @@ public class RowerHomeScript : PFUIPanel
             RowerData.StartEvent -= StartFunc;
             RowerData.StartEvent += StartFunc;
         }
+        rowerType = new RowerType { type = 1, value = 500 };
+        HandleSelectType();
         Init();
     }
 
@@ -413,7 +421,7 @@ public class RowerHomeScript : PFUIPanel
         {
             startTime = UIManager.Now.GetDateTime();
             createTime = null;
-            truelyTime = 0;
+            truelyTime = historyTime;
             //TimerTicks();
             openTimer = true;
             timer = 1.0f;
@@ -619,7 +627,10 @@ public class RowerHomeScript : PFUIPanel
         leftLine.localPosition = new Vector3(-207.5f+43, leftLine.localPosition.y, leftLine.localPosition.z);
         rightLine.localPosition = new Vector3(164.5f+43, rightLine.localPosition.y, rightLine.localPosition.z);
         finishLine.localPosition = new Vector3(-237.5f+43, finishLine.localPosition.y, finishLine.localPosition.z);
-
+        historyStrokeCount = 0;
+        historyDistance = 0;
+        historyTime = 0;
+        historyEnergy = 0;
 
         Resources.UnloadUnusedAssets();
         GC.Collect();
@@ -643,12 +654,10 @@ public class RowerHomeScript : PFUIPanel
 
     private void ResChanged(object sender, EventArgs e)
     {
-        print("收到阻力" + sender);
         if ((Convert.ToSingle(sender) >= 50) && slider)
         {
             slider.GetComponent<PFUISlider>().SetValue((Convert.ToSingle(sender) - 50) / 300f);
         }
-        
     }
 
     
@@ -697,16 +706,18 @@ public class RowerHomeScript : PFUIPanel
 #endif
         var heartRate = HeartRate ?? 0;
         bottom.Find("BPM/Value").GetComponent<Text>().text = heartRate.ToString();
-        var distance = (int)RowerData.TotalDistance;
-        var energy = RowerData.TotalEnergy;
-        var strokeCount = RowerData.StrokeCount;
+        //断线重连继续
+        var distance = (int)RowerData.TotalDistance + historyDistance;
+        var energy = RowerData.TotalEnergy + historyEnergy;
+        var strokeCount = RowerData.StrokeCount + historyStrokeCount;
+
         var power = RowerData.InstantaneousPower;
         var rate = RowerData.StrokeRate;
         truelyTime++;
         TempRowerCalc tmpdata = null;
 
         //里程停止逻辑
-        if (totalDistance == RowerData.TotalDistance)
+        if (totalDistance == RowerData.TotalDistance + historyDistance)
         {
             //判定一次停止
             stopSeconds++;
@@ -853,6 +864,8 @@ public class RowerHomeScript : PFUIPanel
         }
     }
     //检查本地数据
+    int historyDistance = 0,historyStrokeCount = 0,historyEnergy = 0;
+    public int historyTime = 0;
     private void CheckLocalData()
     {
         try
@@ -875,6 +888,24 @@ public class RowerHomeScript : PFUIPanel
                         {
                             records.Add(item);
                         }
+                        //records.Add($"{strokeCount},{RowerData.ElapsedTime},{distance},{power},{pace},{rate},{RowerData.ResistanceLevel},{heartRate},{energy},{RowerData.AveragePower},{truelyTime}");
+                        var _re = records.LastOrDefault();
+                        if (!string.IsNullOrEmpty(_re)) 
+                        {
+                            var datas = _re.Split(',');
+                            historyStrokeCount = int.Parse(datas[0]);
+                            historyDistance = int.Parse(datas[2]);
+                            historyTime = int.Parse(datas[10]);
+                            seconds = historyTime;
+                            historyEnergy = int.Parse(datas[8]);
+                            var historyRowerType = PlayerPrefs.GetString("historyRowerType");
+                            if (!string.IsNullOrEmpty(historyRowerType))
+                            {
+                                var typeObject = historyRowerType.Split(',');
+                                rowerType = new RowerType() { type = int.Parse(typeObject[0]), value = float.Parse(typeObject[1]) };
+                                HandleSelectType();
+                            }
+                        }
                     }
                     UIManager.CloseConfirm();
                 }, 2,
@@ -905,6 +936,7 @@ public class RowerHomeScript : PFUIPanel
                 Directory.CreateDirectory(dir);
             }
             File.WriteAllText(path, string.Join("\r\n", records));
+            PlayerPrefs.SetString("historyRowerType", $"{rowerType.type},{rowerType.value}");
         }
         catch (Exception e)
         {