Merge branch 'dev_rower' into dev_cyp

# Conflicts:
#	ProjectSettings/ProjectSettings.asset

Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab

@@ -7471,12 +7471,12 @@ PrefabInstance:
     - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7496,12 +7496,12 @@ PrefabInstance:
     - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7511,12 +7511,12 @@ PrefabInstance:
     - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7681,12 +7681,12 @@ PrefabInstance:
     - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7696,12 +7696,12 @@ PrefabInstance:
     - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7761,12 +7761,12 @@ PrefabInstance:
     - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7776,12 +7776,12 @@ PrefabInstance:
     - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7836,12 +7836,12 @@ PrefabInstance:
     - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7856,12 +7856,12 @@ PrefabInstance:
     - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7881,12 +7881,12 @@ PrefabInstance:
     - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7916,12 +7916,12 @@ PrefabInstance:
     - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
@@ -7931,7 +7931,7 @@ PrefabInstance:
     - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -2
       objectReference: {fileID: 0}
     - target: {fileID: 8719966614707449432, guid: 240a4465e4dc90848a0efc1a9520c658,
         type: 3}

Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab

@@ -95,7 +95,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3111753855602397197
 RectTransform:
   m_ObjectHideFlags: 0
@@ -749,6 +749,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 693a8dfbfae474849b06c5d0080136f1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!1 &3070817481139605444
 GameObject:
   m_ObjectHideFlags: 0
@@ -1614,7 +1615,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1724308109339741718
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1803,6 +1804,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e9e4a559c32ef6d4a95d06e4a10c73d4, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
   routeResult: {fileID: 4085630360285719620, guid: ed1035afec068174db9b2d39c6568c42,
     type: 3}
 --- !u!1 &4915624194418938824

Assets/Scripts/Devices/Ant/Interfaces/IRowerDevice.cs

@@ -11,5 +11,6 @@ namespace Assets.Scripts.Devices.Ant.Interfaces
     {
         FtmsRowerData rowerData { get; }
         void Reset();
+        void SetResistanceLevel(ushort v);
     }
 }

Assets/Scripts/Devices/Ble/Devices/FtmsRower.cs

@@ -77,5 +77,11 @@ namespace Assets.Scripts.Devices.Ble.Devices
             Debug.Log("发送重置命令"+this.controlPointCharacteristic.ToString());
             hwInterface.WriteCharacteristic(this.controlPointCharacteristic, new byte[] { 0x01 });
         }
+        public void SetResistanceLevel(ushort v)
+        {
+            var r = new byte[] { 0x04 }.Concat(BitConverter.GetBytes(v)).ToArray();
+            Debug.Log($"设置阻力{v}, {string.Join(",", r)}");
+            hwInterface.WriteCharacteristic(this.controlPointCharacteristic, r);
+        }
     }
 }

Assets/Scripts/Scenes/MainController.cs

@@ -296,18 +296,18 @@ public class MainController : BaseScene
         //{
         //    UIManager.ShowHomePanel();
         //});
-        //#if UNITY_ANDROID || UNITY_IOS
+#if UNITY_ANDROID || UNITY_IOS
-        //        if (!App.IsRowerMode.HasValue)
+        if (!App.IsRowerMode.HasValue)
-        //        {
+        {
-        //            UIManager.ShowRowerSelector();
+            UIManager.ShowRowerSelector();
-        //            return;
+            return;
-        //        }
+        }
-        //        if (App.IsRowerMode == true)
+        if (App.IsRowerMode == true)
-        //        {
+        {
-        //            UIManager.ShowRowerPanel();
+            UIManager.ShowRowerPanel();
-        //            return;
+            return;
-        //        }
+        }
-        //#endif
+#endif
         LastRide();//检查本地异常中断的骑行并弹窗提示继续
         if (App.MainSceneParam.ContainsKey("Name") && !string.IsNullOrEmpty(App.MainSceneParam["Name"]))
         {

Assets/Scripts/UI/Control/PFUISlider.cs

@@ -17,6 +17,16 @@ public class PFUISlider : MonoBehaviour
             text.text = $"{(f * 100).ToString("#0")}%";
         });
     }
+    public void SetValueChanged(System.Action<float> a)
+    {
+        slider = transform.GetComponent<Slider>();
+        slider.onValueChanged.RemoveAllListeners();
+        slider.onValueChanged.AddListener((f) =>
+        {
+            text.text = $"{(f * 100).ToString("#0")}%";
+            a.Invoke(f);
+        });
+    }
     // Start is called before the first frame update
     void Start()
     {

Assets/Scripts/UI/Prefab/NewMainNav.cs

@@ -77,7 +77,7 @@ public class NewMainNav : MonoBehaviour
             types = typeArray.Where((x, i) => indexs.Contains(i)).ToList();
         }
         string shrinkName = null;
-        if (shrinkIndex.HasValue && (shrinkIndex == 0 || shrinkIndex == 2))
+        if (shrinkIndex.HasValue && isShrinkIndex(shrinkIndex.Value))
         {
             shrinkName = typeArray[shrinkIndex.Value];
         }
@@ -117,7 +117,7 @@ public class NewMainNav : MonoBehaviour
     public void ShowButton(string v)
     {
         var i = typeArray.FindIndex((x)=>x == v);
-        if (i == -1 || i == 0 || i == 2)
+        if (i == -1 || isShrinkIndex(i))
         {
             return;
         }
@@ -127,7 +127,7 @@ public class NewMainNav : MonoBehaviour
     public void HideButton(string v)
     {
         var i = typeArray.FindIndex((x) => x == v);
-        if (i == -1 || i == 0 || i == 2)
+        if (i == -1 || isShrinkIndex(i))
         {
             return;
         }
@@ -245,7 +245,10 @@ public class NewMainNav : MonoBehaviour
             transform.Find("Home").gameObject.SetActive(false);
         }
     }
-
+    private bool isShrinkIndex(int ind) 
+    {
+        return ind == 0 || ind == 2;
+    }
     // Start is called before the first frame update
     void Start()
     {

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

@@ -42,7 +42,10 @@ public class HomeController : PFUIPanel
 
 #if UNITY_ANDROID || UNITY_IOS
         var nav = transform.Find("MainNav-mobile").GetComponent<NewMainNav>();
-        nav.SetButtonActive(new List<int> { 1, 3, 4, 6 });
+        nav.SetButtonActive(new List<int> { 1, 3, 4, 6 },null,new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/Rower/划船"), () => 
+        {
+            UIManager.ShowRowerPanel();
+        }));
         newNav = nav;
         UIManager.AddEvent(transform.Find("TodayData/Datas/Distance").gameObject, EventTriggerType.PointerClick, b =>
         {

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

@@ -93,6 +93,14 @@ public class RowerHomeScript : PFUIPanel
     /// </summary>
     int stopSeconds = 0;
     uint totalDistance = 0;
+    protected override void Start()
+    {
+        var nav = transform.Find("MainNav-mobile").GetComponent<NewMainNav>();
+        nav.SetButtonActive(new List<int> {1,4,6 }, null, new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/Rower/骑行"), () =>
+        {
+            ReturnHome();
+        }));
+    }
     protected override void Awake()
     {
         spriteDict = new Dictionary<object, Sprite>()
@@ -127,6 +135,15 @@ public class RowerHomeScript : PFUIPanel
         left = transform.Find("Left");
         bottom = transform.Find("Bottom");
         PaintPullCurveDelegate = new EventHandler(PaintPullCurve);
+        transform.Find("PFUISlider").GetComponent<PFUISlider>().SetValueChanged(r =>
+        {
+            var v = (ushort)(r * 65535);
+            if (Rower != null)
+            {
+                Rower.SetResistanceLevel(v);
+                //RowerData.
+            }
+        });
         Init();
     }