合并FileManager

public/media_control_client_product.js

@@ -1,3 +1,5 @@
 window.media_control_client_product = "LED_PLAYER";
 // window.media_control_client_product = "SPECIAL_VIDEO";
 // window.media_control_client_product = "RK_3568";
+
+window.media_control_client_custom_title = "SmartPlayer";

src/common/ClientConnection.ts

@@ -1519,6 +1519,15 @@ export default class ClientConnection {
       console.error(e);
     }
   }
+  public async CheckModeIndex(mode_index:number) {
+    try {
+      return await this.doRpc<Protocol.RpcCheckModeIndexResponseEntity>(
+        new Protocol.RpcCheckModeIndexRequestEntity(mode_index)
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
 }
 
 export interface NotifyMessage {

src/components/BackgroundImageDialog.vue

@@ -47,7 +47,6 @@
                   ref="uploader"
                   :url="upload_url"
                   method="post"
-                  :headers="generatorFileUploadHeaders"
                   :label="$t('select background image') + ':'"
                   :accept="$store.state.isSpecialVideo() ? '.svdoj' : 'image/*'"
                   :hide-upload-btn="true"
@@ -56,6 +55,7 @@
                   @added="(files) => files && (file_count += files.length)"
                   @removed="(files) => files && (file_count -= files.length)"
                 />
+                <!-- :headers="generatorFileUploadHeaders" -->
               </q-item-section>
             </q-item>
           </q-list>
@@ -70,7 +70,7 @@
             no-caps
             :loading="loading"
             color="primary"
-            @click="showBackgroundImage"
+            @click="showBackgroundImage()"
             :label="$t('view current background image')"
           />
           <q-space />
@@ -131,35 +131,11 @@ export default defineComponent({
       loga(a: any) {
         console.log(a);
       },
-      generatorFileUploadHeaders(files: File[]) {
-        if (files.length > 0) {
-          return [
-            {
-              name: HttpProtocol.kHeaderXProductName,
-              value: HttpProtocol.getProductName($store),
-            },
-            {
-              name: HttpProtocol.kHeaderXFileLength,
-              value: files[0].size,
-            },
-          ];
-        }
-        return [];
-      },
       showDialog() {
         show_dialog.value = true;
-        let client = GlobalData.getInstance().getCurrentClient();
+        let url = GlobalData.getInstance().createCurrentRequestUrl();
-        if (client) {
+        if (url) {
-          let url = new URL(client.url);
+          url.pathname = "/upload_background_image_file";
-          url.port =
-            GlobalData.getInstance().applicationConfig?.httpserver_port ??
-            HttpProtocol.DefaultHttpPort.toString();
-          url.pathname = HttpProtocol.RequestUploadFile;
-          url.protocol = "http:";
-          url.searchParams.append(
-            "type",
-            HttpProtocol.UploadTypeBackgroundImage
-          );
           upload_url.value = url.toString();
         }
       },
@@ -169,17 +145,10 @@ export default defineComponent({
         file_count.value = 0;
       },
       showBackgroundImage() {
-        const temp_port =
-          GlobalData.getInstance().applicationConfig?.httpserver_port ??
-          HttpProtocol.DefaultHttpPort.toString();
         try {
-          const url = new URL(
+          let url = GlobalData.getInstance().createCurrentRequestUrl();
-            GlobalData.getInstance().getCurrentClient()?.url ??
+          if (url) {
-              "http://127.0.0.1:" + temp_port
+            url.pathname = "/get_background_image_file";
-          );
-          url.protocol = "http";
-          url.port = temp_port.toString();
-          url.pathname = "/static/background_image.png";
             viewerApi({
               options: {
                 toolbar: true,
@@ -193,6 +162,7 @@ export default defineComponent({
                 },
               ],
             });
+          }
         } catch {}
       },
       async onSubmit() {

src/components/FileManageDialog.vue

@@ -346,14 +346,12 @@
             style="height: 69vh; width: 70%"
             :disable="uploader_loading"
             :url="getUrl"
-            method="post"
+            multiple
-            :headers="generatorFileUploadHeaders"
+            method="POST"
             :label="$t('select file') + ':'"
             :accept="uploader_accept"
             @start="onStartUpload"
-            @uploaded="onUploaded"
+            @finish="onFailed"
-            @failed="onFailed"
-            @added="/*onFileAdded*/ null"
           >
           </q-uploader>
           <q-space />
@@ -687,7 +685,6 @@ export default defineComponent({
       loading.value = false;
     };
 
-
     const refresh_file_list_async = async () => {
       const response = await _request_list_files(path.value);
       _show_files(response);
@@ -882,21 +879,6 @@ export default defineComponent({
           resolve = _resolve;
         });
       },
-      generatorFileUploadHeaders(files: File[]) {
-        if (files.length > 0) {
-          return [
-            {
-              name: HttpProtocol.kHeaderXProductName,
-              value: HttpProtocol.getProductName($store),
-            },
-            {
-              name: HttpProtocol.kHeaderXFileLength,
-              value: files[0].size,
-            },
-          ];
-        }
-        return [];
-      },
       resetData() {
         loading.value = false;
         uploading.value = false;
@@ -917,7 +899,8 @@ export default defineComponent({
           message: $t.t("input folder name") + ":",
           prompt: {
             model: "",
-              isValid: (val: string) => !!val && val.trim().length > 0,
+            isValid: (val: string) =>
+              !!val && val.trim().length > 0&& val.indexOf(".") != 0 ,
             type: "text",
           },
           ok: {
@@ -935,6 +918,7 @@ export default defineComponent({
           const response = await GlobalData.getInstance()
             .getCurrentClient()
             ?.CreateDirectoryFileManager(path.value, data);
+          console.log(response);
           if (response && response.success) {
             refresh_file_list();
             $q.notify({
@@ -944,17 +928,35 @@ export default defineComponent({
               timeout: 1500,
             });
           } else {
+            // if (
+            //   response?.error_message ==
+            //   "the folder name cannot start with a '.'"
+            // ) {
+            //   $q.notify({
+            //     type: "warning",
+            //     message:
+            //       $t.t("create folder") +
+            //       $t.t("fail") +
+            //       "!" +
+            //       $t.t("the folder name cannot start with a '.'"),
+            //     position: "top",
+            //     timeout: 1500,
+            //   });
+            // }
+            //  else {
+            if (response) {
               $q.notify({
                 type: "warning",
                 message:
                   $t.t("create folder") +
                   $t.t("fail") +
                   "! " +
-                    (response ? response.error_message : ""),
+                  $t.t(response.error_message),
                 position: "top",
                 timeout: 1500,
               });
             }
+          }
         });
       },
 
@@ -1068,8 +1070,8 @@ export default defineComponent({
       getUrl(file: File[]) {
         let url = GlobalData.getInstance().createCurrentRequestUrl();
         if (url) {
-          url.pathname = HttpProtocol.RequestUploadFile;
+          url.pathname = "/upload_media_file"; //HttpProtocol.RequestUploadFile;
-          url.searchParams.append("type", HttpProtocol.HttpUploadTypeNormal);
+          // url.searchParams.append("type", HttpProtocol.HttpUploadTypeNormal);
           url.searchParams.append("base_dir", path.value);
           return url.toString();
         }
@@ -1078,99 +1080,20 @@ export default defineComponent({
       onStartUpload() {
         loading.value = true;
       },
-      async onFileAdded(files: File[] | File) {
+      async onFailed(info: any) {
-        setTimeout(async () => {
+        let file_list: any = await _request_list_files(path.value);
-          const onError = async (file: File | null) => {
+        setTimeout(() => {
-            await nextTick(() => {});
+          if (files.value.length != file_list.files.length) {
-            uploader.value.reset();
-
-            $q.notify({
-              color: "negative",
-              icon: "warning",
-              message: $t.t("load file error") + "!",
-              position: "top",
-              timeout: 3000,
-            });
-          };
-
-          let file: File | null = null;
-
-          try {
-            if (Array.isArray(files)) {
-              if (files.length > 0) {
-                file = files[0];
-              }
-            } else {
-              file = files;
-            }
-            if (file) {
-              const file_name = file.name;
-              const blob = file.slice(0, 1024 * 1024 * 1); // 1 MB
-              uploader_loading.value = true;
-
-              try {
-                let url = GlobalData.getInstance().createCurrentRequestUrl();
-                if (url) {
-                  url.pathname = HttpProtocol.RequestPathCheckFileSupport;
-
-                  // if (FileSuffixHelper.isVideoPath(file_name)) {
-
-                  // }
-                  const data = new FormData();
-                  data.append(
-                    "file",
-                    new File([blob], file_name, {
-                      lastModified: file.lastModified,
-                    })
-                  );
-                  const response = await api.post(url.toString(), data, {
-                    headers: {
-                      "Content-Type": "multipart/form-data",
-                    },
-                  });
-                  if (response && response.data && response.data.is_support) {
-                  } else {
-                    onError(file);
-                  }
-                } else {
-                  throw "";
-                }
-              } catch (e) {
-                console.error(e);
-                onError(file);
-              }
-              uploader_loading.value = false;
-              return;
-            }
-          } catch (e) {
-            console.error(e);
-            onError(file);
-          }
-        }, 1);
-      },
-      onUploaded() {
-        uploading.value = false;
-        uploader.value.reset();
-        refresh_file_list();
-
             $q.notify({
               type: "positive",
-          message: $t.t("file upload") + $t.t("success") + "!",
+              message: $t.t("file upload") + $t.t("finish") + "!",
               position: "top",
               timeout: 1500,
             });
             loading.value = false;
-      },
+            uploading.value = false;
-      onFailed(info: any) {
+          }
-        console.log(info);
+        }, 500);
-        $q.notify({
-          type: "warning",
-          message: $t.t("file upload") + $t.t("fail") + "!",
-          position: "top",
-          timeout: 1500,
-        });
-        loading.value = false;
-        loading.value = false;
       },
       copyFile(file: FileEntity) {
         if (file) {

src/components/ModeDialog.vue

@@ -457,13 +457,17 @@ export default defineComponent({
             resolve($t.t("Please type 0~65535"));
           } else {
             try {
-              let url = GlobalData.getInstance().createCurrentRequestUrl();
+              // let url = GlobalData.getInstance().createCurrentRequestUrl();
-              if (!url) {
+              // if (!url) {
-                url = new URL(window.location.hostname);
+              //   url = new URL(window.location.hostname);
-              }
+              // }
-              url.pathname = HttpProtocol.RequestCheckModeIndex;
+              // url.pathname = HttpProtocol.RequestCheckModeIndex;
-              url.searchParams.append("index", index.value.toString());
+              // url.searchParams.append("index", index.value.toString());
-              let response = (await api.get(url.toString())).data as boolean;
+              // let response = (await api.get(url.toString())).data as boolean;
+              // console.log(url)
+              let response= (await GlobalData.getInstance().getCurrentClient()?.CheckModeIndex(index.value))?.success as boolean;
+              // let response:boolean;
+              // console.log(res)
               if (typeof response != "boolean") {
                 try {
                   response = JSON.parse(response);

src/components/RecoveryDatabaseDialog.vue

@@ -47,8 +47,7 @@
                   class="full-width"
                   ref="uploader"
                   :url="upload_url"
-                  method="post"
+                  method="POST"
-                  :headers="generatorFileUploadHeaders"
                   :label="$t('select data(DBP) file') + ':'"
                   accept=".dbp"
                   :hide-upload-btn="true"
@@ -119,32 +118,11 @@ export default defineComponent({
       upload_url,
       uploader,
       file_count,
-      generatorFileUploadHeaders(files: File[]) {
-        if (files.length > 0) {
-          return [
-            {
-              name: HttpProtocol.kHeaderXProductName,
-              value: HttpProtocol.getProductName($store),
-            },
-            {
-              name: HttpProtocol.kHeaderXFileLength,
-              value: files[0].size,
-            },
-          ];
-        }
-        return [];
-      },
       showDialog() {
         show_dialog.value = true;
-        let client = GlobalData.getInstance().getCurrentClient();
+        let url = GlobalData.getInstance().createCurrentRequestUrl();
-        if (client) {
+        if (url) {
-          let url = new URL(client.url);
+          url.pathname = "/upload_db_file";
-          url.port =
-            GlobalData.getInstance().applicationConfig?.httpserver_port ??
-            HttpProtocol.DefaultHttpPort.toString();
-          url.pathname = HttpProtocol.RequestUploadFile;
-          url.protocol = "http:";
-          url.searchParams.append("type", HttpProtocol.UploadTypeDatabase);
           upload_url.value = url.toString();
         }
       },

src/components/UpgradeDialog.vue

@@ -61,7 +61,6 @@
                   ref="uploader_software"
                   :url="upload_url_software"
                   method="post"
-                  :headers="generatorFileUploadHeaders"
                   :label="$t('select software upgrade file') + ':'"
                   accept=".zip,.tar,.tar.gz"
                   :hide-upload-btn="true"
@@ -76,7 +75,6 @@
                   ref="uploader_rootfs"
                   :url="upload_url_rootfs"
                   method="post"
-                  :headers="generatorFileUploadHeaders"
                   :label="$t('select rootfs upgrade file') + ':'"
                   accept=".img"
                   :hide-upload-btn="true"
@@ -85,6 +83,7 @@
                   @added="(files) => files && (file_count += files.length)"
                   @removed="(files) => files && (file_count -= files.length)"
                 />
+                <!-- :headers="generatorFileUploadHeaders" -->
               </q-item-section>
             </q-item>
           </q-list>
@@ -92,9 +91,7 @@
 
         <q-separator />
 
-        <q-card-actions>
+        <q-card-actions align="right">
-          <q-item-section>V: {{ server_version }}</q-item-section>
-          <q-space />
           <q-btn
             :loading="loading"
             flat
@@ -146,7 +143,6 @@ export default defineComponent({
 
     let select_options = [$t.t("software"), $t.t("rootfs")];
     let upgrade_type = ref($t.t("software"));
-    const server_version = ref("unknow");
 
     return {
       show_dialog,
@@ -158,49 +154,18 @@ export default defineComponent({
       file_count,
       upgrade_type,
       select_options,
-      server_version,
-      generatorFileUploadHeaders(files: File[]) {
-        if (files.length > 0) {
-          return [
-            {
-              name: HttpProtocol.kHeaderXProductName,
-              value: HttpProtocol.getProductName($store),
-            },
-            {
-              name: HttpProtocol.kHeaderXFileLength,
-              value: files[0].size,
-            },
-          ];
-        }
-        return [];
-      },
       loga(a: any) {
         console.log(a);
       },
       showDialog() {
         show_dialog.value = true;
 
-        let client = GlobalData.getInstance().getCurrentClient();
+        let url = GlobalData.getInstance().createCurrentRequestUrl();
-        if (client) {
+          if (url) {
-          let url = new URL(client.url);
+          url.pathname = "/upload_soft_file";
-          url.port =
-            GlobalData.getInstance().applicationConfig?.httpserver_port ??
-            HttpProtocol.DefaultHttpPort.toString();
-          url.pathname = HttpProtocol.RequestUploadFile;
-          url.protocol = "http:";
-          url.searchParams.append("type", HttpProtocol.UploadTypeRootFS);
-          upload_url_rootfs.value = url.toString();
-
-          url.searchParams.set("type", HttpProtocol.UploadTypeSoftware);
           upload_url_software.value = url.toString();
-          try {
+          url.pathname = "/upload_root_fs_file";
-            client?.getBuildInfo()?.then((build_info) => {
+          upload_url_rootfs.value = url.toString();
-              if (build_info) {
-                server_version.value = build_info.version;
-              }
-            });
-            // console.log(build_info);
-          } catch {}
         }
       },
       resetData() {

src/entities/HttpProtocol.ts

@@ -1,8 +1,8 @@
 export namespace HttpProtocol {
   export const DefaultHttpPort = 80;
   export const RequestUploadFile = "/upload_file";
-  export const RequestPathUpdateDBBackupFile = "/common/update_db_backup_file";
+  export const RequestPathUpdateDBBackupFile = "/update_db_backup_file";
-  export const RequestPathDBBackup = "/db_backup";
+  export const RequestPathDBBackup = "/download_db_backup_file";
   export const RequestPathListFile = "/list_file";
   export const RequestPathCreateDirectory = "/create_directory";
   export const RequestPathCheckFileSupport = "/check_file_support";

src/entities/WSProtocol.ts

@@ -534,6 +534,9 @@ export namespace Protocol {
     public static get kRpcFileManagerCreateDirectory() {
       return Commands.PROTOCOL_PREFIX + "RpcFileManagerCreateDirectory";
     }
+    public static get kRpcCheckModeIndex() {
+      return Commands.PROTOCOL_PREFIX + "RpcCheckModeIndex";
+    }
     static _all_commands = new Set([
       Commands.kUnKnowCommand,
       Commands.kSearchDevice,
@@ -668,6 +671,7 @@ export namespace Protocol {
       Commands.kRpcFileManagerRename,
       Commands.kRpcFileManagerDelete,
       Commands.kRpcFileManagerCreateDirectory,
+      Commands.kRpcCheckModeIndex,
     ]);
     public static get AllCommands() {
       return this._all_commands;
@@ -3541,4 +3545,21 @@ export namespace Protocol {
     error_message=""
     error_code=0;
   }
+  export class RpcCheckModeIndexRequestEntity extends PacketEntity{
+    constructor(mode_index:number,rpc_id = 0) {
+      super();
+      super.command = Commands.kRpcCheckModeIndex;
+      super.flag = PacketEntity.FLAG_REQUEST;
+      this.mode_index=mode_index
+    }
+    mode_index = 0;
+  }
+  export class   RpcCheckModeIndexResponseEntity extends PacketEntity{
+    constructor() {
+      super();
+      super.flag = PacketEntity.FLAG_RESPONSE;
+    }
+    success = false;
+
+  }
 }

src/i18n/en-US/index.ts

@@ -294,6 +294,7 @@ export default {
   "open left tool bar": "Open Left Tool Bar",
   "open right tool bar": "Open Right Tool Bar",
   fail: " Fail",
+  finish:"Finish",
   "edit group": "Edit Group",
   "open window": "Open Window",
   "close all windows": "Close All Windows",
@@ -444,4 +445,6 @@ export default {
   resize: "Resize",
   "export magic": "Export",
   "raster graph": "Raster Graph",
+  "the folder name cannot start with a '.'":"The Folder Name Cannot Start With a '.'",
+
 };

src/i18n/zh-CN/index.ts

@@ -5,6 +5,7 @@ export default {
   " ": "",
   title: "MediaPlayerWebApp",
   failed: "失败",
+  finish:"完成",
   fail: "失败",
   error: "错误",
   Confirm: "确认",
@@ -712,4 +713,5 @@ export default {
   resize: "缩放",
   "export magic": "导出",
   "raster graph": "栅格图",
+  "the folder name cannot start with a '.'":"文件夹名称不能以“.” 开头",
 };

src/pages/TopToolBar.vue

@@ -305,7 +305,10 @@
           <q-item
             clickable
             :disable="!$store.state.power_state"
-            v-if="$store.state.isLedPlayer()&&!$store.state.custom_defines.function_magic_wall"
+            v-if="
+              $store.state.isLedPlayer() &&
+              !$store.state.custom_defines.function_magic_wall
+            "
             v-close-popup
             @click="
               ($store.state.isSpecialVideo()
@@ -338,9 +341,6 @@
             </q-item-section>
           </q-item>
 
-
-
-
           <q-item
             clickable
             :disable="!$store.state.power_state"
@@ -457,7 +457,6 @@
             </q-item-section>
           </q-item>
 
-
           <q-item
             clickable
             v-close-popup
@@ -711,9 +710,9 @@ export default defineComponent({
       show_device_list.value =
         typeof (<any>window).user_search?.hide_device_list == "undefined";
     });
-    let isfan=ref(true)
+    let isfan = ref(true);
     if ((window as any).$wujie) {
-      isfan.value=false
+      isfan.value = false;
     }
     return {
       show_advanced_menu,
@@ -738,8 +737,11 @@ export default defineComponent({
           console.log(url.toString());
           let response = await api.get(url.toString());
           if (response.status == 200 && response && response.data) {
-            url.pathname =
+            console.log(response.data);
-              HttpProtocol.RequestPathDBBackup + "/" + response.data;
+
+            url.pathname = HttpProtocol.RequestPathDBBackup;
+            url.searchParams.append("name", response.data);
+            console.log(url);
             openURL(url.toString());
           } else {
             $q.notify({