yuqucheng/killapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: yuqucheng:ca042827d6585a7e5aa44707b32ba0799d66ad8f
Branches Tags
yuqucheng:main
yuqucheng:master
..
compare: yuqucheng:a1f3221ae0512d3fc3c0b14d5402d82b072505e6
Branches Tags
yuqucheng:master
yuqucheng:main

No commits in common. "ca042827d6585a7e5aa44707b32ba0799d66ad8f" and "a1f3221ae0512d3fc3c0b14d5402d82b072505e6" have entirely different histories.
ca042827d6 ... a1f3221ae0

1 changed files with 3 additions and 5 deletions
Show Stats Expand all files Collapse all files

6
Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs
View File

@ -822,7 +822,6 @@ namespace Kill.UI.Pages
public async Task Init() public async Task Init()
{ {
LoadingUI.Show();
if (DataManager.Instance.userInfo.device_count == 0) if (DataManager.Instance.userInfo.device_count == 0)
{ {
noDevicePage.SetActive(true); noDevicePage.SetActive(true);
@ -878,13 +877,13 @@ namespace Kill.UI.Pages
Debug.Log("当前选中设备：" + DataManager.Instance.selectedDeviceMac); Debug.Log("当前选中设备：" + DataManager.Instance.selectedDeviceMac);
} }
} }
selectDeviceButton.GetComponentInChildren<Text>().text = selectedDevice.device_name;
selectDeviceButton.gameObject.SetActive(true);
hasWifi=await GetDeviceOnlineStatus(); hasWifi=await GetDeviceOnlineStatus();
DataManager.Instance.hasWifi=hasWifi; DataManager.Instance.hasWifi=hasWifi;
hasBluetooth = BluetoothManager.Instance.ChangeAimMac(selectedDevice.ble_mac); hasBluetooth = BluetoothManager.Instance.ChangeAimMac(selectedDevice.ble_mac);
DataManager.Instance.hasBluetooth=hasBluetooth; DataManager.Instance.hasBluetooth=hasBluetooth;
selectDeviceButton.GetComponentInChildren<Text>().text = selectedDevice.device_name;
selectDeviceButton.gameObject.SetActive(true);
// 先初始化所有 UI 为未连接状态 // 先初始化所有 UI 为未连接状态
ResetAllDeviceUI(); ResetAllDeviceUI();
@ -929,7 +928,6 @@ namespace Kill.UI.Pages
DataManager.Instance.selectedDevice = selectedDevice; DataManager.Instance.selectedDevice = selectedDevice;
DataManager.Instance.OwnedDevices=OwnedDevices; DataManager.Instance.OwnedDevices=OwnedDevices;
DataManager.Instance.SharedDevices=SharedDevices; DataManager.Instance.SharedDevices=SharedDevices;
LoadingUI.Hide();
} }
/// <summary> /// <summary>