蓝牙断开重连相关逻辑优化
This commit is contained in:
1 parent
87a0e7fb6d
commit
f25d0b7b8c
11 files changed
+455
-27
No files matched your search
@@ -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<Button>().interactable = !(bool)sender;
|
||||
transform.Find("ResBar/BtnAdd").GetComponent<Button>().interactable = !(bool)sender;
|
||||
}
|
||||
bool initRes = false;
|
||||
|
||||
private void ResChanged(object sender, EventArgs e)
|
||||
{
|
||||
Debug.Log(Convert.ToSingle(sender));
|
||||
if (!initRes && slider)
|
||||
var originData = (IRowerCommonData)sender;
|
||||
if (slider && RowerData!= null && originData == RowerData)
|
||||
{
|
||||
var origin = Convert.ToSingle(sender);
|
||||
var origin = RowerData.ResistanceLevel;
|
||||
var wrapped = origin< 50 ? 50 : origin;
|
||||
slider.GetComponent<PFUISlider>().SetValue((wrapped - 50) / 300f);
|
||||
initRes = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public bool checkRowing()
|
||||
{
|
||||
if (seconds > 0)
|
||||
@@ -792,6 +795,7 @@ public class RowerHomeScript : PFUIPanel
|
||||
private Text rmyAvgForceText { get; set; }
|
||||
private Text PeakForceText { get; set; }
|
||||
private Text rmyPeakForceText { get; set; }
|
||||
private bool interruptFlag{ get; set; }
|
||||
|
||||
void TimerTicks()
|
||||
{
|
||||
@@ -801,21 +805,26 @@ public class RowerHomeScript : PFUIPanel
|
||||
PaintPullCurve((ushort)(a / 10));
|
||||
if (RowerData == null) return;
|
||||
#endif
|
||||
#if !UNITY_EDITOR
|
||||
//#if !UNITY_EDITOR
|
||||
if (Rower == null)
|
||||
{
|
||||
interruptFlag = true;
|
||||
//HandleDiscardDirect();
|
||||
isPause = true;
|
||||
UIManager.ShowConfirm(App.GetLocalString("Warning"), App.GetLocalString("Save the game?"), () =>
|
||||
{
|
||||
HandleSaveDirect();
|
||||
UIManager.CloseConfirm();
|
||||
interruptFlag = false;
|
||||
}, 2, ()=> {
|
||||
Init();
|
||||
interruptFlag = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (interruptFlag) return;
|
||||
if (RowerData == null) return;
|
||||
#endif
|
||||
//#endif
|
||||
var heartRate = HeartRate ?? 0;
|
||||
BPMText.text = heartRate.ToString();
|
||||
//断线重连继续
|
||||
@@ -1087,7 +1096,10 @@ public class RowerHomeScript : PFUIPanel
|
||||
|
||||
void PaintPullCurve(object sender, EventArgs e)
|
||||
{
|
||||
//防止设备断开重连rowData对象发生变化,事件重复触发
|
||||
var ftms = (IRowerCommonData)sender;
|
||||
if (RowerData != ftms)
|
||||
return;
|
||||
//Debug.Log(ftms.PullValue);
|
||||
PaintPullCurve(ftms.PullValue);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user