update：优化ota状态共享

src/App.vue

@@ -8,9 +8,6 @@
 	} from "@dcloudio/uni-app";
 	import websocket from "@/websocket";
 	import matchWebsocket from "@/matchWebsocket";
-	import {
-		getDeviceBatteryAPI
-	} from "@/apis";
 	import {
 		MESSAGETYPES
 	} from "@/constants";
@@ -27,8 +24,9 @@
 	} = storeToRefs(store);
 	const {
 		updateUser,
-		updateOnline,
+		updateDeviceStatus,
-		updateDeviceBattery,
+		setDeviceOnline,
+		clearDeviceStatus,
 		showDeviceChargingDialog,
 		clearSessionState,
 		clearDevice
@@ -70,14 +68,19 @@
 		});
 	}
 
-	async function emitUpdateOnline() {
+	function emitUpdateOnline(nextOnline) {
-		const data = await getDeviceBatteryAPI();
 		const wasOnline = Boolean(online.value);
-		const nextOnline = Boolean(data.online);
+		setDeviceOnline(nextOnline === true);
-		updateOnline(nextOnline);
+		if (!device.value.deviceId || wasOnline === (nextOnline === true)) return;
-		updateDeviceBattery(nextOnline ? data?.battery ?? data?.power : null);
+		audioManager.play(nextOnline === true ? "设备已连接" : "设备连接已断开");
-		if (!device.value.deviceId || wasOnline === nextOnline) return;
+	}
-		audioManager.play(nextOnline ? "设备已连接" : "设备连接已断开");
+
+	function onDeviceStatusPush(status) {
+		updateDeviceStatus(status);
+	}
+
+	function onShootSocketDisconnected() {
+		clearDeviceStatus();
 	}
 
 	function onDeviceBindInvalid() {
@@ -113,6 +116,10 @@
 	}
 
 	function onShootWsMsg(content) {
+		if (content?.event === "/addons/shoot/battery") {
+			onDeviceStatusPush(content.data);
+			return;
+		}
 		if(content.type === 'shoot-trigger'){
 			onDeviceShoot()
 		}
@@ -124,6 +131,7 @@
 		void audioManager.warmButton();
 		uni.$on("update-user", emitUpdateUser);
 		uni.$on("update-online", emitUpdateOnline);
+		uni.$on("shoot-socket-disconnected", onShootSocketDisconnected);
 		uni.$on("session-kicked-out", onSessionKickedOut);
 		uni.$on("device-bind-invalid", onDeviceBindInvalid);
 		uni.$on("device-charging", onDeviceCharging);
@@ -150,6 +158,7 @@
 	onHide(() => {
 		uni.$off("update-user", emitUpdateUser);
 		uni.$off("update-online", emitUpdateOnline);
+		uni.$off("shoot-socket-disconnected", onShootSocketDisconnected);
 		uni.$off("session-kicked-out", onSessionKickedOut);
 		uni.$off("device-bind-invalid", onDeviceBindInvalid);
 		uni.$off("device-charging", onDeviceCharging);
@@ -159,6 +168,7 @@
 		matchWebsocket.closeMatchWebSocket({
 			reason: "app-hide"
 		});
+		clearDeviceStatus();
 		websocket.closeWebSocket();
 	});
 </script>

src/apis.js

@@ -28,7 +28,8 @@ try {
 const ADDONS_BASE_URL = BASE_URL.replace(/\/api\/shoot$/, "/api/shoot");
 const API_ROOT_URL = BASE_URL.replace(/\/api\/shoot$/, "");
 // 统一处理业务接口请求，包含登录态、业务错误和特定接口空响应兼容。
-function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0]) {
+function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0], options = {}) {
+    const {timeout = 10000, showErrorToast = true} = options;
     const token = uni.getStorageSync(
         `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
     );
@@ -40,8 +41,16 @@ function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0])
             method,
             header,
             data,
-            timeout: 10000,
+            timeout,
             success: (res) => {
+                if (
+                    url === "/user/hardwareBox/connectWifi" &&
+                    res.statusCode === 200 &&
+                    typeof res.data?.success === "boolean"
+                ) {
+                    resolve(res.data);
+                    return;
+                }
                 const acceptsEmptyResponse = [
                     "/user/hardwareBox/connectWifi",
                     "/user/device/unbindByQrcodeId",
@@ -111,10 +120,12 @@ function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0])
                                 icon: "none",
                             });
                         }
+                        if (showErrorToast) {
                             uni.showToast({
                                 title: message,
                                 icon: "none",
                             });
+                        }
                         reject(error);
                         return;
                     }
@@ -122,7 +133,7 @@ function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0])
                 }
             },
             fail: (err) => {
-                handleRequestError(err, url);
+                if (showErrorToast) handleRequestError(err, url);
                 reject(err);
             },
         });
@@ -285,6 +296,10 @@ export const getDeviceDetailAPI = (deviceId) => {
     return request("GET", `/user/device/getDetail?deviceId=${encodeURIComponent(deviceId)}`);
 };
 
+export const updateDeviceAliasAPI = (deviceId, alias) => {
+    return request("POST", "/user/device/updateAlias", {deviceId, alias});
+};
+
 export const createPractiseAPI = (arrows, time, target) => {
     return request("POST", "/user/practice/create", {
         shootNumber: arrows,
@@ -565,13 +580,16 @@ export const laserCloseAPI = async () => {
     return request("POST", "/user/device/closeAim");
 };
 
-export const getDeviceBatteryAPI = async () => {
-    return request("GET", "/user/device/battery");
-};
-
 // 设备连接指定 WiFi，只下发 WiFi 凭证，不触发 OTA 升级。
 export const connectDeviceWifiAPI = async (ssid, password) => {
-    return request("POST", "/user/hardwareBox/connectWifi", {ssid, password});
+    return request(
+        "POST",
+        "/user/hardwareBox/connectWifi",
+        {ssid, password},
+        BASE_URL,
+        [0],
+        {timeout: 20000, showErrorToast: false}
+    );
 };
 
 // 获取硬件盒子版本信息，用于判断当前设备是否需要 OTA 升级。
@@ -584,11 +602,6 @@ export const sendHardwareBoxUpdateAPI = async (data) => {
     return request("POST", "/user/hardwareBox/sendUpdate", data);
 };
 
-// 根据任务 ID 获取硬件盒子 OTA 更新状态。
-export const getHardwareBoxTaskStatusAPI = async (taskId) => {
-    return request("GET", `/user/hardwareBox/taskStatus?taskId=${taskId}`);
-};
-
 export const addNoteAPI = async (id, remark) => {
     return request("POST", "/user/score/sheet/remark", {id, remark});
 };

src/components/BowPower.vue

@@ -1,44 +1,15 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount } from "vue";
+import useStore from "@/store";
-import { getDeviceBatteryAPI } from "@/apis";
+import { storeToRefs } from "pinia";
 
-const power = ref(0);
+const store = useStore();
-const timer = ref(null);
+const { deviceBattery: power } = storeToRefs(store);
-let disposed = false;
-let requestInFlight = false;
-
-const refreshPower = async () => {
-  if (disposed || requestInFlight) return;
-  requestInFlight = true;
-  try {
-    const data = await getDeviceBatteryAPI();
-    if (!disposed) power.value = data.battery;
-  } catch (_) {
-    // 电量轮询失败时等待下一轮，避免产生未处理的 Promise 拒绝。
-  } finally {
-    requestInFlight = false;
-  }
-};
-
-onMounted(async () => {
-  await refreshPower();
-  if (disposed) return;
-  timer.value = setInterval(() => {
-    void refreshPower();
-  }, 1000 * 10);
-});
-
-onBeforeUnmount(() => {
-  disposed = true;
-  clearInterval(timer.value);
-  timer.value = null;
-});
 </script>
 
 <template>
   <view class="container">
     <image src="../static/b-power.png" mode="widthFix" />
-    <view>电量{{ power || 1 }}%</view>
+    <view>{{ power === null ? "电量--" : `电量${power}%` }}</view>
   </view>
 </template>
 

src/components/ModalDialog.vue

@@ -1,4 +1,6 @@
 <script setup>
+import IconButton from "./IconButton.vue";
+
 const props = defineProps({
   show: {
     type: Boolean,
@@ -28,6 +30,14 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  confirmDisabled: {
+    type: Boolean,
+    default: false,
+  },
+  showClose: {
+    type: Boolean,
+    default: false,
+  },
   onCancel: {
     type: Function,
     default: null,
@@ -36,6 +46,10 @@ const props = defineProps({
     type: Function,
     default: null,
   },
+  onClose: {
+    type: Function,
+    default: null,
+  },
 });
 
 const handleCancel = () => {
@@ -43,8 +57,13 @@ const handleCancel = () => {
 };
 
 const handleConfirm = () => {
+  if (props.confirmDisabled) return;
   props.onConfirm?.();
 };
+
+const handleClose = () => {
+  props.onClose?.();
+};
 </script>
 
 <template>
@@ -89,6 +108,7 @@ const handleConfirm = () => {
           <view
             v-if="showConfirm"
             class="dialog-button confirm"
+            :class="{ disabled: confirmDisabled }"
             @click="handleConfirm"
           >
             <text>{{ confirmText }}</text>
@@ -96,6 +116,13 @@ const handleConfirm = () => {
           
         </view>
       </view>
+      <view v-if="showClose" class="dialog-close">
+        <IconButton
+          src="../static/close-gold-outline.png"
+          :width="30"
+          :onClick="handleClose"
+        />
+      </view>
     </view>
   </view>
 </template>
@@ -108,6 +135,7 @@ const handleConfirm = () => {
   top: 0;
   left: 0;
   background-color: rgba(0, 0, 0, 0.62);
+  flex-direction: column;
   justify-content: center;
   align-items: center;
   z-index: 999;
@@ -116,6 +144,7 @@ const handleConfirm = () => {
 .modal-wrap {
   position: relative;
   display: flex;
+  flex-direction: column;
   width: 549rpx;
   min-height: 318rpx;;
   padding-top: 168rpx;
@@ -222,6 +251,14 @@ const handleConfirm = () => {
   background-color: #ffda3f;
 }
 
+.dialog-button.confirm.disabled {
+  opacity: 0.62;
+}
+
+.dialog-close {
+  margin-top: 28rpx;
+}
+
 @keyframes rotateLight {
   from {
     transform: translateX(-50%) rotate(0deg);

src/components/OtaModal.vue

@@ -1,10 +1,11 @@
 <script setup>
 import { computed } from "vue";
-import { getDeviceBatteryAPI } from "@/apis";
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
 
-const OTA_MIN_BATTERY = 50;
-const OTA_LOW_BATTERY_TEXT = "电量不足 50%，暂不支持 OTA 升级";
 const OTA_OFFLINE_TEXT = "请先开启智能弓";
+const store = useStore();
+const { deviceStatus } = storeToRefs(store);
 
 const props = defineProps({
   visible: {
@@ -23,6 +24,10 @@ const props = defineProps({
     type: Number,
     default: 40,
   },
+  phase: {
+    type: String,
+    default: "",
+  },
   // 副标题：如“新版本将优化智能弓体验”
   description: {
     type: String,
@@ -47,30 +52,24 @@ const isSuccess = computed(() => props.state === "update_success");
 const isFailure = computed(() => props.state === "update_failure");
 // Clamp progress to keep the progress bar width within its container.
 const progressValue = computed(() => Math.min(100, Math.max(0, Number(props.progress) || 0)));
+const progressPhaseText = computed(() => {
+  const phaseText = {
+    started: "正在准备固件更新",
+    downloading: "正在下载固件",
+    installing: "正在安装固件",
+  };
+  return phaseText[props.phase] || "正在进行固件更新";
+});
 
-// 点击立即更新前先校验设备在线状态，再校验设备电量。
+// 点击立即更新前先校验设备在线状态。
-const handleUpdateClick = async () => {
+const handleUpdateClick = () => {
-  try {
+  if (deviceStatus.value?.online !== true) {
-    const deviceStatus = await getDeviceBatteryAPI();
-    if (deviceStatus?.online !== true) {
     uni.showToast({
       title: OTA_OFFLINE_TEXT,
       icon: "none",
     });
     return;
   }
-
-    if (Number(deviceStatus?.battery) <= OTA_MIN_BATTERY) {
-      uni.showToast({
-        title: OTA_LOW_BATTERY_TEXT,
-        icon: "none",
-      });
-      return;
-    }
-  } catch (err) {
-    emit("update");
-    return;
-  }
   emit("update");
 };
 </script>
@@ -140,10 +139,10 @@ const handleUpdateClick = async () => {
           <!-- 更新成功：图片左边距 34rpx，文案左边距 44rpx，按钮浮动底部居中 -->
           <block v-else-if="isSuccess">
             <image src="https://static.shelingxingqiu.com/shootmini/static/ota/update-ok.png" mode="aspectFit" class="result-title-img" style="width: 220rpx; height: 62rpx;" />
-            <text class="dialog-desc">请关机并重启智能弓</text>
+            <text class="dialog-desc">固件更新已完成</text>
             <view class="btn-group-result">
               <view class="primary-btn" @click="emit('done')">
-                <text class="primary-btn-text">完成</text>
+                <text class="primary-btn-text">关闭</text>
               </view>
             </view>
           </block>
@@ -152,9 +151,14 @@ const handleUpdateClick = async () => {
           <block v-else-if="isProgress">
             <image src="https://static.shelingxingqiu.com/shootmini/static/ota/update_progress.png" mode="aspectFit" class="result-title-img" style="width: 220rpx; height: 62rpx;" />
             <view class="progress-wrap">
+              <view class="progress-meta">
+                <text class="progress-phase">{{ progressPhaseText }}</text>
+                <text class="progress-value">{{ Math.floor(progressValue) }}%</text>
+              </view>
               <view class="progress-track">
                 <view class="progress-fill" :style="{ width: `${progressValue}%` }"></view>
               </view>
+              <text class="progress-warning">请勿离开当前页面！</text>
             </view>
           </block>
 
@@ -404,9 +408,26 @@ const handleUpdateClick = async () => {
 }
 .progress-wrap {
   width: 394rpx;
-  margin-top: 40rpx;
+  margin-top: 28rpx;
   margin-left: 44rpx;
 }
+.progress-meta {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 16rpx;
+  color: #ffffff;
+  font-size: 24rpx;
+  line-height: 34rpx;
+}
+.progress-phase {
+  flex: 1;
+}
+.progress-value {
+  flex-shrink: 0;
+  margin-left: 16rpx;
+  color: #fed847;
+}
 .progress-track {
   width: 100%;
   height: 18rpx;
@@ -419,6 +440,14 @@ const handleUpdateClick = async () => {
   background-color: #FED847;
   border-radius: 999rpx;
 }
+.progress-warning {
+  display: block;
+  margin-top: 16rpx;
+  color: rgba(255, 255, 255, 0.88);
+  font-size: 22rpx;
+  line-height: 32rpx;
+  text-align: center;
+}
 
 /* 关闭按钮（位于弹窗下方） */
 .ota-close-below {

src/components/Signin.vue

@@ -12,12 +12,11 @@ import {
   getHomeData,
   getPhoneNumberAPI,
   getPhoneNumberAPIv2,
-  getDeviceBatteryAPI,
 } from "@/apis";
 
 import useStore from "@/store";
 const store = useStore();
-const { updateUser, updateDevice, updateOnline, clearDevice } = store;
+const { updateUser, updateDevice, clearDevice } = store;
 
 const props = defineProps({
   show: {
@@ -125,8 +124,6 @@ async function doLogin() {
         devices.bindings[0].deviceId,
         devices.bindings[0].deviceName
       );
-      const data = await getDeviceBatteryAPI();
-      updateOnline(data.online);
     } else {
       clearDevice();
     }

src/composables/useOtaUpdate.js

@@ -0,0 +1,227 @@
+import { computed, ref } from "vue";
+import { sendHardwareBoxUpdateAPI } from "@/apis";
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+
+const OTA_PROGRESS_EVENT = "/addons/shoot/otaProgress";
+const OTA_RESULT_EVENT = "/addons/shoot/otaResult";
+const UPDATE_TIMEOUT = 10 * 60 * 1000;
+
+const phaseTextMap = {
+  started: "正在准备固件更新",
+  downloading: "正在下载固件",
+  installing: "正在安装固件",
+};
+
+// OTA 状态由首页、WiFi 设置页和我的设备页共享，页面切换后仍可继续接收进度。
+const updating = ref(false);
+const progress = ref(0);
+const phase = ref("started");
+const resultVisible = ref(false);
+const resultStatus = ref("");
+const resultReason = ref("");
+
+let deviceRef = null;
+let updateRunId = 0;
+let targetVersion = "";
+let lastFinishedVersion = "";
+let timeoutTimer = null;
+let successCallback = null;
+let socketListening = false;
+
+const phaseText = computed(
+  () => phaseTextMap[phase.value] || "正在进行固件更新"
+);
+const resultTitle = computed(() =>
+  resultStatus.value === "success" ? "固件更新完成" : "固件更新失败"
+);
+const resultContent = computed(() => {
+  if (resultStatus.value === "success") return "固件更新已完成";
+  return resultReason.value || "更新失败，请检查设备及网络后重试";
+});
+
+const clearTimers = () => {
+  clearTimeout(timeoutTimer);
+  timeoutTimer = null;
+};
+
+const resetActiveUpdate = () => {
+  clearTimers();
+  successCallback = null;
+};
+
+const finishUpdate = (status, reason = "", runId = updateRunId) => {
+  if (runId !== updateRunId || !updating.value) return;
+  const onSuccess = successCallback;
+  resetActiveUpdate();
+  updating.value = false;
+  resultStatus.value = status;
+  resultReason.value = reason;
+  lastFinishedVersion = targetVersion;
+  if (status === "success") {
+    progress.value = 100;
+    phase.value = "installing";
+    onSuccess?.();
+  }
+  resultVisible.value = true;
+};
+
+const isCurrentDeviceMessage = (data) => {
+  const messageDeviceId = String(data?.deviceId || "");
+  const currentDeviceId = String(deviceRef?.value?.deviceId || "");
+  return !messageDeviceId || !currentDeviceId || messageDeviceId === currentDeviceId;
+};
+
+const isCurrentVersionMessage = (data) => {
+  const messageVersion = String(data?.versionNumber || "");
+  return !messageVersion || !targetVersion || messageVersion === targetVersion;
+};
+
+// 页面切换导致弹窗关闭后，使用下一条进度消息恢复当前 OTA 会话。
+const recoverUpdateFromMessage = (data) => {
+  updateRunId += 1;
+  const runId = updateRunId;
+  targetVersion = String(data?.versionNumber || "");
+  lastFinishedVersion = "";
+  successCallback = null;
+  resultVisible.value = false;
+  resultStatus.value = "";
+  resultReason.value = "";
+  progress.value = 0;
+  phase.value = "started";
+  updating.value = true;
+  clearTimers();
+  timeoutTimer = setTimeout(() => {
+    finishUpdate("failed", "固件更新超时，请稍后重试", runId);
+  }, UPDATE_TIMEOUT);
+};
+
+function handleSocketMessage(message) {
+  if (Number(message?.code ?? 0) !== 0) return;
+  if (![OTA_PROGRESS_EVENT, OTA_RESULT_EVENT].includes(message?.event)) return;
+  if (!isCurrentDeviceMessage(message.data)) return;
+
+  const messageVersion = String(message.data?.versionNumber || "");
+
+  if (message.event === OTA_PROGRESS_EVENT) {
+    if (!updating.value) {
+      if (
+        lastFinishedVersion &&
+        (!messageVersion || messageVersion === lastFinishedVersion)
+      ) {
+        return;
+      }
+      recoverUpdateFromMessage(message.data);
+    } else if (!isCurrentVersionMessage(message.data)) {
+      return;
+    }
+
+    const nextProgress = Math.min(
+      100,
+      Math.max(0, Number(message.data?.progress) || 0)
+    );
+    progress.value = Math.max(progress.value, nextProgress);
+    if (phaseTextMap[message.data?.phase]) {
+      phase.value = message.data.phase;
+    }
+    return;
+  }
+
+  if (!updating.value) {
+    if (
+      lastFinishedVersion &&
+      (!messageVersion || messageVersion === lastFinishedVersion)
+    ) {
+      return;
+    }
+    recoverUpdateFromMessage(message.data);
+  } else if (!isCurrentVersionMessage(message.data)) {
+    return;
+  }
+
+  if (message.data?.status === "success") {
+    finishUpdate("success");
+  } else if (message.data?.status === "failed") {
+    finishUpdate("failed", message.data?.reason || "");
+  }
+}
+
+const startSocketListening = () => {
+  if (socketListening) return;
+  uni.$on("socket-inbox", handleSocketMessage);
+  socketListening = true;
+};
+
+export const useOtaUpdate = () => {
+  const store = useStore();
+  const { device } = storeToRefs(store);
+  deviceRef = device;
+  startSocketListening();
+
+  const startUpdate = async ({
+    versionNumber,
+    resourceUrl,
+    wifiSsid = "",
+    wifiPassword = "",
+    onSuccess,
+  }) => {
+    if (updating.value) return false;
+
+    updateRunId += 1;
+    const runId = updateRunId;
+    targetVersion = String(versionNumber || "");
+    lastFinishedVersion = "";
+    successCallback = onSuccess || null;
+    resultVisible.value = false;
+    resultStatus.value = "";
+    resultReason.value = "";
+    progress.value = 0;
+    phase.value = "started";
+    updating.value = true;
+    clearTimers();
+    timeoutTimer = setTimeout(() => {
+      finishUpdate("failed", "固件更新超时，请稍后重试", runId);
+    }, UPDATE_TIMEOUT);
+
+    try {
+      const updateResult = await sendHardwareBoxUpdateAPI({
+        versionNumber: targetVersion,
+        wifiSsid,
+        wifiPassword,
+        resourceUrl,
+      });
+      if (runId !== updateRunId || !updating.value) return false;
+      if (!updateResult?.taskId) {
+        finishUpdate("failed", "固件更新任务创建失败，请稍后重试", runId);
+        return false;
+      }
+      return true;
+    } catch (error) {
+      if (runId === updateRunId) {
+        finishUpdate(
+          "failed",
+          error?.message || "固件更新请求失败，请稍后重试",
+          runId
+        );
+      }
+      return false;
+    }
+  };
+
+  const closeResult = () => {
+    resultVisible.value = false;
+  };
+
+  return {
+    updating,
+    progress,
+    phase,
+    phaseText,
+    resultVisible,
+    resultStatus,
+    resultTitle,
+    resultContent,
+    startUpdate,
+    closeResult,
+  };
+};

src/pages.json

@@ -147,6 +147,9 @@
         {
           "path": "my-device"
         },
+        {
+          "path": "device-qrcode"
+        },
         {
           "path": "device-bind-success"
         },

src/pages/device/composables/useDeviceBinding.js

@@ -6,7 +6,6 @@ export function useDeviceBinding({
   binding,
   updateDevice,
   deviceDetails,
-  refreshDeviceStatus,
 }) {
   const showBindFailurePage = () => {
     uni.hideToast();
@@ -63,7 +62,6 @@ export function useDeviceBinding({
       const applyBoundDevice = () => {
         updateDevice(deviceId, deviceName);
         deviceDetails.value = result || {};
-        void refreshDeviceStatus();
       };
       uni.navigateTo({
         url: `/pages/device/device-bind-success?deviceId=${encodeURIComponent(deviceId)}`,

src/pages/device/composables/useDeviceStatus.js

@@ -1,38 +1,64 @@
 import { computed, ref } from "vue";
-import { getDeviceBatteryAPI, getMyDevicesAPI, unbindDeviceAPI } from "@/apis";
+import {
+  getDeviceDetailAPI,
+  getMyDevicesAPI,
+  unbindDeviceAPI,
+} from "@/apis";
 
 export const DEVICE_NAME_STORAGE_KEY = "device_name_overrides";
 
 export function useDeviceStatus({
   user,
   device,
+  deviceStatus,
   online,
   updateDevice,
-  updateOnline,
   clearDevice,
   unbindDialogVisible,
 }) {
-  const deviceStatus = ref({});
   const deviceDetails = ref({});
+  let deviceDetailRequestVersion = 0;
 
   const isDeviceOnline = computed(
     () => deviceStatus.value.online === true || online.value === true
   );
-  const statusText = computed(() => (isDeviceOnline.value ? "已连接" : "未连接"));
+  const isDeviceCharging = computed(
+    () => isDeviceOnline.value && deviceStatus.value.charging === true
+  );
+  const statusText = computed(() => {
+    if (!isDeviceOnline.value) return "未连接";
+    return isDeviceCharging.value ? "已连接（充电中）" : "已连接";
+  });
   const statusClass = computed(() =>
     isDeviceOnline.value ? "device-status--online" : "device-status--offline"
   );
   const battery = computed(() => {
-    const value = Number(
+    const rawValue = deviceStatus.value.battery ?? deviceStatus.value.power;
-      deviceStatus.value.battery ?? deviceStatus.value.power ?? 0
+    if (rawValue === null || rawValue === undefined || rawValue === "") return null;
-    );
+    const value = Number(rawValue);
-    return Number.isFinite(value) && value > 0 ? Math.min(100, value) : 0;
+    return Number.isFinite(value) ? Math.min(100, Math.max(0, value)) : null;
   });
   const batteryText = computed(() =>
-    battery.value ? `${battery.value}%` : "暂无数据"
+    battery.value === null ? "暂无数据" : `${battery.value}%`
+  );
+  const onlineDurationText = computed(() => {
+    const rawDuration = deviceStatus.value.onlineDuration;
+    if (rawDuration == null || String(rawDuration).trim() === "") return "--";
+
+    const seconds = Number(rawDuration);
+    if (!Number.isFinite(seconds) || seconds < 0) return "--";
+
+    // WS 推送秒数，页面按完整分钟展示累计使用时间。
+    const totalMinutes = Math.floor(seconds / 60);
+    const hours = Math.floor(totalMinutes / 60);
+    const minutes = totalMinutes % 60;
+    return hours > 0 ? `${hours}小时${minutes}分钟` : `${minutes}分钟`;
+  });
+  const networkType = computed(() =>
+    String(deviceStatus.value.netType ?? "").trim().toLowerCase()
   );
   const networkText = computed(() => {
-    const netType = String(deviceStatus.value.netType || "").toLowerCase();
+    const netType = networkType.value;
     if (netType === "wifi") return "WiFi";
     if (netType === "4g") return "4G";
     return isDeviceOnline.value ? "在线" : "未连接";
@@ -55,15 +81,37 @@ export function useDeviceStatus({
     return value && typeof value === "object" ? value : {};
   };
 
-  const refreshDeviceStatus = async () => {
+  const refreshDeviceDetails = async () => {
-    if (!device.value.deviceId) return;
+    const deviceId = device.value.deviceId;
+    if (!deviceId) return;
+
+    const requestVersion = ++deviceDetailRequestVersion;
     try {
-      const result = await getDeviceBatteryAPI();
+      const detailResponse = await getDeviceDetailAPI(deviceId);
-      deviceStatus.value = result || {};
+      const detail = detailResponse?.detail || detailResponse?.data?.detail;
-      updateOnline(result?.online === true);
+      if (
+        !detail ||
+        typeof detail !== "object" ||
+        requestVersion !== deviceDetailRequestVersion ||
+        device.value.deviceId !== deviceId
+      ) {
+        return;
+      }
+
+      deviceDetails.value = {
+        ...deviceDetails.value,
+        ...detail,
+        deviceModelName: detail.deviceModelName ?? "",
+        bindTime: String(
+          detail.bindTime ?? deviceDetails.value.bindTime ?? ""
+        ).trim(),
+        qrCodeUrl: String(
+          detail.qrCodeUrl ?? deviceDetails.value.qrCodeUrl ?? ""
+        ).trim(),
+      };
     } catch (error) {
-      deviceStatus.value = {};
+      // 实时刷新失败时保留当前页面数据，等待下次通知或页面重新显示。
-      console.log("获取设备状态失败", error);
+      console.log("刷新设备详情失败", error);
     }
   };
 
@@ -74,19 +122,46 @@ export function useDeviceStatus({
       if (Array.isArray(devices?.bindings) && devices.bindings.length > 0) {
         const currentDevice = devices.bindings[0];
         const nameOverrides = getDeviceNameOverrides();
-        deviceDetails.value = currentDevice;
+        // 二维码和绑定时间仅取详情接口，绑定列表不能作为这两项的回退数据。
+        let latestDevice = {
+          ...currentDevice,
+          deviceModelName: "",
+          bindTime: "",
+          qrCodeUrl: "",
+        };
+
+        try {
+          const detailResponse = await getDeviceDetailAPI(currentDevice.deviceId);
+          const detail = detailResponse?.detail || detailResponse?.data?.detail;
+          if (detail && typeof detail === "object") {
+            latestDevice = {
+              ...currentDevice,
+              ...detail,
+              deviceModelName: detail.deviceModelName ?? "",
+              bindTime: String(detail.bindTime ?? "").trim(),
+              qrCodeUrl: String(detail.qrCodeUrl ?? "").trim(),
+              deviceName:
+                detail.deviceAlias || detail.deviceName || currentDevice.deviceName,
+            };
+          }
+        } catch (error) {
+          // 详情接口失败时保留绑定关系，二维码和绑定时间仍保持为空。
+          console.log("获取设备详情失败", error);
+        }
+
+        deviceDetails.value = latestDevice;
         updateDevice(
-          currentDevice.deviceId,
+          latestDevice.deviceId,
-          nameOverrides[currentDevice.deviceId] ||
+          nameOverrides[latestDevice.deviceId] ||
-            currentDevice.deviceName ||
+            latestDevice.deviceAlias ||
-            currentDevice.name ||
+            latestDevice.deviceName ||
+            latestDevice.name ||
             "我的智能弓"
         );
-        await refreshDeviceStatus();
         return;
       }
       clearDevice();
-      deviceStatus.value = {};
+      deviceDetailRequestVersion += 1;
       deviceDetails.value = {};
     } catch (error) {
       console.log("同步设备绑定失败", error);
@@ -99,7 +174,7 @@ export function useDeviceStatus({
       await unbindDeviceAPI(device.value.deviceId);
       uni.setStorageSync("calibration", false);
       clearDevice();
-      deviceStatus.value = {};
+      deviceDetailRequestVersion += 1;
       deviceDetails.value = {};
       unbindDialogVisible.value = false;
       uni.showToast({ title: "解绑成功", icon: "success" });
@@ -117,10 +192,13 @@ export function useDeviceStatus({
     deviceDetails,
     deviceRows,
     getDeviceNameOverrides,
+    isDeviceCharging,
     isDeviceOnline,
     maskedDeviceId,
     networkText,
-    refreshDeviceStatus,
+    networkType,
+    onlineDurationText,
+    refreshDeviceDetails,
     statusClass,
     statusText,
     syncDeviceBinding,

src/pages/device/device-qrcode.vue

@@ -0,0 +1,192 @@
+<script setup>
+import { ref } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
+import Container from "@/components/Container.vue";
+import { getDeviceDetailAPI } from "@/apis";
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+
+const store = useStore();
+const { device } = storeToRefs(store);
+const deviceId = ref("");
+const qrImageUrl = ref("");
+const qrSaved = ref(false);
+const loading = ref(true);
+
+const loadQrCode = async () => {
+  if (!deviceId.value) {
+    loading.value = false;
+    return;
+  }
+
+  try {
+    const response = await getDeviceDetailAPI(deviceId.value);
+    const detail = response?.detail || response?.data?.detail;
+    qrImageUrl.value = String(detail?.qrCodeUrl ?? "").trim();
+  } catch (error) {
+    console.error("获取设备二维码失败", error);
+    qrImageUrl.value = "";
+  } finally {
+    loading.value = false;
+  }
+};
+
+const saveQrCode = async () => {
+  if (!qrImageUrl.value) return;
+
+  let filePath = qrImageUrl.value;
+  try {
+    if (/^https?:\/\//.test(filePath)) {
+      filePath = await new Promise((resolve, reject) => {
+        uni.downloadFile({
+          url: filePath,
+          success: (result) =>
+            result.statusCode === 200
+              ? resolve(result.tempFilePath)
+              : reject(new Error("二维码下载失败")),
+          fail: reject,
+        });
+      });
+    }
+
+    await new Promise((resolve, reject) => {
+      uni.saveImageToPhotosAlbum({ success: resolve, fail: reject, filePath });
+    });
+    qrSaved.value = true;
+    uni.showToast({ title: "已保存至相册", icon: "success" });
+  } catch (error) {
+    uni.showToast({ title: "请长按二维码保存", icon: "none" });
+  }
+};
+
+onLoad((options = {}) => {
+  try {
+    deviceId.value = decodeURIComponent(options.deviceId || "") || device.value.deviceId || "";
+  } catch (error) {
+    deviceId.value = device.value.deviceId || "";
+  }
+  void loadQrCode();
+});
+</script>
+
+<template>
+  <Container :bgType="12" :scroll="false">
+    <view class="qr-page">
+      <view class="qr-corner qr-corner--top"></view>
+      <view class="qr-corner qr-corner--bottom"></view>
+      <view class="qr-canvas">
+        <text v-if="loading" class="qr-empty">二维码加载中...</text>
+        <template v-else-if="qrImageUrl">
+          <image class="qr-image" :src="qrImageUrl" mode="aspectFit" show-menu-by-longpress />
+          <text v-if="qrSaved" class="qr-device-id">设备ID：{{ deviceId }}</text>
+          <view v-else class="qr-save-button" @click="saveQrCode">
+            <text>保存至相册</text>
+          </view>
+          <text class="qr-description">
+            该二维码为当前绑定弓箭的二维码，你可以截图保存到相册，以便当二维码丢失或不在身边时，可以扫描二维码进行设备绑定。
+          </text>
+          <text class="qr-note">注：解除绑定后将无法查看该二维码。</text>
+        </template>
+        <text v-else class="qr-empty">暂无设备二维码</text>
+      </view>
+    </view>
+  </Container>
+</template>
+
+<style scoped>
+.qr-page {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  min-height: 0;
+  box-sizing: border-box;
+  overflow: hidden;
+  background: transparent;
+}
+
+.qr-corner {
+  position: absolute;
+  width: 300rpx;
+  height: 300rpx;
+  background: #ffeb00;
+}
+
+.qr-corner--top {
+  top: -220rpx;
+  right: -170rpx;
+  transform: rotate(42deg);
+}
+
+.qr-corner--bottom {
+  bottom: -220rpx;
+  left: -170rpx;
+  transform: rotate(42deg);
+}
+
+.qr-canvas {
+  position: relative;
+  z-index: 1;
+  display: flex;
+  width: 100%;
+  height: 100%;
+  min-height: 0;
+  box-sizing: border-box;
+  flex-direction: column;
+  align-items: center;
+  padding: 260rpx 62rpx 70rpx;
+}
+
+.qr-image {
+  width: 432rpx;
+  height: 432rpx;
+  box-sizing: border-box;
+  background: #ffffff;
+}
+
+.qr-save-button {
+  display: flex;
+  width: 360rpx;
+  height: 72rpx;
+  align-items: center;
+  justify-content: center;
+  margin-top: 34rpx;
+  border: 1rpx solid #e8c840;
+  border-radius: 36rpx;
+  color: #ffe846;
+  font-size: 26rpx;
+}
+
+.qr-device-id,
+.qr-empty {
+  color: rgba(255, 255, 255, 0.72);
+  font-size: 26rpx;
+  line-height: 40rpx;
+  text-align: center;
+}
+
+.qr-device-id {
+  margin-top: 24rpx;
+}
+
+.qr-empty {
+  margin-top: 140rpx;
+}
+
+.qr-description,
+.qr-note {
+  width: 100%;
+  color: rgba(255, 255, 255, 0.6);
+  font-size: 22rpx;
+  line-height: 36rpx;
+  text-align: center;
+}
+
+.qr-description {
+  margin-top: 42rpx;
+}
+
+.qr-note {
+  margin-top: 12rpx;
+  color: rgba(255, 232, 70, 0.7);
+}
+</style>

src/pages/device/ota-wifi.vue

@@ -3,22 +3,19 @@ import { ref, computed, onMounted, onUnmounted } from "vue";
 import { onLoad, onShow } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import ScreenHint from "@/components/ScreenHint.vue";
+import ModalDialog from "@/components/ModalDialog.vue";
+import OtaModal from "@/components/OtaModal.vue";
 import {
   connectDeviceWifiAPI,
-  getDeviceBatteryAPI,
-  getHardwareBoxTaskStatusAPI,
   getHardwareBoxVersionAPI,
-  sendHardwareBoxUpdateAPI,
 } from "@/apis";
+import { useOtaUpdate } from "@/composables/useOtaUpdate";
 
 const STATES = {
   SCANNING: "SCANNING",
   LIST: "LIST",
   CONNECTING: "CONNECTING",
   CONNECTED: "CONNECTED",
-  UPDATING: "UPDATING",
-  DONE: "DONE",
-  FAILED: "FAILED",
 };
 
 const isIOS = uni.getDeviceInfo().osName === "ios";
@@ -38,27 +35,37 @@ const keyboardHeight = ref(0);
 const showPassword = ref(false);
 // 刷新防抖标志：扫描进行中为 true，禁止重复点击；扫描结束（成功/失败）后重置为 false。
 const isRefreshing = ref(false);
-const isStartingUpdate = ref(false);
+const fromFirmwareUpdate = ref(false);
 const routeOtaInfo = ref({
   versionNumber: "",
   resourceUrl: "",
 });
-
+const countdownVisible = ref(false);
-const progress = ref(0);
+const countdownSeconds = ref(3);
-let progressTimer = null;
+const firmwareMessageVisible = ref(false);
-let timeoutTimer = null;
+const firmwareMessage = ref("");
-let statusTimer = null;
+let countdownTimer = null;
-let wifiConnectTimer = null;
 let wifiConnectRequestId = 0;
-let wifiConnectPollCount = 0;
-const WIFI_CONNECT_POLL_INTERVAL = 2000;
-const WIFI_CONNECT_MAX_POLL_COUNT = 30;
 const WIFI_CONNECT_FAILED_TEXT = "连接失败，请检查WiFi密码或WiFi状态";
-const OTA_MIN_BATTERY = 50;
-const OTA_LOW_BATTERY_TEXT = "电量不足 50%，暂不支持 OTA 升级";
 // 控制授权拒绝弹窗显示/隐藏
 const wifiAuthDeniedVisible = ref(false);
 
+const {
+  updating: otaUpdating,
+  progress: otaProgress,
+  phase: otaPhase,
+  resultVisible: otaResultVisible,
+  resultStatus: otaResultStatus,
+  resultTitle: otaResultTitle,
+  resultContent: otaResultContent,
+  startUpdate: startOtaUpdate,
+  closeResult: closeOtaResult,
+} = useOtaUpdate();
+
+const countdownButtonText = computed(
+  () => `${Math.max(1, countdownSeconds.value)}秒后开始`
+);
+
 // 判断 WiFi 列表失败是否由用户拒绝授权引起（兼容 errno:103 及各平台 errMsg 变体）。
 const isWifiPermissionDenied = (err) => {
   if (err?.errno === 103) return true;
@@ -207,7 +214,7 @@ const startScanning = () => {
 
 // 选择列表中的 WiFi，并打开密码输入弹窗。
 const selectWifi = (wifi) => {
-  cancelWifiConnectPolling();
+  cancelWifiConnectWaiting();
   connectingWifi.value = wifi;
   connectInput.value = { ssid: wifi.SSID, password: "" };
   connectMode.value = wifi.secure ? "secure" : "open";
@@ -217,7 +224,7 @@ const selectWifi = (wifi) => {
 
 // 选择手动输入 WiFi，并打开手动输入弹窗。
 const selectOther = () => {
-  cancelWifiConnectPolling();
+  cancelWifiConnectWaiting();
   connectingWifi.value = null;
   connectInput.value = { ssid: "", password: "" };
   connectMode.value = "manual";
@@ -225,9 +232,9 @@ const selectOther = () => {
   currentState.value = STATES.CONNECTING;
 };
 
-// 关闭连接弹窗，并停止当前 WiFi 连接轮询。
+// 关闭连接弹窗，并停止等待当前 WiFi 连接结果。
 const closeConnectSheet = () => {
-  cancelWifiConnectPolling();
+  cancelWifiConnectWaiting();
   connectError.value = "";
   currentState.value = connectedWifi.value ? STATES.CONNECTED : STATES.LIST;
 };
@@ -257,89 +264,30 @@ const wifiListScrollHeight = computed(() => {
   return `${Math.min(itemCount * 92, maxHeight)}rpx`;
 });
 
-// 清理 WiFi 连接轮询定时器。
+// 取消当前 WiFi 连接请求的页面等待状态，并忽略可能迟到的响应。
-const clearWifiConnectTimer = () => {
+const cancelWifiConnectWaiting = () => {
-  clearTimeout(wifiConnectTimer);
-  wifiConnectTimer = null;
-  wifiConnectPollCount = 0;
-};
-
-// 取消当前 WiFi 连接轮询，并恢复弹窗提交状态。
-const cancelWifiConnectPolling = () => {
   wifiConnectRequestId += 1;
-  clearWifiConnectTimer();
   connectStatusText.value = "";
   isSubmittingWifi.value = false;
   uni.hideLoading();
 };
 
-// 判断设备电量接口返回的 online/netType 字段，确定设备是否已通过 WiFi 在线。
+// 把接口失败和传输异常转换为连接弹窗内的用户提示。
-// 返回值含义：true → WiFi 在线成功；"net_fail" → 设备走 4g 失败；false → 未就绪，需继续轮询。
+const getWifiConnectErrorText = (error) => {
-const isDeviceConnectedByWifi = (deviceStatus) => {
+  const message = error?.message || "";
-  // online 不为 true → 设备不在线，需继续轮询
+  if (message.includes("请先开启智能弓")) return "请先开启智能弓";
-  if (deviceStatus?.online !== true) return false;
+  if (message.includes("超时") || error?.errMsg?.includes("timeout")) {
-  const netType = String(deviceStatus?.netType || "").toLowerCase();
+    return "等待设备响应超时，请重试";
-  // online:true + netType:4g → 设备已切 4g，WiFi 连接失败
+  }
-  if (netType === "4g") return "net_fail";
+  if (error?.errMsg) return "网络异常，请检查网络后重试";
-  // online:true + netType:wifi → WiFi 连接成功
+  return message || WIFI_CONNECT_FAILED_TEXT;
-  // online:true + netType:"" → 设备在线但 netType 暂未上报，继续轮询等待
-  return netType === "wifi";
 };
 
-// 轮询设备电量接口，等待设备切到 WiFi 在线；netType:4g 快速失败，超时 30 次后放弃。
+// 提交 WiFi 配置，并以接口返回的设备最终连接结果更新页面。
-const waitForDeviceWifiConnected = (requestId) => {
-  return new Promise((resolve) => {
-    const poll = async () => {
-      if (requestId !== wifiConnectRequestId) {
-        resolve(false);
-        return;
-      }
-
-      wifiConnectPollCount += 1;
-      try {
-        const deviceStatus = await getDeviceBatteryAPI();
-        if (requestId !== wifiConnectRequestId) {
-          resolve(false);
-          return;
-        }
-        const connResult = isDeviceConnectedByWifi(deviceStatus);
-        // online:true + netType:wifi → 成功
-        if (connResult === true) {
-          resolve(true);
-          return;
-        }
-        // online:true + netType:4g → 立即失败（设备已切 4g，WiFi 连不上）
-        if (connResult === "net_fail") {
-          resolve(false);
-          return;
-        }
-        // online:false + netType:"" → 继续轮询
-        // online:true + netType:"" → 忽略，继续轮询（netType 暂未上报）
-      } catch (err) {
-        if (requestId !== wifiConnectRequestId) {
-          resolve(false);
-          return;
-        }
-      }
-
-      if (wifiConnectPollCount >= WIFI_CONNECT_MAX_POLL_COUNT) {
-        resolve(false);
-        return;
-      }
-
-      wifiConnectTimer = setTimeout(poll, WIFI_CONNECT_POLL_INTERVAL);
-    };
-
-    poll();
-  });
-};
-
-// 提交 WiFi 配置给游戏设备，并轮询确认设备真实连上 WiFi 后再展示成功。
 const submitDeviceWifiConfig = async ({ ssid, password }) => {
   if (isSubmittingWifi.value) return;
   wifiConnectRequestId += 1;
   const requestId = wifiConnectRequestId;
-  clearWifiConnectTimer();
   isSubmittingWifi.value = true;
   connectStatusText.value = "WiFi连接中...";
   uni.showLoading({
@@ -347,10 +295,9 @@ const submitDeviceWifiConfig = async ({ ssid, password }) => {
     mask: true,
   });
   try {
-    await connectDeviceWifiAPI(ssid, password);
+    const connectResult = await connectDeviceWifiAPI(ssid, password);
-    const isConnected = await waitForDeviceWifiConnected(requestId);
     if (requestId !== wifiConnectRequestId) return;
-    if (!isConnected) {
+    if (connectResult?.success !== true) {
       connectError.value = WIFI_CONNECT_FAILED_TEXT;
       return;
     }
@@ -362,14 +309,15 @@ const submitDeviceWifiConfig = async ({ ssid, password }) => {
     };
     connectError.value = "";
     currentState.value = STATES.CONNECTED;
+    if (fromFirmwareUpdate.value) {
+      openFirmwareCountdown();
+    }
   } catch (err) {
     if (requestId === wifiConnectRequestId) {
-      connectError.value =
+      connectError.value = getWifiConnectErrorText(err);
-        err?.code === -1 && err?.message ? err.message : WIFI_CONNECT_FAILED_TEXT;
     }
   } finally {
     if (requestId === wifiConnectRequestId) {
-      clearWifiConnectTimer();
       connectStatusText.value = "";
       isSubmittingWifi.value = false;
       uni.hideLoading();
@@ -387,81 +335,7 @@ const joinNetwork = () => {
   submitDeviceWifiConfig({ ssid, password });
 };
 
-// 清理 OTA 更新相关定时器，避免页面退出或状态结束后继续执行。
+// 获取 OTA 更新版本信息，正常使用入口传参，缺失时再请求后端兜底。
-const clearUpdateTimers = () => {
-  clearInterval(progressTimer);
-  clearTimeout(timeoutTimer);
-  clearTimeout(statusTimer);
-  progressTimer = null;
-  timeoutTimer = null;
-  statusTimer = null;
-};
-
-// 启动本地进度条动画，真实完成状态以后端任务轮询结果为准。
-const startProgressAnimation = () => {
-  clearInterval(progressTimer);
-  progressTimer = setInterval(() => {
-    if (progress.value >= 90) {
-      clearInterval(progressTimer);
-      return;
-    }
-    const increment = Math.max(0.5, 2 - progress.value / 60);
-    progress.value = Math.min(90, progress.value + increment);
-  }, 500);
-};
-
-// 将 OTA 更新流程标记为失败并切换到失败页面。
-const failUpdate = () => {
-  clearUpdateTimers();
-  isStartingUpdate.value = false;
-  currentState.value = STATES.FAILED;
-};
-
-// 将 OTA 更新流程标记为成功，进度补到 100% 后进入完成页面。
-const completeUpdate = () => {
-  clearUpdateTimers();
-  isStartingUpdate.value = false;
-  progress.value = 100;
-  setTimeout(() => {
-    currentState.value = STATES.DONE;
-  }, 300);
-};
-
-// 轮询 OTA 更新任务状态，状态为处理中则继续轮询，成功或失败则结束流程。
-const pollUpdateTaskStatus = (taskId) => {
-  clearTimeout(statusTimer);
-  statusTimer = setTimeout(async () => {
-    try {
-      const taskStatus = await getHardwareBoxTaskStatusAPI(taskId);
-      const status = Number(taskStatus?.status);
-      if (status === 2) {
-        completeUpdate();
-        return;
-      }
-      if (status === 3) {
-        failUpdate();
-        return;
-      }
-      if (status === 0 || status === 1) {
-        pollUpdateTaskStatus(taskId);
-        return;
-      }
-      failUpdate();
-    } catch (err) {
-      failUpdate();
-    }
-  }, 3000);
-};
-
-// 判断设备是否满足 OTA 更新条件，不满足时返回精确提示文案。
-const getUpdateDisabledReason = (deviceStatus) => {
-  if (deviceStatus?.online !== true) return "请先开启智能弓";
-  if (Number(deviceStatus?.battery) <= OTA_MIN_BATTERY) return OTA_LOW_BATTERY_TEXT;
-  if (String(deviceStatus?.netType || "").toLowerCase() !== "wifi") return "设备当前未连接 WiFi，请先连接 WiFi 后再更新";
-  return "";
-};
-
-// 获取 OTA 更新版本信息，优先使用首页跳转传入的数据，没有传参时再请求后端版本接口。
 const getOtaVersionInfo = async () => {
   if (routeOtaInfo.value.versionNumber && routeOtaInfo.value.resourceUrl) {
     return {
@@ -473,101 +347,43 @@ const getOtaVersionInfo = async () => {
   return getHardwareBoxVersionAPI();
 };
 
-// 点击开始更新时先判断设备状态和版本信息，满足条件才发送 OTA 指令并开始轮询任务状态。
+const startFirmwareUpdate = async () => {
-const startUpdate = async () => {
+  if (!fromFirmwareUpdate.value || !connectedWifi.value || otaUpdating.value) return;
-  if (isStartingUpdate.value) return;
-  if (!connectedWifi.value) return;
-  isStartingUpdate.value = true;
-
   try {
-    const deviceStatus = await getDeviceBatteryAPI();
+    const versionInfo = await getOtaVersionInfo();
-    const disabledReason = getUpdateDisabledReason(deviceStatus);
-    if (disabledReason) {
-      isStartingUpdate.value = false;
-      uni.showToast({
-        title: disabledReason,
-        icon: "none",
-      });
-      return;
-    }
-
-    let versionInfo;
-    try {
-      versionInfo = await getOtaVersionInfo();
-    } catch (err) {
-      isStartingUpdate.value = false;
-      uni.showToast({
-        title: "获取更新版本失败，请重试",
-        icon: "none",
-      });
-      return;
-    }
-
     if (!versionInfo?.needUpdate) {
-      isStartingUpdate.value = false;
+      firmwareMessage.value = "当前已是最新版本";
-      uni.showToast({
+      firmwareMessageVisible.value = true;
-        title: "当前已是最新版本",
-        icon: "none",
-      });
       return;
     }
-
+    await startOtaUpdate({
-    currentState.value = STATES.UPDATING;
-    progress.value = 0;
-    startProgressAnimation();
-    timeoutTimer = setTimeout(() => {
-      if (currentState.value === STATES.UPDATING) {
-        failUpdate();
-      }
-    }, 5 * 60 * 1000);
-
-    const updateResult = await sendHardwareBoxUpdateAPI({
       versionNumber: versionInfo.versionNumber,
       wifiSsid: connectedWifi.value.SSID,
       wifiPassword: connectedWifi.value.password || "",
       resourceUrl: versionInfo.resourceUrl,
     });
-    if (!updateResult?.taskId) {
+  } catch (error) {
-      failUpdate();
+    firmwareMessage.value = "获取更新版本失败，请重试";
-      return;
+    firmwareMessageVisible.value = true;
-    }
-
-    pollUpdateTaskStatus(updateResult.taskId);
-  } catch (err) {
-    failUpdate();
   }
 };
 
-// WebSocket 成功回调保留兜底能力，触发后直接按更新完成处理。
+const clearFirmwareCountdown = () => {
-const handleWsDone = () => {
+  clearInterval(countdownTimer);
-  completeUpdate();
+  countdownTimer = null;
 };
 
-// WebSocket 失败回调保留兜底能力，触发后直接按更新失败处理。
+const openFirmwareCountdown = () => {
-const handleWsFail = () => {
+  clearFirmwareCountdown();
-  failUpdate();
+  countdownSeconds.value = 3;
-};
+  countdownVisible.value = true;
-
+  countdownTimer = setInterval(() => {
-// 处理更新完成返回，兼容首页 OTA 弹窗入口和设备页普通入口。
+    countdownSeconds.value -= 1;
-const handleDone = () => {
+    if (countdownSeconds.value > 0) return;
-  const pages = getCurrentPages();
+    clearFirmwareCountdown();
-  const prevPage = pages[pages.length - 2];
+    countdownVisible.value = false;
-  const prevVm = prevPage?.$vm;
+    void startFirmwareUpdate();
-
+  }, 1000);
-  if (prevVm && "otaState" in prevVm && "otaVisible" in prevVm) {
-    prevVm.otaState = "update_success";
-    prevVm.otaVisible = true;
-  }
-
-  uni.navigateBack({ delta: 1 });
-};
-
-const handleRetry = () => {
-  if (connectedWifi.value) {
-    currentState.value = STATES.CONNECTED;
-  } else {
-    startScanning();
-  }
 };
 
 // 监听系统输入法高度，用于让底部弹窗避开键盘遮挡。
@@ -585,8 +401,9 @@ const togglePasswordVisibility = () => {
   });
 };
 
-// 页面加载时接收首页传入的 OTA 版本号和固件地址。
+// 页面加载时识别普通 WiFi 入口和固件更新入口。
 onLoad((options = {}) => {
+  fromFirmwareUpdate.value = options.source === "firmware-update";
   routeOtaInfo.value = {
     versionNumber: decodeURIComponent(options.versionNumber || ""),
     resourceUrl: decodeURIComponent(options.resourceUrl || ""),
@@ -612,8 +429,8 @@ onUnmounted(() => {
   if (typeof uni.offKeyboardHeightChange === "function") {
     uni.offKeyboardHeightChange(handleKeyboardHeightChange);
   }
-  cancelWifiConnectPolling();
+  cancelWifiConnectWaiting();
-  clearUpdateTimers();
+  clearFirmwareCountdown();
   wx.offGetWifiList && wx.offGetWifiList();
 });
 </script>
@@ -711,46 +528,6 @@ onUnmounted(() => {
         </block>
       </scroll-view>
 
-      <!-- CONNECTED：开始更新按钮 -->
-      <view v-if="currentState === 'CONNECTED'" class="bottom-btn-area connected-bottom-btn-area">
-        <view class="primary-btn update-btn" @click="startUpdate">
-          <text class="primary-btn-text">开始更新</text>
-        </view>
-      </view>
-    </view>
-
-    <!-- UPDATING -->
-    <view v-else-if="currentState === 'UPDATING'" class="center-page">
-      <image src="https://static.shelingxingqiu.com/shootmini/static/ota/target-char.png" mode="aspectFit" style="width: 194rpx; height: 164rpx;" />
-      <text class="page-title" style="margin-top: 24rpx;">更新中,请稍等片刻...</text>
-      <view class="progress-wrap">
-        <view class="progress-track">
-          <view class="progress-fill" :style="{ width: progress + '%' }"></view>
-        </view>
-        <text class="progress-pct">{{ Math.floor(progress) }}%</text>
-      </view>
-    </view>
-
-    <!-- DONE -->
-    <view v-else-if="currentState === 'DONE'" class="center-page">
-      <image src="https://static.shelingxingqiu.com/shootmini/static/ota/check-char.png" mode="aspectFit" style="width: 194rpx; height: 166rpx;" />
-      <text class="page-title" style="margin-top: 24rpx;">更新完成</text>
-      <text class="page-desc-white">请关机并重启智能弓</text>
-      <view class="primary-btn done-btn" style="margin-top:20px" @click="handleDone">
-        <text class="primary-btn-text">完成</text>
-      </view>
-    </view>
-
-    <!-- FAILED -->
-    <view v-else-if="currentState === 'FAILED'" class="center-page">
-      <image src="https://static.shelingxingqiu.com/shootmini/static/ota/close-char.png" mode="aspectFit" style="width: 194rpx; height: 164rpx;" />
-      <text class="page-title fail-title" style="margin-top: 24rpx;">更新失败</text>
-      <text class="page-desc-white">请确保：</text>
-      <text class="page-desc-white">1、智能弓已开启</text>
-      <text class="page-desc-white">2、网路连接稳定</text>
-      <view class="primary-btn done-btn" style="margin-top: 40rpx;" @click="handleRetry">
-        <text class="primary-btn-text">重试</text>
-      </view>
     </view>
 
     <!-- CONNECTING 底部弹窗 -->
@@ -883,6 +660,46 @@ onUnmounted(() => {
         </view>
       </view>
     </ScreenHint>
+
+    <ModalDialog
+      :show="countdownVisible"
+      title="WiFi连接成功"
+      content="3秒后将自动开始更新"
+      :confirmText="countdownButtonText"
+      :showCancel="false"
+      :confirmDisabled="true"
+    ></ModalDialog>
+
+    <OtaModal
+      :visible="otaUpdating"
+      state="update_progress"
+      :progress="otaProgress"
+      :phase="otaPhase"
+    />
+
+    <OtaModal
+      :visible="otaResultVisible && otaResultStatus === 'success'"
+      state="update_success"
+      @done="closeOtaResult"
+    />
+
+    <ModalDialog
+      :show="otaResultVisible && otaResultStatus === 'failed'"
+      :title="otaResultTitle"
+      :content="otaResultContent"
+      confirmText="关闭"
+      :showCancel="false"
+      :onConfirm="closeOtaResult"
+    ></ModalDialog>
+
+    <ModalDialog
+      :show="firmwareMessageVisible"
+      title="固件更新"
+      :content="firmwareMessage"
+      confirmText="关闭"
+      :showCancel="false"
+      :onConfirm="() => (firmwareMessageVisible = false)"
+    ></ModalDialog>
   </Container>
 </template>
 

src/pages/index.vue

@@ -1,26 +1,25 @@
 <script setup>
-import {computed, onMounted, onUnmounted, ref, watch} from "vue";
+import {computed, onMounted, ref, watch} from "vue";
-import {onHide, onShareAppMessage, onShareTimeline, onShow} from "@dcloudio/uni-app";
+import {onShareAppMessage, onShareTimeline, onShow} from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import AppFooter from "@/components/AppFooter.vue";
 import UserHeader from "@/components/UserHeader.vue";
 import Signin from "@/components/Signin.vue";
 import BubbleTip from "@/components/BubbleTip.vue";
+import ModalDialog from "@/components/ModalDialog.vue";
 import OtaModal from "@/components/OtaModal.vue";
 
 import {
   checkUserBindAPI,
   getAppConfig,
-  getDeviceBatteryAPI,
-  getHardwareBoxTaskStatusAPI,
   getHardwareBoxVersionAPI,
   getHomeData,
   getMyDevicesAPI,
   getScoreRankList,
-  sendHardwareBoxUpdateAPI,
   silentLoginAPI,
 } from "@/apis";
 import {topThreeColors} from "@/constants";
+import {useOtaUpdate} from "@/composables/useOtaUpdate";
 
 import useStore from "@/store";
 import {storeToRefs} from "pinia";
@@ -33,103 +32,19 @@ const {
   clearDevice,
   getLvlName,
   getLvlNameByScore,
-  updateOnline,
-  updateDeviceBattery,
 } = store;
-const {user, device, online, deviceBattery, game} = storeToRefs(store);
+const {user, device, deviceStatus, online, deviceBattery, game} = storeToRefs(store);
 
 const showModal = ref(false);
 const showGuide = ref(false);
 const scoreRankList = ref([]);
-const HOME_DEVICE_STATUS_POLL_INTERVAL = 10000;
+const DEVICE_STATUS_STALE_TIME = 6000;
-let isHomePageVisible = false;
-let homeDeviceStatusTimer = null;
-let isHomeDeviceStatusRequesting = false;
-
-// 设备状态接口可能返回布尔值、数字或字符串，统一成 true / false / null。
-// null 表示接口没有给出可判断的状态，调用方应保留已有状态。
-const normalizeDeviceOnline = (value) => {
-  if (typeof value === "boolean") return value;
-  if (typeof value === "number") return value === 1;
-
-  const normalized = String(value ?? "").trim().toLowerCase();
-  if (["true", "1", "online", "connected"].includes(normalized)) return true;
-  if (["false", "0", "offline", "disconnected"].includes(normalized)) return false;
-  return null;
-};
-
-// 将设备状态接口响应统一同步到首页 Store，离线时清空无效电量。
-const applyHomeDeviceStatus = (data) => {
-  const normalizedOnline = normalizeDeviceOnline(data?.online);
-  if (normalizedOnline !== null) {
-    updateOnline(normalizedOnline);
-  }
-  if (normalizedOnline === false) {
-    updateDeviceBattery(null);
-    return;
-  }
-
-  const battery = data?.battery ?? data?.power;
-  if (battery !== undefined && battery !== null) {
-    updateDeviceBattery(battery);
-  }
-};
-
-// 刷新首页设备在线状态和电量；上一轮未结束时跳过，避免请求堆积。
-const refreshHomeDeviceStatus = async () => {
-  if (
-    !isHomePageVisible ||
-    !user.value?.id ||
-    !device.value?.deviceId ||
-    isHomeDeviceStatusRequesting
-  ) {
-    return;
-  }
-
-  isHomeDeviceStatusRequesting = true;
-  try {
-    const data = await getDeviceBatteryAPI();
-    if (isHomePageVisible) {
-      applyHomeDeviceStatus(data);
-    }
-  } catch (error) {
-    // 请求失败时保留上一次有效状态，等待下一轮自动恢复。
-    console.log("刷新首页设备状态失败", error);
-  } finally {
-    isHomeDeviceStatusRequesting = false;
-  }
-};
-
-const stopHomeDeviceStatusPolling = () => {
-  clearInterval(homeDeviceStatusTimer);
-  homeDeviceStatusTimer = null;
-};
-
-// 首页可见且用户已绑定设备时，每 10 秒刷新一次设备状态。
-const startHomeDeviceStatusPolling = () => {
-  stopHomeDeviceStatusPolling();
-  if (!isHomePageVisible || !user.value?.id || !device.value?.deviceId) return;
-
-  homeDeviceStatusTimer = setInterval(() => {
-    void refreshHomeDeviceStatus();
-  }, HOME_DEVICE_STATUS_POLL_INTERVAL);
-};
-
-// 首页停留期间登录或绑定状态变化时，及时启停设备状态轮询。
-watch(
-  [() => user.value?.id, () => device.value?.deviceId],
-  () => {
-    if (isHomePageVisible) {
-      startHomeDeviceStatusPolling();
-    }
-  }
-);
 
 // 首页设备卡片按“未绑定 / 已绑定未连接 / 已绑定已连接”三态展示。
 const deviceCardState = computed(() => {
   // 未登录时始终展示绑定入口，避免本地残留设备状态误显示为已绑定。
   if (!user.value?.id || !device.value?.deviceId) return "unbound";
-  return normalizeDeviceOnline(online.value) === true ? "online" : "offline";
+  return online.value === true ? "online" : "offline";
 });
 
 const deviceCardAssets = {
@@ -154,8 +69,7 @@ const deviceCardAsset = computed(() => deviceCardAssets[deviceCardState.value]);
 
 // OTA 相关
 const otaVisible = ref(false);
-const otaState = ref("new_version");
+const wifiRequiredVisible = ref(false);
-const otaProgress = ref(0);
 const otaInfo = ref({
   versionNumber: "",
   versionInfo: "",
@@ -166,51 +80,16 @@ const otaInfo = ref({
 const isStartingOta = ref(false);
 let isCheckingOta = false;
 let otaCheckQueuedForOnline = false;
-let otaProgressTimer = null;
-let otaStatusTimer = null;
-let otaTimeoutTimer = null;
-let otaResultTimer = null;
-let otaStatusPollCount = 0;
-let otaUpdateRunId = 0;
-// 首页 OTA 轮询采用请求次数和总时长双重兜底，避免更新中状态长期卡住。
-const OTA_TASK_STATUS_POLL_INTERVAL = 2000;
-const OTA_TASK_STATUS_MAX_POLL_COUNT = 15;
-const OTA_TASK_STATUS_TIMEOUT = 30000;
 
-// 清理首页 OTA 更新定时器，避免弹窗关闭或页面卸载后继续轮询。
+const {
-const clearOtaUpdateTimers = () => {
+  updating: otaUpdating,
-  clearInterval(otaProgressTimer);
+  progress: otaProgress,
-  clearTimeout(otaStatusTimer);
+  phase: otaPhase,
-  clearTimeout(otaTimeoutTimer);
+  resultVisible: otaResultVisible,
-  clearTimeout(otaResultTimer);
+  resultStatus: otaResultStatus,
-  otaProgressTimer = null;
+  startUpdate: startOtaUpdate,
-  otaStatusTimer = null;
+  closeResult: closeOtaResult,
-  otaTimeoutTimer = null;
+} = useOtaUpdate();
-  otaResultTimer = null;
-  otaStatusPollCount = 0;
-};
-
-// 使当前 OTA 运行失效，确保旧请求返回后不会继续轮询或覆盖新状态。
-const invalidateOtaUpdateRun = () => {
-  otaUpdateRunId += 1;
-  clearOtaUpdateTimers();
-};
-
-const isOtaUpdateRunActive = (runId) =>
-  runId === otaUpdateRunId && otaState.value === "update_progress";
-
-// 启动首页 OTA 本地进度动画，最终成功失败以后端任务状态为准。
-const startOtaProgressAnimation = () => {
-  clearInterval(otaProgressTimer);
-  otaProgressTimer = setInterval(() => {
-    if (otaProgress.value >= 90) {
-      clearInterval(otaProgressTimer);
-      return;
-    }
-    const increment = Math.max(0.5, 2 - otaProgress.value / 60);
-    otaProgress.value = Math.min(90, otaProgress.value + increment);
-  }, 500);
-};
 
 // 获取并保存后端返回的 OTA 版本信息，供弹窗展示和更新接口使用。
 const applyOtaVersionInfo = (versionInfo) => {
@@ -226,17 +105,21 @@ const applyOtaVersionInfo = (versionInfo) => {
 
 // 检查当前设备盒子是否存在可升级版本。
 const checkOtaUpdate = async () => {
-  if (isCheckingOta || otaVisible.value) return;
+  if (
+    isCheckingOta ||
+    otaVisible.value ||
+    otaUpdating.value ||
+    otaResultVisible.value
+  ) return;
   isCheckingOta = true;
 
   try {
-    let deviceStatus;
+    if (
-    try {
+      online.value !== true ||
-      deviceStatus = await getDeviceBatteryAPI();
+      otaVisible.value ||
-    } catch (err) {
+      otaUpdating.value ||
-      return;
+      otaResultVisible.value
-    }
+    ) return;
-    if (normalizeDeviceOnline(deviceStatus?.online) !== true || otaVisible.value) return;
 
     let versionInfo;
     try {
@@ -244,20 +127,24 @@ const checkOtaUpdate = async () => {
     } catch (err) {
       return;
     }
-    if (otaVisible.value) return;
+    if (otaVisible.value || otaUpdating.value || otaResultVisible.value) return;
     applyOtaVersionInfo(versionInfo);
     if (!otaInfo.value.needUpdate) return;
 
     const dismissedAt = uni.getStorageSync("ota_dismissed_at");
     const now = Date.now();
     if (!otaInfo.value.forceUpdate && dismissedAt && now - dismissedAt < 24 * 60 * 60 * 1000) return;
-    otaState.value = "new_version";
     otaVisible.value = true;
   } finally {
     isCheckingOta = false;
     const shouldRecheckForOnline = otaCheckQueuedForOnline;
     otaCheckQueuedForOnline = false;
-    if (shouldRecheckForOnline && !otaVisible.value) {
+    if (
+      shouldRecheckForOnline &&
+      !otaVisible.value &&
+      !otaUpdating.value &&
+      !otaResultVisible.value
+    ) {
       void checkOtaUpdate();
     }
   }
@@ -265,7 +152,13 @@ const checkOtaUpdate = async () => {
 
 // 设备由 WS 通知上线时补查 OTA；已显示任何 OTA 弹窗时保留当前流程和结果。
 watch(online, (nextOnline, previousOnline) => {
-  if (previousOnline !== false || nextOnline !== true || otaVisible.value) return;
+  if (
+    previousOnline !== false ||
+    nextOnline !== true ||
+    otaVisible.value ||
+    otaUpdating.value ||
+    otaResultVisible.value
+  ) return;
   if (isCheckingOta) {
     otaCheckQueuedForOnline = true;
     return;
@@ -273,10 +166,18 @@ watch(online, (nextOnline, previousOnline) => {
   void checkOtaUpdate();
 });
 
+// 任一页面发起或恢复 OTA 后，关闭首页的版本发现弹窗，避免两层弹窗重叠。
+watch([otaUpdating, otaResultVisible], ([updating, resultVisible]) => {
+  if (!updating && !resultVisible) return;
+  otaVisible.value = false;
+  isStartingOta.value = false;
+});
+
 // 拼接 OTA WiFi 页参数，让未连 WiFi 的设备继续使用同一份版本信息。
 const getOtaWifiUrl = () => {
   const { versionNumber, resourceUrl } = otaInfo.value;
   const query = [
+    "source=firmware-update",
     `versionNumber=${encodeURIComponent(versionNumber)}`,
     `resourceUrl=${encodeURIComponent(resourceUrl)}`,
   ].join("&");
@@ -290,117 +191,26 @@ const handleOtaDismiss = () => {
   otaVisible.value = false;
 };
 
-// 将首页 OTA 直连更新流程标记为失败。
+// 设备盒子已连 WiFi 时，通过共享 OTA 状态发起更新。
-const failHomeOtaUpdate = (runId) => {
-  if (!isOtaUpdateRunActive(runId)) return;
-  invalidateOtaUpdateRun();
-  isStartingOta.value = false;
-  otaState.value = "update_failure";
-  otaVisible.value = true;
-};
-
-// 将首页 OTA 直连更新流程标记为成功。
-const completeHomeOtaUpdate = (runId) => {
-  if (!isOtaUpdateRunActive(runId)) return;
-  invalidateOtaUpdateRun();
-  isStartingOta.value = false;
-  otaInfo.value = {...otaInfo.value, needUpdate: false};
-  otaProgress.value = 100;
-  const completedRunId = otaUpdateRunId;
-  otaResultTimer = setTimeout(() => {
-    otaResultTimer = null;
-    if (completedRunId !== otaUpdateRunId) return;
-    otaState.value = "update_success";
-    otaVisible.value = true;
-  }, 300);
-};
-
-// 轮询首页直接发起的 OTA 更新任务状态。
-const pollHomeOtaTaskStatus = async (taskId, runId) => {
-  if (!isOtaUpdateRunActive(runId)) return;
-
-  otaStatusPollCount += 1;
-  try {
-    const taskStatus = await getHardwareBoxTaskStatusAPI(taskId);
-    if (!isOtaUpdateRunActive(runId)) return;
-
-    const status = Number(taskStatus?.status);
-    if (status === 2) {
-      completeHomeOtaUpdate(runId);
-      return;
-    }
-    if (status === 3) {
-      failHomeOtaUpdate(runId);
-      return;
-    }
-    if (status === 0 || status === 1) {
-      if (otaStatusPollCount >= OTA_TASK_STATUS_MAX_POLL_COUNT) {
-        failHomeOtaUpdate(runId);
-        return;
-      }
-      otaStatusTimer = setTimeout(() => {
-        otaStatusTimer = null;
-        if (!isOtaUpdateRunActive(runId)) return;
-        void pollHomeOtaTaskStatus(taskId, runId);
-      }, OTA_TASK_STATUS_POLL_INTERVAL);
-      return;
-    }
-    failHomeOtaUpdate(runId);
-  } catch (err) {
-    if (!isOtaUpdateRunActive(runId)) return;
-    failHomeOtaUpdate(runId);
-  }
-};
-
-// 设备盒子已连 WiFi 时，从首页直接传空 WiFi 信息发起 OTA 更新。
 const startHomeOtaUpdate = async () => {
-  invalidateOtaUpdateRun();
+  otaVisible.value = false;
-  const runId = otaUpdateRunId;
+  await startOtaUpdate({
-  otaState.value = "update_progress";
-  otaVisible.value = true;
-  otaProgress.value = 0;
-  startOtaProgressAnimation();
-  otaTimeoutTimer = setTimeout(() => {
-    if (!isOtaUpdateRunActive(runId)) return;
-    failHomeOtaUpdate(runId);
-  }, OTA_TASK_STATUS_TIMEOUT);
-
-  try {
-    const updateResult = await sendHardwareBoxUpdateAPI({
     versionNumber: otaInfo.value.versionNumber,
-      wifiSsid: "",
-      wifiPassword: "",
     resourceUrl: otaInfo.value.resourceUrl,
+    onSuccess: () => {
+      otaInfo.value = {...otaInfo.value, needUpdate: false};
+    },
   });
-    if (!isOtaUpdateRunActive(runId)) return;
+  isStartingOta.value = false;
-    if (!updateResult?.taskId) {
-      failHomeOtaUpdate(runId);
-      return;
-    }
-    void pollHomeOtaTaskStatus(updateResult.taskId, runId);
-  } catch (err) {
-    if (!isOtaUpdateRunActive(runId)) return;
-    failHomeOtaUpdate(runId);
-  }
 };
 
-// 点击立即更新时先判断设备是否在线并已通过 WiFi 联网，已联网则首页直接更新，否则跳转 WiFi 页面。
+// 点击立即更新时先判断设备是否在线并已通过 WiFi 联网，未联网时先展示连接引导。
 const handleOtaUpdate = async () => {
   if (isStartingOta.value) return;
   isStartingOta.value = true;
-  let deviceStatus;
+  const currentDeviceStatus = deviceStatus.value;
-  try {
-    deviceStatus = await getDeviceBatteryAPI();
-  } catch (err) {
-    isStartingOta.value = false;
-    uni.showToast({
-      title: "获取设备状态失败，请重试",
-      icon: "none",
-    });
-    return;
-  }
 
-  if (normalizeDeviceOnline(deviceStatus?.online) !== true) {
+  if (currentDeviceStatus?.online !== true) {
     isStartingOta.value = false;
     uni.showToast({
       title: "请先开启智能弓",
@@ -409,25 +219,53 @@ const handleOtaUpdate = async () => {
     return;
   }
 
-  if (String(deviceStatus?.netType || "").toLowerCase() === "wifi") {
+  if (
+    Date.now() - Number(currentDeviceStatus?.receivedAt || 0) >
+    DEVICE_STATUS_STALE_TIME
+  ) {
+    isStartingOta.value = false;
+    uni.showToast({
+      title: "设备状态同步中，请稍后重试",
+      icon: "none",
+    });
+    return;
+  }
+
+  if (String(currentDeviceStatus?.netType || "").toLowerCase() === "wifi") {
     startHomeOtaUpdate();
     return;
   }
 
   isStartingOta.value = false;
   otaVisible.value = false;
+  wifiRequiredVisible.value = true;
+};
+
+// 从首页固件更新提示进入 WiFi 配置页，并继续沿用当前版本信息。
+const goWifiForOtaUpdate = () => {
+  wifiRequiredVisible.value = false;
   uni.navigateTo({ url: getOtaWifiUrl() });
 };
 
-// 处理 OTA 更新成功后的完成按钮，关闭结果弹窗。
+// 处理 OTA 更新成功后的完成按钮，关闭共享结果弹窗。
 const handleOtaDone = () => {
-  otaVisible.value = false;
+  closeOtaResult();
 };
 
-// 处理 OTA 更新失败后的重试按钮，重新走立即更新判断流程。
+// 处理共享 OTA 更新失败后的重试，先刷新版本参数再重新判断网络状态。
-const handleOtaRetry = () => {
+const handleOtaRetry = async () => {
-  invalidateOtaUpdateRun();
+  closeOtaResult();
-  handleOtaUpdate();
+  try {
+    const versionInfo = await getHardwareBoxVersionAPI();
+    applyOtaVersionInfo(versionInfo);
+    if (!otaInfo.value.needUpdate) return;
+    await handleOtaUpdate();
+  } catch (error) {
+    uni.showToast({
+      title: "获取更新版本失败，请重试",
+      icon: "none",
+    });
+  }
 };
 
 // 提取积分榜接口返回的榜单数组，兼容数组和对象两种返回格式。
@@ -489,37 +327,19 @@ const syncHomeDevice = async () => {
     return;
   }
 
-  const previousDeviceId = String(device.value?.deviceId || "");
   const deviceId = String(currentDevice.deviceId || "");
   updateDevice(
     deviceId,
     currentDevice.deviceName || currentDevice.name || ""
   );
 
-  // 切换到新设备时先以离线态初始化，避免沿用上一台设备的在线状态。
-  if (previousDeviceId !== deviceId) {
-    updateOnline(false);
-    updateDeviceBattery(null);
-  }
-
-  await refreshHomeDeviceStatus();
 };
 
-onShow(async (options) => {
+onShow(async () => {
-  isHomePageVisible = true;
-  startHomeDeviceStatusPolling();
-
   const env = uni.getAccountInfoSync().miniProgram.envVersion;
   const token = uni.getStorageSync(`${env}_token`);
 
-  // 检查是否从 OTA 更新页面返回
+  if (token || user.value.id) {
-  if (options && options.updateResult) {
-    otaState.value = options.updateResult;
-    if (options.updateResult === "update_success") {
-      otaInfo.value = {...otaInfo.value, needUpdate: false};
-    }
-    otaVisible.value = true;
-  } else if (token || user.value.id) {
     await checkOtaUpdate();
   }
 
@@ -538,8 +358,6 @@ onShow(async (options) => {
     //           devices.bindings[0].deviceId,
     //           devices.bindings[0].deviceName
     //       );
-    //       const data = await getDeviceBatteryAPI();
-    //       updateOnline(data.online);
     //     }
     //   } else {
     //     showModal.value = true;
@@ -579,13 +397,6 @@ onShow(async (options) => {
     }
   }
 
-  // 登录态或绑定设备可能在本次 onShow 中发生变化，按最新状态重建轮询。
-  startHomeDeviceStatusPolling();
-});
-
-onHide(() => {
-  isHomePageVisible = false;
-  stopHomeDeviceStatusPolling();
 });
 
 onMounted(async () => {
@@ -594,12 +405,6 @@ onMounted(async () => {
   console.log("全局配置：", config);
 });
 
-onUnmounted(() => {
-  isHomePageVisible = false;
-  stopHomeDeviceStatusPolling();
-  invalidateOtaUpdateRun();
-});
-
 onShareAppMessage(() => {
   return {
     title: "智能真弓：实时捕捉+毫秒级同步，弓箭选手全球竞技！", // 分享卡片的标题
@@ -620,20 +425,42 @@ onShareTimeline(() => {
 
 <template>
   <Container :isHome="true" :showBackToGame="true">
-    <!-- OTA 升级弹窗：使用 visible 控制显隐，description 为副标题，changelog 为详细说明 -->
+    <!-- 首页版本发现弹窗仅负责触发更新，执行状态由三个页面共享。 -->
     <OtaModal
-      :visible="otaVisible"
+      :visible="otaVisible && !otaUpdating && !otaResultVisible"
-      :state="otaState"
+      state="new_version"
       :version="otaInfo.versionNumber"
-      :progress="otaProgress"
       :description="''"
       :changelog="otaInfo.versionInfo"
       :forceUpdate="otaInfo.forceUpdate"
       @update="handleOtaUpdate"
       @skip="handleOtaDismiss"
       @close="handleOtaDismiss"
+    />
+    <OtaModal
+      :visible="otaUpdating"
+      state="update_progress"
+      :progress="otaProgress"
+      :phase="otaPhase"
+    />
+    <OtaModal
+      :visible="otaResultVisible && otaResultStatus === 'success'"
+      state="update_success"
       @done="handleOtaDone"
+    />
+    <OtaModal
+      :visible="otaResultVisible && otaResultStatus === 'failed'"
+      state="update_failure"
       @retry="handleOtaRetry"
+      @close="closeOtaResult"
+    />
+    <ModalDialog
+      :show="wifiRequiredVisible"
+      title="固件更新"
+      content="请在WiFi网络下更新"
+      confirmText="连接WiFi"
+      :showCancel="false"
+      :onConfirm="goWifiForOtaUpdate"
     />
     <view class="container">
       <view class="top-theme">
@@ -657,6 +484,7 @@ onShareTimeline(() => {
               />
               <image
                   class="device-visual-bow"
+                  :class="{ 'device-visual-bow--floating': deviceCardState === 'online' }"
                   :src="deviceCardAsset.bow"
                   mode="scaleToFill"
               />
@@ -878,6 +706,20 @@ onShareTimeline(() => {
   height: 388rpx;
 }
 
+.device-visual-bow--floating {
+  animation: device-bow-float 3s ease-in-out infinite;
+}
+
+@keyframes device-bow-float {
+  0%,
+  100% {
+    transform: translateY(0) rotate(-0.5deg);
+  }
+  50% {
+    transform: translateY(-10rpx) rotate(0.5deg);
+  }
+}
+
 .device-status-badge,
 .device-action-badge {
   display: flex;

src/pages/team-battle/components/BowPower.vue

@@ -1,44 +1,15 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount } from "vue";
+import useStore from "@/store";
-import { getDeviceBatteryAPI } from "@/apis";
+import { storeToRefs } from "pinia";
 
-const power = ref(0);
+const store = useStore();
-const timer = ref(null);
+const { deviceBattery: power } = storeToRefs(store);
-let disposed = false;
-let requestInFlight = false;
-
-const refreshPower = async () => {
-  if (disposed || requestInFlight) return;
-  requestInFlight = true;
-  try {
-    const data = await getDeviceBatteryAPI();
-    if (!disposed) power.value = data.battery;
-  } catch (_) {
-    // 电量轮询失败时等待下一轮，避免产生未处理的 Promise 拒绝。
-  } finally {
-    requestInFlight = false;
-  }
-};
-
-onMounted(async () => {
-  await refreshPower();
-  if (disposed) return;
-  timer.value = setInterval(() => {
-    void refreshPower();
-  }, 1000 * 10);
-});
-
-onBeforeUnmount(() => {
-  disposed = true;
-  clearInterval(timer.value);
-  timer.value = null;
-});
 </script>
 
 <template>
   <view class="container">
     <image src="../../../static/b-power.png" mode="widthFix" />
-    <view>电量{{ power || 1 }}%</view>
+    <view>{{ power === null ? "电量--" : `电量${power}%` }}</view>
   </view>
 </template>
 

src/pages/training/components/TrainingDifficultyPreviewCard.vue

@@ -89,7 +89,7 @@ const previewLines = computed(() => {
 }
 
 .difficulty-preview__copy {
-  width: 80%;
+  width: 84%;
   margin: 0 auto;
   display: block;
   color: #ffffff;

src/store.js

@@ -17,6 +17,16 @@ const getDefaultDevice = () => ({
   deviceName: "",
 });
 
+const getDefaultDeviceStatus = () => ({
+  battery: null,
+  charging: false,
+  version: "",
+  online: false,
+  netType: "",
+  onlineDuration: null,
+  receivedAt: 0,
+});
+
 const getDefaultGame = () => ({
   roomID: "",
   inBattle: false,
@@ -102,6 +112,8 @@ export default defineStore("store", {
     online: false,
     // 设备电量属于运行时状态，null 表示当前没有有效数据。
     deviceBattery: null,
+    // WebSocket 实时推送的设备状态，不参与持久化。
+    deviceStatus: getDefaultDeviceStatus(),
     game: {
       roomID: "",
       inBattle: false,
@@ -136,7 +148,7 @@ export default defineStore("store", {
       this.rankData = { ...(data || {}) };
     },
     updateOnline(online) {
-      this.online = online;
+      this.setDeviceOnline(online);
     },
     updateDeviceBattery(value) {
       if (value === null || value === undefined || value === "") {
@@ -149,6 +161,44 @@ export default defineStore("store", {
         ? Math.min(100, Math.max(0, battery))
         : null;
     },
+    updateDeviceStatus(status = {}) {
+      const battery = Number(status.battery ?? status.power);
+      const onlineDuration = Number(status.onlineDuration);
+      const online = status.online === true;
+      const nextStatus = {
+        battery: Number.isFinite(battery)
+          ? Math.min(100, Math.max(0, battery))
+          : null,
+        charging: status.charging === true,
+        version: String(status.version ?? "").trim(),
+        online,
+        netType: String(status.netType ?? "").trim().toLowerCase(),
+        onlineDuration:
+          Number.isFinite(onlineDuration) && onlineDuration >= 0
+            ? onlineDuration
+            : null,
+        receivedAt: Date.now(),
+      };
+
+      this.deviceStatus = nextStatus;
+      this.online = online;
+      this.deviceBattery = online ? nextStatus.battery : null;
+    },
+    setDeviceOnline(online) {
+      const nextOnline = online === true;
+      this.online = nextOnline;
+      if (nextOnline) {
+        this.deviceStatus = { ...this.deviceStatus, online: true };
+        return;
+      }
+      this.deviceBattery = null;
+      this.deviceStatus = getDefaultDeviceStatus();
+    },
+    clearDeviceStatus() {
+      this.online = false;
+      this.deviceBattery = null;
+      this.deviceStatus = getDefaultDeviceStatus();
+    },
     async updateUser(user = {}) {
       this.user = { ...getDefaultUser(), ...user };
       this.user.lvlName = getLvlNameByScore(this.user.scores, this.config.randInfos)
@@ -158,13 +208,15 @@ export default defineStore("store", {
       );
     },
     updateDevice(deviceId, deviceName) {
+      if (String(this.device.deviceId || "") !== String(deviceId || "")) {
+        this.clearDeviceStatus();
+      }
       this.device.deviceId = deviceId;
       this.device.deviceName = deviceName;
     },
     clearDevice() {
       this.device = getDefaultDevice();
-      this.online = false;
+      this.clearDeviceStatus();
-      this.deviceBattery = null;
     },
     async updateConfig(config) {
       this.config = config;
@@ -214,6 +266,7 @@ export default defineStore("store", {
         device: getDefaultDevice(),
         online: false,
         deviceBattery: null,
+        deviceStatus: getDefaultDeviceStatus(),
         game: getDefaultGame(),
         dailyCount: getDefaultDailyCount(),
         deviceChargingDialogVisible: false,

src/utils/matchProtocol.js

@@ -7,7 +7,7 @@ const { Reader, Writer } = protobuf;
 // 所以这里使用 minimal Reader/Writer 做静态字段解码和客户端消息编码。
 // <match-schema-generated>
 // 此区块由 scripts/generate-match-schema.mjs 自动生成，请勿手动修改。
-// 来源：src/utils/match.min.js（sha256: bece92f31bde3072）
+// 来源：src/utils/match.min.js（sha256: ec0371baeba9a9bf）
 // 协议命名空间：rpc；消息数：12；字段数：163
 
 export const ServerMessageType = {
@@ -188,7 +188,7 @@ const SCHEMAS = {
     43: { name: "calories", kind: "double" },
     44: { name: "score_slot", kind: "int32" },
     45: { name: "current_energy", kind: "int32" },
-    46: { name: "energy_cost_per_sec", kind: "int32" },
+    46: { name: "energy_cost_per_sec", kind: "float" },
     47: { name: "energy_per_hit", kind: "int32" },
     48: { name: "energy_req_percent", kind: "int32" },
     49: { name: "delta_current_energy", kind: "int32" },

src/websocket.js

@@ -77,17 +77,38 @@ function createWebSocket(token, onMessage) {
   socketTask.onMessage((res) => {
     if (socket !== socketTask) return;
 
-    const { data, event } = JSON.parse(res.data);
+    let response;
+    try {
+      response = JSON.parse(res.data);
+    } catch (err) {
+      console.error("WebSocket 消息解析失败", err);
+      return;
+    }
+
+    const { data, event, code, timestamp } = response || {};
     if (event === "pong") return;
-    if (data.type) {
+    const passthroughEvents = [
+      "/addons/shoot/battery",
+      "/addons/shoot/otaProgress",
+      "/addons/shoot/otaResult",
+    ];
+    if (passthroughEvents.includes(event)) {
+      if ((code == null || Number(code) === 0) && onMessage && data && typeof data === "object") {
+        onMessage({ event, data, code, timestamp });
+      }
+      return;
+    }
+    if (data?.type) {
       if (ENABLE_REALTIME_MESSAGE_LOG) {
         console.log("收到 WebSocket 消息", getMessageTypeName(data.type));
       }
       if (onMessage) onMessage({ ...(data.data || {}), type: data.type });
       return;
     }
-    if (onMessage && data.updates) onMessage(data.updates);
+    const updates = Array.isArray(data?.updates) ? data.updates : [];
-    const msg = data.updates[0];
+    if (!updates.length) return;
+    if (onMessage) onMessage(updates);
+    const msg = updates[0];
     if (msg) {
       if (ENABLE_REALTIME_MESSAGE_LOG) {
         console.log(
@@ -101,9 +122,9 @@ function createWebSocket(token, onMessage) {
       } else if (msg.constructor === MESSAGETYPES.LvlUpdate) {
         uni.setStorageSync("latestLvl", msg.lvl);
       } else if (msg.constructor === MESSAGETYPES.DeviceOnline) {
-        uni.$emit("update-online");
+        uni.$emit("update-online", true);
       } else if (msg.constructor === MESSAGETYPES.DeviceOffline) {
-        uni.$emit("update-online");
+        uni.$emit("update-online", false);
       } else if (msg.constructor === MESSAGETYPES.DeviceCharging) {
         uni.$emit("device-charging");
       }
@@ -121,6 +142,7 @@ function createWebSocket(token, onMessage) {
     stopHeartbeat();
     socket = null;
     isConnecting = false;
+    uni.$emit("shoot-socket-disconnected");
 
     if (manualClose || kickedOut) return;
     await handleUnexpectedClose(onMessage);