lishuo/powerfun-unity
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决c2表头设定课程后抖动问题，设备断开失败问题

Browse Source
This commit is contained in:
lishuo 2022-06-15 16:42:07 +08:00
parent 0202814f67
commit 610c98f9b8
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/Devices/Ble/BleDevice.cs
View File

@ -128,7 +128,7 @@ namespace Assets.Scripts.Devices.Ble
Debug.Log("断开设备" + this.Name); Debug.Log("断开设备" + this.Name);
//App.MainDeviceAdapter.PrintStatus(); //App.MainDeviceAdapter.PrintStatus();
this.State = DeviceState.Disconnected; //this.State = DeviceState.Disconnected;
this.hwInterface.DisconnectPeripheral(this.peripheralInfo, () => { this.hwInterface.DisconnectPeripheral(this.peripheralInfo, () => {
//App.MainDeviceAdapter.PrintStatus(); //App.MainDeviceAdapter.PrintStatus();

3
Assets/Scripts/Devices/Ble/mobile/BleMobileInterface.cs
View File

@ -240,6 +240,7 @@ namespace Assets.Scripts.Ble
IsSuccess = true, IsSuccess = true,
Error = null Error = null
}; };
PeripheralDisconnected(address, info);//连接前断开
callback?.Invoke(self, info, s); callback?.Invoke(self, info, s);
this.callbacks.Remove(info); this.callbacks.Remove(info);
Debug.Log("连接成功!" + info.Name); Debug.Log("连接成功!" + info.Name);
@ -341,8 +342,6 @@ namespace Assets.Scripts.Ble
{ {
characteristicsDiscoveredCallbacks.Remove(characteristicsDiscoveredCallback.First().Key); characteristicsDiscoveredCallbacks.Remove(characteristicsDiscoveredCallback.First().Key);
} }
peripheralDisconnectedEvent(this, info, null, false);
} }
#endregion #endregion

6
Assets/Scripts/UI/Control/PFUISlider.cs
View File

@ -64,12 +64,14 @@ public class PFUISlider : MonoBehaviour
text.text = $"{valueHandler(f):#0}"; text.text = $"{valueHandler(f):#0}";
this.ValueChangedHandler?.Invoke(f); this.ValueChangedHandler?.Invoke(f);
} }
public void SetValue(float a) public void SetValue(float a,bool silent = false)
{ {
a = a > 1 ? 1 : a; a = a > 1 ? 1 : a;
a = a < 0 ? 0 : a; a = a < 0 ? 0 : a;
slider.value = a; slider.value = a;
OnValueChanged(); text.text = $"{valueHandler(a):#0}";
if(!silent)
OnValueChanged();
} }
public float GetValue() public float GetValue()

14
Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs
View File

@ -751,7 +751,7 @@ public class RowerHomeScript : PFUIPanel
{ {
var origin = RowerData.ResistanceLevel; var origin = RowerData.ResistanceLevel;
var wrapped = origin< 50 ? 50 : origin; var wrapped = origin< 50 ? 50 : origin;
slider.GetComponent<PFUISlider>().SetValue((wrapped - 50) / 300f); slider.GetComponent<PFUISlider>().SetValue((wrapped - 50) / 300f,false);
} }
} }
@ -827,7 +827,10 @@ public class RowerHomeScript : PFUIPanel
}); });
return; return;
} }
if (interruptFlag) return; if (interruptFlag) {
transform.Find("Stopped").gameObject.SetActive(false);
return;
}
if (RowerData == null) return; if (RowerData == null) return;
//#endif //#endif
//断线重连继续 //断线重连继续
@ -853,9 +856,10 @@ public class RowerHomeScript : PFUIPanel
} }
if (stopSeconds >= 2) if (stopSeconds >= 2)
{ {
if (UIManager.Instance.confirm != null && UIManager.Instance.confirm.IsActive()) if (UIManager.Instance.confirm != null && UIManager.Instance.confirm.IsActive()) {
transform.Find("Stopped").gameObject.SetActive(false);
return; return;
}
transform.Find("Stopped").gameObject.SetActive(true); transform.Find("Stopped").gameObject.SetActive(true);
//if (stopSeconds == 6) //if (stopSeconds == 6)
//{ //{
@ -1339,7 +1343,7 @@ public class RowerHomeScript : PFUIPanel
} }
if (Rower != null) if (Rower != null)
{ {
if (C2RowerData.IsEnabled == true && !openTimer && !isPause && C2RowerData.rowerType!=null) if (C2RowerData.IsEnabled == true && !openTimer && !isPause && C2RowerData.rowerType!=null && rowerType!= null && !rowerType.EqualTo(C2RowerData.rowerType))
{ {
rowerType = C2RowerData.rowerType; rowerType = C2RowerData.rowerType;
HandleSelectType(); HandleSelectType();

3
Assets/Scripts/UI/Prefab/Rower/RowerTaskPanel.cs
View File

@ -22,6 +22,9 @@ public class RowerTaskPanel : PFUIPanel
/// 里程：m 时间：s /// 里程：m 时间：s
/// </summary> /// </summary>
public float value { get; set; } public float value { get; set; }
public bool EqualTo(RowerType rowerType) {
return this.type == rowerType.type && this.value == rowerType.value;
}
} }
Transform selector, distance, time; Transform selector, distance, time;
public RowerType rowerType; public RowerType rowerType;