fix: 恢复文件列表查询实现

src/utils/jensen.js

@@ -704,32 +704,25 @@ Jensen.prototype.getBluetoothStatus = async function (seconds) {
 };
 
 Jensen.prototype.listFiles = async function () {
-  let tag = 'filelist-' + this.serialNumber + '-' + this.sequence();
+  let tag = 'filelist-' + this.serialNumber;
   if (this[tag] != null) return null;
 
   let fc = null;
+  if (typeof this.versionNumber == 'undefined' || this.versionNumber <= 327722) {
     fc = await this.getFileCount(5);
-  if (fc == null) return [];
-  if (fc && fc.count == 0) return [];
-  else fc = fc.count;
-  Logger.info('jensen', 'cmd', 'file count: ' + fc);
+    if (fc == null) return null;
+  }
+
+  if (fc && fc.count == 0) return null;
 
   let self = this;
   // let tag = 'data_' + new Date().getTime();
   this[tag] = [];
   this.registerHandler(QUERY_FILE_LIST, (msg, jensen) => {
-    console.log('tag', tag);
-    if (msg.body.length == 0)
-    {
-      console.log('remove tag1: ' + tag);
+    if (msg.body.length == 0) {
       jensen[tag] = null;
       return [];
     }
-    if (jensen[tag] == null)
-    {
-      console.trace('no tag for: ' + tag);
-      return 'x';
-    }
     jensen[tag].push(msg.body);
     let data = [];
     let files = [];
@@ -800,51 +793,22 @@ Jensen.prototype.listFiles = async function () {
       {
         duration = flen / 12;
       }
-      else if (ver == 6)
-      {
-        duration = flen / 16;
-      }
       let createDate = '';
       let createTime = '';
       if (ftime) {
         createDate = ftime.getFullYear() + '/' + fnpad(ftime.getMonth() + 1) + '/' + fnpad(ftime.getDate());
         createTime = fnpad(ftime.getHours()) + ':' + fnpad(ftime.getMinutes()) + ':' + fnpad(ftime.getSeconds());
       }
-      let mode = 'room';
-      // 如果是旧的whisper mode
-      fname = fname.join('');
-      if (fname.match(/^.*REC\d+\.(hda|wav)$/gi))
-      {
-        mode = 'room';
-      }
-      else if (fname.match(/^.*WIP\d+\.(hda|wav)$/gi))
-      {
-        mode = 'whisper';
-      }
-      else if (fname.match(/^.*CALL\d+\.(hda|wav)$/gi))
-      {
-        mode = 'call';
-      }
-      else if (fname.match(/^.*ROOM\d+\.(hda|wav)$/gi))
-      {
-        mode = 'room';
-      }
-      else if (fname.match(/^.*WHSP\d+\.(hda|wav)$/gi))
-      {
-        mode = 'whisper';
-      }
       files.push({
-        name: fname,
+        name: fname.join(''),
         createDate: createDate,
         createTime: createTime,
         time: ftime,
         duration: duration,
         version: ver,
         length: flen,
-        mode: mode,
         signature: sign.join('')
       });
-      // console.log(`Sign1: ${sign.join('')}, Sign2: ${sign2}`);
     }
     // if (fcount == -1 && (fc))
     // 如果没有判断数量的依据
@@ -867,28 +831,14 @@ Jensen.prototype.listFiles = async function () {
       }
     });
 
-    // 如果已经等待过长的时间了，那就直接返回好了
-    let kv = tag + '-timer';
-    let now = new Date().getTime();
-    if (kv in jensen)
-    {
-      window.clearTimeout(jensen[kv]);
-    }
-    
-    jensen[kv] = now;
-    let ts = 2500;
-    if (fc == files.length)
-    {
-      return files.filter((f) => { return Boolean(f.time); });
-    }
-    else if (fc > 0 && fc - files.length < 10) ts = 1000;
-    else ts = 15000;
-    jensen[kv] = window.setTimeout(() => {
-      console.log('remove tag: ' + tag);
+    if ((fc && files.length >= fc.count) || (fcount > -1 && files.length >= fcount)) {
+      // delete jensen[tag];
       jensen[tag] = null;
-      jensen._trigger(files.filter((f) => { return Boolean(f.time); }), QUERY_FILE_LIST);
-      console.log('jensen', 'list-files', 'timed return');
-    }, ts);
+      console.log('original file list:', files);
+      return files.filter((f) => {
+        return Boolean(f.time);
+      });
+    }
   });
 
   return this.send(new Command(QUERY_FILE_LIST));