From dccd851058831e007caf0948fdc6eda21493ad79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E8=99=9E=E6=B8=A0=E6=88=90=E2=80=9D?=
<“yuqucheng2006@qq.com”>
Date: Mon, 24 Aug 2026 11:09:22 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BA=E4=BB=B6=E6=9B=B4=E6=96=B0):=201.?=
=?UTF-8?q?=E4=BC=98=E5=85=88=E8=B5=B0=E8=93=9D=E7=89=99OTA=202.OTA?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=E7=AD=89=E5=BE=8515s=E5=86=8D?=
=?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=A6=96=E9=A1=B5=203.=E8=B0=83=E6=95=B4?=
=?UTF-8?q?=E5=9B=BA=E4=BB=B6=E6=9B=B4=E6=96=B0UI=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Assets/Res/ui/deviceinfopage/固件更新.prefab | 20 +++++++++---------
Assets/Scenes/MainScene.unity | 1 +
.../DeviceInfoPage/FirmwareUpdatePage.cs | 21 +++++++++++++++----
3 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/Assets/Res/ui/deviceinfopage/固件更新.prefab b/Assets/Res/ui/deviceinfopage/固件更新.prefab
index 9892bbb..9acfda1 100644
--- a/Assets/Res/ui/deviceinfopage/固件更新.prefab
+++ b/Assets/Res/ui/deviceinfopage/固件更新.prefab
@@ -132,8 +132,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchoredPosition: {x: -109.99999, y: 0}
+ m_SizeDelta: {x: -220.00002, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1585583418072198037
CanvasRenderer:
@@ -176,7 +176,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: Your firmware is up to date
+ m_Text: Your firmware is already up to date
--- !u!114 &8864543209794588195
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -268,7 +268,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1.2
- m_Text: 0.0.1
+ m_Text: 00.00.00.00
--- !u!1 &1332892953517141795
GameObject:
m_ObjectHideFlags: 0
@@ -948,8 +948,8 @@ MonoBehaviour:
m_Padding:
m_Left: 30
m_Right: 30
- m_Top: 0
- m_Bottom: 30
+ m_Top: 20
+ m_Bottom: 20
m_ChildAlignment: 0
m_Spacing: 0
m_ChildForceExpandWidth: 1
@@ -1335,7 +1335,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &7503423504018185484
RectTransform:
m_ObjectHideFlags: 0
@@ -1352,8 +1352,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 660, y: -21}
- m_SizeDelta: {x: 630, y: 0}
+ m_AnchoredPosition: {x: 660, y: -141}
+ m_SizeDelta: {x: 630, y: 42}
m_Pivot: {x: 1, y: 0.5}
--- !u!222 &2453520056608504307
CanvasRenderer:
@@ -1494,7 +1494,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {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_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4462388716669752208
diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity
index f16f39f..e1f6d44 100644
--- a/Assets/Scenes/MainScene.unity
+++ b/Assets/Scenes/MainScene.unity
@@ -592,6 +592,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 91bf0ca06c32c924c82e026dbb6f2ad7, type: 3}
m_Name:
m_EditorClassIdentifier:
+ isSwitchingDevice: 0
AutoConnect: 0
ConnectionTimeout: 8
needBackHome: 1
diff --git a/Assets/Scripts/UI/Pages/DeviceInfoPage/FirmwareUpdatePage.cs b/Assets/Scripts/UI/Pages/DeviceInfoPage/FirmwareUpdatePage.cs
index a6b6d9b..ba405cf 100644
--- a/Assets/Scripts/UI/Pages/DeviceInfoPage/FirmwareUpdatePage.cs
+++ b/Assets/Scripts/UI/Pages/DeviceInfoPage/FirmwareUpdatePage.cs
@@ -104,7 +104,7 @@ namespace Kill.UI.Pages
Screen.sleepTimeout = SleepTimeout.NeverSleep;
// WiFi 模式：直接 push OTA 指令，设备自行下载固件
- if (DataManager.Instance.hasWifi)
+ if (DataManager.Instance.hasWifi&&!DataManager.Instance.hasBluetooth)
{
try
{
@@ -185,15 +185,18 @@ namespace Kill.UI.Pages
UIManager.Instance.RegisterBackAction(otaBackAction);
if (success)
{
- ToastUI.Show("100226");
DataManager.Instance.selectedDevice.firmware_version = otaData.version;
+ UpdateLoadingUI.Instance.Hide();
+ ToastUI.Show("100226");
+ // OTA 成功后等待 15s 再返回主页（设备升级后需要时间重启）
+ StartCoroutine(DelayedGoHome(15f));
}
else
{
ToastUI.Show("100227");
+ UpdateLoadingUI.Instance.Hide();
+ UIManager.Instance.OpenMainPage(UIManager.PageName.homePage);
}
- UpdateLoadingUI.Instance.Hide();
- UIManager.Instance.OpenMainPage(UIManager.PageName.homePage);
});
}));
}
@@ -202,6 +205,16 @@ namespace Kill.UI.Pages
private byte[] _selectedFirmwareData;
private string _selectedFirmwarePath;
+ ///
+ /// 延迟指定时间后返回主页
+ ///
+ private IEnumerator DelayedGoHome(float delay)
+ {
+ yield return new WaitForSeconds(delay);
+ UpdateLoadingUI.Instance.Hide();
+ UIManager.Instance.OpenMainPage(UIManager.PageName.homePage);
+ }
+
///
/// 加载固件文件
///