添加点击就置顶窗口的功能

添加查看设备时间信息的功能

package.json

@@ -1,6 +1,6 @@
 {
   "name": "media_player_client",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "A Quasar Framework app",
   "productName": "MediaPlayerClient",
   "author": "fangxiang <fangxiang@cloudview.work>",

src/common/ClientConnection.ts

@@ -734,6 +734,11 @@ export default class ClientConnection {
     );
   }
 
+  public async getSystemTimes() {
+    return await this.doRpc<Protocol.GetSystemTimesResponseEntity>(
+      new Protocol.GetSystemTimesRequestEntity(0)
+    );
+  }
   public restartDevice(delay_ms?: number) {
     this.ws?.send(
       JSON.stringify(new Protocol.RestartDeviceRequestEntity(delay_ms))

src/common/RemoteDataExangeProcesser.ts

@@ -402,9 +402,6 @@ export default class RemoteDataExangeProcesser {
             }
           }
           break;
-        default:
-          console.log(notify.data);
-          break;
       }
     } catch {}
   }

src/components/Window.vue

@@ -290,6 +290,12 @@ export default defineComponent({
       return signal_source.value.window_type == "EwindowType::Clock";
     });
 
+    watch(
+      () => props.window,
+      (n, o) => {
+        reload_signal_source();
+      }
+    );
     reload_signal_source();
 
     const flags = new _Flags();
@@ -317,6 +323,11 @@ export default defineComponent({
         }
         if (!props.mouse_area_flag) {
           evt.stopPropagation();
+          if (props.window.uuid != $store.state.selected_window) {
+            GlobalData.getInstance()
+              .getCurrentClient()
+              ?.focusIn(props.window.window_id);
+          }
           $store.commit("setSelectedWindow", props.window.uuid);
         }
       },

src/entities/WSProtocol.ts

@@ -289,6 +289,10 @@ export namespace Protocol {
       return Commands.PROTOCOL_PREFIX + "DesktopDisconnectNotify";
     }
 
+    public static get kRpcGetSystemTimes() {
+      return Commands.PROTOCOL_PREFIX + "RpcGetSystemTimes";
+    }
+
     static _all_commands = new Set([
       Commands.kUnKnowCommand,
       Commands.kSearchDevice,
@@ -359,6 +363,7 @@ export namespace Protocol {
       Commands.kPollingStateChanged,
       Commands.kDesktopResolutionChangedNotify,
       Commands.kDesktopDisconnectNotify,
+      Commands.kRpcGetSystemTimes,
     ]);
 
     public static get AllCommands() {
@@ -1677,4 +1682,27 @@ export namespace Protocol {
       this.command = Commands.kDesktopDisconnectNotify;
     }
   }
+
+  export class GetSystemTimesRequestEntity extends PacketEntity {
+    timestamp = new Date().getMilliseconds();
+
+    constructor(rpcid?: number) {
+      super();
+      this.rpc_id = rpcid ?? 0;
+      this.command = Commands.kRpcGetSystemTimes;
+    }
+  }
+
+  export class GetSystemTimesResponseEntity extends PacketEntity {
+    system_run_time: number = 0;
+    system_idle_time: number = 0;
+    current_system_time: number = 0;
+    server_run_time: number = 0;
+    server_all_run_time: number = 0;
+
+    constructor() {
+      super();
+      this.command = Commands.kRpcGetSystemTimes;
+    }
+  }
 }

src/i18n/zh-CN/index.ts

@@ -323,4 +323,10 @@ export default {
   "are you sure about the update": "确定更新吗",
   "device info": "设备信息",
   resolution: "分辨率",
+  "system run time": "系统运行时间",
+  "system idle time": "系统空闲时间",
+  "system idle rate": "系统空闲率",
+  "server run time": "服务运行时间",
+  "current server system time": "当前服务系统时间",
+  "server all run time": "服务总运行时间",
 };

src/pages/TopToolBar.vue

@@ -256,7 +256,7 @@ import { Protocol } from "src/entities/WSProtocol";
 import GlobalData from "src/common/GlobalData";
 import { api } from "boot/axios";
 import { HttpProtocol } from "src/entities/HttpProtocol";
-import { SessionStorage, openURL, useQuasar } from "quasar";
+import { SessionStorage, openURL, useQuasar, date as $date } from "quasar";
 import { useI18n } from "vue-i18n";
 import { NotifyMessage } from "src/common/ClientConnection";
 
@@ -281,6 +281,12 @@ export default defineComponent({
 
     let show_advanced_menu = ref(true);
 
+    let system_run_time = 0;
+    let system_idle_time = 0;
+    let current_system_time = 0;
+    let server_run_time = 0;
+    let server_all_run_time = 0;
+
     const plan_running = computed(
       () => $store.state.current_running_plan.trim() != ""
     );
@@ -363,17 +369,42 @@ export default defineComponent({
         SessionStorage.clear();
         window.location.reload();
       },
-      showDeviceInfo() {
+      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({
-          title: $t.t("device info"),
+          html: true,
-          message:
+          title: "<div class='text-h4'>" + $t.t("device info") + "</div>",
-            $t.t("resolution") +
+          message: `<div class="text-h6">
-            ": " +
+          ${$t.t("device resolution")} : ${$store.state.device_screen_width}X${
-            $store.state.device_screen_width +
+            $store.state.device_screen_height
-            "X" +
+          }@${$store.state.device_screen_refresh_rate}<br />
-            $store.state.device_screen_height +
+          ${$t.t("system run time")} :  ${system_run_time} ${$t.t("s")} <br />
-            "@" +
+          ${$t.t("system idle rate")} :  ${(
-            $store.state.device_screen_refresh_rate,
+            system_idle_time /
+            (system_run_time * 4)
+          ).toFixed(2)} % <br />
+          ${$t.t("current server system time")} : ${$date.formatDate(
+            new Date(current_system_time),
+            "YYYY-MM-DD HH:mm:ss"
+          )}<br />
+          ${$t.t("server run time")} :  ${server_run_time} ${$t.t("s")} <br />
+          ${$t.t("server all run time")} :  ${server_all_run_time} ${$t.t(
+            "s"
+          )} <br />
+          </div>`,
         });
       },
     };

src/pages/WallPage.vue

@@ -10,17 +10,17 @@
   >
     <div id="windows" style="position: absolute">
       <vue3-resize-drag
-        :w="item.width * $refs.wall.clientWidth"
+        :w="item.width * ($refs.wall?.clientWidth ?? 0)"
-        :h="item.height * $refs.wall.clientHeight"
+        :h="item.height * ($refs.wall?.clientHeight ?? 0)"
         :x="
-          ($refs.wall.parentElement?.offsetLeft ?? 0) +
+          ($refs.wall?.parentElement?.offsetLeft ?? 0) +
-          $refs.wall.offsetLeft +
+          ($refs.wall?.offsetLeft ?? 0) +
-          item.x * $refs.wall.clientWidth
+          item.x * ($refs.wall?.clientWidth ?? 0)
         "
         :y="
-          ($refs.wall.parentElement?.offsetTop ?? 0) +
+          ($refs.wall?.parentElement?.offsetTop ?? 0) +
-          $refs.wall.offsetTop +
+          ($refs.wall?.offsetTop ?? 0) +
-          item.y * $refs.wall.clientHeight
+          item.y * ($refs.wall?.clientHeight ?? 0)
         "
         :zIndex="
           $store.state.windows_sort.findIndex((element) => element == item.uuid)