Merge branch 'feat-shebei' into test

project.config.json

@@ -4,6 +4,10 @@
   "libVersion": "3.7.7",
   "packOptions": {
     "ignore": [
+      {
+        "type": "folder",
+        "value": "static/coin"
+      },
       {
         "type": "file",
         "value": "static/common/dialog-light.png"
@@ -243,14 +247,6 @@
       {
         "type": "folder",
         "value": "static/training-difficulty-design"
-      },
-      {
-        "type": "folder",
-        "value": "static/coin"
-      },
-      {
-        "type": "folder",
-        "value": "static/home-device"
       }
     ],
     "include": []

src/components/TargetCanvas.vue

@@ -164,8 +164,6 @@ const defaultHighlightStyle = {
   color: "rgba(255, 228, 0, 0.6)",
   strokeColor: "rgba(254, 216, 71, 0.82)",
   lineWidthRatio: 0.003,
-  // 在最小线宽计算后应用倍数，确保不同靶面尺寸下按比例加粗。
-  lineWidthScale: 1,
 };
 
 // 合并默认靶纸样式和外部传入样式，ringColors 单独深合并。
@@ -321,7 +319,7 @@ const drawSectorHighlight = (
         (angles.endAngle - angles.startAngle) * safeRevealProgress,
       style.color,
       style.strokeColor,
-      Math.max(1, targetRadius * style.lineWidthRatio) * style.lineWidthScale
+      Math.max(1, targetRadius * style.lineWidthRatio)
     );
   });
 };

src/manifest.json

@@ -55,6 +55,10 @@
         "appid" : "wxa8f5989dcd45cc23",
         "packOptions" : {
             "ignore" : [
+                {
+                    "type" : "folder",
+                    "value" : "static/coin"
+                },
                 {
                     "type" : "file",
                     "value" : "static/common/dialog-light.png"
@@ -294,14 +298,6 @@
                 {
                     "type" : "folder",
                     "value" : "static/training-difficulty-design"
-                },
-                {
-                    "type" : "folder",
-                    "value" : "static/coin"
-                },
-                {
-                    "type" : "folder",
-                    "value" : "static/home-device"
                 }
             ]
         },

src/pages.json

@@ -21,9 +21,6 @@
     {
       "path": "pages/audio-test"
     },
-    {
-      "path": "pages/calibration"
-    },
     {
       "path": "pages/about-us"
     },
@@ -60,12 +57,6 @@
     {
       "path": "pages/match-page"
     },
-    {
-      "path": "pages/my-device"
-    },
-    {
-      "path": "pages/device-intro"
-    },
     {
       "path": "pages/user"
     },
@@ -107,12 +98,6 @@
     },
     {
       "path": "pages/mine-bow-data"
-    },
-    {
-      "path": "pages/ota-wifi",
-      "style": {
-        "navigationStyle": "custom"
-      }
     }
   ],
   "globalStyle": {

src/pages/device/my-device.vue

@@ -874,8 +874,8 @@ onShow(async () => {
 
 .product-link {
   position: fixed;
-  bottom: 208rpx;
+  bottom: 104rpx;
-  /* bottom: calc(env(safe-area-inset-bottom) + 104rpx); */
+  bottom: calc(env(safe-area-inset-bottom) + 104rpx);
   left: 0;
   z-index: 2;
   width: 100%;

src/pages/device/ota-wifi.vue

@@ -39,7 +39,6 @@ const connectMode = ref("secure"); // secure | open | manual
 const connectError = ref("");
 const connectStatusText = ref("");
 const isSubmittingWifi = ref(false);
-const wifiSuccessVisible = ref(false);
 const keyboardHeight = ref(0);
 // 控制密码输入框是否显示明文
 const showPassword = ref(false);
@@ -365,13 +364,10 @@ const submitDeviceWifiConfig = async ({ ssid, password }) => {
       secure: connectMode.value === "secure" || !!password,
     };
     connectError.value = "";
+    currentState.value = STATES.CONNECTED;
     void refreshConnectedWifiName();
     if (fromFirmwareUpdate.value) {
-      currentState.value = STATES.CONNECTED;
       openFirmwareCountdown();
-    } else {
-      // 保留配网输入界面，避免成功提示出现前先露出 WiFi 列表。
-      wifiSuccessVisible.value = true;
     }
   } catch (err) {
     if (requestId === wifiConnectRequestId) {
@@ -386,13 +382,6 @@ const submitDeviceWifiConfig = async ({ ssid, password }) => {
   }
 };
 
-// 普通配网成功后，确认并收起输入界面，停留在当前 WiFi 页面。
-const confirmWifiSuccess = () => {
-  if (!wifiSuccessVisible.value) return;
-  wifiSuccessVisible.value = false;
-  currentState.value = STATES.CONNECTED;
-};
-
 // 校验用户输入并提交 WiFi 配置，不再把手机连接结果当作设备连接成功。
 const joinNetwork = () => {
   if (joinDisabled.value) return;
@@ -766,14 +755,6 @@ onUnmounted(() => {
       </view>
     </view>
 
-    <ModalDialog
-      :show="wifiSuccessVisible"
-      content="WIFI连接成功"
-      confirmText="确定"
-      :showCancel="false"
-      :onConfirm="confirmWifiSuccess"
-    ></ModalDialog>
-
     <ModalDialog
       :show="countdownVisible"
       title="WiFi连接成功"

src/pages/training/components/BowTarget.vue

@@ -546,7 +546,6 @@ onBeforeUnmount(() => {
         :showCrosshair="false"
         :showRingLabels="false"
         :highlightOnly="true"
-        :highlightStyle="{ strokeColor: '#00fffc', lineWidthScale: 3 }"
         :sectorCount="sectorCount"
         :activeSector="activeSector"
         :activeRings="activeRings"

src/websocket.js

@@ -93,30 +93,36 @@ function createWebSocket(token, onMessage) {
       "/addons/shoot/otaResult",
     ];
     if (passthroughEvents.includes(event)) {
-      if ((code == null || Number(code) === 0) && onMessage && data && typeof data === "object") {
+      if (
+        (code == null || Number(code) === 0) &&
+        onMessage &&
+        data &&
+        typeof data === "object"
+      ) {
         onMessage({ event, data, code, timestamp });
       }
       return;
     }
-    if (data?.type) {
+    if (!data || typeof data !== "object") return;
+    if (data.type) {
       if (ENABLE_REALTIME_MESSAGE_LOG) {
         console.log("收到 WebSocket 消息", getMessageTypeName(data.type));
       }
       if (onMessage) onMessage({ ...(data.data || {}), type: data.type });
       return;
     }
-    const updates = Array.isArray(data?.updates) ? data.updates : [];
+    if (!Array.isArray(data.updates)) return;
-    if (!updates.length) return;
+    if (onMessage) onMessage(data.updates);
-    if (onMessage) onMessage(updates);
+    const firstMessage = data.updates[0];
-    const msg = updates[0];
+    if (firstMessage && ENABLE_REALTIME_MESSAGE_LOG) {
-    if (msg) {
-      if (ENABLE_REALTIME_MESSAGE_LOG) {
       console.log(
         "收到 WebSocket 更新",
-          getMessageTypeName(msg.constructor),
+        getMessageTypeName(firstMessage.constructor),
         { updateCount: data.updates.length }
       );
     }
+    data.updates.forEach((msg) => {
+      if (msg) {
         if (msg.constructor === MESSAGETYPES.RankUpdate) {
           uni.setStorageSync("latestRank", msg.lvl);
         } else if (msg.constructor === MESSAGETYPES.LvlUpdate) {
@@ -130,6 +136,7 @@ function createWebSocket(token, onMessage) {
         }
       }
     });
+  });
 
   socketTask.onError((err) => {
     if (socket !== socketTask) return;