fix(固件更新):
1.优先走蓝牙OTA 2.OTA完成后等待15s再返回首页 3.调整固件更新UI显示
This commit is contained in:
parent
bfb56b8423
commit
dccd851058
@ -132,8 +132,8 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: -109.99999, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: -220.00002, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1585583418072198037
|
--- !u!222 &1585583418072198037
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@ -176,7 +176,7 @@ MonoBehaviour:
|
|||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: Your firmware is up to date
|
m_Text: Your firmware is already up to date
|
||||||
--- !u!114 &8864543209794588195
|
--- !u!114 &8864543209794588195
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -268,7 +268,7 @@ MonoBehaviour:
|
|||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1.2
|
m_LineSpacing: 1.2
|
||||||
m_Text: 0.0.1
|
m_Text: 00.00.00.00
|
||||||
--- !u!1 &1332892953517141795
|
--- !u!1 &1332892953517141795
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -948,8 +948,8 @@ MonoBehaviour:
|
|||||||
m_Padding:
|
m_Padding:
|
||||||
m_Left: 30
|
m_Left: 30
|
||||||
m_Right: 30
|
m_Right: 30
|
||||||
m_Top: 0
|
m_Top: 20
|
||||||
m_Bottom: 30
|
m_Bottom: 20
|
||||||
m_ChildAlignment: 0
|
m_ChildAlignment: 0
|
||||||
m_Spacing: 0
|
m_Spacing: 0
|
||||||
m_ChildForceExpandWidth: 1
|
m_ChildForceExpandWidth: 1
|
||||||
@ -1335,7 +1335,7 @@ GameObject:
|
|||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &7503423504018185484
|
--- !u!224 &7503423504018185484
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1352,8 +1352,8 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 660, y: -21}
|
m_AnchoredPosition: {x: 660, y: -141}
|
||||||
m_SizeDelta: {x: 630, y: 0}
|
m_SizeDelta: {x: 630, y: 42}
|
||||||
m_Pivot: {x: 1, y: 0.5}
|
m_Pivot: {x: 1, y: 0.5}
|
||||||
--- !u!222 &2453520056608504307
|
--- !u!222 &2453520056608504307
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@ -1494,7 +1494,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 345, y: -50}
|
m_AnchoredPosition: {x: 345, y: -70}
|
||||||
m_SizeDelta: {x: 630, y: 100}
|
m_SizeDelta: {x: 630, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4462388716669752208
|
--- !u!222 &4462388716669752208
|
||||||
|
|||||||
@ -592,6 +592,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 91bf0ca06c32c924c82e026dbb6f2ad7, type: 3}
|
m_Script: {fileID: 11500000, guid: 91bf0ca06c32c924c82e026dbb6f2ad7, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
|
isSwitchingDevice: 0
|
||||||
AutoConnect: 0
|
AutoConnect: 0
|
||||||
ConnectionTimeout: 8
|
ConnectionTimeout: 8
|
||||||
needBackHome: 1
|
needBackHome: 1
|
||||||
|
|||||||
@ -104,7 +104,7 @@ namespace Kill.UI.Pages
|
|||||||
Screen.sleepTimeout = SleepTimeout.NeverSleep;
|
Screen.sleepTimeout = SleepTimeout.NeverSleep;
|
||||||
|
|
||||||
// WiFi 模式:直接 push OTA 指令,设备自行下载固件
|
// WiFi 模式:直接 push OTA 指令,设备自行下载固件
|
||||||
if (DataManager.Instance.hasWifi)
|
if (DataManager.Instance.hasWifi&&!DataManager.Instance.hasBluetooth)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -185,15 +185,18 @@ namespace Kill.UI.Pages
|
|||||||
UIManager.Instance.RegisterBackAction(otaBackAction);
|
UIManager.Instance.RegisterBackAction(otaBackAction);
|
||||||
if (success)
|
if (success)
|
||||||
{
|
{
|
||||||
ToastUI.Show("100226");
|
|
||||||
DataManager.Instance.selectedDevice.firmware_version = otaData.version;
|
DataManager.Instance.selectedDevice.firmware_version = otaData.version;
|
||||||
|
UpdateLoadingUI.Instance.Hide();
|
||||||
|
ToastUI.Show("100226");
|
||||||
|
// OTA 成功后等待 15s 再返回主页(设备升级后需要时间重启)
|
||||||
|
StartCoroutine(DelayedGoHome(15f));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ToastUI.Show("100227");
|
ToastUI.Show("100227");
|
||||||
}
|
|
||||||
UpdateLoadingUI.Instance.Hide();
|
UpdateLoadingUI.Instance.Hide();
|
||||||
UIManager.Instance.OpenMainPage(UIManager.PageName.homePage);
|
UIManager.Instance.OpenMainPage(UIManager.PageName.homePage);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
@ -202,6 +205,16 @@ namespace Kill.UI.Pages
|
|||||||
private byte[] _selectedFirmwareData;
|
private byte[] _selectedFirmwareData;
|
||||||
private string _selectedFirmwarePath;
|
private string _selectedFirmwarePath;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 延迟指定时间后返回主页
|
||||||
|
/// </summary>
|
||||||
|
private IEnumerator DelayedGoHome(float delay)
|
||||||
|
{
|
||||||
|
yield return new WaitForSeconds(delay);
|
||||||
|
UpdateLoadingUI.Instance.Hide();
|
||||||
|
UIManager.Instance.OpenMainPage(UIManager.PageName.homePage);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 加载固件文件
|
/// 加载固件文件
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user