From be4f57530e7a27fe5b6846b93da222c930c4e51a Mon Sep 17 00:00:00 2001
From: fangxiang <fangxiang@cloudview.work>
Date: Thu, 5 Aug 2021 17:26:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AA=97=E5=8F=A3=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E3=80=82=E5=AE=AB=E6=A0=BC=E8=A1=8C=E5=95=8A=E6=98=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 quasar.conf.js                 |  99 ++++++++++------------
 src/App.vue                    |  12 ++-
 src/common/ClientConnection.ts |  78 +++++++----------
 src/common/EventBus.ts         |  12 +++
 src/entities/WSProtocol.ts     |  20 +++++
 src/i18n/zh-CN/index.ts        |  34 ++++----
 src/pages/TopToolBar.vue       |  14 +++-
 src/pages/WallPage.vue         | 149 ++++++++++++++++++++++++---------
 src/store/index.ts             |   6 ++
 9 files changed, 262 insertions(+), 162 deletions(-)
 create mode 100644 src/common/EventBus.ts

diff --git a/quasar.conf.js b/quasar.conf.js
index 4273df0..e70f606 100644
--- a/quasar.conf.js
+++ b/quasar.conf.js
@@ -6,7 +6,7 @@
 // Configuration for your app
 // https://v2.quasar.dev/quasar-cli/quasar-conf-js
 
-const { configure } = require('quasar/wrappers');
+const { configure } = require("quasar/wrappers");
 
 module.exports = configure(function (ctx) {
   return {
@@ -19,15 +19,10 @@ module.exports = configure(function (ctx) {
     // app boot file (/src/boot)
     // --> boot files are part of "main.js"
     // https://v2.quasar.dev/quasar-cli/boot-files
-    boot: [
-      'i18n',
-      'axios',
-    ],
+    boot: ["i18n", "axios"],
 
     // https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css
-    css: [
-      'app.scss'
-    ],
+    css: ["app.scss"],
 
     // https://github.com/quasarframework/quasar/tree/dev/extras
     extras: [
@@ -39,13 +34,13 @@ module.exports = configure(function (ctx) {
       // 'line-awesome',
       // 'roboto-font-latin-ext', // this or either 'roboto-font', NEVER both!
 
-      'roboto-font', // optional, you are not bound to it
-      'material-icons', // optional, you are not bound to it
+      "roboto-font", // optional, you are not bound to it
+      "material-icons", // optional, you are not bound to it
     ],
 
     // Full list of options: https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-build
     build: {
-      vueRouterMode: 'hash', // available values: 'hash', 'history'
+      vueRouterMode: "hash", // available values: 'hash', 'history'
 
       // transpile: false,
 
@@ -65,7 +60,7 @@ module.exports = configure(function (ctx) {
 
       // https://v2.quasar.dev/quasar-cli/handling-webpack
       // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain
-      chainWebpack (/* chain */) {
+      chainWebpack(/* chain */) {
         //
       },
     },
@@ -74,7 +69,7 @@ module.exports = configure(function (ctx) {
     devServer: {
       https: false,
       port: 8080,
-      open: true // opens browser window automatically
+      open: true, // opens browser window automatically
     },
 
     // https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework
@@ -92,7 +87,7 @@ module.exports = configure(function (ctx) {
       // directives: [],
 
       // Quasar plugins
-      plugins: []
+      plugins: ["Notify", "Dialog", "Loading", "AppFullscreen"],
     },
 
     // animations: 'all', // --- includes all animations
@@ -107,29 +102,29 @@ module.exports = configure(function (ctx) {
       // manualPostHydrationTrigger: true,
 
       prodPort: 3000, // The default port that the production server should use
-                      // (gets superseded if process.env.PORT is specified at runtime)
+      // (gets superseded if process.env.PORT is specified at runtime)
 
       maxAge: 1000 * 60 * 60 * 24 * 30,
-        // Tell browser when a file from the server should expire from cache (in ms)
+      // Tell browser when a file from the server should expire from cache (in ms)
 
-      chainWebpackWebserver (/* chain */) {
+      chainWebpackWebserver(/* chain */) {
         //
       },
 
       middlewares: [
-        ctx.prod ? 'compression' : '',
-        'render' // keep this as last one
-      ]
+        ctx.prod ? "compression" : "",
+        "render", // keep this as last one
+      ],
     },
 
     // https://v2.quasar.dev/quasar-cli/developing-pwa/configuring-pwa
     pwa: {
-      workboxPluginMode: 'GenerateSW', // 'GenerateSW' or 'InjectManifest'
+      workboxPluginMode: "GenerateSW", // 'GenerateSW' or 'InjectManifest'
       workboxOptions: {}, // only for GenerateSW
 
       // for the custom service worker ONLY (/src-pwa/custom-service-worker.[js|ts])
       // if using workbox in InjectManifest mode
-      chainWebpackCustomSW (/* chain */) {
+      chainWebpackCustomSW(/* chain */) {
         //
       },
 
@@ -137,38 +132,38 @@ module.exports = configure(function (ctx) {
         name: `Quasar App`,
         short_name: `Quasar App`,
         description: `A Quasar Framework app`,
-        display: 'standalone',
-        orientation: 'portrait',
-        background_color: '#ffffff',
-        theme_color: '#027be3',
+        display: "standalone",
+        orientation: "portrait",
+        background_color: "#ffffff",
+        theme_color: "#027be3",
         icons: [
           {
-            src: 'icons/icon-128x128.png',
-            sizes: '128x128',
-            type: 'image/png'
+            src: "icons/icon-128x128.png",
+            sizes: "128x128",
+            type: "image/png",
           },
           {
-            src: 'icons/icon-192x192.png',
-            sizes: '192x192',
-            type: 'image/png'
+            src: "icons/icon-192x192.png",
+            sizes: "192x192",
+            type: "image/png",
           },
           {
-            src: 'icons/icon-256x256.png',
-            sizes: '256x256',
-            type: 'image/png'
+            src: "icons/icon-256x256.png",
+            sizes: "256x256",
+            type: "image/png",
           },
           {
-            src: 'icons/icon-384x384.png',
-            sizes: '384x384',
-            type: 'image/png'
+            src: "icons/icon-384x384.png",
+            sizes: "384x384",
+            type: "image/png",
           },
           {
-            src: 'icons/icon-512x512.png',
-            sizes: '512x512',
-            type: 'image/png'
-          }
-        ]
-      }
+            src: "icons/icon-512x512.png",
+            sizes: "512x512",
+            type: "image/png",
+          },
+        ],
+      },
     },
 
     // Full list of options: https://v2.quasar.dev/quasar-cli/developing-cordova-apps/configuring-cordova
@@ -178,22 +173,20 @@ module.exports = configure(function (ctx) {
 
     // Full list of options: https://v2.quasar.dev/quasar-cli/developing-capacitor-apps/configuring-capacitor
     capacitor: {
-      hideSplashscreen: true
+      hideSplashscreen: true,
     },
 
     // Full list of options: https://v2.quasar.dev/quasar-cli/developing-electron-apps/configuring-electron
     electron: {
-      bundler: 'packager', // 'packager' or 'builder'
+      bundler: "packager", // 'packager' or 'builder'
 
       packager: {
         // https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#options
-
         // OS X / Mac App Store
         // appBundleId: '',
         // appCategoryType: '',
         // osxSign: '',
         // protocol: 'myapp://path',
-
         // Windows only
         // win32metadata: { ... }
       },
@@ -201,20 +194,20 @@ module.exports = configure(function (ctx) {
       builder: {
         // https://www.electron.build/configuration/configuration
 
-        appId: 'media_player_web'
+        appId: "media_player_web",
       },
 
       // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain
-      chainWebpack (/* chain */) {
+      chainWebpack(/* chain */) {
         // do something with the Electron main process Webpack cfg
         // extendWebpackMain also available besides this chainWebpackMain
       },
 
       // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain
-      chainWebpackPreload (/* chain */) {
+      chainWebpackPreload(/* chain */) {
         // do something with the Electron main process Webpack cfg
         // extendWebpackPreload also available besides this chainWebpackPreload
       },
-    }
-  }
+    },
+  };
 });
diff --git a/src/App.vue b/src/App.vue
index 66a25a4..b8d1071 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,15 +3,19 @@
   <router-view />
 </template>
 <script lang="ts">
-import { defineComponent } from 'vue';
-import { useI18n } from 'vue-i18n';
+import { defineComponent } from "vue";
+import { useI18n } from "vue-i18n";
+import EventBus from "src/common/EventBus";
 
 export default defineComponent({
-  name: 'App',
+  name: "App",
 
   setup() {
     const $t = useI18n();
-    document.title = $t.t('title');
+    document.title = $t.t("title");
+
+    window.onresize = (evt: any) =>
+      EventBus.getInstance().emit("windowResize", evt);
     return {};
   },
 });
diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts
index a943ad1..2665f6f 100644
--- a/src/common/ClientConnection.ts
+++ b/src/common/ClientConnection.ts
@@ -144,11 +144,10 @@ export default class ClientConnection {
     }
   }
 
-  public async doRpc(reuqest: any | Protocol.PacketEntity) {
+  public async doRpc<_RequestType extends Protocol.PacketEntity, _ResponseType>(
+    RequestType: new () => _RequestType
+  ): Promise<_ResponseType | null> {
     return new Promise((resolve, reject) => {
-      if (!reuqest) {
-        reject();
-      }
       const rpc_id = ++this._rpc_id_counter;
       if (this.rpc_map.has(rpc_id)) {
         const f = this.rpc_map.get(rpc_id);
@@ -157,8 +156,9 @@ export default class ClientConnection {
           this.rpc_map.delete(rpc_id);
         }
       }
-      reuqest.rpc_id = rpc_id;
-      this.ws?.send(JSON.stringify(reuqest));
+      let request: _RequestType = new RequestType();
+      request.rpc_id = rpc_id;
+      this.ws?.send(JSON.stringify(request));
       this.rpc_map.set(
         rpc_id,
         (is_fail: boolean, packet: Protocol.Commands, data: string) => {
@@ -166,9 +166,7 @@ export default class ClientConnection {
             reject();
           } else {
             try {
-              const response = JSON.parse(
-                data
-              ) as Protocol.GetApplicationConfigResponseEntity;
+              const response = JSON.parse(data) as _ResponseType;
               if (response) {
                 resolve(response);
               } else {
@@ -186,49 +184,33 @@ export default class ClientConnection {
   }
 
   public async getSignalSources() {
-    return new Promise((resolve, reject) => {
-      const rpc_id = ++this._rpc_id_counter;
-      if (this.rpc_map.has(rpc_id)) {
-        const f = this.rpc_map.get(rpc_id);
-        if (f && typeof f == "function") {
-          f(true, new Protocol.Commands(), "");
-          this.rpc_map.delete(rpc_id);
-        }
-      }
-      this.ws?.send(
-        JSON.stringify(new Protocol.GetSignalSourcesRequest(rpc_id))
-      );
-      this.rpc_map.set(
-        rpc_id,
-        (is_fail: boolean, packet: Protocol.Commands, data: string) => {
-          if (is_fail) {
-            reject();
-          } else {
-            try {
-              const response = JSON.parse(
-                data
-              ) as Protocol.GetSignalSourcesResponse;
-              if (response) {
-                resolve(response);
-              } else {
-                reject();
-                console.log("reject");
-              }
-            } catch {
-              reject();
-              console.log("reject");
-            }
-          }
-        }
-      );
-    });
+    try {
+      return await this.doRpc<
+        Protocol.GetSignalSourcesRequest,
+        Protocol.GetSignalSourcesResponse
+      >(Protocol.GetSignalSourcesRequest);
+    } catch (e) {
+      console.error(e);
+    }
   }
 
   public async getApplicationSettins() {
     try {
-      return (await this.doRpc(
-        new Protocol.GetApplicationConfigRequestEntity()
-      )) as Protocol.GetApplicationConfigResponseEntity;
+      return await this.doRpc<
+        Protocol.GetApplicationConfigRequestEntity,
+        Protocol.GetApplicationConfigResponseEntity
+      >(Protocol.GetApplicationConfigRequestEntity);
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  public async getWindows() {
+    try {
+      return await this.doRpc<
+        Protocol.GetWindowsRequestEntity,
+        Protocol.GetWindowsResponseEntity
+      >(Protocol.GetWindowsRequestEntity);
     } catch (e) {
       console.error(e);
     }
diff --git a/src/common/EventBus.ts b/src/common/EventBus.ts
new file mode 100644
index 0000000..0435e52
--- /dev/null
+++ b/src/common/EventBus.ts
@@ -0,0 +1,12 @@
+import EventEmitter from "events";
+
+export default class EventBus extends EventEmitter {
+  private static _instance: EventBus | null = null;
+
+  public static getInstance() {
+    if (!EventBus._instance) {
+      EventBus._instance = new EventBus();
+    }
+    return EventBus._instance;
+  }
+}
diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts
index 05ae3e9..2d26c21 100644
--- a/src/entities/WSProtocol.ts
+++ b/src/entities/WSProtocol.ts
@@ -1,5 +1,6 @@
 import { SignalSourceEntity } from "./SignalSourceEntity";
 import ApplicationConfigEntity from "./ApplicationConfigEntity";
+import MultimediaWindowEntity from "./MultimediaWindowEntity";
 
 export namespace Protocol {
   export class Commands {
@@ -139,4 +140,23 @@ export namespace Protocol {
       this.command = Commands.kRpcGetApplicationConfig;
     }
   }
+
+  export class GetWindowsRequestEntity extends PacketEntity {
+    timestamp: number = new Date().getMilliseconds();
+
+    constructor(rpcid?: number) {
+      super();
+      this.rpc_id = rpcid ?? 0;
+      this.command = Commands.kRpcGetWindows;
+    }
+  }
+
+  export class GetWindowsResponseEntity extends PacketEntity {
+    windows: MultimediaWindowEntity[] = [];
+
+    constructor() {
+      super();
+      this.command = Commands.kRpcGetWindows;
+    }
+  }
 }
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index da19788..1ff314c 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -2,21 +2,25 @@
 // so you can safely delete all default props below
 
 export default {
-  title: 'MediaPlayerWebAPP',
-  failed: '失败',
-  success: '成功',
-  login: '登录',
-  'user name': '用户名',
-  password: '密码',
-  'please input user name': '请输入用户',
-  'please input password': '请输入密码',
-  'login fail!': '登陆失败',
-  'Please type something': '请输入内容',
+  title: "MediaPlayerWebAPP",
+  failed: "失败",
+  success: "成功",
+  login: "登录",
+  "user name": "用户名",
+  password: "密码",
+  "please input user name": "请输入用户",
+  "please input password": "请输入密码",
+  "login fail!": "登陆失败",
+  "Please type something": "请输入内容",
 
-  'grid setting': '宫格设置',
-  'background image': '底图设置',
-  'data import': '数据导入',
-  'data export': '数据导出',
+  "grid setting": "宫格设置",
+  "background image": "底图设置",
+  "data import": "数据导入",
+  "data export": "数据导出",
 
-  root: '根节点',
+  root: "根节点",
+
+  "close all windwos": "关闭所有窗口",
+  "close this window": "关闭当前窗口",
+  "close other windows": "关闭其它窗口",
 };
diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue
index ed24423..7be734b 100644
--- a/src/pages/TopToolBar.vue
+++ b/src/pages/TopToolBar.vue
@@ -7,6 +7,7 @@
         icon="img:icons/favicon-32x32.png"
         label="电视机拼接盒"
         class="q-mr-sm"
+        @click="test"
       />
       <q-separator vertical inset />
       <q-btn
@@ -60,15 +61,22 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent } from "vue";
+import { useStore } from "src/store";
 
 export default defineComponent({
-  name: 'PageTopToolBar',
+  name: "PageTopToolBar",
 
   components: {},
 
   setup() {
-    return {};
+    let $store = useStore();
+
+    return {
+      test() {
+        $store.commit("setWallCol", 2);
+      },
+    };
   },
 });
 </script>
diff --git a/src/pages/WallPage.vue b/src/pages/WallPage.vue
index 48b692f..1722445 100644
--- a/src/pages/WallPage.vue
+++ b/src/pages/WallPage.vue
@@ -18,47 +18,69 @@
         </q-item>
       </q-list>
     </q-popup-proxy>
-    <div
-      v-for="row in wall_rows"
-      :key="row"
-      class="row"
-      :style="{
-        height: item_height + 'px',
-      }"
-    >
+    <div id="windows" style="position: absolute">
       <div
-        :ref="'item' + (row - 1) * wall_cols * col"
-        v-for="col in wall_cols"
-        :key="col"
-        class="col wall_item"
+        :ref="'window_' + index"
+        v-for="(item, index) in windows"
+        :key="index"
+        class="window"
+        :style="{
+          top: item.y / wall_height_scaler + 'px',
+          left: item.x / wall_width_scaler + 'px',
+          width: item.width / wall_width_scaler + 'px',
+          height: item.height / wall_height_scaler + 'px',
+        }"
+      >
+        {{ wall_height_scaler }}
+        {{ wall_width_scaler }}
+      </div>
+    </div>
+    <div ref="wall_grids">
+      <div
+        v-for="row in wall_rows"
+        :key="row"
+        class="row"
         :style="{
-          width: item_witdh + 'px',
           height: item_height + 'px',
         }"
       >
-        <q-popup-proxy context-menu no-parent-event>
-          <q-popup-proxy context-menu />
-          <q-list>
-            <q-item clickable v-close-popup>
-              <q-item-section avatar>
-                <q-icon name="close" color="red" />
-              </q-item-section>
-              <q-item-section> {{ $t("close this windwo") }} </q-item-section>
-            </q-item>
-            <q-item clickable v-close-popup>
-              <q-item-section avatar>
-                <q-icon name="close" color="red" />
-              </q-item-section>
-              <q-item-section> {{ $t("close other windwos") }} </q-item-section>
-            </q-item>
-            <q-item clickable v-close-popup>
-              <q-item-section avatar>
-                <q-icon name="close" color="red" />
-              </q-item-section>
-              <q-item-section> {{ $t("close all windwos") }} </q-item-section>
-            </q-item>
-          </q-list>
-        </q-popup-proxy>
+        <div
+          :ref="'item' + (row - 1) * wall_cols * col"
+          v-for="col in wall_cols"
+          :key="col"
+          class="col wall_item"
+          :style="{
+            width: item_witdh + 'px',
+            height: item_height + 'px',
+          }"
+          @resize="(evt) => loga(evt)"
+        >
+          <q-popup-proxy context-menu no-parent-event>
+            <q-popup-proxy context-menu />
+            <q-list>
+              <q-item clickable v-close-popup>
+                <q-item-section avatar>
+                  <q-icon name="close" color="red" />
+                </q-item-section>
+                <q-item-section> {{ $t("close this windwo") }} </q-item-section>
+              </q-item>
+              <q-item clickable v-close-popup>
+                <q-item-section avatar>
+                  <q-icon name="close" color="red" />
+                </q-item-section>
+                <q-item-section>
+                  {{ $t("close other windwos") }}
+                </q-item-section>
+              </q-item>
+              <q-item clickable v-close-popup>
+                <q-item-section avatar>
+                  <q-icon name="close" color="red" />
+                </q-item-section>
+                <q-item-section> {{ $t("close all windwos") }} </q-item-section>
+              </q-item>
+            </q-list>
+          </q-popup-proxy>
+        </div>
       </div>
     </div>
   </div>
@@ -72,16 +94,22 @@
 .wall_item {
   border: 1px solid black;
 }
+
+.window {
+  border: 1px solid rebeccapurple;
+  position: absolute;
+}
 </style>
 
 <script lang="ts">
 import GlobalData from "src/common/GlobalData";
-import { defineComponent, ref, Ref, computed } from "vue";
+import { defineComponent, ref, Ref, computed, watch, onMounted } from "vue";
 import { Common } from "src/common/Common";
 import { Protocol } from "src/entities/WSProtocol";
 
 import { useI18n } from "vue-i18n";
 import { useStore } from "src/store";
+import EventBus from "src/common/EventBus";
 
 interface _OptionsType {
   $t: any;
@@ -131,6 +159,15 @@ const _getApplicationConfig = async (options: _OptionsType) => {
   }
 };
 
+const _getWindows = async (options: _OptionsType) => {
+  const global_data = GlobalData.getInstance();
+  let windows = (await global_data.getCurrentClient()?.getWindows())?.windows;
+  let $store = options.$store;
+  if (windows && $store) {
+    $store.commit("setWindows", windows);
+  }
+};
+
 const _initialize = async (options: _OptionsType) => {
   const global_data = GlobalData.getInstance();
   let client = global_data.getCurrentClient();
@@ -139,7 +176,9 @@ const _initialize = async (options: _OptionsType) => {
       await Common.waitFor(100);
     }
 
-    _initSignalSourceTree(options);
+    _initSignalSourceTree(options).then(() => {
+      _getWindows(options);
+    });
     _getApplicationConfig(options);
   }
 };
@@ -157,6 +196,11 @@ export default defineComponent({
       $store,
     });
 
+    const windows = computed({
+      get: () => $store.state.windows,
+      set: (val) => $store.commit("setWindows", val),
+    });
+
     const wall_rows = computed({
       get: () => $store.state.wall_row,
       set: (val) => $store.commit("setWallRow", val),
@@ -195,13 +239,40 @@ export default defineComponent({
       set: (val) => $store.commit("setWallCol", val),
     });
 
+    const wall_width_scaler = ref(0);
+    const wall_height_scaler = ref(0);
+
+    const calcWallVWScaler = () => {
+      if (wall.value && wall.value.parentElement) {
+        wall_height_scaler.value =
+          $store.state.device_screen_height /
+          (item_height.value * wall_rows.value);
+        wall_width_scaler.value =
+          $store.state.device_screen_width /
+          wall.value.parentElement.offsetWidth;
+
+        wall_height_scaler.value += 0.1;
+        wall_width_scaler.value += 0.05;
+      }
+    };
+
+    EventBus.getInstance().on("windowResize", () => {
+      calcWallVWScaler();
+    });
+
+    onMounted(() => {
+      calcWallVWScaler();
+    });
+
     return {
+      windows,
       wall,
       wall_rows,
       wall_cols,
       item_witdh,
       item_height,
-
+      wall_width_scaler,
+      wall_height_scaler,
       loga(a: any) {
         console.log(a);
       },
diff --git a/src/store/index.ts b/src/store/index.ts
index 0b97582..536a4dd 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -62,6 +62,12 @@ export default store(function (/* { ssrContext } */) {
     },
 
     mutations: {
+      setWindows(state: StateInterface, playload?: any) {
+        let windows = playload as MultimediaWindowEntity[];
+        if (windows) {
+          state.windows = windows;
+        }
+      },
       clearWindows(state: StateInterface, playload?: any) {
         state.windows = [];
       },