From f5d5475ee4a38fede40681c2709f2dcab2da7700 Mon Sep 17 00:00:00 2001
From: kron <kai_hong@126.com>
Date: Wed, 29 Oct 2025 17:26:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E9=87=8F=E6=98=BE=E7=A4=BA=E8=B5=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis.js                     |  4 ++++
 src/components/BattleFooter.vue |  6 +-----
 src/components/BowPower.vue     | 20 +++++++++++++++-----
 src/components/BowTarget.vue    |  6 +-----
 src/components/TestDistance.vue |  4 +---
 src/pages/first-try.vue         | 12 +++++-------
 src/pages/melee-match.vue       |  4 +---
 src/pages/practise-one.vue      |  4 +---
 src/pages/practise-two.vue      |  4 +---
 src/pages/team-battle.vue       |  2 --
 src/pages/team-match.vue        |  1 -
 11 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/src/apis.js b/src/apis.js
index b94d5e7..7e105fd 100644
--- a/src/apis.js
+++ b/src/apis.js
@@ -506,3 +506,7 @@ export const laserAimAPI = async () => {
 export const laserCloseAPI = async () => {
   return request("POST", "/user/device/closeAim");
 };
+
+export const getDeviceBatteryAPI = async () => {
+  return request("GET", "/user/device/battery");
+};
diff --git a/src/components/BattleFooter.vue b/src/components/BattleFooter.vue
index 3a83868..d31c577 100644
--- a/src/components/BattleFooter.vue
+++ b/src/components/BattleFooter.vue
@@ -15,10 +15,6 @@ defineProps({
     type: Number,
     default: 0,
   },
-  power: {
-    type: Number,
-    default: 0,
-  },
   goldenRound: {
     type: Number,
     default: 0,
@@ -36,7 +32,7 @@ defineProps({
           transform: 'scale(0.8) translateX(10px)',
         }"
       >
-        <BowPower :power="power" />
+        <BowPower />
       </view>
     </view>
     <view>
diff --git a/src/components/BowPower.vue b/src/components/BowPower.vue
index c0361d3..19d59fa 100644
--- a/src/components/BowPower.vue
+++ b/src/components/BowPower.vue
@@ -1,9 +1,19 @@
 <script setup>
-defineProps({
-  power: {
-    type: Number,
-    default: 0,
-  },
+import { ref, onMounted, onBeforeUnmount } from "vue";
+import { getDeviceBatteryAPI } from "@/apis";
+
+const power = ref(0);
+const timer = ref(null);
+
+onMounted(async () => {
+  timer.value = setInterval(async () => {
+    const data = await getDeviceBatteryAPI();
+    power.value = data.battery;
+  }, 1000 * 10);
+});
+
+onBeforeUnmount(() => {
+  clearInterval(timer.value);
 });
 </script>
 
diff --git a/src/components/BowTarget.vue b/src/components/BowTarget.vue
index 96a12f6..9ec73b3 100644
--- a/src/components/BowTarget.vue
+++ b/src/components/BowTarget.vue
@@ -21,10 +21,6 @@ const props = defineProps({
     type: String,
     default: "",
   },
-  power: {
-    type: Number,
-    default: 0,
-  },
   scores: {
     type: Array,
     default: () => [],
@@ -118,7 +114,7 @@ onMounted(() => {
         "/" +
         totalRound
       }}</text>
-      <BowPower :power="power" />
+      <BowPower />
     </view>
     <view class="target">
       <view v-if="stop" class="stop-sign">中场休息</view>
diff --git a/src/components/TestDistance.vue b/src/components/TestDistance.vue
index 127dd0d..82a5611 100644
--- a/src/components/TestDistance.vue
+++ b/src/components/TestDistance.vue
@@ -22,7 +22,6 @@ const props = defineProps({
   },
 });
 const arrow = ref({});
-const power = ref(0);
 const distance = ref(0);
 const debugInfo = ref("");
 const showsimul = ref(false);
@@ -49,7 +48,6 @@ async function onReceiveMessage(messages = []) {
   messages.forEach((msg) => {
     if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
       arrow.value = msg.target;
-      power.value = msg.target.battery;
       distance.value = Number((msg.target.dst / 100).toFixed(2));
       debugInfo.value = msg.target;
       audioManager.play("距离合格");
@@ -120,7 +118,7 @@ onBeforeUnmount(() => {
       </view>
       <view class="user-row">
         <Avatar :src="user.avatar" :size="35" />
-        <BowPower :power="power" />
+        <BowPower />
       </view>
     </view>
     <view v-if="isBattle" class="ready-timer">
diff --git a/src/pages/first-try.vue b/src/pages/first-try.vue
index 06466e0..c849487 100644
--- a/src/pages/first-try.vue
+++ b/src/pages/first-try.vue
@@ -33,7 +33,6 @@ const stepButtonTexts = [
 const title = ref("新手试炼场");
 const start = ref(false);
 const practiseResult = ref({});
-const power = ref(0);
 const btnDisabled = ref(false);
 const practiseId = ref("");
 const showGuide = ref(false);
@@ -66,11 +65,10 @@ async function onReceiveMessage(messages = []) {
       if (scores.value.length < total) {
         scores.value.push(msg.target);
       }
-      power.value = msg.target.battery;
-      // if (step.value === 2 && msg.target.dst / 100 >= 5) {
-      btnDisabled.value = false;
-      showGuide.value = true;
-      // }
+      if (step.value === 2 && msg.target.dst / 100 >= 5) {
+        btnDisabled.value = false;
+        showGuide.value = true;
+      }
     }
     if (msg.constructor === MESSAGETYPES.ShootSyncMePracticeID) {
       if (practiseId.value && practiseId.value === msg.practice.id) {
@@ -230,7 +228,7 @@ const onClose = () => {
         :style="{ marginBottom: step === 2 ? '40px' : '0' }"
       >
         <Avatar :src="user.avatar" :size="35" />
-        <BowPower :power="power" />
+        <BowPower />
       </view>
       <BowTarget
         v-if="step === 4"
diff --git a/src/pages/melee-match.vue b/src/pages/melee-match.vue
index c993bcb..933e403 100644
--- a/src/pages/melee-match.vue
+++ b/src/pages/melee-match.vue
@@ -22,7 +22,6 @@ const start = ref(false);
 const startCount = ref(true);
 const battleId = ref("");
 const currentRound = ref(1);
-const power = ref(0);
 const scores = ref([]);
 const tips = ref("即将开始...");
 const players = ref([]);
@@ -120,7 +119,6 @@ async function onReceiveMessage(messages = []) {
       if (!start.value) getCurrentGameAPI();
       if (msg.userId === user.value.id) {
         scores.value.push({ ...msg.target });
-        power.value = msg.target.battery;
       }
       playersScores.value[msg.userId].push({ ...msg.target });
     }
@@ -203,7 +201,7 @@ onHide(() => {
       />
       <view v-if="start" class="user-row">
         <Avatar :src="user.avatar" :size="35" />
-        <BowPower :power="power" />
+        <BowPower />
       </view>
       <BowTarget
         v-if="start"
diff --git a/src/pages/practise-one.vue b/src/pages/practise-one.vue
index e8a0313..7759a4e 100644
--- a/src/pages/practise-one.vue
+++ b/src/pages/practise-one.vue
@@ -22,7 +22,6 @@ const scores = ref([]);
 const total = 12;
 const currentRound = ref(0);
 const practiseResult = ref({});
-const power = ref(0);
 const practiseId = ref("");
 const showGuide = ref(false);
 
@@ -53,7 +52,6 @@ async function onReceiveMessage(messages = []) {
           }, 3000);
         }
       }
-      power.value = msg.target.battery;
     }
     if (msg.constructor === MESSAGETYPES.ShootSyncMePracticeID) {
       if (practiseId.value && practiseId.value === msg.practice.id) {
@@ -128,7 +126,7 @@ onBeforeUnmount(() => {
             <text>还有两场，坚持</text>
             <text>就是胜利！💪</text>
           </BubbleTip>
-          <BowPower :power="power" />
+          <BowPower />
         </view>
         <BowTarget
           :totalRound="start ? total / 4 : 0"
diff --git a/src/pages/practise-two.vue b/src/pages/practise-two.vue
index c566337..3fb99ed 100644
--- a/src/pages/practise-two.vue
+++ b/src/pages/practise-two.vue
@@ -21,7 +21,6 @@ const start = ref(false);
 const scores = ref([]);
 const total = 36;
 const practiseResult = ref({});
-const power = ref(0);
 const practiseId = ref("");
 const showGuide = ref(false);
 
@@ -47,7 +46,6 @@ async function onReceiveMessage(messages = []) {
           }, 3000);
         }
       }
-      power.value = msg.target.battery;
     }
     if (msg.constructor === MESSAGETYPES.ShootSyncMePracticeID) {
       if (practiseId.value && practiseId.value === msg.practice.id) {
@@ -115,7 +113,7 @@ onBeforeUnmount(() => {
             <text>完成过半，胜利</text>
             <text>在望！💪</text>
           </BubbleTip>
-          <BowPower :power="power" />
+          <BowPower />
         </view>
         <BowTarget
           :currentRound="scores.length"
diff --git a/src/pages/team-battle.vue b/src/pages/team-battle.vue
index 9425218..82611f3 100644
--- a/src/pages/team-battle.vue
+++ b/src/pages/team-battle.vue
@@ -337,7 +337,6 @@ onHide(() => {
       <BowTarget
         v-if="start"
         mode="team"
-        :power="start ? power : 0"
         :scores="scores"
         :blueScores="blueScores"
       />
@@ -347,7 +346,6 @@ onHide(() => {
         :redPoints="redPoints"
         :bluePoints="bluePoints"
         :goldenRound="goldenRound"
-        :power="power"
       />
       <ScreenHint
         :show="showRoundTip"
diff --git a/src/pages/team-match.vue b/src/pages/team-match.vue
index 0c299e1..7b6c9b5 100644
--- a/src/pages/team-match.vue
+++ b/src/pages/team-match.vue
@@ -319,7 +319,6 @@ onHide(() => {
       <BowTarget
         v-if="start"
         mode="team"
-        :power="start ? power : 0"
         :currentRound="scores.length"
         :totalRound="3"
         :scores="scores"