diff --git a/package.json b/package.json index 797ec0b..6702f45 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "media_player_client", - "version": "1.4.13", + "version": "1.4.14", "description": "A Quasar Framework app", "productName": "MediaPlayerClient", "author": "fangxiang ", diff --git a/src/App.vue b/src/App.vue index e406161..2f15e8a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -42,6 +42,16 @@ export default defineComponent({ console.log(e); } + { + const user_search = (window).user_search || {}; + if (typeof user_search == "object") { + $store.commit( + "setAvancedDebug", + typeof user_search["debug"] != "undefined" + ); + } + } + window.onresize = (evt: any) => EventBus.getInstance().emit(EventNamesDefine.WindowResize, evt); diff --git a/src/components/AdvancedDebugDialog.vue b/src/components/AdvancedDebugDialog.vue index ba47421..9a201a0 100644 --- a/src/components/AdvancedDebugDialog.vue +++ b/src/components/AdvancedDebugDialog.vue @@ -39,7 +39,7 @@ - {{ $t("function") }}: + {{ $t("function") }} - + + + + {{ $t("language") }} + + +
+ + +
+
+ + + +
+ + + + {{ $t("device info") }} + + + + {{ $t("restart") }} @@ -107,7 +150,7 @@ + diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue index c41b553..e9bbb61 100644 --- a/src/pages/TopToolBar.vue +++ b/src/pages/TopToolBar.vue @@ -292,15 +292,6 @@ {{ $t("CN/EN switch") }} - - - - - - - {{ $t("device info") }} - - = ref(null); const plan_running = computed( () => $store.state.current_running_plan.trim() != "" ); - const get_time_text = (s: number, show_ss: boolean = true) => { - console.log(s); - var time = ""; - var second = s % 60; - var minute = parseInt((parseInt(s.toString()) / 60).toString()) % 60; - if (show_ss) { - time = second + $t.t("SS"); - } - if (minute >= 1) { - time = minute + $t.t("MM") + time; - } - var hour = parseInt((parseInt((s / 60).toString()) / 60).toString()) % 24; - if (hour >= 1) { - time = hour + $t.t("HH") + time; - } - var day = parseInt( - ( - parseInt((parseInt((s / 60).toString()) / 60).toString()) / 24 - ).toString() - ); - if (day >= 1) { - time = day + $t.t("DD") + time; - } - return time; - }; - const checkRegistered = () => { if ( GlobalData.getInstance().getCurrentClient()?.is_connected && @@ -666,45 +619,6 @@ export default defineComponent({ window.location.reload(); } }, - async showDeviceInfo() { - try { - const response = await GlobalData.getInstance() - .getCurrentClient() - ?.getSystemTimes(); - if (response) { - system_run_time = response.system_run_time; - system_idle_time = response.system_idle_time; - current_system_time = response.current_system_time; - server_run_time = response.server_run_time; - server_all_run_time = response.server_all_run_time; - } - } catch (e) { - console.log(e); - } - $q.dialog({ - html: true, - title: "
" + $t.t("device info") + "
", - message: `
- ${$t.t("device resolution")} : ${$store.state.device_screen_width}X${ - $store.state.device_screen_height - }@${$store.state.device_screen_refresh_rate}
- ${$t.t("system run time")} : ${get_time_text(system_run_time)}
- ${$t.t("system idle rate")} : ${( - (system_idle_time / (system_run_time * 4)) * - 100 - ).toFixed(0)} %
- ${$t.t("server run time")} : ${get_time_text(server_run_time)}
- ${$t.t("server all run time")} : ${get_time_text( - server_all_run_time, - false - )}
- ${$t.t("current server system time")} : ${$date.formatDate( - new Date(current_system_time), - "YYYY-MM-DD HH:mm:ss" - )}
-
`, - }); - }, async powerOff() { let success = false; try { diff --git a/src/store/index.ts b/src/store/index.ts index 262201b..32733c3 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -284,7 +284,7 @@ export default store(function (/* { ssrContext } */) { state: { // state initialized: false, - advanced_debug: window.location.href.indexOf("advanced_debug=1") != -1, + advanced_debug: false, signal_source_tree: [], polling_tree: [], mode_tree: [], @@ -332,6 +332,12 @@ export default store(function (/* { ssrContext } */) { state.device_attribute = num; } }, + setAvancedDebug(state: StateInterface, playload?: any) { + if (playload || playload == "true") { + console.log("debug", playload); + } + state.advanced_debug = playload; + }, setArrayValue(state: StateInterface, playload?: any) { if (Array.isArray(playload.value)) { const arr: Array = (state)[playload.name];