修改断线重连自动开始问题

Assets/Scenes/MainScene.unity

@@ -155,7 +155,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -30, y: 30}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &43982091
@@ -190,7 +190,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: '2022-06-06 v1
+  m_Text: '2022-06-07 v1
 
 '
 --- !u!222 &43982092
@@ -201,92 +201,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 43982089}
   m_CullTransparentMesh: 0
---- !u!21 &90081773
-Material:
-  serializedVersion: 6
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: RoundedCornersTextureMaterial(Clone)
-  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
-  m_ShaderKeywords: 
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Height: 50
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _Radius: 15
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _UseUIAlphaClip: 0
-    - _Width: 50
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _WidthHeightRadius: {r: 446, g: 70, b: 70, a: 0}
 --- !u!21 &120553182
 Material:
   serializedVersion: 6
@@ -701,6 +615,92 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 684809389}
   m_CullTransparentMesh: 0
+--- !u!21 &698887077
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: RoundedCornersTextureMaterial(Clone)
+  m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Height: 50
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _Radius: 15
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _UseUIAlphaClip: 0
+    - _Width: 50
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _WidthHeightRadius: {r: 446, g: 70, b: 70, a: 0}
 --- !u!1 &724627085
 GameObject:
   m_ObjectHideFlags: 0
@@ -1459,7 +1459,85 @@ Material:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _WidthHeightRadius: {r: 273, g: 44, b: 44, a: 0}
---- !u!21 &1660838781
+--- !u!1 &1726804851
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1726804852}
+  - component: {fileID: 1726804854}
+  - component: {fileID: 1726804853}
+  m_Layer: 5
+  m_Name: BatteryText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1726804852
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1726804851}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 684809390}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 60, y: 30}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!114 &1726804853
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1726804851}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
+    m_FontSize: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!222 &1726804854
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1726804851}
+  m_CullTransparentMesh: 0
+--- !u!21 &1947923732
 Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
@@ -1545,84 +1623,6 @@ Material:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _WidthHeightRadius: {r: 50, g: 50, b: 50, a: 0}
---- !u!1 &1726804851
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1726804852}
-  - component: {fileID: 1726804854}
-  - component: {fileID: 1726804853}
-  m_Layer: 5
-  m_Name: BatteryText
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1726804852
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1726804851}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 684809390}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 60, y: 30}
-  m_Pivot: {x: 1, y: 0.5}
---- !u!114 &1726804853
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1726804851}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
-    m_FontSize: 16
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: 
---- !u!222 &1726804854
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1726804851}
-  m_CullTransparentMesh: 0
 --- !u!1 &1962586925
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/App.cs

@@ -235,7 +235,7 @@ public static class App
         //Host = "http://192.168.0.101:5087/";
         //UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11000);
         //TcpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.102"), 21001);
-        Debug.unityLogger.logEnabled = false;
+        //Debug.unityLogger.logEnabled = false;
 #else 
         //Host = "http://pf.juze.pro/";
         //Host = "http://192.168.0.101:5087/";

Assets/Scripts/Devices/Ble/Characteristic/C2RowerData.cs

@@ -155,7 +155,7 @@ namespace Assets.Scripts.Devices.Ble.Characteristic
         /// 平均划桨频率
         /// </summary>
         public int AverageStrokeRate { get; set; } = 0;
-        private UInt32 _totalDistance = 0;
+        private UInt32 _totalDistance = 1;
         public UInt32 TotalDistance
         {
             get => _totalDistance;

Assets/Scripts/Devices/Ble/Characteristic/FtmsRowerData.cs

@@ -25,7 +25,7 @@ namespace Assets.Scripts.Devices.Ble.Characteristic
         /// </summary>
         public int AverageStrokeRate { get; set; } = 0;
 
-        private UInt32 _totalDistance = 0;
+        private UInt32 _totalDistance = 1;
         public UInt32 TotalDistance
         {
             get => _totalDistance;
@@ -113,6 +113,7 @@ namespace Assets.Scripts.Devices.Ble.Characteristic
                 return this.Flags.HasFlag(RowerDataFlag.MoreData);
             }
         }
+        private string[] deviceNamePool = new string[] {"Think","PF" };
 
         public void HandleAttributeReceived(byte[] data)
         {
@@ -127,7 +128,7 @@ namespace Assets.Scripts.Devices.Ble.Characteristic
             //}
             var output = "";
             output += "收到消息：" + string.Join(",", data);
-            Debug.Log(output);
+            
             this.Flags = (RowerDataFlag)BitConverter.ToUInt16(data, 0);
             int b = 2;
             if (!this.MoreDataFlag)
@@ -191,7 +192,7 @@ namespace Assets.Scripts.Devices.Ble.Characteristic
             {
                 this.commonRes = BitConvertHelper.ToInt16(data, b);
                 var device = App.MainDeviceAdapter.GetDevices().FirstOrDefault(d => (d.State == DeviceState.Connected) && d.Sensor == SensorType.Rower);
-                if (device != null && !device.Name.Contains("Think") && RowerResChanged != null) 
+                if (device != null && deviceNamePool.FirstOrDefault(x => device.Name.ToLower().Contains(x.ToLower())) == null && RowerResChanged != null) 
                 {
                     RowerResChanged.Invoke(this.commonRes, null);
                 }
@@ -230,7 +231,7 @@ namespace Assets.Scripts.Devices.Ble.Characteristic
             {
                 this.thinkRes = BitConvertHelper.ToInt16(data, b + 1);
                 var device = App.MainDeviceAdapter.GetDevices().FirstOrDefault(d => (d.State == DeviceState.Connected) && d.Sensor == SensorType.Rower);
-                if (device != null && device.Name.Contains("Think") && RowerResChanged != null)
+                if (device != null && deviceNamePool.FirstOrDefault(x=>device.Name.ToLower().Contains(x.ToLower()))!=null && RowerResChanged != null)
                 {
                     RowerResChanged.Invoke(this.thinkRes, null);
                 }
@@ -263,6 +264,7 @@ namespace Assets.Scripts.Devices.Ble.Characteristic
                 }
                 //Debug.Log("拉力：" + string.Join(",",list));
             }
+            //Debug.Log(output);
         }
         List<ushort> pullList;
         public void Reset()

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

@@ -53,6 +53,7 @@ namespace Assets.Scripts.Devices.Ble.Devices
                             Debug.Log("中控台获取");
                             this.controlPointCharacteristic = character;
                             C2RowerData.IsEnabled = false;
+                            Reset();
                         }
                         else if (character.MatchGuid(ServiceUuids.Characteristics.RowerData))
                         {

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

@@ -609,10 +609,10 @@ public class RowerHomeScript : PFUIPanel
         {
             Rower.Reset();
         }
-        if (RowerData != null)
+        //if (RowerData != null)
-        {
+        //{
-            RowerData.Reset();
+        //    RowerData.Reset();
-        }
+        //}
         GetComponent<RowerMultiModeScript>().GetShadowList(rowerType, reRowData);
         btnStart.tag = "Start";
         btnStart.GetComponent<Image>().sprite = spriteDict["Start"];
@@ -996,6 +996,10 @@ public class RowerHomeScript : PFUIPanel
                         {
                             Helper.DelectDir(dir);
                             UIManager.CloseConfirm();
+                            if (Rower != null)
+                            {
+                                Rower.Reset();
+                            }
                         });
                     }
                     else 
@@ -1051,6 +1055,10 @@ public class RowerHomeScript : PFUIPanel
                         {
                             Helper.DelectDir(dir);
                             UIManager.CloseConfirm();
+                            if (Rower != null)
+                            {
+                                Rower.Reset();
+                            }
                         });
                     }
                 }
@@ -1292,7 +1300,7 @@ public class RowerHomeScript : PFUIPanel
             {
                 isFirstReset = true;
                 Rower.Reset();
-                RowerData.Reset();
+                //RowerData.Reset();
             }
         }
         if (transform.Find("Stopped").gameObject.activeInHierarchy) 

Assets/Scripts/UI/Prefab/Rower/RowerMultiModeScript.cs

@@ -464,11 +464,11 @@ public class RowerMultiModeScript : MonoBehaviour
             }
         }
         //if(!data.isMine) diffWidth = 101;
+        t.Find("Left/Rank").GetComponent<Text>().text = (userList.FindIndex(x => x.UserId == data.UserId) + 1).ToString("00");
         if (is0to100(diffWidth))
         {
             var tWidth = (diffWidth / 100f) * width;
             t.Find("Main/Boat").gameObject.SetActive(true);
-            t.Find("Left/Rank").GetComponent<Text>().text = (userList.FindIndex(x => x.UserId == data.UserId) + 1).ToString("00");
             if (isAni)
             {
                 t.Find("Main/Boat").DOLocalMoveX(21.5f + tWidth, 0.9f);

ProjectSettings/AndroidResolverDependencies.xml

@@ -13,7 +13,7 @@
   </packages>
   <files />
   <settings>
-    <setting name="androidAbis" value="arm64-v8a,armeabi-v7a" />
+    <setting name="androidAbis" value="armeabi-v7a" />
     <setting name="bundleId" value="com.ZhiXingPai.PowerFunUnity" />
     <setting name="explodeAars" value="True" />
     <setting name="gradleBuildEnabled" value="True" />

ProjectSettings/ProjectSettings.asset

@@ -256,7 +256,7 @@ PlayerSettings:
   clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
   templatePackageId: com.unity.template.3d@4.2.8
   templateDefaultScene: Assets/Scenes/SampleScene.unity
-  AndroidTargetArchitectures: 3
+  AndroidTargetArchitectures: 1
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
   AndroidKeystoreName: '{inproject}: Assets/Plugins/Android/powerfun.keystore'
@@ -868,7 +868,7 @@ PlayerSettings:
   platformArchitecture:
     iPhone: 1
   scriptingBackend:
-    Android: 1
+    Android: 0
     Standalone: 0
   il2cppCompilerConfiguration:
     Standalone: 0