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

蓝牙重复初始化问题

Browse Source
This commit is contained in:
lishuo 2022-06-08 18:27:16 +08:00 committed by CaiYanPeng
parent 6b3dd70c61
commit 72f254af2a
5 changed files with 70 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ namespace Assets.Scripts.Devices.Ble
this.managerStatusChanged -= value;
}
}
WclBleManagerStatus statusEnum = WclBleManagerStatus.RadioOff;
WclBleManagerStatus statusEnum = WclBleManagerStatus.RadioOn;
internal BleMobileThread() {
var self = this;
//初始蓝牙
@ -69,6 +69,7 @@ namespace Assets.Scripts.Devices.Ble
public void StartWatcher() {
var self = this;
statusEnum = WclBleManagerStatus.RadioOn;
if (statusEnum == WclBleManagerStatus.RadioOff)
{
BluetoothLEHardwareInterface.BluetoothEnable(true);

4
Assets/Scripts/UI/Prefab/Device/DeviceItem.cs
View File

@ -64,11 +64,11 @@ public class DeviceItem : Selectable, IEventSystemHandler, IPointerClickHandler
//signal.enabled = true;
var signalValue = DeviceInfo.SignalStrength * -1;
if (signalValue >= 0 && signalValue <= 20)
if (signalValue >= 0 && signalValue <= 30)
{
signal.sprite = Resources.Load<Sprite>("Images/Signal_1");
}
else if (signalValue > 20 && signalValue <= 60)
else if (signalValue > 30 && signalValue <= 60)
{
signal.sprite = Resources.Load<Sprite>("Images/Signal_2");
}

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

@ -978,111 +978,50 @@ public class RowerHomeScript : PFUIPanel
var historyRowerTime = PlayerPrefs.GetString("historyRowerTime");
if (!string.IsNullOrEmpty(historyRowerTime))
{
if ((UIManager.Now.GetDateTime() - Convert.ToDateTime(historyRowerTime)).TotalMinutes >= 2)
UIManager.ShowConfirm(App.GetLocalString("Warning"), App.GetLocalString("Save the game?"), () =>
{
UIManager.ShowConfirm(App.GetLocalString("Warning"), App.GetLocalString("Save the game?"), () =>
var str = File.ReadAllText(files[0]);
var list = str.Replace("\r\n", " ").Split(' ');
records.Clear();
foreach (var item in list)
{
var str = File.ReadAllText(files[0]);
var list = str.Replace("\r\n", " ").Split(' ');
records.Clear();
foreach (var item in list)
if (!string.IsNullOrEmpty(item))
{
if (!string.IsNullOrEmpty(item))
var datas = item.Split(',');
records.Add(item);
values.Add(new TempRowerCalc()
{
var datas = item.Split(',');
records.Add(item);
values.Add(new TempRowerCalc() {
strokeCount = int.Parse(datas[0]),
pace = ushort.Parse(datas[4]),
power = int.Parse(datas[3]),
rate = uint.Parse(datas[5]),
heartRate = int.Parse(datas[7]),
distance = int.Parse(datas[2]),
energy = int.Parse(datas[8]) });
}
//records.Add($"{strokeCount}0,{RowerData.ElapsedTime},{distance}2,{power}3,{pace}4,{rate}5,{RowerData.ResistanceLevel},{heartRate}7,{energy}8,{RowerData.AveragePower},{truelyTime}");
strokeCount = int.Parse(datas[0]),
pace = ushort.Parse(datas[4]),
power = int.Parse(datas[3]),
rate = uint.Parse(datas[5]),
heartRate = int.Parse(datas[7]),
distance = int.Parse(datas[2]),
energy = int.Parse(datas[8])
});
}
var historyRowerType = PlayerPrefs.GetString("historyRowerType");
if (!string.IsNullOrEmpty(historyRowerType))
{
var typeObject = historyRowerType.Split(',');
rowerType = new RowerType() { type = int.Parse(typeObject[0]), value = float.Parse(typeObject[1]) };
}
createTime = UIManager.Now.GetDateTime();
Save(PlayerPrefs.GetString("historyRowerShadowIds"));
Helper.DelectDir(dir);
UIManager.CloseConfirm();
}, 2,
() =>
//records.Add($"{strokeCount}0,{RowerData.ElapsedTime},{distance}2,{power}3,{pace}4,{rate}5,{RowerData.ResistanceLevel},{heartRate}7,{energy}8,{RowerData.AveragePower},{truelyTime}");
}
var historyRowerType = PlayerPrefs.GetString("historyRowerType");
if (!string.IsNullOrEmpty(historyRowerType))
{
Helper.DelectDir(dir);
UIManager.CloseConfirm();
if (Rower != null)
{
Rower.Reset();
}
});
}
else
var typeObject = historyRowerType.Split(',');
rowerType = new RowerType() { type = int.Parse(typeObject[0]), value = float.Parse(typeObject[1]) };
}
createTime = UIManager.Now.GetDateTime();
Save(PlayerPrefs.GetString("historyRowerShadowIds"));
Helper.DelectDir(dir);
UIManager.CloseConfirm();
}, 2,
() =>
{
UIManager.ShowConfirm(App.GetLocalString("Warning"), App.GetLocalString("Continue the game?"), () =>
Helper.DelectDir(dir);
UIManager.CloseConfirm();
if (Rower != null)
{
var str = File.ReadAllText(files[0]);
var list = str.Replace("\r\n", " ").Split(' ');
records.Clear();
foreach (var item in list)
{
if (!string.IsNullOrEmpty(item))
{
var datas = item.Split(',');
records.Add(item);
values.Add(new TempRowerCalc()
{
strokeCount = int.Parse(datas[0]),
pace = ushort.Parse(datas[4]),
power = int.Parse(datas[3]),
rate = uint.Parse(datas[5]),
heartRate = int.Parse(datas[7]),
distance = int.Parse(datas[2]),
energy = int.Parse(datas[8])
});
}
//records.Add($"{strokeCount},{RowerData.ElapsedTime},{distance},{power},{pace},{rate},{RowerData.ResistanceLevel},{heartRate},{energy},{RowerData.AveragePower},{truelyTime}");
}
var _re = records.LastOrDefault();
if (!string.IsNullOrEmpty(_re))
{
var datas = _re.Split(',');
historyTime = int.Parse(datas[10]);
var historyRowerType = PlayerPrefs.GetString("historyRowerType");
if (!string.IsNullOrEmpty(historyRowerType))
{
var typeObject = historyRowerType.Split(',');
rowerType = new RowerType() { type = int.Parse(typeObject[0]), value = float.Parse(typeObject[1]) };
HandleSelectType();
}
historyTime = int.Parse(datas[10]);
historyStrokeCount = int.Parse(datas[0]);
historyDistance = int.Parse(datas[2]);
seconds = historyTime;
historyEnergy = int.Parse(datas[8]);
}
Helper.DelectDir(dir);
UIManager.CloseConfirm();
}, 2,
() =>
{
Helper.DelectDir(dir);
UIManager.CloseConfirm();
if (Rower != null)
{
Rower.Reset();
}
});
}
Rower.Reset();
}
});
}
}
}

28
Assets/Scripts/UIManager.cs
View File

@ -1137,6 +1137,33 @@ public class UIManager : MonoBehaviour
});
}
//处理EventTrigger 拦截scroll事件触发问题
var scrollView = gameObject.GetComponentInParent<ScrollRect>();
if (scrollView != null)
{
EventTrigger.Entry entryBegin = new EventTrigger.Entry(), entryDrag = new EventTrigger.Entry(), entryEnd = new EventTrigger.Entry(), entrypotential = new EventTrigger.Entry()
, entryScroll = new EventTrigger.Entry();
entryBegin.eventID = EventTriggerType.BeginDrag;
entryBegin.callback.AddListener((data) => { scrollView.OnBeginDrag((PointerEventData)data); });
et.triggers.Add(entryBegin);
entryDrag.eventID = EventTriggerType.Drag;
entryDrag.callback.AddListener((data) => { scrollView.OnDrag((PointerEventData)data); });
et.triggers.Add(entryDrag);
entryEnd.eventID = EventTriggerType.EndDrag;
entryEnd.callback.AddListener((data) => { scrollView.OnEndDrag((PointerEventData)data); });
et.triggers.Add(entryEnd);
entrypotential.eventID = EventTriggerType.InitializePotentialDrag;
entrypotential.callback.AddListener((data) => { scrollView.OnInitializePotentialDrag((PointerEventData)data); });
et.triggers.Add(entrypotential);
entryScroll.eventID = EventTriggerType.Scroll;
entryScroll.callback.AddListener((data) => { scrollView.OnScroll((PointerEventData)data); });
et.triggers.Add(entryScroll);
}
}
public static void Close(MonoBehaviour obj)
@ -1205,6 +1232,7 @@ public class UIManager : MonoBehaviour
UIManager.Instance.confirm.Show();
UIManager.Instance.confirm.Set(title, content, action, cancel);
}
UIManager.Instance.confirm.transform.SetAsLastSibling();
UIManager.Instance.confirm.SetType(type);
}
public static void CloseConfirm()

4
ProjectSettings/ProjectSettings.asset
View File

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