fix: OTA轮询次数改为15次

fix: 修复首页更新卡在更新中弹窗问题
feat: OTA 首页弹窗优化
2026-08-18 13:57:49 +08:00 · 2026-08-18 11:48:20 +08:00 · 2026-08-18 10:30:16 +08:00 · 2026-08-17 18:02:12 +08:00 · 2026-08-17 10:11:28 +08:00 · 2026-08-14 17:59:11 +08:00
51 changed files with 1665 additions and 2688 deletions
@@ -28,6 +28,7 @@
 	const {
 		updateUser,
 		updateOnline,
+		showDeviceChargingDialog,
 		clearSessionState,
 		clearDevice
 	} = store;
@@ -82,6 +83,10 @@
 		uni.setStorageSync("calibration", false);
 	}

+	function onDeviceCharging() {
+		showDeviceChargingDialog();
+	}
+
 	function onDeviceShoot() {
 		// audioManager.play("射箭声音")
 	}
@@ -119,6 +124,7 @@
 		uni.$on("update-online", emitUpdateOnline);
 		uni.$on("session-kicked-out", onSessionKickedOut);
 		uni.$on("device-bind-invalid", onDeviceBindInvalid);
+		uni.$on("device-charging", onDeviceCharging);
 		if (typeof uni.offNetworkStatusChange === "function") {
 			uni.offNetworkStatusChange(onNetworkStatusChange);
 		}
@@ -144,6 +150,7 @@
 		uni.$off("update-online", emitUpdateOnline);
 		uni.$off("session-kicked-out", onSessionKickedOut);
 		uni.$off("device-bind-invalid", onDeviceBindInvalid);
+		uni.$off("device-charging", onDeviceCharging);
 		if (typeof uni.offNetworkStatusChange === "function") {
 			uni.offNetworkStatusChange(onNetworkStatusChange);
 		}
@@ -246,6 +246,12 @@ export const checkUserBindAPI = async (code) => {
    });
 };

+export const tempBindOrgAPI = (scene) => {
+    return request("POST", "/user/org/device/tempBind", {
+        scene,
+    });
+};
+
 export const bindDeviceAPI = (device) => {
    return request("POST", "/user/device/bindDevice", {
        device,
@@ -305,6 +311,13 @@ export const getPractiseAPI = async (id) => {
    return request("GET", `/user/practice/get?id=${id}`);
 };

+export const getPractiseDetailAPI = async (id) => {
+    return request(
+        "GET",
+        `/user/practice/detail?id=${encodeURIComponent(id)}`
+    );
+};
+
 export const createRoomAPI = (gameType, teamSize, targetType) => {
    return request("POST", "/user/createroom", {
        gameType,
@@ -338,12 +351,12 @@ export const startRoomAPI = (number) => {
    return request("POST", "/user/room/start", {number});
 };

-export const getPractiseResultListAPI = async (page = 1, page_size = 15) => {
-    const reuslt = await request(
+export const getPractiseResultListAPI = async (page = 1, pageSize = 15) => {
+    const result = await request(
        "GET",
-        `/user/practice/list?page=${page}&page_size=${page_size}`
+        `/user/practice/mylist?page=${page}&pageSize=${pageSize}&status=0`
    );
-    return reuslt.list;
+    return Array.isArray(result?.list) ? result.list : [];
 };

 export const matchGameAPI = (match, gameType, teamSize) => {
@@ -52,6 +52,12 @@ export const audioFils = {
    "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutzdrl5u0iromqhf.mp3",
  射击无效:
    "https://static.shelingxingqiu.com/shootmini/static/audio/%E5%B0%84%E7%AE%AD%E6%97%A0%E6%95%88%E6%A3%80%E6%9F%A5%E8%B7%9D%E7%A6%BB%E5%92%8C%E9%9D%B6%E7%BA%B8.mp3",
+  "射箭无效，距离不足":
+    "https://static.shelingxingqiu.com/shootmini/static/audio/%E5%B0%84%E7%AE%AD%E6%97%A0%E6%95%88%EF%BC%8C%E8%B7%9D%E7%A6%BB%E4%B8%8D%E8%B6%B3.MP3",
+  "射箭无效，未识别到靶纸":
+    "https://static.shelingxingqiu.com/shootmini/static/audio/%E5%B0%84%E7%AE%AD%E6%97%A0%E6%95%88%EF%BC%8C%E6%9C%AA%E8%AF%86%E5%88%AB%E5%88%B0%E9%9D%B6%E7%BA%B8.MP3",
+  "射箭无效，靶纸错误":
+    "https://static.shelingxingqiu.com/shootmini/static/audio/%E5%B0%84%E7%AE%AD%E6%97%A0%E6%95%88%EF%BC%8C%E9%9D%B6%E7%BA%B8%E9%94%99%E8%AF%AF.mp3.MP3",
  未上靶:
    "https://static.shelingxingqiu.com/attachment/2025-11-12/de6n45o3tsm1v4unam.mp3",
  "1环":
@@ -106,6 +112,8 @@ export const audioFils = {
 const AUDIO_LOAD_TIMEOUT_MS = 5000;
 const AUDIO_WARM_CONCURRENCY = 3;
 const AUDIO_WARM_RETRIES = 1;
+const AUDIO_INSTANCE_LIMIT = 24;
+const AUDIO_QUEUE_COMPACT_THRESHOLD = 12;
 const AUDIO_WARM_PRIORITY_KEYS = [
  "点击按钮",
  "设备连接已断开",
@@ -117,6 +125,9 @@ const AUDIO_WARM_PRIORITY_KEYS = [
  "轮到你了",
  "比赛结束",
  "射击无效",
+  "射箭无效，距离不足",
+  "射箭无效，未识别到靶纸",
+  "射箭无效，靶纸错误",
  "中场休息",
  "下半场开始",
  "决金箭轮",
@@ -153,6 +164,8 @@ class AudioManager {
    this.loadingKeyPromises = new Map();
    this.pendingPlayKeys = new Set();
    this.cacheWritePromises = new Map();
+    this.audioLastUsedAt = new Map();
+    this.warmPriorityPromise = null;
    this.warmAllPromise = null;

    // 连续播放队列相关属性
@@ -244,14 +257,74 @@ class AudioManager {
  }

  getWarmupKeys() {
-    return Array.from(
-      new Set([...AUDIO_WARM_PRIORITY_KEYS, ...Object.keys(audioFils)])
-    );
+    return Array.from(new Set(AUDIO_WARM_PRIORITY_KEYS));
+  }
+
+  getAllAudioKeys() {
+    return Object.keys(audioFils);
+  }
+
+  touchAudioKey(key) {
+    this.audioLastUsedAt.set(key, Date.now());
+  }
+
+  destroyAudioInstance(key) {
+    const audio = this.audioMap.get(key);
+    if (!audio) return false;
+
+    this.clearPlayWatchdog(key);
+    this.audioMap.delete(key);
+    this.readyMap.delete(key);
+    this.allowPlayMap.delete(key);
+    this.audioLastUsedAt.delete(key);
+    try {
+      audio.destroy();
+    } catch (_) {}
+    // destroy 可能同步触发 onStop，最后再清一次对应状态。
+    this.allowPlayMap.delete(key);
+    return true;
+  }
+
+  pruneAudioInstances(preserveKey) {
+    while (this.audioMap.size >= AUDIO_INSTANCE_LIMIT) {
+      const candidate = Array.from(this.audioMap.keys())
+        .filter(
+          (key) =>
+            key !== preserveKey &&
+            key !== this.currentPlayingKey &&
+            !this.loadingKeyPromises.has(key)
+        )
+        .sort(
+          (left, right) =>
+            (this.audioLastUsedAt.get(left) || 0) -
+            (this.audioLastUsedAt.get(right) || 0)
+        )[0];
+      if (!candidate || !this.destroyAudioInstance(candidate)) return;
+    }
+  }
+
+  compactSequenceQueue(force = false) {
+    if (!this.isSequenceRunning || this.sequenceIndex <= 0) return;
+    if (!force && this.sequenceIndex < AUDIO_QUEUE_COMPACT_THRESHOLD) return;
+    this.sequenceQueue = this.sequenceQueue.slice(this.sequenceIndex);
+    this.sequenceIndex = 0;
+  }
+
+  getRuntimeStats() {
+    return {
+      audioInstanceCount: this.audioMap.size,
+      loadingAudioCount: this.loadingKeyPromises.size,
+      pendingPlayCount: this.pendingPlayKeys.size,
+      sequenceQueueLength: this.isSequenceRunning
+        ? Math.max(this.sequenceQueue.length - this.sequenceIndex, 0)
+        : 0,
+    };
  }

  ensureAudio(key) {
    if (!audioFils[key]) return Promise.resolve(false);
    if (this.readyMap.get(key) && this.audioMap.has(key)) {
+      this.touchAudioKey(key);
      return Promise.resolve(true);
    }

@@ -303,23 +376,39 @@ class AudioManager {
    return this.warmKeys(["点击按钮"], { concurrency: 1, retries: 1 });
  }

-  warmAll() {
-    if (this.warmAllPromise) return this.warmAllPromise;
+  warmCommon() {
+    if (this.warmPriorityPromise) return this.warmPriorityPromise;

-    debugLog("开始后台分级预热全部语音");
+    debugLog("开始后台预热常用语音");
    this.isLoading = true;
-    this.warmAllPromise = this.warmKeys(this.getWarmupKeys())
+    this.warmPriorityPromise = this.warmKeys(this.getWarmupKeys())
      .catch((error) => {
-        debugLog("后台语音预热异常", error);
+        debugLog("常用语音预热异常", error);
      })
      .finally(() => {
        this.isLoading = false;
-        debugLog("后台语音预热结束", this.getLoadProgress());
+        debugLog("常用语音预热结束", this.getRuntimeStats());
+      });
+    return this.warmPriorityPromise;
+  }
+
+  warmAll() {
+    if (this.warmAllPromise) return this.warmAllPromise;
+
+    debugLog("音频测试页开始遍历全部语音");
+    this.isLoading = true;
+    this.warmAllPromise = this.warmKeys(this.getAllAudioKeys())
+      .catch((error) => {
+        debugLog("全部语音遍历异常", error);
+      })
+      .finally(() => {
+        this.isLoading = false;
+        debugLog("全部语音遍历结束", this.getRuntimeStats());
      });
    return this.warmAllPromise;
  }

-  // 保留旧入口兼容测试页或其他历史调用，实际行为改为非阻塞后台预热。
+  // 音频测试页保留全量遍历；实例池会及时淘汰旧实例，避免同时常驻全部语音。
  initAudios() {
    return this.warmAll();
  }
@@ -357,6 +446,7 @@ class AudioManager {
        return;
      }

+      this.pruneAudioInstances(key);
      const audio = uni.createInnerAudioContext();
      audio.autoplay = false;
      try {
@@ -368,6 +458,7 @@ class AudioManager {
      } catch (_) {}
      this.allowPlayMap.set(key, false);
      audio.onPlay(() => {
+        if (this.audioMap.get(key) !== audio) return;
        if (!this.allowPlayMap.get(key)) {
          try {
            audio.stop();
@@ -405,6 +496,7 @@ class AudioManager {
        }
        this.readyMap.set(key, false);
        this.audioMap.delete(key);
+        this.audioLastUsedAt.delete(key);
        try {
          audio.destroy();
        } catch (_) {}
@@ -437,6 +529,7 @@ class AudioManager {
        if (!isCurrentGeneration()) {
          clearLoadTimeout();
          this.audioMap.delete(key);
+          this.audioLastUsedAt.delete(key);
          try {
            audio.destroy();
          } catch (_) {}
@@ -471,6 +564,7 @@ class AudioManager {
      });

      audio.onEnded(() => {
+        if (this.audioMap.get(key) !== audio) return;
        this.finishPlayback(key, {
          advanceSequence: true,
          emitEnded: true,
@@ -478,10 +572,12 @@ class AudioManager {
      });

      audio.onStop(() => {
+        if (this.audioMap.get(key) !== audio) return;
        this.finishPlayback(key);
      });

      this.audioMap.set(key, audio);
+      this.touchAudioKey(key);
      audio.src = realSrc;
    };

@@ -691,14 +787,7 @@ class AudioManager {
    const loadingPromise = this.loadingKeyPromises.get(key);
    if (loadingPromise) return loadingPromise;

-    this.clearPlayWatchdog(key);
-    const oldAudio = this.audioMap.get(key);
-    if (oldAudio) {
-      try {
-        oldAudio.destroy();
-      } catch (_) {}
-    }
-    this.audioMap.delete(key);
+    this.destroyAudioInstance(key);
    this.readyMap.set(key, false);
    return this.ensureAudio(key);
  }
@@ -745,7 +834,8 @@ class AudioManager {
    // 不打断当前播放：把新的队列加入到序列中，等待当前播放结束后衔接
    if (this.currentPlayingKey) {
      if (this.isSequenceRunning) {
-        // 已有序列在跑：直接追加
+        // 已有序列在跑：先移除已消费前缀，再追加待播语音。
+        this.compactSequenceQueue(true);
        this.sequenceQueue = this.sequenceQueue.concat(queue);
      } else {
        // 没有序列但当前有正在播放的：以当前为序列的起点
@@ -754,6 +844,17 @@ class AudioManager {
        this.sequenceIndex = 0;
        // 不触发 _playSingle，等待当前音频自然结束后由 onAudioEnded 接管
      }
+    } else if (
+      this.isSequenceRunning &&
+      this.sequenceQueue[this.sequenceIndex]
+    ) {
+      // 当前队首正在按需加载时只追加，不能覆盖已经排队的语音。
+      this.compactSequenceQueue(true);
+      this.sequenceQueue = this.sequenceQueue.concat(queue);
+      const pendingKey = this.sequenceQueue[this.sequenceIndex];
+      if (!this.pendingPlayKeys.has(pendingKey)) {
+        this._playSingle(pendingKey, false);
+      }
    } else {
      // 当前没有播放：直接启动新的序列
      this.sequenceQueue = queue;
@@ -860,6 +961,7 @@ class AudioManager {
      this.currentPlayingKey = key;
      this.lastPlayKey = key;
      this.lastPlayAt = Date.now();
+      this.touchAudioKey(key);
      this.startPlayWatchdog(key);
    } else {
      debugLog(`音频 ${key} 尚未就绪，按需加载后播放...`);
@@ -876,7 +978,8 @@ class AudioManager {
    const nextIndex = this.sequenceIndex + 1;
    if (nextIndex < this.sequenceQueue.length) {
      this.sequenceIndex = nextIndex;
-      const nextKey = this.sequenceQueue[nextIndex];
+      this.compactSequenceQueue();
+      const nextKey = this.sequenceQueue[this.sequenceIndex];
      this._playSingle(nextKey, false);
    } else {
      // 队列播放完成
@@ -960,6 +1063,7 @@ class AudioManager {
  reloadAll() {
    debugLog("执行 reloadAll: 重置音频实例并后台恢复");
    const shouldWarmAll = this.warmAllPromise !== null;
+    const shouldWarmPriority = this.warmPriorityPromise !== null;
    this.loadGeneration += 1;

    // 1. 停止所有播放
@@ -972,6 +1076,7 @@ class AudioManager {
      } catch (_) {}
    }
    this.audioMap.clear();
+    this.audioLastUsedAt.clear();

    // 3. 重置状态
    this.readyMap.clear();
@@ -990,10 +1095,13 @@ class AudioManager {

    // 4. 重置后台预热状态
    this.isLoading = false;
+    this.warmPriorityPromise = null;
    this.warmAllPromise = null;

-    // 5. 之前已启动过全量预热则继续全量恢复，否则只恢复按钮音效。
-    return shouldWarmAll ? this.warmAll() : this.warmButton();
+    // 5. 按中断前使用范围恢复，产品页不再全量创建语音实例。
+    if (shouldWarmAll) return this.warmAll();
+    if (shouldWarmPriority) return this.warmCommon();
+    return this.warmButton();
  }
 }

@@ -4,18 +4,34 @@ import { getDeviceBatteryAPI } from "@/apis";

 const power = ref(0);
 const timer = ref(null);
+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 () => {
-  const data = await getDeviceBatteryAPI();
-  power.value = data.battery;
-  timer.value = setInterval(async () => {
-    const data = await getDeviceBatteryAPI();
-    power.value = data.battery;
+  await refreshPower();
+  if (disposed) return;
+  timer.value = setInterval(() => {
+    void refreshPower();
  }, 1000 * 10);
 });

 onBeforeUnmount(() => {
+  disposed = true;
  clearInterval(timer.value);
+  timer.value = null;
 });
 </script>

@@ -67,6 +67,10 @@ const props = defineProps({
    type: Boolean,
    default: false,
  },
+  enableShotEffect: {
+    type: Boolean,
+    default: true,
+  },
 });

 const pMode = ref(true);
@@ -113,7 +117,13 @@ function hasShotPoint(shot) {
 }

 function shouldPlayShotEffect(shot) {
-  return props.isSvip && !!shot && Number(shot.ring) > 0 && hasShotPoint(shot);
+  return (
+    props.enableShotEffect &&
+    props.isSvip &&
+    !!shot &&
+    Number(shot.ring) > 0 &&
+    hasShotPoint(shot)
+  );
 }

 function clearTipTimer() {
@@ -276,7 +286,7 @@ watch(
      const latestShot = props.scores[newLen - 1];
      if (shouldPlayShotEffect(latestShot)) {
        void prepareShotEffect("red", latestShot, newLen - 1);
-      } else {
+      } else if (props.enableShotEffect) {
        shotEffectRequestGeneration += 1;
        pendingShotEffect.value = null;
        showShotTip("red", latestShot);
@@ -301,7 +311,7 @@ watch(
      const latestShot = props.blueScores[newLen - 1];
      if (shouldPlayShotEffect(latestShot)) {
        void prepareShotEffect("blue", latestShot, newLen - 1);
-      } else {
+      } else if (props.enableShotEffect) {
        shotEffectRequestGeneration += 1;
        pendingShotEffect.value = null;
        showShotTip("blue", latestShot);
@@ -5,6 +5,7 @@ import AppBackground from "@/components/AppBackground.vue";
 import Header from "@/components/Header.vue";
 import ScreenHint from "@/components/ScreenHint.vue";
 import BackToGame from "@/components/BackToGame.vue";
+import DeviceChargingDialog from "@/components/DeviceChargingDialog.vue";
 import {laserAimAPI, getBattleAPI, matchGameAPI} from "@/apis";
 import { capsuleHeight, debounce } from "@/util";
 import { returnToBattle } from "@/utils/matchReturn";
@@ -226,6 +227,7 @@ const goCalibration = async () => {
        <text>{{ loadingText || "加载中..." }}</text>
      </view>
    </view>
+    <DeviceChargingDialog />
  </view>
 </template>

@@ -0,0 +1,22 @@
+<script setup>
+import { storeToRefs } from "pinia";
+import ModalDialog from "@/components/ModalDialog.vue";
+import useStore from "@/store";
+
+const chargingNotice =
+  "检测到智能弓箭已开始充电，为保护电池，设备即将自动关机。\n(注意:此时拔出充电线将会重启设备。)";
+
+const store = useStore();
+const { deviceChargingDialogVisible } = storeToRefs(store);
+const { hideDeviceChargingDialog } = store;
+</script>
+
+<template>
+  <ModalDialog
+    :show="deviceChargingDialogVisible"
+    :content="chargingNotice"
+    :show-cancel="false"
+    confirm-text="我知道了"
+    :on-confirm="hideDeviceChargingDialog"
+  />
+</template>
@@ -2,7 +2,7 @@
 import { ref, watch, onMounted, onBeforeUnmount } from "vue";
 import audioManager from "@/audioManager";
 import { MESSAGETYPESV2 } from "@/constants";
-import { getDirectionText } from "@/util";
+import { getDirectionText, getInvalidShotAudioKey } from "@/util";

 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -91,7 +91,7 @@ async function onReceiveMessage(message) {
      title: "距离不足，无效",
      icon: "none",
    });
-    audioManager.play("射击无效");
+    audioManager.play(getInvalidShotAudioKey(shootData));
  }
 }

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch, onMounted, onBeforeUnmount } from "vue";
+import { ref, watch } from "vue";
 const props = defineProps({
  rowCount: {
    type: Number,
@@ -29,31 +29,24 @@ const bgImages = [
  "https://static.shelingxingqiu.com/shootmini/static/complete-light1.png",
  "https://static.shelingxingqiu.com/shootmini/static/complete-light2.png",
 ];
-const bgIndex = ref(0);
 watch(
  () => props.total,
  (newValue) => {
    items.value = new Array(newValue).fill(9);
  }
 );
-const timer = ref(null);
-onMounted(() => {
-  timer.value = setInterval(() => {
-    bgIndex.value = bgIndex.value === 0 ? 1 : 0;
-  }, 200);
-});
-onBeforeUnmount(() => {
-  if (timer.value) {
-    clearInterval(timer.value);
-  }
-});
 </script>
 <template>
  <view class="container">
+    <template v-if="total > 0 && arrows.length === total && completeEffect">
      <image
-      v-if="total > 0 && arrows.length === total && completeEffect"
-      :src="bgImages[bgIndex]"
-      class="complete-light"
+        v-for="(image, index) in bgImages"
+        :key="image"
+        :src="image"
+        :class="[
+          'complete-light',
+          index === 0 ? 'complete-light--first' : 'complete-light--second',
+        ]"
        :style="{
          width: `calc(${(100 / (rowCount + 2)) * rowCount}vw + ${
            (100 / (total * 2)) * (rowCount * 2 + (total === 12 ? 8 : 24))
@@ -65,6 +58,7 @@ onBeforeUnmount(() => {
          top: `${total === 12 ? -2 : -3}vw`,
        }"
      />
+    </template>
    <view
      v-for="(_, index) in items"
      :key="index"
@@ -121,4 +115,30 @@ onBeforeUnmount(() => {
 .complete-light {
  position: absolute;
 }
+.complete-light--first {
+  animation: complete-light-first 400ms steps(1, end) infinite;
+}
+.complete-light--second {
+  animation: complete-light-second 400ms steps(1, end) infinite;
+}
+@keyframes complete-light-first {
+  0%,
+  49.9% {
+    opacity: 1;
+  }
+  50%,
+  100% {
+    opacity: 0;
+  }
+}
+@keyframes complete-light-second {
+  0%,
+  49.9% {
+    opacity: 0;
+  }
+  50%,
+  100% {
+    opacity: 1;
+  }
+}
 </style>
@@ -2,7 +2,7 @@
 import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue";
 import audioManager from "@/audioManager";
 import { MESSAGETYPESV2 } from "@/constants";
-import { getDirectionText } from "@/util";
+import { getDirectionText, getInvalidShotAudioKey } from "@/util";

 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -174,7 +174,7 @@ async function onReceiveMessage(msg) {
      title: "距离不足，无效",
      icon: "none",
    });
-    audioManager.play("射击无效");
+    audioManager.play(getInvalidShotAudioKey(msg.shootData));
  }
 }

@@ -32,6 +32,10 @@ const props = defineProps({
    type: Function,
    default: () => {},
  },
+  onSuccess: {
+    type: Function,
+    default: () => {},
+  },
 });
 const agree = ref(false);
 const phone = ref("");
@@ -127,6 +131,7 @@ async function doLogin() {
      clearDevice();
    }
    props.onClose();
+    await props.onSuccess();
  } catch (error) {
    console.log("login error", error);
  } finally {
@@ -1,8 +1,18 @@
 <script setup>
-import { computed, getCurrentInstance, nextTick, onMounted, ref, watch } from "vue";
+import {
+  computed,
+  getCurrentInstance,
+  nextTick,
+  onBeforeUnmount,
+  onMounted,
+  ref,
+  watch,
+} from "vue";

 const defaultCanvasSize = 300;
 const defaultRingCount = 10;
+const highlightRevealProgressFrames = [0.08, 0.2, 0.38, 0.6, 0.82, 1];
+const highlightRevealFrameInterval = 60;

 const props = defineProps({
  // canvas 唯一标识；不传时组件内部自动生成，避免多个靶面 canvas-id 冲突。
@@ -41,6 +51,11 @@ const props = defineProps({
    type: Number,
    default: 0,
  },
+  // 每次变化时以固定低帧数重新展开当前高亮扇区；默认关闭。
+  highlightRefreshToken: {
+    type: Number,
+    default: 0,
+  },
  showSectorLabels: {
    type: Boolean,
    default: false,
@@ -94,6 +109,10 @@ const canvasSize = ref({
  width: defaultCanvasSize,
  height: defaultCanvasSize,
 });
+let drawRequestGeneration = 0;
+let highlightAnimationGeneration = 0;
+let highlightAnimationTimer = null;
+let mountDrawTimer = null;

 // 完整靶纸默认样式，调用方可以通过 targetStyleConfig 局部覆盖。
 const defaultTargetStyleConfig = {
@@ -238,10 +257,23 @@ const drawTargetRings = (ctx, centerX, centerY, targetRadius, config) => {
 };

 // 高亮后端指定区域；activeRing 有效时只高亮该区域内的单个环。
-const drawSectorHighlight = (ctx, centerX, centerY, targetRadius, config) => {
+const drawSectorHighlight = (
+  ctx,
+  centerX,
+  centerY,
+  targetRadius,
+  config,
+  revealProgress = 1
+) => {
  const angles = getSectorAngles(props.activeSector, props.sectorCount);
  if (!angles) return;

+  const safeRevealProgress = Math.min(
+    Math.max(getNumber(revealProgress, 1), 0),
+    1
+  );
+  if (safeRevealProgress <= 0) return;
+
  const ring = getPositiveInteger(props.activeRing);
  const hasActiveRing = ring >= 1 && ring <= config.ringCount;
  const innerRadius = hasActiveRing
@@ -262,7 +294,8 @@ const drawSectorHighlight = (ctx, centerX, centerY, targetRadius, config) => {
    innerRadius,
    outerRadius,
    angles.startAngle,
-    angles.endAngle,
+    angles.startAngle +
+      (angles.endAngle - angles.startAngle) * safeRevealProgress,
    style.color,
    style.strokeColor,
    Math.max(1, targetRadius * style.lineWidthRatio)
@@ -399,12 +432,12 @@ const getDrawKey = (width, height) => {
 };

 // 主绘制入口：根据 highlightOnly 决定画完整靶纸，还是只画透明高亮层。
-const drawTarget = () => {
+const drawTarget = ({ force = false, highlightProgress = 1 } = {}) => {
  const width = Math.max(getNumber(canvasSize.value.width, defaultCanvasSize), 1);
  const height = Math.max(getNumber(canvasSize.value.height, defaultCanvasSize), 1);
  const drawKey = getDrawKey(width, height);

-  if (drawKey === lastDrawKey.value) {
+  if (!force && drawKey === lastDrawKey.value) {
    return;
  }

@@ -421,7 +454,14 @@ const drawTarget = () => {
    drawTargetRings(ctx, centerX, centerY, targetRadius, config);
  }

-  drawSectorHighlight(ctx, centerX, centerY, targetRadius, config);
+  drawSectorHighlight(
+    ctx,
+    centerX,
+    centerY,
+    targetRadius,
+    config,
+    highlightProgress
+  );

  if (!props.highlightOnly) {
    drawRingLines(ctx, centerX, centerY, targetRadius, config);
@@ -441,26 +481,82 @@ const drawTarget = () => {
  drawSectorLabels(ctx, centerX, centerY, targetRadius);

  ctx.draw();
-  lastDrawKey.value = drawKey;
+  lastDrawKey.value = highlightProgress >= 1 ? drawKey : "";
 };

-const setCanvasSizeAndDraw = async (width, height) => {
+const cancelHighlightAnimation = () => {
+  highlightAnimationGeneration += 1;
+  if (highlightAnimationTimer) {
+    clearTimeout(highlightAnimationTimer);
+    highlightAnimationTimer = null;
+  }
+};
+
+// 固定 6 帧展开黄色扇区，避免对原生 canvas 节点做缩放导致低端机错位。
+const runHighlightRevealAnimation = () => {
+  cancelHighlightAnimation();
+  const generation = highlightAnimationGeneration;
+  let frameIndex = 0;
+
+  const drawNextFrame = () => {
+    if (generation !== highlightAnimationGeneration) return;
+
+    drawTarget({
+      force: true,
+      highlightProgress: highlightRevealProgressFrames[frameIndex],
+    });
+    frameIndex += 1;
+
+    if (frameIndex < highlightRevealProgressFrames.length) {
+      highlightAnimationTimer = setTimeout(
+        drawNextFrame,
+        highlightRevealFrameInterval
+      );
+    } else {
+      highlightAnimationTimer = null;
+    }
+  };
+
+  drawNextFrame();
+};
+
+const setCanvasSizeAndDraw = async (
+  width,
+  height,
+  { animateHighlight = false, requestGeneration } = {}
+) => {
  canvasSize.value = {
    width: width > 0 ? width : defaultCanvasSize,
    height: height > 0 ? height : width || defaultCanvasSize,
  };

  await nextTick();
+  if (requestGeneration !== drawRequestGeneration) return;
+
+  const canAnimateHighlight =
+    animateHighlight &&
+    props.highlightOnly &&
+    !!getSectorAngles(props.activeSector, props.sectorCount);
+
+  if (canAnimateHighlight) {
+    runHighlightRevealAnimation();
+  } else {
+    cancelHighlightAnimation();
    drawTarget();
+  }
 };

 // 读取 canvas 实际渲染尺寸后再绘制，保证小程序真机尺寸和坐标一致。
-const measureAndDraw = () => {
+const measureAndDraw = ({ animateHighlight = false } = {}) => {
+  const requestGeneration = ++drawRequestGeneration;
  const propWidth = Math.round(getNumber(props.canvasWidth, 0));
  const propHeight = Math.round(getNumber(props.canvasHeight, 0));

  if (propWidth > 0 && propHeight > 0) {
-    setCanvasSizeAndDraw(propWidth, propHeight);
+    setCanvasSizeAndDraw(propWidth, propHeight, {
+      animateHighlight,
+      requestGeneration,
+    });
    return;
  }

@@ -469,18 +565,23 @@ const measureAndDraw = () => {
  query
    .select(`#${currentCanvasId.value}`)
    .boundingClientRect(async (rect) => {
+      if (requestGeneration !== drawRequestGeneration) return;
+
      const width = Math.round(getNumber(rect?.width, defaultCanvasSize));
      const height = Math.round(getNumber(rect?.height, width || defaultCanvasSize));

-      await setCanvasSizeAndDraw(width, height);
+      await setCanvasSizeAndDraw(width, height, {
+        animateHighlight,
+        requestGeneration,
+      });
    })
    .exec();
 };

 // 等待 Vue 完成 DOM 更新后重新测量和绘制。
-const scheduleDraw = async () => {
+const scheduleDraw = async ({ animateHighlight = false } = {}) => {
  await nextTick();
-  measureAndDraw();
+  measureAndDraw({ animateHighlight });
 };

 watch(
@@ -491,6 +592,7 @@ watch(
    props.sectorCount,
    props.activeSector,
    props.activeRing,
+    props.highlightRefreshToken,
    props.showSectorLabels,
    props.highlightOnly,
    props.canvasWidth,
@@ -501,14 +603,33 @@ watch(
    props.sectorLabelStyle,
    props.highlightStyle,
  ],
-  scheduleDraw,
+  (currentValues, previousValues = []) => {
+    const refreshTokenIndex = 6;
+    const refreshToken = Number(currentValues[refreshTokenIndex]);
+    const previousRefreshToken = Number(previousValues[refreshTokenIndex]);
+    const animateHighlight =
+      Number.isFinite(refreshToken) &&
+      refreshToken > 0 &&
+      refreshToken !== previousRefreshToken;
+
+    return scheduleDraw({ animateHighlight });
+  },
  {
    deep: true,
  }
 );

 onMounted(() => {
-  setTimeout(measureAndDraw, 30);
+  mountDrawTimer = setTimeout(measureAndDraw, 30);
+});
+
+onBeforeUnmount(() => {
+  drawRequestGeneration += 1;
+  cancelHighlightAnimation();
+  if (mountDrawTimer) {
+    clearTimeout(mountDrawTimer);
+    mountDrawTimer = null;
+  }
 });
 </script>

@@ -9,11 +9,13 @@ const props = defineProps({
 const show = ref(false);
 const count = ref(props.countdown);
 const timer = ref(null);
+const showTimer = ref(null);
 const updateTimer = (value) => {
  count.value = Math.round(value);
 };
 onMounted(() => {
-  setTimeout(() => {
+  showTimer.value = setTimeout(() => {
+    showTimer.value = null;
    show.value = true;
    timer.value = setInterval(() => {
      if (count.value === 0) {
@@ -27,7 +29,10 @@ onMounted(() => {
  uni.$on("update-timer", updateTimer);
 });
 onBeforeUnmount(() => {
+  if (showTimer.value) clearTimeout(showTimer.value);
+  showTimer.value = null;
  if (timer.value) clearInterval(timer.value);
+  timer.value = null;
  uni.$off("update-timer", updateTimer);
 });
 </script>
@@ -0,0 +1,164 @@
+<script setup>
+import { computed } from "vue";
+
+const MAX_VISIBLE_SCORE_CARDS = 60;
+
+const props = defineProps({
+  arrows: {
+    type: Array,
+    default: () => [],
+  },
+  total: {
+    type: Number,
+    default: 0,
+  },
+  trainingType: {
+    type: String,
+    default: "",
+  },
+  recordMode: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const getDisplayText = (arrow = {}) => {
+  if (!arrow) return "";
+  if (!arrow.ring) return "0";
+  return arrow.ringX ? "X" : String(arrow.ring);
+};
+
+const isFailed = (arrow = {}) => {
+  if (!arrow) return false;
+  if (props.recordMode && props.trainingType !== "precision") return false;
+  return arrow.ok !== true;
+};
+
+const hiddenScoreCount = computed(() =>
+  props.recordMode
+    ? 0
+    : Math.max(props.arrows.length - MAX_VISIBLE_SCORE_CARDS, 0)
+);
+
+const displayArrows = computed(() => {
+  const list = props.recordMode
+    ? [...props.arrows]
+    : props.arrows.slice(-MAX_VISIBLE_SCORE_CARDS);
+  // total 是达标箭数，不是实际射箭上限；训练中始终预留下一箭空框。
+  if (!props.recordMode) list.push(null);
+  return list;
+});
+</script>
+
+<template>
+  <view v-if="displayArrows.length" class="score-panel">
+    <text v-if="hiddenScoreCount" class="score-window-tip">
+      已省略前 {{ hiddenScoreCount }} 支，仅显示最近
+      {{ MAX_VISIBLE_SCORE_CARDS }} 支
+    </text>
+    <view class="score-grid">
+      <view
+        v-for="(arrow, index) in displayArrows"
+        :key="index"
+        class="score-card"
+      >
+        <image
+          class="score-card-bg"
+          :src="
+            isFailed(arrow)
+              ? 'https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/block-gray.png'
+              : 'https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/block-gold.png'
+          "
+        />
+        <image
+          v-if="trainingType === 'precision' && arrow"
+          class="score-result-icon"
+          :src="
+            arrow.ok === true
+              ? 'https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/gou.png'
+              : 'https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/cha.png'
+          "
+          mode="aspectFit"
+        />
+        <text
+          v-else
+          class="score-value"
+          :class="{ 'score-value--low': isFailed(arrow) }"
+        >
+          {{ getDisplayText(arrow) }}
+        </text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<style scoped lang="scss">
+.score-panel {
+  width: 100%;
+  padding: 30rpx 40rpx 0 40rpx;
+  box-sizing: border-box;
+}
+
+.score-grid {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.score-window-tip {
+  display: block;
+  margin-bottom: 18rpx;
+  color: rgba(255, 255, 255, 0.6);
+  font-size: 22rpx;
+  line-height: 1.4;
+}
+
+.score-card {
+  position: relative;
+  width: 100rpx;
+  height: 56rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+  margin-right: 14rpx;
+  margin-bottom: 14rpx;
+}
+
+.score-card:nth-child(6n) {
+  margin-right: 0;
+}
+
+.score-card-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100rpx;
+  height: 56rpx;
+}
+
+.score-result-icon {
+  position: relative;
+  z-index: 1;
+  width: 30rpx;
+  height: 30rpx;
+}
+
+.score-value {
+  position: relative;
+  z-index: 1;
+  min-width: 28rpx;
+  text-align: center;
+  font-size: 34rpx;
+  line-height: 1;
+  font-weight: 700;
+  font-style: italic;
+  color: #f6e3b2;
+  text-shadow: 0 2rpx 0 rgba(36, 36, 48, 0.5);
+  margin-left: -10rpx;
+}
+
+.score-value--low {
+  color: #cfcfcf;
+  text-shadow: 0 2rpx 0 rgba(0, 0, 0, 0.5);
+}
+</style>
@@ -29,6 +29,7 @@ export const MESSAGETYPES = {
  DeviceOnline: 4168086626,
  DeviceOffline: 4168086627,
  SomeoneIsReady: 4168086628,
+  DeviceCharging: 4168086631, // 设备充电中
 };

 export const MESSAGETYPESV2 = {
@@ -9,7 +9,7 @@ import {
  getServerMessageTypeName,
 } from "@/utils/matchProtocol";
 import { MESSAGETYPESV2 } from "@/constants";
-import { getDirectionText } from "@/util";
+import { getDirectionText, getInvalidShotAudioKey } from "@/util";
 import {
  normalizeId,
  normalizeMatchInfo,
@@ -41,6 +41,27 @@ const LIVENESS_TIMEOUT_MS = 30000;
 const RECONNECT_DELAYS_MS = [1000, 2000, 4000, 8000, 15000];
 const ROUND_AUDIO_NAMES = ["一", "二", "三", "四", "五"];
 const MATCH_STATUS_HALF_REST = 3;
+const ENABLE_REALTIME_MESSAGE_LOG = (() => {
+  try {
+    return uni.getAccountInfoSync().miniProgram.envVersion !== "release";
+  } catch (_) {
+    return false;
+  }
+})();
+
+function getServerMessageLogSummary(message = {}) {
+  const practiceInfo = message.practice_info || message.practiceInfo || {};
+  const matchInfo = message.match_info || message.matchInfo || {};
+  return {
+    type: message.type,
+    matchId: normalizeId(pickField(message, "matchId", "match_id")),
+    sequence: message.sequence,
+    practiceDetailCount: Array.isArray(practiceInfo.details)
+      ? practiceInfo.details.length
+      : 0,
+    roundCount: Array.isArray(matchInfo.rounds) ? matchInfo.rounds.length : 0,
+  };
+}

 // 比赛服消息类型先映射成项目里已有的 V2 业务消息，页面仍然复用原来的 socket-inbox 流程。
 const BUSINESS_TYPE_BY_SERVER_TYPE = {
@@ -378,7 +399,7 @@ function getAckAudioKeys(message, businessMessage) {
    case ServerMessageType.SERVER_MSG_CHECK:
      return getTestDistanceAudioKeys(businessMessage?.shootData);
    case ServerMessageType.SERVER_MSG_NOT_ENOUGH_DISTANCE:
-      return ["射击无效"];
+      return [getInvalidShotAudioKey(businessMessage?.shootData)];
    default:
      return [];
  }
@@ -785,7 +806,13 @@ function handleMessage(data) {
  }

  const typeName = getServerMessageTypeName(message.type);
-  console.log("收到比赛服 WebSocket 消息", typeName, message);
+  if (ENABLE_REALTIME_MESSAGE_LOG) {
+    console.log(
+      "收到比赛服 WebSocket 消息",
+      typeName,
+      getServerMessageLogSummary(message)
+    );
+  }

  const decodedMatchId = normalizeId(pickField(message, "matchId", "match_id"));
  if (message.type === ServerMessageType.SERVER_MSG_SYNC_PRACTICE_INFO) {
@@ -1,104 +0,0 @@
-// 首页一周打卡展示数据，直接对应顶部 7 个日期卡片。
-export const trainingHomeWeekSchedule = [
-  {
-    key: "mon",
-    label: "周一",
-    status: "done",
-    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/done.png",
-  },
-  {
-    key: "tue",
-    label: "周二",
-    status: "done",
-    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/done.png",
-  },
-  {
-    key: "wed",
-    label: "周三",
-    status: "missed",
-    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/missed.png",
-  },
-  {
-    key: "thu",
-    label: "周四",
-    status: "missed",
-    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/missed.png",
-  },
-  {
-    key: "fri",
-    label: "周五",
-    status: "done",
-    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/done.png",
-  },
-  {
-    key: "sat",
-    label: "周六",
-    status: "done",
-    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/done.png",
-  },
-  {
-    key: "sun",
-    label: "周日",
-    status: "missed",
-    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/missed.png",
-  },
-];
-
-// 首页统计卡数据，按设计稿从左到右展示。
-export const trainingHomeStats = [
-  { key: "days", value: "12", unit: "天", label: "共训练" },
-  { key: "shots", value: "112", unit: "支", label: "累计射箭" },
-  { key: "hitRate", value: "30", unit: "%", label: "命中率" },
-  { key: "endurance", value: "6", unit: "支/分钟", label: "耐力射击" },
-  { key: "calories", value: "31W", unit: "卡路里", label: "共消耗" },
-];
-
-// 雷达图区文案与数值配置。
-export const trainingHomeRadar = {
-  labels: ["基础", "精准", "力量", "节奏", "耐力"],
-  values: [5.5, 6.3, 10, 4.5, 6],
-  maxValue: 10,
-  surpassValue: '80%'
-};
-
-// 首页主推荐训练卡数据。
-export const trainingHomeFeatured = {
-  title: "基础训练",
-  progressText: "当前进度 LV7 >",
-};
-
-// 首页四个训练入口卡片数据。
-export const trainingHomeModes = [
-  {
-    key: "endurance",
-    title: "耐力训练",
-    progressText: "当前进度 LV5 >",
-    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_3.png",
-    recommended: true,
-    disabled: false,
-  },
-  {
-    key: "precision",
-    title: "精准训练",
-    progressText: "当前进度 LV3 >",
-    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_4.png",
-    recommended: false,
-    disabled: false,
-  },
-  {
-    key: "rhythm",
-    title: "节奏训练",
-    progressText: "当前进度 LV6 >",
-    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_5.png",
-    recommended: false,
-    disabled: false,
-  },
-  {
-    key: "power",
-    title: "力量训练",
-    progressText: "Coming!  LV10",
-    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_6.png",
-    recommended: false,
-    disabled: true,
-  },
-];
@@ -1,113 +0,0 @@
-// 难度页当前用于保存“开始训练前上下文”的本地存储 key。
-export const trainingDifficultyStorageKey = "training-selection";
-
-// 当前是页面联调用的模拟数据：
-// 1. 总难度 20 级
-// 2. 已解锁到 Lv3
-// 3. 前三关展示不同完成进度
-const totalDifficultyLevel = 20;
-const mockedUnlockedDifficultyId = "lv3";
-const mockedDifficultyProgressMap = {
-  lv1: 100,
-  lv2: 90,
-  lv3: 70,
-};
-
-const modeList = [
-  {
-    key: "endurance",
-    title: "耐力训练",
-  },
-  {
-    key: "precision",
-    title: "精准训练",
-  },
-  {
-    key: "rhythm",
-    title: "节奏训练",
-  },
-  {
-    key: "basic",
-    title: "基础训练",
-  },
-  {
-    key: "power",
-    title: "力量训练",
-  },
-  {
-    key: "focus",
-    title: "专注训练",
-  },
-];
-
-const createDifficultyId = (level) => `lv${level}`;
-
-const createDifficultyLabel = (level) => `Lv${level}`;
-
-// 根据等级生成模拟文案，方便一次性扩展到更多关卡。
-const createDifficultySummary = (level) => {
-  return [
-    `箭靶划分为${Math.min(1 + Math.floor((level - 1) / 5), 4)}个区域`,
-    `需${4 + level}次命中目标`,
-    `${100 + Math.floor((level - 1) / 2) * 10}秒内完成所有射击`,
-    "需使用20CM全环靶",
-  ];
-};
-
-// 难度页的节点位置已经在页面内统一计算，
-// 这里保留最核心的 id / label 即可，不再维护无效的 left / top / style 字段。
-const createDifficultyNode = (level) => {
-  return {
-    id: createDifficultyId(level),
-    label: createDifficultyLabel(level),
-  };
-};
-
-const createDifficultyDetail = (level) => {
-  const id = createDifficultyId(level);
-  const label = createDifficultyLabel(level);
-
-  return {
-    id,
-    label,
-    title: `${label}难度`,
-    summary: createDifficultySummary(level),
-    startText: "开始",
-    targetPaperType: "20CM全环靶",
-  };
-};
-
-// 所有训练模式当前共用同一套难度定义。
-const sharedDifficultyNodes = Array.from(
-  { length: totalDifficultyLevel },
-  (_, index) => createDifficultyNode(index + 1)
-);
-
-const sharedDifficultyDetails = Object.fromEntries(
-  Array.from({ length: totalDifficultyLevel }, (_, index) => {
-    const detail = createDifficultyDetail(index + 1);
-    return [detail.id, detail];
-  })
-);
-
-const createModeConfig = ({ key, title, reward = null }) => {
-  return {
-    key,
-    title,
-    nodes: sharedDifficultyNodes,
-    details: sharedDifficultyDetails,
-    activeDifficultyId: mockedUnlockedDifficultyId,
-    progressMap: mockedDifficultyProgressMap,
-    reward,
-  };
-};
-
-// 难度页数据源入口：
-// 页面通过 getTrainingDifficultyModeConfig(modeKey) 获取当前模式完整配置。
-export const trainingDifficultyModeMap = Object.fromEntries(
-  modeList.map((mode) => [mode.key, createModeConfig(mode)])
-);
-
-export const getTrainingDifficultyModeConfig = (modeKey) => {
-  return trainingDifficultyModeMap[modeKey] || trainingDifficultyModeMap.precision;
-};
@@ -3,6 +3,9 @@
    {
      "path": "pages/index"
    },
+    {
+      "path": "pages/org-bind"
+    },
    {
      "path": "pages/friend-battle"
    },
@@ -9,17 +9,23 @@ const playAudio = (key) => {
  audioManager.play(key);
 };

+const onAudioLoaded = (key) => {
+  loaded.value = {
+    ...loaded.value,
+    [key]: true,
+  };
+};
+
 onMounted(() => {
  const loadedAudioKeys = uni.getStorageSync("loadedAudioKeys") || {};
  loaded.value = loadedAudioKeys;

-  uni.$on("audioLoaded", (key) => {
-    loaded.value[key] = true;
-  });
+  uni.$on("audioLoaded", onAudioLoaded);
+  void audioManager.initAudios();
 });

 onBeforeUnmount(() => {
-  uni.$off("audioLoaded");
+  uni.$off("audioLoaded", onAudioLoaded);
 });
 </script>

@@ -40,8 +46,10 @@ onBeforeUnmount(() => {
      </view>
      <view v-for="key in Object.keys(audioFils)" :key="key">
        <text>{{ key }}</text>
-        <text v-if="!loaded[key]">未加载</text>
-        <button v-else hover-class="none" @click="playAudio(key)">播放</button>
+        <text>{{ loaded[key] ? "已加载" : "未加载" }}</text>
+        <button hover-class="none" @click="playAudio(key)">
+          {{ loaded[key] ? "播放" : "加载并播放" }}
+        </button>
      </view>
    </view>
  </Container>
@@ -3,6 +3,7 @@ import { ref, computed, onMounted } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
 import Avatar from "@/components/Avatar.vue";
 import UserUpgrade from "@/components/UserUpgrade.vue";
+import DeviceChargingDialog from "@/components/DeviceChargingDialog.vue";
 import { getBattleAPI } from "@/apis";
 import { topThreeColors, getBattleResultTips } from "@/constants";
 import audioManager from "@/audioManager";
@@ -287,6 +288,7 @@ const checkBowData = () => {
      <view @click="exit">返回</view>
    </view>
    <UserUpgrade />
+    <DeviceChargingDialog />
  </view>
 </template>

@@ -1,6 +1,7 @@
 <script setup>
 import { ref, onMounted } from "vue";
 import SButton from "@/components/SButton.vue";
+import DeviceChargingDialog from "@/components/DeviceChargingDialog.vue";

 import { capsuleHeight } from "@/util";

@@ -55,6 +56,7 @@ const onScrollView = (e) => {
        />
      </view>
    </scroll-view>
+    <DeviceChargingDialog />
  </view>
 </template>

@@ -195,7 +195,7 @@ const onClickShare = debounce(async () => {
 });

 onMounted(() => {
-  void audioManager.warmAll();
+  void audioManager.warmCommon();
  uni.setKeepScreenOn({
    keepScreenOn: true,
  });
@@ -1,5 +1,5 @@
 <script setup>
-import {onMounted, onUnmounted, ref} from "vue";
+import {onMounted, onUnmounted, ref, watch} from "vue";
 import {onShareAppMessage, onShareTimeline, onShow} from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import AppFooter from "@/components/AppFooter.vue";
@@ -52,20 +52,41 @@ const otaInfo = ref({
  forceUpdate: false,
 });
 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 clearOtaUpdateTimers = () => {
  clearInterval(otaProgressTimer);
  clearTimeout(otaStatusTimer);
  clearTimeout(otaTimeoutTimer);
+  clearTimeout(otaResultTimer);
  otaProgressTimer = null;
  otaStatusTimer = null;
  otaTimeoutTimer = null;
+  otaResultTimer = null;
+  otaStatusPollCount = 0;
 };

+// 使当前 OTA 运行失效，确保旧请求返回后不会继续轮询或覆盖新状态。
+const invalidateOtaUpdateRun = () => {
+  otaUpdateRunId += 1;
+  clearOtaUpdateTimers();
+};
+
+const isOtaUpdateRunActive = (runId) =>
+  runId === otaUpdateRunId && otaState.value === "update_progress";
+
 // 启动首页 OTA 本地进度动画，最终成功失败以后端任务状态为准。
 const startOtaProgressAnimation = () => {
  clearInterval(otaProgressTimer);
@@ -91,13 +112,25 @@ const applyOtaVersionInfo = (versionInfo) => {

 // 检查当前设备盒子是否存在可升级版本。
 const checkOtaUpdate = async () => {
+  if (isCheckingOta || otaVisible.value) return;
+  isCheckingOta = true;
+
+  try {
+    let deviceStatus;
+    try {
+      deviceStatus = await getDeviceBatteryAPI();
+    } catch (err) {
+      return;
+    }
+    if (deviceStatus?.online !== true || otaVisible.value) return;
+
    let versionInfo;
    try {
      versionInfo = await getHardwareBoxVersionAPI();
    } catch (err) {
      return;
    }
-  if (!versionInfo?.needUpdate) return;
+    if (!versionInfo?.needUpdate || otaVisible.value) return;
    applyOtaVersionInfo(versionInfo);

    const dismissedAt = uni.getStorageSync("ota_dismissed_at");
@@ -105,8 +138,26 @@ const checkOtaUpdate = async () => {
    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) {
+      void checkOtaUpdate();
+    }
+  }
 };

+// 设备由 WS 通知上线时补查 OTA；已显示任何 OTA 弹窗时保留当前流程和结果。
+watch(online, (nextOnline, previousOnline) => {
+  if (previousOnline !== false || nextOnline !== true || otaVisible.value) return;
+  if (isCheckingOta) {
+    otaCheckQueuedForOnline = true;
+    return;
+  }
+  void checkOtaUpdate();
+});
+
 // 拼接 OTA WiFi 页参数，让未连 WiFi 的设备继续使用同一份版本信息。
 const getOtaWifiUrl = () => {
  const { versionNumber, resourceUrl } = otaInfo.value;
@@ -125,61 +176,78 @@ const handleOtaDismiss = () => {
 };

 // 将首页 OTA 直连更新流程标记为失败。
-const failHomeOtaUpdate = () => {
-  clearOtaUpdateTimers();
+const failHomeOtaUpdate = (runId) => {
+  if (!isOtaUpdateRunActive(runId)) return;
+  invalidateOtaUpdateRun();
  isStartingOta.value = false;
  otaState.value = "update_failure";
  otaVisible.value = true;
 };

 // 将首页 OTA 直连更新流程标记为成功。
-const completeHomeOtaUpdate = () => {
-  clearOtaUpdateTimers();
+const completeHomeOtaUpdate = (runId) => {
+  if (!isOtaUpdateRunActive(runId)) return;
+  invalidateOtaUpdateRun();
  isStartingOta.value = false;
  otaProgress.value = 100;
-  setTimeout(() => {
+  const completedRunId = otaUpdateRunId;
+  otaResultTimer = setTimeout(() => {
+    otaResultTimer = null;
+    if (completedRunId !== otaUpdateRunId) return;
    otaState.value = "update_success";
    otaVisible.value = true;
  }, 300);
 };

 // 轮询首页直接发起的 OTA 更新任务状态。
-const pollHomeOtaTaskStatus = (taskId) => {
-  clearTimeout(otaStatusTimer);
-  otaStatusTimer = setTimeout(async () => {
+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();
+      completeHomeOtaUpdate(runId);
      return;
    }
    if (status === 3) {
-        failHomeOtaUpdate();
+      failHomeOtaUpdate(runId);
      return;
    }
    if (status === 0 || status === 1) {
-        pollHomeOtaTaskStatus(taskId);
+      if (otaStatusPollCount >= OTA_TASK_STATUS_MAX_POLL_COUNT) {
+        failHomeOtaUpdate(runId);
        return;
      }
-      failHomeOtaUpdate();
+      otaStatusTimer = setTimeout(() => {
+        otaStatusTimer = null;
+        if (!isOtaUpdateRunActive(runId)) return;
+        void pollHomeOtaTaskStatus(taskId, runId);
+      }, OTA_TASK_STATUS_POLL_INTERVAL);
+      return;
+    }
+    failHomeOtaUpdate(runId);
  } catch (err) {
-      failHomeOtaUpdate();
+    if (!isOtaUpdateRunActive(runId)) return;
+    failHomeOtaUpdate(runId);
  }
-  }, 3000);
 };

 // 设备盒子已连 WiFi 时，从首页直接传空 WiFi 信息发起 OTA 更新。
 const startHomeOtaUpdate = async () => {
+  invalidateOtaUpdateRun();
+  const runId = otaUpdateRunId;
  otaState.value = "update_progress";
  otaVisible.value = true;
  otaProgress.value = 0;
  startOtaProgressAnimation();
  otaTimeoutTimer = setTimeout(() => {
-    if (otaState.value === "update_progress") {
-      failHomeOtaUpdate();
-    }
-  }, 5 * 60 * 1000);
+    if (!isOtaUpdateRunActive(runId)) return;
+    failHomeOtaUpdate(runId);
+  }, OTA_TASK_STATUS_TIMEOUT);

  try {
    const updateResult = await sendHardwareBoxUpdateAPI({
@@ -188,13 +256,15 @@ const startHomeOtaUpdate = async () => {
      wifiPassword: "",
      resourceUrl: otaInfo.value.resourceUrl,
    });
+    if (!isOtaUpdateRunActive(runId)) return;
    if (!updateResult?.taskId) {
-      failHomeOtaUpdate();
+      failHomeOtaUpdate(runId);
      return;
    }
-    pollHomeOtaTaskStatus(updateResult.taskId);
+    void pollHomeOtaTaskStatus(updateResult.taskId, runId);
  } catch (err) {
-    failHomeOtaUpdate();
+    if (!isOtaUpdateRunActive(runId)) return;
+    failHomeOtaUpdate(runId);
  }
 };

@@ -240,6 +310,7 @@ const handleOtaDone = () => {

 // 处理 OTA 更新失败后的重试按钮，重新走立即更新判断流程。
 const handleOtaRetry = () => {
+  invalidateOtaUpdateRun();
  handleOtaUpdate();
 };

@@ -351,7 +422,7 @@ onMounted(async () => {
 });

 onUnmounted(() => {
-  clearOtaUpdateTimers();
+  invalidateOtaUpdateRun();
 });

 onShareAppMessage(() => {
@@ -234,7 +234,7 @@ onLoad(async (options) => {
 });

 onMounted(() => {
-  void audioManager.warmAll();
+  void audioManager.warmCommon();
  uni.setKeepScreenOn({
    keepScreenOn: true,
  });
@@ -1,25 +1,70 @@
 <script setup>
-import { ref } from "vue";
+import { computed, ref } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import Avatar from "@/components/Avatar.vue";
 import BowTarget from "@/components/BowTarget.vue";
-import ScorePanel from "@/components/ScorePanel.vue";
-import { getPractiseAPI } from "@/apis";
+import ScorePanel2 from "@/components/TrainingScorePanel.vue";
+import { getPractiseDetailAPI } from "@/apis";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
 const { user } = storeToRefs(store);
 const arrows = ref([]);
 const isSvip = ref(false);
-const total = ref(0);
+const practiseDetail = ref({});
+const trainingTypeNameMap = Object.freeze({
+  base: "基础训练",
+  endurance: "耐力训练",
+  precision: "精准训练",
+  rhythm: "节奏训练",
+});
+
+const trainingType = computed(() =>
+  String(practiseDetail.value.trainingType || "").trim().toLowerCase()
+);
+const trainingTypeName = computed(
+  () => trainingTypeNameMap[trainingType.value] || "自由训练"
+);
+const targetTypeText = computed(() => {
+  const targetType = Number(practiseDetail.value.targetType);
+  return targetType > 0 ? `${targetType}CM靶` : "";
+});
+const difficultyText = computed(() => {
+  const difficultyLevel = Number(practiseDetail.value.difficultyLevel);
+  return Number.isInteger(difficultyLevel) && difficultyLevel > 0
+    ? `LV${difficultyLevel}`
+    : "";
+});
+const totalRings = computed(() => {
+  const interpretationTotal = Number(
+    practiseDetail.value.interpretation?.totalRings
+  );
+  if (Number.isFinite(interpretationTotal)) return interpretationTotal;
+  return arrows.value.reduce(
+    (total, arrow) => total + (Number(arrow.ring) || 0),
+    0
+  );
+});
+
+const normalizeArrow = (arrow = {}) => ({
+  ...arrow,
+  ring: Number(arrow.ring) || 0,
+  ringX:
+    arrow.ringX === true ||
+    Number(arrow.ringX) === 1 ||
+    Number(arrow.ifX) === 1,
+  ok: arrow.ok === true || Number(arrow.ok) === 1,
+});

 onLoad(async (options) => {
  if (!options.id) return;
-  const result = await getPractiseAPI(options.id || 176);
-  arrows.value = result.details;
-  isSvip.value = result.sVip === true;
-  total.value = result.details.length;
+  const result = (await getPractiseDetailAPI(options.id)) || {};
+  practiseDetail.value = result;
+  arrows.value = Array.isArray(result.details)
+    ? result.details.map(normalizeArrow)
+    : [];
+  isSvip.value = result.sVip === true || user.value?.sVip === true;
 });
 </script>

@@ -35,22 +80,29 @@ onLoad(async (options) => {
          </view>
        </view>
      </view> -->
+      <view v-if="practiseDetail.id" class="practice-meta">
+        <text v-if="targetTypeText">{{ targetTypeText }}</text>
+        <text>{{ trainingTypeName }}</text>
+        <text v-if="difficultyText">{{ difficultyText }}</text>
+      </view>
      <view :style="{ marginBottom: '20px' }">
-        <BowTarget :scores="arrows" :isSvip="isSvip" />
+        <BowTarget
+          :scores="arrows"
+          :isSvip="isSvip"
+          :enableShotEffect="false"
+        />
      </view>
      <view class="desc">
        <text>{{ arrows.length }}</text>
        <text>支箭，共</text>
-        <text>{{ arrows.reduce((a, b) => a + b.ring, 0) }}</text>
+        <text>{{ totalRings }}</text>
        <text>环</text>
      </view>
-      <ScorePanel
-        :completeEffect="false"
-        :rowCount="total === 12 ? 6 : 9"
-        :total="total"
+      <ScorePanel2
        :arrows="arrows"
-        :margin="arrows.length === 12 ? 4 : 1"
-        :fontSize="arrows.length === 12 ? 25 : 22"
+        :total="arrows.length"
+        :trainingType="trainingType"
+        recordMode
      />
    </view>
  </Container>
@@ -63,6 +115,20 @@ onLoad(async (options) => {
  justify-content: center;
  align-items: center;
 }
+.practice-meta {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #fff;
+  font-size: 26rpx;
+  font-weight: 600;
+  line-height: 40rpx;
+  padding: 16rpx 0;
+}
+.practice-meta > text + text {
+  margin-left: 24rpx;
+}
 .header {
  display: flex;
  justify-content: space-between;
@@ -15,6 +15,25 @@ const selectedIndex = ref(0);
 const matchList = ref([]);
 const battleList = ref([]);
 const practiseList = ref([]);
+const trainingTypeNameMap = Object.freeze({
+  base: "基础训练",
+  endurance: "耐力训练",
+  precision: "精准训练",
+  rhythm: "节奏训练",
+});
+
+const getTrainingTypeName = (trainingType) => {
+  const normalizedType = String(trainingType || "").trim().toLowerCase();
+  return trainingTypeNameMap[normalizedType] || "自由训练";
+};
+
+const formatPractiseTime = (value) => {
+  const normalizedTime = String(value || "").trim();
+  const matchedTime = normalizedTime.match(
+    /^(\d{4}-\d{2}-\d{2})[T\s](\d{2}:\d{2}:\d{2})/
+  );
+  return matchedTime ? `${matchedTime[1]} ${matchedTime[2]}` : normalizedTime;
+};

 const toMatchDetail = (id) => {
  uni.navigateTo({
@@ -81,7 +100,7 @@ onLoad((options) => {
  <Container title="我的成长脚印" :scroll="false">
    <view class="tabs">
      <view
-        v-for="(rankType, index) in ['排位赛', '好友约战', '个人练习']"
+        v-for="(rankType, index) in ['排位赛', '好友约战', '个人训练']"
        :key="index"
        :style="{
          color: index === selectedIndex ? '#000' : '#fff',
@@ -153,8 +172,8 @@ onLoad((options) => {
              @click="() => getPractiseDetail(item.id)"
            >
              <text
-                >{{ item.completed_arrows === 36 ? "耐力挑战" : "单组练习" }}
-                {{ item.createTime }}</text
+                >{{ getTrainingTypeName(item.trainingType) }}
+                {{ formatPractiseTime(item.createTime) }}</text
              >
              <image src="../static/back.png" mode="widthFix" />
            </view>
@@ -0,0 +1,179 @@
+<script setup>
+import { ref } from "vue";
+import { onLoad } from "@dcloudio/uni-app";
+import Signin from "@/components/Signin.vue";
+import SButton from "@/components/SButton.vue";
+import DeviceChargingDialog from "@/components/DeviceChargingDialog.vue";
+import { tempBindOrgAPI } from "@/apis";
+
+const scene = ref("");
+const status = ref("idle");
+const errorMessage = ref("");
+const showSignin = ref(false);
+const binding = ref(false);
+
+const getToken = () => {
+  try {
+    const env = uni.getAccountInfoSync().miniProgram.envVersion;
+    return uni.getStorageSync(`${env}_token`);
+  } catch (error) {
+    return "";
+  }
+};
+
+const openSignin = () => {
+  showSignin.value = true;
+};
+
+const closeSignin = () => {
+  showSignin.value = false;
+};
+
+const bindOrg = async () => {
+  if (binding.value || !scene.value) return;
+
+  if (!getToken()) {
+    status.value = "login";
+    return;
+  }
+
+  binding.value = true;
+  status.value = "binding";
+  errorMessage.value = "";
+
+  try {
+    await tempBindOrgAPI(scene.value);
+    status.value = "success";
+  } catch (error) {
+    if (error?.type === "AUTH_INVALID") {
+      status.value = "login";
+      errorMessage.value = "登录已失效，请重新登录后完成绑定。";
+    } else {
+      status.value = "failed";
+      errorMessage.value = error?.message || "网络异常，请稍后重试。";
+    }
+  } finally {
+    binding.value = false;
+  }
+};
+
+const handleLoginSuccess = async () => {
+  await bindOrg();
+};
+
+onLoad((options) => {
+  try {
+    const value = decodeURIComponent(String(options?.scene || ""));
+    if (!/^org_\d+$/.test(value)) {
+      status.value = "invalid";
+      return;
+    }
+
+    scene.value = value;
+    if (getToken()) {
+      void bindOrg();
+    } else {
+      status.value = "login";
+    }
+  } catch (error) {
+    status.value = "invalid";
+  }
+});
+</script>
+
+<template>
+  <view class="page">
+    <view class="content">
+      <text class="title">机构设备绑定</text>
+
+      <view v-if="status === 'idle' || status === 'binding'" class="state">
+        <text class="state-title">正在绑定</text>
+        <text class="description">正在绑定机构设备，请稍候……</text>
+      </view>
+
+      <view v-else-if="status === 'login'" class="state">
+        <text class="state-title">请先登录</text>
+        <text class="description">
+          {{
+            errorMessage ||
+            "登录后即可绑定当前机构设备。关闭登录窗口后，也可以再次点击下方按钮继续。"
+          }}
+        </text>
+        <SButton width="560rpx" :rounded="20" :onClick="openSignin">
+          <text>立即登录</text>
+        </SButton>
+      </view>
+
+      <view v-else-if="status === 'success'" class="state">
+        <text class="state-title">绑定成功</text>
+        <text class="description">
+          您的账号已成功绑定机构设备，请返回 iPad 继续操作。
+        </text>
+      </view>
+
+      <view v-else-if="status === 'failed'" class="state">
+        <text class="state-title">绑定失败</text>
+        <text class="description">{{ errorMessage }}</text>
+        <SButton width="560rpx" :rounded="20" :onClick="bindOrg">
+          <text>重新绑定</text>
+        </SButton>
+      </view>
+
+      <view v-else class="state">
+        <text class="state-title">二维码无效</text>
+        <text class="description">请重新扫描机构设备上的小程序码。</text>
+      </view>
+    </view>
+
+    <Signin
+      :show="showSignin"
+      :onClose="closeSignin"
+      :onSuccess="handleLoginSuccess"
+    />
+    <DeviceChargingDialog />
+  </view>
+</template>
+
+<style scoped lang="scss">
+.page {
+  box-sizing: border-box;
+  width: 100%;
+  min-height: 100vh;
+  padding: calc(var(--status-bar-height) + 120rpx) 48rpx 80rpx;
+  background-color: #000;
+  color: #fff;
+}
+
+.content {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.title {
+  font-size: 44rpx;
+  font-weight: 600;
+}
+
+.state {
+  width: 100%;
+  margin-top: 120rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.state-title {
+  font-size: 36rpx;
+  font-weight: 600;
+}
+
+.description {
+  max-width: 600rpx;
+  margin: 32rpx 0 64rpx;
+  color: #b8b8b8;
+  font-size: 28rpx;
+  line-height: 1.8;
+  text-align: center;
+}
+</style>
@@ -5,6 +5,7 @@ import SButton from "@/components/SButton.vue";
 import BowTargetEdit from "@/components/BowTargetEdit.vue";
 import ScreenHint2 from "@/components/ScreenHint2.vue";
 import RingBarChart from "@/components/RingBarChart.vue";
+import DeviceChargingDialog from "@/components/DeviceChargingDialog.vue";
 import { getPointBookDetailAPI, getPointBookConfigAPI } from "@/apis";

 const selectedIndex = ref(0);
@@ -238,6 +239,7 @@ const targetTypeName = computed(() => {
        </block>
      </view>
    </ScreenHint2>
+    <DeviceChargingDialog />
  </view>
 </template>

@@ -403,7 +403,7 @@ onShow(async () => {
 });

 onMounted(async () => {
-  void audioManager.warmAll();
+  void audioManager.warmCommon();
  // audioManager.play("第一轮");
  uni.setKeepScreenOn({
    keepScreenOn: true,
@@ -418,7 +418,7 @@ onShow(async () => {
 });

 onMounted(async () => {
-  void audioManager.warmAll();
+  void audioManager.warmCommon();
  uni.setKeepScreenOn({
    keepScreenOn: true,
  });
@@ -2,6 +2,7 @@
 import { computed, nextTick, onMounted, ref } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
 import Avatar from "@/components/Avatar.vue";
+import DeviceChargingDialog from "@/components/DeviceChargingDialog.vue";
 import {
  getMvpRankList,
  getMyMvpRank,
@@ -524,6 +525,7 @@ const measureTabsMetrics = () => {
        {{ getRankUnit() }}
      </text>
    </view>
+    <DeviceChargingDialog />
  </view>
 </template>

@@ -4,18 +4,34 @@ import { getDeviceBatteryAPI } from "@/apis";

 const power = ref(0);
 const timer = ref(null);
+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 () => {
-  const data = await getDeviceBatteryAPI();
-  power.value = data.battery;
-  timer.value = setInterval(async () => {
-    const data = await getDeviceBatteryAPI();
-    power.value = data.battery;
+  await refreshPower();
+  if (disposed) return;
+  timer.value = setInterval(() => {
+    void refreshPower();
  }, 1000 * 10);
 });

 onBeforeUnmount(() => {
+  disposed = true;
  clearInterval(timer.value);
+  timer.value = null;
 });
 </script>

@@ -5,6 +5,7 @@ import AppBackground from "./AppBackground.vue";
 import Header from "./Header.vue";
 import ScreenHint from "./ScreenHint.vue";
 import BackToGame from "./BackToGame.vue";
+import DeviceChargingDialog from "@/components/DeviceChargingDialog.vue";
 import {laserAimAPI, getBattleAPI, matchGameAPI} from "@/apis";
 import { capsuleHeight, debounce } from "@/util";
 import { returnToBattle } from "@/utils/matchReturn";
@@ -204,6 +205,7 @@ const goCalibration = async () => {
        <text>{{ loadingText || "加载中..." }}</text>
      </view>
    </view>
+    <DeviceChargingDialog />
  </view>
 </template>

@@ -20,7 +20,7 @@ import {
  MATCH_WS_STATE_EVENT,
 } from "@/matchWebsocket";
 import { MESSAGETYPESV2 } from "@/constants";
-import { getDirectionText } from "@/util";
+import { getDirectionText, getInvalidShotAudioKey } from "@/util";
 import { takeMatchReturnSnapshot } from "@/utils/matchReturn";
 import audioManager, {
  AUDIO_INTERRUPTION_BEGIN_EVENT,
@@ -1136,7 +1136,9 @@ async function runInvalidShotTask(task, runId) {
    title: "距离不足，无效",
    icon: "none",
  });
-  await playAudioKeys("射击无效", { interrupt: false });
+  await playAudioKeys(getInvalidShotAudioKey(task.message?.shootData), {
+    interrupt: false,
+  });
  notifyMatchAudioAck(task);
 }

@@ -44,6 +44,10 @@ const props = defineProps({
    type: Number,
    default: 0,
  },
+  highlightRefreshToken: {
+    type: Number,
+    default: 0,
+  },
  mode: {
    type: String,
    default: "solo", // solo 单排，team 双排
@@ -95,8 +99,6 @@ const emit = defineEmits(["shot-effect-complete"]);
 const pMode = ref(true);
 const latestOne = ref(null);
 const bluelatestOne = ref(null);
-const prevScores = ref([]);
-const prevBlueScores = ref([]);
 const timer = ref(null);
 const dirTimer = ref(null);
 const angle = ref(null);
@@ -109,9 +111,23 @@ const targetRect = ref({ left: 0, top: 0, width: 0, height: 0 });
 const shakeTimer = ref(null);
 const instance = getCurrentInstance();
 let shotEffectRequestGeneration = 0;
+const MAX_VISIBLE_TARGET_SHOTS = 12;
 const ROUND_TIP_OFFSET_Y = -32;
 const EXPERIENCE_TIP_OFFSET_Y = -68;

+// 长时训练只保留最近一组命中点在靶面上，完整成绩仍由父页面保存并用于结算。
+const getVisibleScoreEntries = (scores = []) => {
+  const startIndex = Math.max(scores.length - MAX_VISIBLE_TARGET_SHOTS, 0);
+  return scores.slice(startIndex).map((shot, offset) => ({
+    shot,
+    index: startIndex + offset,
+  }));
+};
+const visibleScoreEntries = computed(() => getVisibleScoreEntries(props.scores));
+const visibleBlueScoreEntries = computed(() =>
+  getVisibleScoreEntries(props.blueScores)
+);
+
 const getNumber = (value, fallback = 0) => {
  const numberValue = Number(value);
  return Number.isFinite(numberValue) ? numberValue : fallback;
@@ -372,11 +388,11 @@ function handleWindowResize() {
 }

 watch(
-  () => props.scores,
-  (newVal) => {
-    if (newVal.length - prevScores.value.length === 1) {
-      showShotTip(newVal[newVal.length - 1]);
-    } else if (newVal.length < prevScores.value.length) {
+  () => props.scores.length,
+  (newLength, oldLength = 0) => {
+    if (newLength - oldLength === 1) {
+      showShotTip(props.scores[newLength - 1]);
+    } else if (newLength < oldLength) {
      shotEffectRequestGeneration += 1;
      pendingShotEffect.value = null;
      clearTipTimer();
@@ -384,10 +400,6 @@ watch(
      hiddenLatestKey.value = "";
      shotEffect.value = null;
    }
-    prevScores.value = [...newVal];
-  },
-  {
-    deep: true,
  }
 );

@@ -408,19 +420,15 @@ watch(
 );

 watch(
-  () => props.blueScores,
-  (newVal) => {
-    if (newVal.length - prevBlueScores.value.length === 1) {
-      bluelatestOne.value = newVal[newVal.length - 1];
+  () => props.blueScores.length,
+  (newLength, oldLength = 0) => {
+    if (newLength - oldLength === 1) {
+      bluelatestOne.value = props.blueScores[newLength - 1];
      if (timer.value) clearTimeout(timer.value);
      timer.value = setTimeout(() => {
        bluelatestOne.value = null;
      }, 1000);
    }
-    prevBlueScores.value = [...newVal];
-  },
-  {
-    deep: true,
  }
 );

@@ -530,6 +538,7 @@ onBeforeUnmount(() => {
        :sectorCount="sectorCount"
        :activeSector="activeSector"
        :activeRing="activeRing"
+        :highlightRefreshToken="highlightRefreshToken"
        :showSectorLabels="showSectorLabels"
      />
      <view v-if="angle !== null" class="arrow-dir" :style="arrowStyle">
@@ -575,38 +584,45 @@ onBeforeUnmount(() => {
        >{{ bluelatestOne.ringX ? "X" : bluelatestOne.ring || "未上靶"
        }}<text v-if="bluelatestOne.ring">环</text></view
      >
-      <block v-for="(bow, index) in scores" :key="index">
+      <block v-for="entry in visibleScoreEntries" :key="entry.index">
        <image
-          v-if="pMode && isSvip && bow.ring > 0 && !shouldHideLatestHit(index)"
+          v-if="
+            pMode &&
+            isSvip &&
+            entry.shot.ring > 0 &&
+            !shouldHideLatestHit(entry.index)
+          "
          class="svip-hit-bg"
          src="../../../static/vip/svip-xuan.png"
-          :style="getSvipHitBgStyle(bow)"
+          :style="getSvipHitBgStyle(entry.shot)"
          mode="aspectFit"
        />
        <view
-          v-if="bow.ring > 0 && !shouldHideLatestHit(index)"
+          v-if="entry.shot.ring > 0 && !shouldHideLatestHit(entry.index)"
          :class="`hit ${pMode ? 'b' : 's'}-point ${
-            index === scores.length - 1 && latestOne ? 'pump-in' : ''
+            entry.index === scores.length - 1 && latestOne ? 'pump-in' : ''
          }`"
          :style="{
-            ...getHitStyle(bow),
+            ...getHitStyle(entry.shot),
            backgroundColor: mode === 'solo' ? '#00bf04' : '#FF0000',
          }"
-          ><text v-if="pMode">{{ index + 1 }}</text></view
+          ><text v-if="pMode">{{ entry.index + 1 }}</text></view
        >
      </block>
-      <block v-for="(bow, index) in blueScores" :key="index">
+      <block v-for="entry in visibleBlueScoreEntries" :key="entry.index">
        <view
-          v-if="bow.ring > 0"
+          v-if="entry.shot.ring > 0"
          :class="`hit ${pMode ? 'b' : 's'}-point ${
-            index === blueScores.length - 1 && bluelatestOne ? 'pump-in' : ''
+            entry.index === blueScores.length - 1 && bluelatestOne
+              ? 'pump-in'
+              : ''
          }`"
          :style="{
-            ...getHitStyle(bow),
+            ...getHitStyle(entry.shot),
            backgroundColor: '#1840FF',
          }"
        >
-          <text v-if="pMode">{{ index + 1 }}</text>
+          <text v-if="pMode">{{ entry.index + 1 }}</text>
        </view>
      </block>
      <BowShotEffect
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch, onMounted, onBeforeUnmount } from "vue";
+import { ref, watch } from "vue";
 const props = defineProps({
  rowCount: {
    type: Number,
@@ -27,8 +27,6 @@ const bgImages = [
  "../static/complete-light1.png",
  "../static/complete-light2.png",
 ];
-const bgIndex = ref(0);
-
 const getDisplayText = (arrow) => {
  if (!arrow) return "-";
  if (arrow.ringX) return "X";
@@ -47,24 +45,18 @@ watch(
    items.value = new Array(newValue).fill(9);
  }
 );
-const timer = ref(null);
-onMounted(() => {
-  timer.value = setInterval(() => {
-    bgIndex.value = bgIndex.value === 0 ? 1 : 0;
-  }, 200);
-});
-onBeforeUnmount(() => {
-  if (timer.value) {
-    clearInterval(timer.value);
-  }
-});
 </script>
 <template>
  <view class="container">
+    <template v-if="total > 0 && arrows.length === total && completeEffect">
      <image
-      v-if="total > 0 && arrows.length === total && completeEffect"
-      :src="bgImages[bgIndex]"
-      class="complete-light"
+        v-for="(image, index) in bgImages"
+        :key="image"
+        :src="image"
+        :class="[
+          'complete-light',
+          index === 0 ? 'complete-light--first' : 'complete-light--second',
+        ]"
        :style="{
          width: `calc(${(100 / (rowCount + 2)) * rowCount}vw + ${
            (100 / (total * 2)) * (rowCount * 2 + (total === 12 ? 8 : 24))
@@ -76,6 +68,7 @@ onBeforeUnmount(() => {
          top: `${total === 12 ? -2 : -3}vw`,
        }"
      />
+    </template>
    <view
      v-for="(_, index) in items"
      :key="index"
@@ -154,4 +147,30 @@ onBeforeUnmount(() => {
 .complete-light {
  position: absolute;
 }
+.complete-light--first {
+  animation: complete-light-first 400ms steps(1, end) infinite;
+}
+.complete-light--second {
+  animation: complete-light-second 400ms steps(1, end) infinite;
+}
+@keyframes complete-light-first {
+  0%,
+  49.9% {
+    opacity: 1;
+  }
+  50%,
+  100% {
+    opacity: 0;
+  }
+}
+@keyframes complete-light-second {
+  0%,
+  49.9% {
+    opacity: 0;
+  }
+  50%,
+  100% {
+    opacity: 1;
+  }
+}
 </style>
@@ -1,108 +0,0 @@
-<script setup>
-import { computed } from "vue";
-
-const props = defineProps({
-  arrows: {
-    type: Array,
-    default: () => [],
-  },
-  total: {
-    type: Number,
-    default: 0,
-  },
-});
-
-const getDisplayText = (arrow = {}) => {
-  if (!arrow) return "";
-  if (!arrow.ring) return "0";
-  return arrow.ringX ? "X" : String(arrow.ring);
-};
-
-const isLowScore = (arrow = {}) => {
-  if (!arrow || arrow.ringX) return false;
-  return Number(arrow.ring) < 6;
-};
-
-const displayArrows = computed(() => {
-  const list = [...props.arrows];
-  // total 是达标箭数，不是实际射箭上限；训练中始终预留下一箭空框。
-  list.push(null);
-  return list;
-});
-</script>
-
-<template>
-  <view v-if="displayArrows.length" class="score-panel">
-    <view class="score-grid">
-      <view
-        v-for="(arrow, index) in displayArrows"
-        :key="index"
-        class="score-card"
-      >
-        <image class="score-card-bg" :src="isLowScore(arrow)?'https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/block-gray.png':'https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/block-gold.png'"></image>
-        <text
-          class="score-value"
-          :class="{ 'score-value--low': isLowScore(arrow) }"
-        >
-          {{ getDisplayText(arrow) }}
-        </text>
-      </view>
-    </view>
-  </view>
-</template>
-
-<style scoped lang="scss">
-.score-panel {
-  width: 100%;
-  padding: 30rpx 40rpx 0 40rpx;
-  box-sizing: border-box;
-}
-
-.score-grid {
-  display: flex;
-  flex-wrap: wrap;
-}
-
-.score-card {
-  position: relative;
-  width: 100rpx;
-  height: 56rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  overflow: hidden;
-  margin-right: 14rpx;
-  margin-bottom: 14rpx;
-}
-
-.score-card:nth-child(6n) {
-  margin-right: 0;
-}
-
-.score-card-bg {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100rpx;
-  height: 56rpx;
-}
-
-.score-value {
-  position: relative;
-  z-index: 1;
-  min-width: 28rpx;
-  text-align: center;
-  font-size: 34rpx;
-  line-height: 1;
-  font-weight: 700;
-  font-style: italic;
-  color: #f6e3b2;
-  text-shadow: 0 2rpx 0 rgba(36, 36, 48, 0.5);
-  margin-left: -10rpx;
-}
-
-.score-value--low {
-  color: #cfcfcf;
-  text-shadow: 0 2rpx 0 rgba(0, 0, 0, 0.5);
-}
-</style>
@@ -2,7 +2,7 @@
 import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue";
 import audioManager from "@/audioManager";
 import { MESSAGETYPESV2 } from "@/constants";
-import { getDirectionText } from "@/util";
+import { getDirectionText, getInvalidShotAudioKey } from "@/util";
 import Avatar from "@/components/Avatar.vue";

 import useStore from "@/store";
@@ -241,7 +241,7 @@ async function onReceiveMessage(msg) {
      title: "距离不足，无效",
      icon: "none",
    });
-    audioManager.play("射击无效");
+    audioManager.play(getInvalidShotAudioKey(msg.shootData));
  }
 }

@@ -55,8 +55,13 @@ onBeforeUnmount(() => {
 async function onReceiveMessage(msg) {
  if (Array.isArray(msg)) return;
  if (msg.type === MESSAGETYPESV2.TestDistance) {
-    distance.value = Number((msg.shootData.distance / 100).toFixed(2));
-    if (distance.value >= 5) audioManager.play("距离合格");
+    const rawDistance = Number(msg.shootData?.distance);
+    distance.value = Number.isFinite(rawDistance)
+      ? Number((rawDistance / 100).toFixed(2))
+      : 0;
+    if (rawDistance === 0) {
+      audioManager.play("未发现靶纸，请瞄准靶纸射箭");
+    } else if (distance.value >= 5) audioManager.play("距离合格");
    else audioManager.play("距离不足");
  }
 }
@@ -94,7 +99,7 @@ onBeforeUnmount(() => {
        模拟射箭
      </button>
      <view class="warnning-text">
-        <view class="target-tip">当前靶子为<text class="text-yellow">{{ targetType }}cm</text>全环靶,请更换靶子</view>
+        <view class="target-tip">当前靶纸为<text class="text-yellow">{{ targetType }}cm</text>全环靶</view>
        <block v-if="distance > 0">
          <text>当前距离<text class="text-yellow">{{ distance }}</text>米</text>
          <text v-if="distance >= 5">已达到距离要求</text>
@@ -107,30 +107,27 @@ const createDifficultySummary = (item = {}) => {
  const timeLimit = toNumber(item.time_limit);
  const hitReq = toNumber(item.hit_req);
  const totalReq = toNumber(item.total_req);
-  const blocks = toNumber(item.blocks);
  const promoteCnt = toNumber(item.promote_cnt);
-  const timeText = timeLimit > 0 ? `${timeLimit}秒内完成` : "不限时完成";
+  const shootingTimeText =
+    timeLimit > 0 ? `在${timeLimit}秒内进行射箭` : "不限时进行射箭";
+  const enduranceTimeText =
+    timeLimit > 0
+      ? `在${timeLimit}秒内完成${arrows}箭`
+      : `不限时完成${arrows}箭`;
  const promoteText = promoteCnt > 0 ? `完成${promoteCnt}次晋级` : "";

  const summaryMap = {
    base: [
-      desc || (hitReq > 0 ? `每箭命中${hitReq}环以上` : "上靶即可"),
-      [`${arrows}箭`, promoteText].filter(Boolean).join(" · "),
+      shootingTimeText,
+      `需要有${arrows}箭命中${hitReq}环内`,
    ],
    endurance: [
-      desc || `${timeText}${arrows}箭`,
-      [`累计${totalReq}环`, promoteText].filter(Boolean).join(" · "),
+      enduranceTimeText,
+      `且累计环数大于${totalReq}环`,
    ],
    precision: [
-      desc || `命中${blocks}个指定区域`,
-      [
-        `${arrows}箭`,
-        timeText,
-        getDifficultyModeText(item.mode),
-        promoteText,
-      ]
-        .filter(Boolean)
-        .join(" · "),
+      shootingTimeText,
+      `需要有${arrows}箭命中高亮区域`,
    ],
    rhythm: [
      desc || `间隔${timeLimit}秒射击`,
@@ -64,8 +64,8 @@ const createDefaultTrainingData = () => ({
  stats: {
    total_training_days: 0,
    total_arrows: 0,
-    hit_rate: 0,
-    endurance_shoot_speed: 0,
+    target_rate: 0,
+    ten_ring_count: 0,
    total_calories: 0,
  },
  beat_percent: 0,
@@ -286,8 +286,8 @@ const loadPersonalTrainingData = async () => {
      stats: {
        total_training_days: result?.stats?.total_training_days ?? 0,
        total_arrows: result?.stats?.total_arrows ?? 0,
-        hit_rate: result?.stats?.hit_rate ?? 0,
-        endurance_shoot_speed: result?.stats?.endurance_shoot_speed ?? 0,
+        target_rate: result?.stats?.target_rate ?? 0,
+        ten_ring_count: result?.stats?.ten_ring_count ?? 0,
        total_calories: result?.stats?.total_calories ?? 0,
      },
      beat_percent: result?.beat_percent ?? 0,
@@ -431,26 +431,26 @@ onShow(async () => {
            <view class="stats-value-row">
              <view class="stats-value-group">
                <text class="stats-value">
-                  {{ formatValue(trainingData.stats.hit_rate) }}
+                  {{ formatValue(trainingData.stats.target_rate) }}
                </text>
                <text class="stats-unit">%</text>
                <view class="stats-value-decoration"></view>
              </view>
            </view>
-            <text class="stats-label">命中率</text>
+            <text class="stats-label">上靶率</text>
          </view>

          <view class="stats-item">
            <view class="stats-value-row">
              <view class="stats-value-group">
                <text class="stats-value">
-                  {{ formatValue(trainingData.stats.endurance_shoot_speed, 0) }}
+                  {{ formatValue(trainingData.stats.ten_ring_count, 0) }}
                </text>
-                <text class="stats-unit">支/分钟</text>
+                <text class="stats-unit">支</text>
                <view class="stats-value-decoration"></view>
              </view>
            </view>
-            <text class="stats-label">耐力射击</text>
+            <text class="stats-label">10环数</text>
          </view>

          <view class="stats-item">
@@ -4,7 +4,7 @@ import { onHide, onLoad, onShow, onUnload } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import ShootProgress from "./components/ShootProgress.vue";
 import BowTarget from "./components/BowTarget.vue";
-import ScorePanel2 from "./components/ScorePanel2.vue";
+import ScorePanel2 from "@/components/TrainingScorePanel.vue";
 import ScoreResult from "./components/ScoreResult.vue";
 import Avatar from "@/components/Avatar.vue";
 import BowPower from "@/components/BowPower.vue";
@@ -48,6 +48,8 @@ const pageStage = ref(pageStages.LOADING);
 const scores = ref([]);
 // 只在实时 ShootResult 新增一箭时递增，避免同步快照重播飞箭特效。
 const shotEffectToken = ref(0);
+// 可见区域每次正式提交都递增，同一区域连续刷新也能触发动效。
+const precisionTargetRefreshToken = ref(0);
 const defaultTotal = 12;
 const defaultTargetType = 1;
 const total = ref(defaultTotal);
@@ -97,6 +99,8 @@ const SHOT_EFFECT_WAIT_TIMEOUT_MS = 1200;
 const AUDIO_TIMEOUT_BASE = 3500;
 const AUDIO_TIMEOUT_PER_KEY = 2600;
 const AUDIO_TIMEOUT_MAX = 12000;
+const RUNTIME_DIAGNOSTIC_INTERVAL_MS = 60000;
+let lastRuntimeDiagnosticAt = 0;

 const env = computed(() => {
  try {
@@ -106,6 +110,19 @@ const env = computed(() => {
  }
 });

+const maybeLogRuntimeStats = () => {
+  if (env.value !== "develop" && env.value !== "trial") return;
+  const now = Date.now();
+  if (now - lastRuntimeDiagnosticAt < RUNTIME_DIAGNOSTIC_INTERVAL_MS) return;
+  lastRuntimeDiagnosticAt = now;
+  console.log("[training-runtime]", {
+    scoreCount: scores.value.length,
+    renderedTargetShotCount: Math.min(scores.value.length, 12),
+    renderedScoreCardCount: Math.min(scores.value.length, 60) + 1,
+    ...audioManager.getRuntimeStats(),
+  });
+};
+
 const isDistanceStage = computed(() => pageStage.value === pageStages.DISTANCE);
 const isShootingStage = computed(() => pageStage.value === pageStages.SHOOTING);
 const hasPractiseResult = computed(() => !!practiseResult.value?.details);
@@ -253,17 +270,23 @@ const trainingCopy = computed(() => {
      practiceInfo.value.hitReq,
      trainingParams.value.hitReq
    );
-    const arrowsLeft = getPracticeNumber(
-      practiceInfo.value.arrowsLeft,
-      total.value
+    const targetArrows = getPositiveInteger(total.value);
+    const arrowsLeft = Math.min(
+      targetArrows,
+      Math.max(
+        0,
+        getPracticeNumber(practiceInfo.value.arrowsLeft, targetArrows)
+      )
    );
+    const completedArrows = targetArrows - arrowsLeft;

    return {
-      title: `每箭命中${hitReq}环之上`,
+      inline: true,
      details: [
-        { text: "剩余" },
-        { text: arrowsLeft, highlight: true },
-        { text: "箭达到条件" },
+        { text: "计时结束前需要有" },
+        { text: `(${completedArrows}/${targetArrows})`, highlight: true },
+        { text: "箭命中" },
+        { text: `${hitReq}环`, highlight: true },
      ],
    };
  }
@@ -281,35 +304,33 @@ const trainingCopy = computed(() => {
    const currentRings = getPracticeNumber(practiceInfo.value.currentRings);

    return {
-      title: `完成${targetArrows}箭并累计${targetRings}环`,
+      inline: true,
      details: [
-        { text: "已完成" },
-        { text: currentArrows, highlight: true },
-        { text: "箭，累计" },
-        { text: currentRings, highlight: true },
+        { text: "计时结束前完成" },
+        { text: `(${currentArrows}/${targetArrows})`, highlight: true },
+        { text: "箭且累计命中" },
+        { text: `(${currentRings}/${targetRings})`, highlight: true },
        { text: "环" },
      ],
    };
  }

  if (trainingType.value === "precision") {
-    const block = precisionRandomBlock.value;
-    const ring = precisionRandomRingArea.value;
-    const arrowsLeft = getPracticeNumber(
-      practiceInfo.value.arrowsLeft,
-      total.value
+    const targetArrows = getPositiveInteger(total.value);
+    const arrowsLeft = Math.min(
+      targetArrows,
+      Math.max(
+        0,
+        getPracticeNumber(practiceInfo.value.arrowsLeft, targetArrows)
+      )
    );
-    const title = block
-      ? ring
-        ? `请命中区域${block}的${ring}环`
-        : `请命中区域${block}`
-      : "等待目标区域";
+    const completedArrows = targetArrows - arrowsLeft;

    return {
-      title,
+      inline: true,
      details: [
-        { text: "剩余" },
-        { text: arrowsLeft, highlight: true },
+        { text: "射箭命中高亮区域需完成" },
+        { text: `(${completedArrows}/${targetArrows})`, highlight: true },
        { text: "箭" },
      ],
    };
@@ -563,7 +584,10 @@ const commitPrecisionTargetAfterPresentation = async ({
  ) {
    return;
  }
-  visiblePrecisionTarget.value = target;
+  applyVisiblePrecisionTarget(target);
+  if (precisionRandomBlock.value > 0) {
+    precisionTargetRefreshToken.value += 1;
+  }
 };

 const createPracticeEndSnapshot = (message = {}) => {
@@ -1102,6 +1126,7 @@ async function onReceiveMessage(msg) {
      scores.value = msg.details;
      hasNewShot = msg.details.length === previousScoreLength + 1;
      latestShot = hasNewShot ? msg.details[msg.details.length - 1] : null;
+      maybeLogRuntimeStats();
    }

    if (trainingType.value === "precision") {
@@ -1329,7 +1354,7 @@ onBeforeUnmount(() => {
            :sectorCount="precisionBlocks"
            :activeSector="precisionRandomBlock"
            :activeRing="precisionRandomRingArea"
-            :showSectorLabels="precisionBlocks > 0"
+            :highlightRefreshToken="precisionTargetRefreshToken"
            stable-shot-effect
            @shot-effect-complete="onShotEffectComplete"
          />
@@ -1349,7 +1374,7 @@ onBeforeUnmount(() => {
              重置高亮
            </button>
          </view> -->
-          <view class="sound-text-box">
+          <view class="sound-row">
            <button class="sound-btn" hover-class="none" @click="updateSound">
              <image
                class="sound-icon"
@@ -1357,6 +1382,8 @@ onBeforeUnmount(() => {
                mode="aspectFit"
              />
            </button>
+          </view>
+          <view class="sound-text-box">
            <view class="bat-text-big-box">
              <image
                class="dao-icon"
@@ -1366,6 +1393,14 @@ onBeforeUnmount(() => {
              <view v-if="trainingCopy" class="bat-text-box">
                <view class="bat-text-small-box">
                  <view class="text-round-box">
+                    <view v-if="trainingCopy.inline" class="training-copy-inline">
+                      <text
+                        v-for="(part, index) in trainingCopy.details"
+                        :key="index"
+                        :class="{ 'text2-yellow': part.highlight }"
+                      >{{ part.text }}</text>
+                    </view>
+                    <view v-else>
                      <view class="text1">{{ trainingCopy.title }}</view>
                      <view class="text2">
                        <text
@@ -1380,13 +1415,18 @@ onBeforeUnmount(() => {
              </view>
            </view>
          </view>
+        </view>
        <scroll-view
          class="score-scroll"
          scroll-y
          :enhanced="true"
          :show-scrollbar="false"
        >
-          <ScorePanel2 :arrows="scores" :total="total" />
+          <ScorePanel2
+            :arrows="scores"
+            :total="total"
+            :trainingType="trainingType"
+          />
        </scroll-view>
      </view>
      <ScoreResult
@@ -1494,6 +1534,12 @@ onBeforeUnmount(() => {
  margin-left: 16rpx;
 }

+.sound-row {
+  height: 70rpx;
+  padding: 0 56rpx;
+  display: flex;
+  align-items: center;
+}
 .sound-text-box{
  height: 125rpx;
  padding: 0 56rpx;
@@ -1503,6 +1549,9 @@ onBeforeUnmount(() => {
 .sound-btn {
  width: 76rpx;
  height: 70rpx;
+  padding: 0;
+  margin: 0;
+  background: transparent;
  border: none;
 }

@@ -1515,7 +1564,7 @@ onBeforeUnmount(() => {
  height: 70rpx;
 }
 .bat-text-big-box{
-  flex: 1;
+  width: 100%;
  position: relative;
 }
 .dao-icon{
@@ -1530,11 +1579,13 @@ onBeforeUnmount(() => {
 }
 .bat-text-box{
  display: flex;
+  width: 100%;
 }
 .bat-text-small-box{
  background: rgba(0, 0, 0, 0.5);
-  width: auto;
+  width: 100%;
  min-width: 100rpx;
+  box-sizing: border-box;
  border-radius: 16rpx 60rpx 60rpx 16rpx;
  display: flex;
  flex-direction: column;
@@ -1545,6 +1596,15 @@ onBeforeUnmount(() => {
  font-size: 30rpx;
  color: #E7BA80;
 }
+.training-copy-inline {
+  width: 100%;
+  color: #FFFFFF;
+  font-size: 26rpx;
+  font-weight: 400;
+  line-height: 40rpx;
+  white-space: normal;
+  word-break: break-all;
+}
 .text1{
  font-size: 30rpx;
  font-weight: 400;
@@ -109,6 +109,7 @@ export default defineStore("store", {
      tips: "", // 当前提示文案（用于 HeaderProgress 恢复状态，替代 uni.$emit 避免时序问题）
    },
    dailyCount: getDefaultDailyCount(),
+    deviceChargingDialogVisible: false,
  }),

  // 计算属性
@@ -187,6 +188,12 @@ export default defineStore("store", {
        ...(data || {}),
      };
    },
+    showDeviceChargingDialog() {
+      this.deviceChargingDialogVisible = true;
+    },
+    hideDeviceChargingDialog() {
+      this.deviceChargingDialogVisible = false;
+    },
    clearSessionState() {
      this.$patch({
        user: getDefaultUser(),
@@ -194,6 +201,7 @@ export default defineStore("store", {
        online: false,
        game: getDefaultGame(),
        dailyCount: getDefaultDailyCount(),
+        deviceChargingDialogVisible: false,
      });
      uni.removeStorageSync(PERSISTED_STORE_KEY);
      setTimeout(() => {
@@ -329,6 +329,18 @@ export const getDirectionText = (angle = 0) => {
  }
 };

+// 正式射箭阶段的距离单位为厘米，按距离异常类型选择对应语音。
+export const getInvalidShotAudioKey = (shootData) => {
+  if (!shootData || typeof shootData !== "object") return "射击无效";
+  // protobuf 会省略值为 0 的标量字段；消息体存在且距离缺失时按 0 处理。
+  const rawDistance = Number(shootData.distance ?? shootData.dst ?? 0);
+  if (!Number.isFinite(rawDistance)) return "射击无效";
+  if (rawDistance < 0) return "射箭无效，靶纸错误";
+  if (rawDistance === 0) return "射箭无效，未识别到靶纸";
+  if (rawDistance / 100 < 5) return "射箭无效，距离不足";
+  return "射击无效";
+};
+
 export const wxLogin = () => {
  return new Promise((resolve, reject) => {
    uni.login({
@@ -7,8 +7,8 @@ const { Reader, Writer } = protobuf;
 // 所以这里使用 minimal Reader/Writer 做静态字段解码和客户端消息编码。
 // <match-schema-generated>
 // 此区块由 scripts/generate-match-schema.mjs 自动生成，请勿手动修改。
-// 来源：src/utils/match.min.js（sha256: b4f272aad40fb951）
-// 协议命名空间：rpc；消息数：12；字段数：137
+// 来源：src/utils/match.min.js（sha256: 150812589c2e6f7a）
+// 协议命名空间：rpc；消息数：12；字段数：151

 export const ServerMessageType = {
  SERVER_MSG_UNKNOWN: 0,
@@ -50,6 +50,7 @@ const SCHEMAS = {
    7: { name: "angle", kind: "float" },
    8: { name: "distance", kind: "float" },
    9: { name: "three_consecutive_10_rings", kind: "bool" },
+    10: { name: "ok", kind: "bool" },
  },
  MatchShootList: {
    1: { name: "items", kind: "message", type: "MatchShoot", repeated: true },
@@ -101,6 +102,9 @@ const SCHEMAS = {
    13: { name: "s_vip", kind: "bool" },
    14: { name: "vip", kind: "bool" },
    15: { name: "player_match_result", kind: "message", type: "PlayerMatchResult" },
+    16: { name: "rank_lvl", kind: "int32" },
+    17: { name: "rank_name", kind: "string" },
+    18: { name: "rank_icon", kind: "string" },
  },
  TeamInfo: {
    1: { name: "players", kind: "message", type: "PlayerFull", repeated: true },
@@ -180,6 +184,16 @@ const SCHEMAS = {
    41: { name: "level", kind: "int32" },
    42: { name: "upgrade_exp", kind: "int32" },
    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" },
+    47: { name: "energy_per_hit", kind: "int32" },
+    48: { name: "energy_req_percent", kind: "int32" },
+    49: { name: "delta_current_energy", kind: "int32" },
+    50: { name: "round_time", kind: "int32" },
+    51: { name: "shoot_window_start", kind: "int64" },
+    52: { name: "in_shoot_window", kind: "bool" },
+    53: { name: "shoot_time", kind: "int32" },
  },
  MatchInfo: {
    1: { name: "match_id", kind: "string" },
@@ -8,6 +8,13 @@ let manualClose = false;
 let checkingSession = false;
 let kickedOut = false;
 let isConnecting = false;
+const ENABLE_REALTIME_MESSAGE_LOG = (() => {
+  try {
+    return uni.getAccountInfoSync().miniProgram.envVersion !== "release";
+  } catch (_) {
+    return false;
+  }
+})();

 function createWebSocket(token, onMessage) {
  if (!token) return;
@@ -73,22 +80,22 @@ function createWebSocket(token, onMessage) {
    const { data, event } = JSON.parse(res.data);
    if (event === "pong") return;
    if (data.type) {
-      console.log(
-        "收到 WebSocket 消息",
-        getMessageTypeName(data.type),
-        data.data
-      );
+      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 msg = data.updates[0];
    if (msg) {
+      if (ENABLE_REALTIME_MESSAGE_LOG) {
        console.log(
          "收到 WebSocket 更新",
          getMessageTypeName(msg.constructor),
-        msg
+          { updateCount: data.updates.length }
        );
+      }
      if (msg.constructor === MESSAGETYPES.RankUpdate) {
        uni.setStorageSync("latestRank", msg.lvl);
      } else if (msg.constructor === MESSAGETYPES.LvlUpdate) {
@@ -97,6 +104,8 @@ function createWebSocket(token, onMessage) {
        uni.$emit("update-online");
      } else if (msg.constructor === MESSAGETYPES.DeviceOffline) {
        uni.$emit("update-online");
+      } else if (msg.constructor === MESSAGETYPES.DeviceCharging) {
+        uni.$emit("device-charging");
      }
    }
  });
Author	SHA1	Message	Date
chenlimao	75cfcd66ee	fix: OTA轮询次数改为15次	2026-08-18 13:57:49 +08:00
chenlimao	7955b37ec5	fix: 修复首页更新卡在更新中弹窗问题	2026-08-18 11:48:20 +08:00
chenlimao	9e6ad4cf50	feat: OTA 首页弹窗优化	2026-08-18 10:30:16 +08:00
chenlimao	6c55d32f90	chore: 依赖锁提交	2026-08-17 18:02:12 +08:00
zhangyi	63fb4ae85a	update:优化性能问题	2026-08-17 10:11:28 +08:00
zhangyi	2628a17b3f	update: 新增设备充电通知	2026-08-14 17:59:11 +08:00
zhangyi	e7f073ed7c	update:个人训练优化	2026-08-14 17:13:23 +08:00
zhangyi	d662db9465	Merge branch 'test' into feat-scene	2026-08-10 11:56:37 +08:00
zhangyi	fbb2076a77	Merge branch 'main' into feat-scene	2026-08-06 14:24:17 +08:00
zhangyi	360da2a1d7	update:本地域名优化	2026-08-03 14:26:00 +08:00
zhangyi	f34800798d	update:新增机构扫码登录页	2026-07-31 09:42:59 +08:00