From 9d81132329ec4d00f56d64f2e460b414c3711b47 Mon Sep 17 00:00:00 2001 From: fangxiang Date: Fri, 2 Sep 2022 11:14:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=8D=93=E5=B9=B3=E5=8F=B0=E4=B8=8B?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0APP=E4=B8=8B=E8=BD=BD=E6=8F=90=E7=A4=BA=20?= =?UTF-8?q?=E5=AE=89=E5=8D=93APP=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8F=90=E7=A4=BA=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=AF=B9=E8=AF=9D=E6=A1=86loading=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=8B=E8=BF=98=E8=83=BD=E8=A2=AB=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 +- src/common/EventBus.ts | 1 + src/components/AdvancedDebugDialog.vue | 1 + src/components/AdvancedIpAddressDialog.vue | 9 +- src/components/BackgroundImageDialog.vue | 1 + src/components/ClockSignalSourceDialog.vue | 1 + src/components/EdgeBlendingDialog.vue | 1 + .../EditJointActionEquipmentDialog.vue | 1 + src/components/GridSettingDialog.vue | 1 + .../ListJointActionEquipmentDialog.vue | 1 + src/components/ModeDialog.vue | 1 + src/components/ModeGroupDialog.vue | 1 + src/components/PlanDialog.vue | 1 + src/components/PlanGroupDialog.vue | 1 + src/components/PlaylistDialog.vue | 1 + src/components/PollingSettingDialog.vue | 1 + src/components/RecoveryDatabaseDialog.vue | 1 + src/components/SignalSourceDialog.vue | 1 + src/components/SignalSourceGroupDialog.vue | 1 + .../SpecialVideoGridSettingDialog.vue | 1 + src/components/SubtitleDialog.vue | 1 + src/components/SystemSettingDialog.vue | 1 + .../SystenSettingAdvancedNetworkDialog.vue | 9 +- src/components/TimerSignalSourceDialog.vue | 1 + src/components/TimingTaskDialog.vue | 1 + src/components/UpgradeDialog.vue | 1 + src/components/WeatherSignalSourceDialog.vue | 1 + src/components/WindowRectEditDialog.vue | 1 + src/i18n/en-US/index.ts | 5 + src/i18n/zh-CN/index.ts | 5 + src/pad/BottomBar.vue | 6 +- src/pad/Login.vue | 143 +++++++++++++++++- src/pad/MainLayout.vue | 117 ++++++++++++-- yarn.lock | 12 ++ 34 files changed, 315 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 3d4b0ac..e48fa6f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "media_player_client", - "version": "1.5.2", + "version": "1.5.3", "description": "A Quasar Framework app", "productName": "MediaPlayerClient", "author": "fangxiang ", @@ -32,6 +32,7 @@ "zrender": "^5.3.1" }, "devDependencies": { + "@capacitor/core": "^2.5.0", "@quasar/app": "^3.3.3", "@types/node": "^10.17.15", "workbox-webpack-plugin": "^6.4.2" diff --git a/src/common/EventBus.ts b/src/common/EventBus.ts index c0e3dd0..6231ee3 100644 --- a/src/common/EventBus.ts +++ b/src/common/EventBus.ts @@ -36,4 +36,5 @@ export namespace EventNamesDefine { export const RefreshJointActionEquipmentList = "onRefreshJointActionEquipmentList"; export const CheckDebug = "CheckDebug"; + export const NotifyDownloadAndroid = "NotifyDownloadAndroid"; } diff --git a/src/components/AdvancedDebugDialog.vue b/src/components/AdvancedDebugDialog.vue index a2c737a..0c7cded 100644 --- a/src/components/AdvancedDebugDialog.vue +++ b/src/components/AdvancedDebugDialog.vue @@ -23,6 +23,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/AdvancedIpAddressDialog.vue b/src/components/AdvancedIpAddressDialog.vue index cc5a637..6664c8a 100644 --- a/src/components/AdvancedIpAddressDialog.vue +++ b/src/components/AdvancedIpAddressDialog.vue @@ -20,7 +20,14 @@
- + {{ $t("close") }} diff --git a/src/components/BackgroundImageDialog.vue b/src/components/BackgroundImageDialog.vue index 7ebcdb6..6b6df9c 100644 --- a/src/components/BackgroundImageDialog.vue +++ b/src/components/BackgroundImageDialog.vue @@ -24,6 +24,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/ClockSignalSourceDialog.vue b/src/components/ClockSignalSourceDialog.vue index b1e7875..35c6104 100644 --- a/src/components/ClockSignalSourceDialog.vue +++ b/src/components/ClockSignalSourceDialog.vue @@ -25,6 +25,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/EdgeBlendingDialog.vue b/src/components/EdgeBlendingDialog.vue index 1b483ca..3c98f23 100644 --- a/src/components/EdgeBlendingDialog.vue +++ b/src/components/EdgeBlendingDialog.vue @@ -25,6 +25,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/EditJointActionEquipmentDialog.vue b/src/components/EditJointActionEquipmentDialog.vue index 2fe3057..ca325d6 100644 --- a/src/components/EditJointActionEquipmentDialog.vue +++ b/src/components/EditJointActionEquipmentDialog.vue @@ -26,6 +26,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/GridSettingDialog.vue b/src/components/GridSettingDialog.vue index d2d99da..3beb0ff 100644 --- a/src/components/GridSettingDialog.vue +++ b/src/components/GridSettingDialog.vue @@ -25,6 +25,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/ListJointActionEquipmentDialog.vue b/src/components/ListJointActionEquipmentDialog.vue index 107b8f6..5db9b5b 100644 --- a/src/components/ListJointActionEquipmentDialog.vue +++ b/src/components/ListJointActionEquipmentDialog.vue @@ -25,6 +25,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/ModeDialog.vue b/src/components/ModeDialog.vue index f5dcbae..bc1ac43 100644 --- a/src/components/ModeDialog.vue +++ b/src/components/ModeDialog.vue @@ -31,6 +31,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/ModeGroupDialog.vue b/src/components/ModeGroupDialog.vue index a550474..7bb9fdd 100644 --- a/src/components/ModeGroupDialog.vue +++ b/src/components/ModeGroupDialog.vue @@ -31,6 +31,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/PlanDialog.vue b/src/components/PlanDialog.vue index 21856e4..fce4b50 100644 --- a/src/components/PlanDialog.vue +++ b/src/components/PlanDialog.vue @@ -31,6 +31,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/PlanGroupDialog.vue b/src/components/PlanGroupDialog.vue index 4090903..3cdedf3 100644 --- a/src/components/PlanGroupDialog.vue +++ b/src/components/PlanGroupDialog.vue @@ -31,6 +31,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/PlaylistDialog.vue b/src/components/PlaylistDialog.vue index e8cf39f..cfabb2d 100644 --- a/src/components/PlaylistDialog.vue +++ b/src/components/PlaylistDialog.vue @@ -25,6 +25,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/PollingSettingDialog.vue b/src/components/PollingSettingDialog.vue index d50f5c7..7a92822 100644 --- a/src/components/PollingSettingDialog.vue +++ b/src/components/PollingSettingDialog.vue @@ -25,6 +25,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/RecoveryDatabaseDialog.vue b/src/components/RecoveryDatabaseDialog.vue index 22a152b..a6dd0b4 100644 --- a/src/components/RecoveryDatabaseDialog.vue +++ b/src/components/RecoveryDatabaseDialog.vue @@ -25,6 +25,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/SignalSourceDialog.vue b/src/components/SignalSourceDialog.vue index 207f03c..cf363a3 100644 --- a/src/components/SignalSourceDialog.vue +++ b/src/components/SignalSourceDialog.vue @@ -32,6 +32,7 @@ round icon="close" color="red" + :disable="loading" v-close-popup > diff --git a/src/components/SignalSourceGroupDialog.vue b/src/components/SignalSourceGroupDialog.vue index b60f564..3d0cfe6 100644 --- a/src/components/SignalSourceGroupDialog.vue +++ b/src/components/SignalSourceGroupDialog.vue @@ -31,6 +31,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/SpecialVideoGridSettingDialog.vue b/src/components/SpecialVideoGridSettingDialog.vue index 164fc8b..921b53a 100644 --- a/src/components/SpecialVideoGridSettingDialog.vue +++ b/src/components/SpecialVideoGridSettingDialog.vue @@ -25,6 +25,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/SubtitleDialog.vue b/src/components/SubtitleDialog.vue index ccddf09..802a889 100644 --- a/src/components/SubtitleDialog.vue +++ b/src/components/SubtitleDialog.vue @@ -26,6 +26,7 @@ round icon="close" color="red" + :disable="loading" v-close-popup > diff --git a/src/components/SystemSettingDialog.vue b/src/components/SystemSettingDialog.vue index 7fbe327..6bc4809 100644 --- a/src/components/SystemSettingDialog.vue +++ b/src/components/SystemSettingDialog.vue @@ -23,6 +23,7 @@ :loading="loading" flat round + :disable="loading" icon="close" color="red" v-close-popup diff --git a/src/components/SystenSettingAdvancedNetworkDialog.vue b/src/components/SystenSettingAdvancedNetworkDialog.vue index 64adca5..220886f 100644 --- a/src/components/SystenSettingAdvancedNetworkDialog.vue +++ b/src/components/SystenSettingAdvancedNetworkDialog.vue @@ -20,7 +20,14 @@
- + {{ $t("close") }} diff --git a/src/components/TimerSignalSourceDialog.vue b/src/components/TimerSignalSourceDialog.vue index b73ab62..014b3ef 100644 --- a/src/components/TimerSignalSourceDialog.vue +++ b/src/components/TimerSignalSourceDialog.vue @@ -25,6 +25,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/TimingTaskDialog.vue b/src/components/TimingTaskDialog.vue index b94656d..dcf4cfa 100644 --- a/src/components/TimingTaskDialog.vue +++ b/src/components/TimingTaskDialog.vue @@ -26,6 +26,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/UpgradeDialog.vue b/src/components/UpgradeDialog.vue index 719a5e9..c90b02b 100644 --- a/src/components/UpgradeDialog.vue +++ b/src/components/UpgradeDialog.vue @@ -25,6 +25,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/components/WeatherSignalSourceDialog.vue b/src/components/WeatherSignalSourceDialog.vue index 3145665..4b7a297 100644 --- a/src/components/WeatherSignalSourceDialog.vue +++ b/src/components/WeatherSignalSourceDialog.vue @@ -26,6 +26,7 @@ round icon="close" color="red" + :disable="loading" v-close-popup > diff --git a/src/components/WindowRectEditDialog.vue b/src/components/WindowRectEditDialog.vue index 2d54b36..8da994d 100644 --- a/src/components/WindowRectEditDialog.vue +++ b/src/components/WindowRectEditDialog.vue @@ -25,6 +25,7 @@ flat round icon="close" + :disable="loading" color="red" v-close-popup > diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts index ad7cfab..74a4112 100644 --- a/src/i18n/en-US/index.ts +++ b/src/i18n/en-US/index.ts @@ -345,4 +345,9 @@ export default { "type can not be unknow": "Type Can Not Be UnKnow", "joint action equipment is empty! please add equipment first!": "Joint Action Equipment Is Empty! Please Add Equipment First!", + download: "Download", + search: "Search", + "device list": "Device List", + "The detected version does not match, please download the new version!": + "The detected version does not match, please download the new version!", }; diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts index 5f6a2b3..dbc9e41 100644 --- a/src/i18n/zh-CN/index.ts +++ b/src/i18n/zh-CN/index.ts @@ -622,4 +622,9 @@ export default { "type can not be unknow": "类型不能为未知", "joint action equipment is empty! please add equipment first!": "当前没有联动设备! 请先添加设备!", + download: "下载", + search: "搜索", + "device list": "设备列表", + "The detected version does not match, please download the new version!": + "检测到的版本不匹配,请下载新版本!", }; diff --git a/src/pad/BottomBar.vue b/src/pad/BottomBar.vue index ebba229..cd8b0cc 100644 --- a/src/pad/BottomBar.vue +++ b/src/pad/BottomBar.vue @@ -170,7 +170,11 @@ :class="'col-' + ($store.state.landspace ? '3' : '4')" >
-
+
diff --git a/src/pad/Login.vue b/src/pad/Login.vue index 58c58ca..5774a54 100644 --- a/src/pad/Login.vue +++ b/src/pad/Login.vue @@ -46,7 +46,12 @@ - + + + + @@ -200,7 +214,7 @@ :disable="data.loading" /> - + + + + + + +
+
+ {{ $t("device list") }} +
+ +
+ + + {{ $t("close") }} + + +
+
+
+ + + + + + + + {{ item }} + + + + + + + + + + + + +
+
+