Merge pull request #13 from Seeed-Studio/fix/test-question

Fix/test question
Seeed-Studio · Jan 18, 2024 · 1e52726 · 1e52726
2 parents 36eb6b0 + 8b4baa7
commit 1e52726
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/src/pages/setup/process/components/Device.vue b/src/pages/setup/process/components/Device.vue
@@ -12,7 +12,12 @@
         <div class="device-item"> {{ $t('workplace.device.noconnect') }} </div>
       </a-space>
       <div v-else>
-        <template v-if="deviceStore.currentAvailableModel">
+        <template
+          v-if="
+            deviceStore.currentAvailableModel &&
+            deviceStore.deviceStatus === DeviceStatus.SerialConnected
+          "
+        >
           <div class="device-basic-info">
             <a-space class="device-item">
               <div class="device-item-title">{{

diff --git a/src/pages/setup/process/grove_ai_we2/Device.vue b/src/pages/setup/process/grove_ai_we2/Device.vue
@@ -25,11 +25,22 @@
           await Promise.all([
             device.value?.getName(),
             device.value?.getVersion(),
-            device.value?.getInfo().then((base64Str) => {
-              if (!base64Str) return null;
-              const str = decode(base64Str);
-              return JSON.parse(str);
-            }),
+            retry(
+              () =>
+                device.value?.getInfo().then((base64Str) => {
+                  if (!base64Str) return null;
+                  try {
+                    const str = decode(base64Str);
+                    return JSON.parse(str);
+                  } catch (error) {
+                    console.error(error);
+                    return null;
+                  }
+                }),
+              5,
+              1000,
+              null
+            ),
             device.value?.getModel(),
             device.value?.getID(),
           ]);

diff --git a/src/pages/setup/process/xiao_esp32s3/Device.vue b/src/pages/setup/process/xiao_esp32s3/Device.vue
@@ -34,8 +34,12 @@
 
         let model = null;
         if (base64Str) {
-          const str = decode(base64Str);
-          model = JSON.parse(str);
+          try {
+            const str = decode(base64Str);
+            model = JSON.parse(str);
+          } catch (error) {
+            console.error(error);
+          }
         }
         deviceStore.setDeviceName(name);
         deviceStore.setDeviceVersion(version);

diff --git a/src/sscma/grove_ai_we2/deviceHimax.ts b/src/sscma/grove_ai_we2/deviceHimax.ts
@@ -80,10 +80,7 @@ class Himax extends Device {
                 // }
                 this.hasStart = false;
                 const tempCache = [...this.cacheData];
-                requestIdleCallback(() => {
-                  this.parseAndProcessData(tempCache);
-                });
-                // this.parseAndProcessData(tempCache);
+                this.parseAndProcessData(tempCache);
                 this.cacheData = [];
               } else if (this.hasStart) {
                 this.cacheData.push(num);

diff --git a/src/utils/timer.ts b/src/utils/timer.ts
@@ -11,6 +11,9 @@ export function delay(time: number, isReject = false) {
   });
 }
 
+/**
+ * It should be noted that if the 'fn' function contains 'this', please use an arrow function.
+ */
 export async function retry(
   fn: () => Promise<any>,
   retryCount: number,