From f25d0b7b8c4231857890c1c2c8286638120be051 Mon Sep 17 00:00:00 2001 From: lishuo Date: Mon, 13 Jun 2022 18:59:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=93=9D=E7=89=99=E6=96=AD=E5=BC=80=E9=87=8D?= =?UTF-8?q?=E8=BF=9E=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Images/Rower/搜索.png | Bin 0 -> 7914 bytes Assets/Resources/Images/Rower/搜索.png.meta | 128 +++++++++ .../Device/Mobile/ConnectDeviceModal.prefab | 261 ++++++++++++++++++ Assets/Resources/UI/language.json | 6 +- .../Devices/Ble/Characteristic/C2RowerData.cs | 21 +- .../Ble/Characteristic/FtmsRowerData.cs | 12 +- .../Devices/Ble/mobile/BleMobileInterface.cs | 16 ++ Assets/Scripts/UI/Control/PFUISlider.cs | 2 + .../UI/Prefab/Device/ConnectDeviceModal.cs | 3 + .../UI/Prefab/Panel/RowerHomeScript.cs | 28 +- .../UI/Prefab/Rower/RowerDeviceView.cs | 5 +- 11 files changed, 455 insertions(+), 27 deletions(-) create mode 100644 Assets/Resources/Images/Rower/搜索.png create mode 100644 Assets/Resources/Images/Rower/搜索.png.meta diff --git a/Assets/Resources/Images/Rower/搜索.png b/Assets/Resources/Images/Rower/搜索.png new file mode 100644 index 0000000000000000000000000000000000000000..76afa77a30a9653172698e2a373f671554e6b2c4 GIT binary patch literal 7914 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 Uwj#tW!T r = new List(); + //List r = new List(); for (int i = 3; i < data.Length; i += 2) { ushort pull = data[i] < 5 ? (ushort)0 : Convert.ToUInt16(Math.Round(LbsToNewton(data[i], true))); - r.Add(pull); + //r.Add(pull); PullValue = pull; } - Debug.Log("拉力曲线：" + string.Join(",", r)); + // Debug.Log("拉力曲线：" + string.Join(",", r)); } else if (data[0] == 0x31) { @@ -102,11 +102,12 @@ namespace Assets.Scripts.Devices.Ble.Characteristic var time = ((data[3] << 16) + (data[2] << 8) + data[1]) / 100; Debug.Log("划船时间" + time); isReadyStatus = data[9] == 0; - if (RowerResChanged != null) - { - RowerResChanged.Invoke(data[19], new EventArgs()); - } + var hasChanged = data[19] != ResistanceLevel; ResistanceLevel = data[19]; + if (RowerResChanged != null && hasChanged) + { + RowerResChanged.Invoke(this, null); + } //isReadyStatus = data[2] == 1 || data[2] == 129; } else if (data[0] == 0x32) @@ -163,7 +164,7 @@ namespace Assets.Scripts.Devices.Ble.Characteristic { if (_totalDistance == 0 && value != 0 && StartEvent != null) { - StartEvent.Invoke(null, new EventArgs()); + StartEvent.Invoke(this, null); } _totalDistance = value; } diff --git a/Assets/Scripts/Devices/Ble/Characteristic/FtmsRowerData.cs b/Assets/Scripts/Devices/Ble/Characteristic/FtmsRowerData.cs index f109d75e..458c0a32 100644 --- a/Assets/Scripts/Devices/Ble/Characteristic/FtmsRowerData.cs +++ b/Assets/Scripts/Devices/Ble/Characteristic/FtmsRowerData.cs @@ -38,7 +38,7 @@ namespace Assets.Scripts.Devices.Ble.Characteristic { if (_instantaneousPace == 0 && value != 0 && StartEvent != null) { - StartEvent.Invoke(null, new EventArgs()); + StartEvent.Invoke(this, null); } _instantaneousPace = value; } @@ -104,7 +104,7 @@ namespace Assets.Scripts.Devices.Ble.Characteristic _pullValue = value; if (this.PullChanged != null) { - this.PullChanged(this, new EventArgs()); + this.PullChanged(this, null); } } } @@ -200,7 +200,7 @@ namespace Assets.Scripts.Devices.Ble.Characteristic var device = App.MainDeviceAdapter.GetDevices().FirstOrDefault(d => (d.State == DeviceState.Connected) && d.Sensor == SensorType.Rower); if (resChanged && device != null && deviceNamePool.FirstOrDefault(x => device.Name.ToLower().Contains(x.ToLower())) == null && RowerResChanged != null) { - RowerResChanged.Invoke(this.commonRes, null); + RowerResChanged.Invoke(this, null); } b += this.SizeOfDataForFlag(RowerDataFlag.ResistanceLevel); } @@ -241,7 +241,7 @@ namespace Assets.Scripts.Devices.Ble.Characteristic var device = App.MainDeviceAdapter.GetDevices().FirstOrDefault(d => (d.State == DeviceState.Connected) && d.Sensor == SensorType.Rower); if (thinkResChanged && device != null && deviceNamePool.FirstOrDefault(x=>device.Name.ToLower().Contains(x.ToLower()))!=null && RowerResChanged != null) { - RowerResChanged.Invoke(this.thinkRes, null); + RowerResChanged.Invoke(this, null); } b += this.SizeOfDataForFlag(RowerDataFlag.ThinkDragFactor); } @@ -254,6 +254,8 @@ namespace Assets.Scripts.Devices.Ble.Characteristic tempPullList.Add(val); PullValue = val; } + Debug.Log("拉力列表：" + string.Join(",", tempPullList)); + if (pullList == null) pullList = new List(); foreach (var pull in tempPullList) { @@ -269,7 +271,7 @@ namespace Assets.Scripts.Devices.Ble.Characteristic pullList.Add(pull); } tempPullList.Clear(); - //Debug.Log("拉力：" + string.Join(",",list)); + } } List pullList { get; set; } diff --git a/Assets/Scripts/Devices/Ble/mobile/BleMobileInterface.cs b/Assets/Scripts/Devices/Ble/mobile/BleMobileInterface.cs index b2c1a994..d35ebd46 100644 --- a/Assets/Scripts/Devices/Ble/mobile/BleMobileInterface.cs +++ b/Assets/Scripts/Devices/Ble/mobile/BleMobileInterface.cs @@ -116,6 +116,10 @@ namespace Assets.Scripts.Ble private void ManagerStatusChanged(BleMobileThread sender, WclBleManagerStatus status) { this.BleState = BleMobileInterface.StateFromNativeState(status); + if (this.BleState == BleState.Off) + { + ClearAllCallbacks(); + } } private void WatcherScanInfoReceived(BleMobileThread sender, string address, string name, int rssi,string[] uuids) @@ -348,6 +352,7 @@ namespace Assets.Scripts.Ble BluetoothLEHardwareInterface.DisconnectPeripheral(peripheral.Address, (address) => { Debug.Log("断开回调"+ address); + PeripheralDisconnected(address,peripheral); peripheralDisconnectedEvent(this, peripheral, null, true); callback?.Invoke(); }); @@ -374,6 +379,17 @@ namespace Assets.Scripts.Ble { bleMobileThread?.Stop(); } + + public void ClearAllCallbacks() + { + callbacks?.Clear(); + servicesCallbacks?.Clear(); + characteristicNotificationCallbacks?.Clear(); + characteristicReadCallbacks?.Clear(); + characteristicsDiscoveredCallbacks?.Clear(); + _discoveredCallback = null; + _pCache?.Clear(); + } //发现服务列表 public void DiscoverServices(BlePeripheralInfo peripheral, Action>> callback) diff --git a/Assets/Scripts/UI/Control/PFUISlider.cs b/Assets/Scripts/UI/Control/PFUISlider.cs index c394cc9d..807ee35f 100644 --- a/Assets/Scripts/UI/Control/PFUISlider.cs +++ b/Assets/Scripts/UI/Control/PFUISlider.cs @@ -50,6 +50,8 @@ public class PFUISlider : MonoBehaviour } public void SetValue(float a) { + a = a > 1 ? 1 : a; + a = a < 0 ? 0 : a; slider.value = a; slider.onValueChanged?.Invoke(a); } diff --git a/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs b/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs index 951656b1..74547532 100644 --- a/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs +++ b/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs @@ -44,6 +44,7 @@ public class ConnectDeviceModal : PFUIPanel private Dictionary deviceList; private Text noDevice,Title; private RectTransform searchIconRect; + private GameObject deviceNotFound; protected override void Awake() { @@ -52,6 +53,7 @@ public class ConnectDeviceModal : PFUIPanel deviceList = new Dictionary(); var container = this.transform.Find("GameObject"); + deviceNotFound = container.Find("Panel/Error").gameObject; var closeBtn = container.Find("CloseBtn"); Logo = container.Find("Logo").GetComponent(); Title = container.Find("Title").GetComponent(); @@ -259,6 +261,7 @@ public class ConnectDeviceModal : PFUIPanel //如果没有可连接的设备按钮只读 connectBtn.mButton.enabled = deviceList.Count > 0; connectBtn.mButton.interactable = deviceList.Count > 0; + deviceNotFound.SetActive(deviceList.Count <= 0); } } //选中需要连接的设备 diff --git a/Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs b/Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs index b4b3aaaa..0a2e0247 100644 --- a/Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs +++ b/Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs @@ -466,6 +466,10 @@ public class RowerHomeScript : PFUIPanel int truelyTime = 0; private void StartFunc(object sender, EventArgs e) { + var rowdata = (IRowerCommonData)sender; + if (rowdata != RowerData) + return; + Debug.Log($"开始了:{openTimer}"); if (UIManager.Instance.confirm != null && UIManager.Instance.confirm.IsActive()) { @@ -626,6 +630,7 @@ public class RowerHomeScript : PFUIPanel private void Init() { + pointCount = 0; print("初始化"); if (Rower != null) { @@ -734,20 +739,18 @@ public class RowerHomeScript : PFUIPanel transform.Find("ResBar/BtnSub").GetComponent