update:更新靶纸

src/App.vue

@@ -22,7 +22,8 @@
 	const {
 		updateUser,
 		updateOnline,
-		clearSessionState
+		clearSessionState,
+		clearDevice
 	} = store;
 
 	watch(
@@ -63,6 +64,11 @@
 		updateOnline(data.online);
 	}
 
+	function onDeviceBindInvalid() {
+		clearDevice();
+		uni.setStorageSync("calibration", false);
+	}
+
 	function onDeviceShoot() {
 		// audioManager.play("射箭声音")
 	}
@@ -78,6 +84,7 @@
 		uni.$on("update-user", emitUpdateUser);
 		uni.$on("update-online", emitUpdateOnline);
 		uni.$on("session-kicked-out", onSessionKickedOut);
+		uni.$on("device-bind-invalid", onDeviceBindInvalid);
 		const token = uni.getStorageSync(
 			`${uni.getAccountInfoSync().miniProgram.envVersion}_token`
 		);
@@ -91,6 +98,7 @@
 		uni.$off("update-user", emitUpdateUser);
 		uni.$off("update-online", emitUpdateOnline);
 		uni.$off("session-kicked-out", onSessionKickedOut);
+		uni.$off("device-bind-invalid", onDeviceBindInvalid);
 		websocket.closeWebSocket();
 	});
 </script>

src/apis.js

@@ -70,6 +70,15 @@ function request(method, url, data = {}) {
                             resolve({binded: true});
                             return;
                         }
+                        if (message === "BIND_FAILD") {
+                            uni.$emit("device-bind-invalid");
+                            uni.showToast({
+                                title: "设备绑定状态已失效，请重新绑定",
+                                icon: "none",
+                            });
+                            reject({type: "DEVICE_BIND_INVALID", message});
+                            return;
+                        }
                         if (message === "ERROR_ORDER_UNPAY") {
                             uni.showToast({
                                 title: "当前有未支付订单",

src/components/Signin.vue

@@ -16,7 +16,7 @@ import {
 
 import useStore from "@/store";
 const store = useStore();
-const { updateUser, updateDevice, updateOnline } = store;
+const { updateUser, updateDevice, updateOnline, clearDevice } = store;
 
 const props = defineProps({
   show: {
@@ -107,6 +107,8 @@ async function doLogin() {
       );
       const data = await getDeviceBatteryAPI();
       updateOnline(data.online);
+    } else {
+      clearDevice();
     }
     props.onClose();
   } catch (error) {

src/pages/friend-battle-result.vue

@@ -305,7 +305,7 @@ function goBack() {
     <Container
       :bgType="data.mode > 3 ? -1 : 0"
       bgColor="#000000"
-      :onBack="goBack"
+      :onBack="exit"
     >
 
       <!-- ----- Banner 区：game 胜负展示图（仅 NvN 对抗模式）----- -->

src/pages/index.vue

@@ -26,6 +26,7 @@ const {
   updateConfig,
   updateUser,
   updateDevice,
+  clearDevice,
   getLvlName,
   getLvlNameByScore,
   updateOnline,
@@ -127,6 +128,8 @@ onShow(async () => {
         );
         const data = await getDeviceBatteryAPI();
         updateOnline(data.online);
+      } else {
+        clearDevice();
       }
     }
   }

src/pages/my-device.vue

@@ -16,7 +16,7 @@ const showTip = ref(false);
 const confirmBindTip = ref(false);
 const addDevice = ref();
 const store = useStore();
-const { updateDevice } = store;
+const { updateDevice, clearDevice } = store;
 const { user, device } = storeToRefs(store);
 const justBind = ref(false);
 const calibration = ref(false);
@@ -84,13 +84,21 @@ const toFristTryPage = () => {
 };
 
 const unbindDevice = async () => {
+  try {
     await unbindDeviceAPI(device.value.deviceId);
+  } catch (error) {
+    if (error?.type === "DEVICE_BIND_INVALID") {
+      uni.setStorageSync("calibration", false);
+      clearDevice();
+    }
+    return;
+  }
   uni.setStorageSync("calibration", false);
   uni.showToast({
     title: "解绑成功",
     icon: "success",
   });
-  device.value = {};
+  clearDevice();
 };
 
 const toDeviceIntroPage = () => {
@@ -122,8 +130,23 @@ const goCalibration = async () => {
   });
 };
 
-onShow(() => {
+const syncDeviceBinding = async () => {
+  if (!user.value.id) return;
+  try {
+    const devices = await getMyDevicesAPI();
+    if (devices.bindings && devices.bindings.length) {
+      updateDevice(devices.bindings[0].deviceId, devices.bindings[0].deviceName);
+    } else {
+      clearDevice();
+    }
+  } catch (error) {
+    console.log("sync device binding error", error);
+  }
+};
+
+onShow(async () => {
   calibration.value = uni.getStorageSync("calibration");
+  await syncDeviceBinding();
 });
 </script>
 

src/pages/team-battle/index.vue

@@ -1249,7 +1249,7 @@ onShow(() => {
         <view class="offline-modal">
           <text class="offline-title">设备已离线</text>
           <text class="offline-desc">检测到设备已断开连接，请检查设备后继续比赛</text>
-          <SButton @click="showOfflineModal = false">我知道了</SButton>
+          <SButton :onClick="() => (showOfflineModal = false)">我知道了</SButton>
         </view>
       </SModal>
     </view>

src/store.js

@@ -137,6 +137,10 @@ export default defineStore("store", {
       this.device.deviceId = deviceId;
       this.device.deviceName = deviceName;
     },
+    clearDevice() {
+      this.device = getDefaultDevice();
+      this.online = false;
+    },
     async updateConfig(config) {
       this.config = config;
       if (this.user.scores !== undefined) {