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 17:24:35 +08:00 committed by CaiYanPeng
parent 46b6c7fa01
commit 6b3dd70c61
6 changed files with 58 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Plugins/Android/unityandroidbluetoothlelib.jar
View File

Binary file not shown.

5
Assets/Scripts/Devices/Ant/AntConnector.cs
View File

@ -544,5 +544,10 @@ namespace Assets.Scripts.Devices.Ant
channel.closeChannel(500);
channel.unassignChannel(500);
}
public void Remove(AbstractAntDevice device)
{
discoveredDevices.Remove(device);
}
}
}

12
Assets/Scripts/Devices/Ant/AntDeviceAdapter.cs
View File

@ -42,6 +42,18 @@ namespace Assets.Scripts.Devices.Ant
return AntConnector.Instance().discoveredDevices;
}
public override void Refresh()
{
var list = AntConnector.Instance().discoveredDevices.ToList();
foreach (var item in list)
{
if (item.State == Ant.DeviceState.Disconnected)
{
AntConnector.Instance().Remove(item);
}
}
}
public override void StartScan()
{
//throw new NotImplementedException();

13
Assets/Scripts/Devices/Ble/BleDeviceAdapter.cs
View File

@ -183,6 +183,19 @@ namespace Assets.Scripts.Devices.Ble
}
}
public override void Refresh()
{
var list = discoveredDevices.ToList();
foreach (var item in list)
{
if (item.Value.State == Ant.DeviceState.Disconnected)
{
item.Value.Dispose();
discoveredDevices.Remove(item.Key);
}
}
}
/// <summary>
/// 清除未连接的设备
/// </summary>

2
Assets/Scripts/Devices/DeviceAdapter.cs
View File

@ -24,7 +24,7 @@ namespace Assets.Scripts.Devices
{
}
public abstract void Refresh();
}
}

33
Assets/Scripts/UI/Prefab/Rower/RowerDeviceView.cs
View File

@ -129,14 +129,35 @@ public class RowerDeviceView : MonoBehaviour
UIManager.AddEvent(gameObject, EventTriggerType.PointerClick, b =>
{
if (!mPairButton.activeInHierarchy && !mDisconnectButton.activeInHierarchy) return;
connectButtonClick();
var device = GetDevice();
if (device != null && device.State == DeviceState.Connected)
{
UIManager.ShowConfirm("警告", "是否断开该设备？", () =>
{
device.Disconnect(false);
UIManager.CloseConfirm();
}, 2, () => {
UIManager.CloseConfirm();
});
}
else
{
connectButtonClick();
}
});
UIManager.AddEvent(mDisconnectButton, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction<BaseEventData>(e => {
//var device = GetDevice();
//if(device != null && device.State == DeviceState.Connected)
//{
// device.Disconnect();
//}
UIManager.ShowConfirm("警告", "是否断开该设备？", () =>
{
var device = GetDevice();
if (device != null && device.State == DeviceState.Connected)
{
device.Disconnect(false);
}
UIManager.CloseConfirm();
}, 2, () => {
UIManager.CloseConfirm();
});
return;
#if UNITY_IOS || UNITY_ANDROID
var obj = Resources.Load("UI/Prefab/Device/Mobile/ConnectDeviceModal");