diff --git a/package.json b/package.json index 2eb3dee..a006f62 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "media_player_client", - "version": "0.0.1", + "version": "1.0.2", "description": "A Quasar Framework app", "productName": "MediaPlayerClient", "author": "fangxiang ", diff --git a/public/svgs/fan.svg b/public/svgs/fan.svg new file mode 100644 index 0000000..e135e03 --- /dev/null +++ b/public/svgs/fan.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 55af366..7a9ca44 100644 --- a/src/App.vue +++ b/src/App.vue @@ -8,12 +8,15 @@ import { defineComponent } from "vue"; import { useI18n } from "vue-i18n"; import EventBus, { EventNamesDefine } from "src/common/EventBus"; +import GlobalData from "./common/GlobalData"; +import { useStore } from "src/store"; export default defineComponent({ name: "App", setup() { const $t = useI18n(); + const $q = useStore(); document.title = $t.t("title"); window.onresize = (evt: any) => @@ -23,6 +26,21 @@ export default defineComponent({ EventBus.getInstance().emit(EventNamesDefine.DocumentBodyClick, evt); document.body.classList.add("overflow-hidden"); + + const refreshFanTemp = async () => { + try { + const info = await GlobalData.getInstance() + .getCurrentClient() + ?.getUnimportantInfo(); + console.log(info); + if (info) { + $q.commit("setFanTemp", info.fan_temp); + } + } catch {} + }; + setInterval(refreshFanTemp, 1000 * 3); + refreshFanTemp(); + return {}; }, }); diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts index 7d851ee..04a7af8 100644 --- a/src/common/ClientConnection.ts +++ b/src/common/ClientConnection.ts @@ -636,23 +636,27 @@ export default class ClientConnection { } public async unmuteWindow(window_id: number) { - try { - return await this.doRpc( - new Protocol.UnMuteWindowRequestEntity(window_id, 0) - ); - } catch (e) { - console.error(e); - } + return await this.doRpc( + new Protocol.UnMuteWindowRequestEntity(window_id, 0) + ); } public async muteWindow(window_id: number) { - try { - return await this.doRpc( - new Protocol.MuteWindowRequestEntity(window_id, 0) - ); - } catch (e) { - console.error(e); - } + return await this.doRpc( + new Protocol.MuteWindowRequestEntity(window_id, 0) + ); + } + + public async getBuildInfo() { + return await this.doRpc( + new Protocol.GetBuildInfoRequestEntity(0) + ); + } + + public async getUnimportantInfo() { + return await this.doRpc( + new Protocol.GetUnimportantInfoRequestEntity(0) + ); } public restartDevice(delay_ms?: number) { diff --git a/src/components/AboutDialog.vue b/src/components/AboutDialog.vue new file mode 100644 index 0000000..0c08945 --- /dev/null +++ b/src/components/AboutDialog.vue @@ -0,0 +1,147 @@ + + + + + diff --git a/src/components/EditVolumeDialog.vue b/src/components/EditVolumeDialog.vue index 0622902..9d1dcf6 100644 --- a/src/components/EditVolumeDialog.vue +++ b/src/components/EditVolumeDialog.vue @@ -33,7 +33,7 @@ import { useI18n } from "vue-i18n"; import GlobalData from "src/common/GlobalData"; export default defineComponent({ - name: "EditVolumeDialog", + name: "ComponentEditVolumeDialog", setup() { let $store = useStore(); diff --git a/src/components/ModeTree.vue b/src/components/ModeTree.vue index 80baad8..8318711 100644 --- a/src/components/ModeTree.vue +++ b/src/components/ModeTree.vue @@ -133,7 +133,7 @@ import { ModeEntity } from "src/entities/ModeEntity"; import EventBus, { EventNamesDefine } from "src/common/EventBus"; export default defineComponent({ - name: "PageModeTree", + name: "ComponentModeTree", components: { ModeGroupDialog, ModeDialog }, diff --git a/src/components/PlanTree.vue b/src/components/PlanTree.vue index f997c56..1dbc665 100644 --- a/src/components/PlanTree.vue +++ b/src/components/PlanTree.vue @@ -170,7 +170,7 @@ import { PlanEntity } from "src/entities/PlanEntity"; import { NotifyMessage } from "src/common/ClientConnection"; export default defineComponent({ - name: "PagePlanTree", + name: "ComponentPlanTree", components: { PlanGroupDialog, PlanDialog }, diff --git a/src/components/RecoveryDatabaseDialog.vue b/src/components/RecoveryDatabaseDialog.vue index 86b894c..b345956 100644 --- a/src/components/RecoveryDatabaseDialog.vue +++ b/src/components/RecoveryDatabaseDialog.vue @@ -5,7 +5,7 @@
- {{ $t("data import") }} + {{ $t("database import") }}
diff --git a/src/components/SignalSourceTree.vue b/src/components/SignalSourceTree.vue index 8b76f05..065a9d1 100644 --- a/src/components/SignalSourceTree.vue +++ b/src/components/SignalSourceTree.vue @@ -136,7 +136,7 @@ import { Protocol } from "src/entities/WSProtocol"; import { NotifyMessage } from "src/common/ClientConnection"; export default defineComponent({ - name: "PageSignalSourceTree", + name: "ComponentSignalSourceTree", components: { SignalSourceGroupDialog, SignalSourceDialog }, diff --git a/src/components/SystemSettingDialog.vue b/src/components/SystemSettingDialog.vue index 33908e7..0c5f27a 100644 --- a/src/components/SystemSettingDialog.vue +++ b/src/components/SystemSettingDialog.vue @@ -722,7 +722,7 @@ const _time_zones = [ ]; export default defineComponent({ - name: "SystemSettingDialog", + name: "ComponentSystemSettingDialog", setup() { let $store = useStore(); diff --git a/src/components/Window.vue b/src/components/Window.vue index 10250fb..dc4d2a4 100644 --- a/src/components/Window.vue +++ b/src/components/Window.vue @@ -314,7 +314,6 @@ export default defineComponent({ signal_source.value, GlobalData.getInstance().getSignalSource(props.signal_source_table_uuid) ); - console.log(signal_source.value.window_type); }; const is_audo_player_window = computed( diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts index 55a3c48..9ef2e96 100644 --- a/src/entities/WSProtocol.ts +++ b/src/entities/WSProtocol.ts @@ -232,6 +232,14 @@ export namespace Protocol { return Commands.PROTOCOL_PREFIX + "UnMuteWidow"; } + public static get kRpcGetBuildInfo() { + return Commands.PROTOCOL_PREFIX + "RpcGetBuildInfo"; + } + + public static get kRpcGetUnimportantInfo() { + return Commands.PROTOCOL_PREFIX + "RpcGetUnimportantInfo"; + } + static _all_commands = new Set([ Commands.kUnKnowCommand, Commands.kSearchDevice, @@ -285,6 +293,8 @@ export namespace Protocol { Commands.kSetWindowVolume, Commands.kMuteWidow, Commands.kUnMuteWidow, + Commands.kRpcGetBuildInfo, + Commands.kRpcGetUnimportantInfo, ]); public static get AllCommands() { @@ -1383,4 +1393,48 @@ export namespace Protocol { this.window_id = window_id; } } + + export class GetBuildInfoRequestEntity extends Protocol.PacketEntity { + timestamp = new Date().getMilliseconds(); + + constructor(rcp_id?: number) { + super(); + this.rpc_id = rcp_id ?? 0; + this.command = Protocol.Commands.kRpcGetBuildInfo; + } + } + + export class GetBuildInfoResponseEntity extends Protocol.PacketEntity { + version = "unknow"; + commit_hash = "unknow"; + build_date = "unknow"; + branch_name = "unknow"; + major_version = 0; + minor_version = 0; + patch_version = 0; + tweak_version = 0; + constructor() { + super(); + this.command = Protocol.Commands.kRpcGetBuildInfo; + } + } + + export class GetUnimportantInfoRequestEntity extends Protocol.PacketEntity { + timestamp = new Date().getMilliseconds(); + + constructor(rcp_id?: number) { + super(); + this.rpc_id = rcp_id ?? 0; + this.command = Protocol.Commands.kRpcGetUnimportantInfo; + } + } + + export class GetUnimportantInfoResponseEntity extends Protocol.PacketEntity { + fan_temp = 0; + note = "unknow"; + constructor() { + super(); + this.command = Protocol.Commands.kRpcGetUnimportantInfo; + } + } } diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts index becfe0d..69f9954 100644 --- a/src/i18n/zh-CN/index.ts +++ b/src/i18n/zh-CN/index.ts @@ -25,6 +25,8 @@ export default { "background image": "底图设置", "data import": "数据导入", "data export": "数据导出", + "database import": "数据恢复", + "database export": "数据备份", root: "根节点", @@ -274,4 +276,15 @@ export default { "please input mode index": "请输入模式索引(0自动生成)", "mode index": "模式索引", "edit volume": "修改音量", + about: "关于", + "product name": "产品名称", + "TV splicing box": "电视机拼接盒", + copyright: "版权", + "guangdong chuangxian jishu": "广东创显技术有限公司", + "client version": "客户端版本", + "server version": "服务端版本", + "server commit hash": "服务端COMMIT", + "server branch name": "服务端分支", + "server build date": "服务端编译日期", + "restart device3568": "重启电视机拼接盒", }; diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index 94c9e88..9d9773e 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -13,7 +13,7 @@
-
Copyright © 2020 - 2021 SX
+
+ Copyright © 2020 - 2021 广东创显技术有限公司 +
- {{ $t("data import") }} + {{ $t("database import") }} @@ -109,7 +109,19 @@ - {{ $t("data export") }} + {{ $t("database export") }} + + + + + + + + {{ $t("about") }} @@ -117,6 +129,14 @@ + + + + {{ $store.state.fan_temp }} ℃ + + +