From 6c9b3f825a8dc0eb44aa0c5f50b84b8a0d3ca9df Mon Sep 17 00:00:00 2001
From: lishuo <lishuo@juze.pro>
Date: Wed, 15 Jun 2022 18:07:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B2=A1=E6=9C=89=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=8F=B7=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UI/Prefab/Panel/RowerHomeScript.cs        | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs b/Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs
index 5d844e3f..a3278dbc 100644
--- a/Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs
+++ b/Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs
@@ -470,6 +470,15 @@ public class RowerHomeScript : PFUIPanel
     int truelyTime = 0;
     private void StartFunc(object sender, EventArgs e)
     {
+        var bleDevice = App.MainDeviceAdapter.GetDevices().FirstOrDefault(d => (d.State == DeviceState.Connected || d.State == DeviceState.Connecting) && d.Sensor == SensorType.Rower) as BleDevice;
+        if (bleDevice != null)
+        {
+            deviceName = bleDevice.Name;
+            deviceNetwork = bleDevice.Network.ToString();
+            deviceAddress = bleDevice.Address;
+            deviceSensor = bleDevice.Sensor.ToString();
+        }
+
         var rowdata = (IRowerCommonData)sender;
         if (rowdata != RowerData)
             return;
@@ -523,6 +532,10 @@ public class RowerHomeScript : PFUIPanel
             tempRecordData = new TempRecordData(model, files);
             return false;
         }
+
+        model.ManufacturerName = deviceName + " " + deviceNetwork + " " + deviceSensor;
+        model.DeviceNumber = $"{ deviceAddress },{ deviceSensor }";
+
         var res = ConfigHelper.rowerApi.Add(model, files);
         if (res.result)
         {
@@ -558,6 +571,11 @@ public class RowerHomeScript : PFUIPanel
         }
     }
     TempRecordData tempRecordData;
+    private string deviceName { get; set; }
+    private string deviceNetwork { get; set; }
+    private string deviceSensor { get; set; }
+    private string deviceAddress { get; set; }
+
     private bool Save(string shadowids = null)
     {
         RowerRecordModel model = new RowerRecordModel();
@@ -568,6 +586,11 @@ public class RowerHomeScript : PFUIPanel
             model.ManufacturerName = bleDevice.Name + " " + bleDevice.Network + " " + bleDevice.Sensor;
             model.DeviceNumber = $"{ bleDevice.Address },{ bleDevice.Sensor }";
         }
+        else
+        {
+            model.ManufacturerName = deviceName + " " + deviceNetwork + " " + deviceSensor;
+            model.DeviceNumber = $"{ deviceAddress },{ deviceSensor }";
+        }
         model.Id = Id;//Guid.NewGuid().ToString();
         model.Weight = App.CurrentUser.Weight;
         if (string.IsNullOrEmpty(shadowids))
@@ -634,6 +657,10 @@ public class RowerHomeScript : PFUIPanel
 
     private void Init()
     {
+        deviceName = "";
+        deviceNetwork = "";
+        deviceAddress = "";
+        deviceSensor = "";
         pointCount = 0;
         print("初始化");
         if (Rower != null)