From 72f254af2acdebd6b8eea5d9cb202a6852532f67 Mon Sep 17 00:00:00 2001 From: lishuo Date: Wed, 8 Jun 2022 18:27:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=93=9D=E7=89=99=E9=87=8D=E5=A4=8D=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Devices/Ble/mobile/BleMobileThread.cs | 3 +- Assets/Scripts/UI/Prefab/Device/DeviceItem.cs | 4 +- .../UI/Prefab/Panel/RowerHomeScript.cs | 133 +++++------------- Assets/Scripts/UIManager.cs | 28 ++++ ProjectSettings/ProjectSettings.asset | 4 +- 5 files changed, 70 insertions(+), 102 deletions(-) diff --git a/Assets/Scripts/Devices/Ble/mobile/BleMobileThread.cs b/Assets/Scripts/Devices/Ble/mobile/BleMobileThread.cs index ef0afcf2..7309a9e9 100644 --- a/Assets/Scripts/Devices/Ble/mobile/BleMobileThread.cs +++ b/Assets/Scripts/Devices/Ble/mobile/BleMobileThread.cs @@ -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); diff --git a/Assets/Scripts/UI/Prefab/Device/DeviceItem.cs b/Assets/Scripts/UI/Prefab/Device/DeviceItem.cs index 720ddcd6..1965b122 100644 --- a/Assets/Scripts/UI/Prefab/Device/DeviceItem.cs +++ b/Assets/Scripts/UI/Prefab/Device/DeviceItem.cs @@ -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("Images/Signal_1"); } - else if (signalValue > 20 && signalValue <= 60) + else if (signalValue > 30 && signalValue <= 60) { signal.sprite = Resources.Load("Images/Signal_2"); } diff --git a/Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs b/Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs index fa84e1c6..8ebf57d9 100644 --- a/Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs +++ b/Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs @@ -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(); + } + }); } } } diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs index 620c3598..2a56693c 100644 --- a/Assets/Scripts/UIManager.cs +++ b/Assets/Scripts/UIManager.cs @@ -1137,6 +1137,33 @@ public class UIManager : MonoBehaviour }); } + //处理EventTrigger 拦截scroll事件触发问题 + var scrollView = gameObject.GetComponentInParent(); + 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() diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c4963e8f..669f8140 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -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