From 2ea3d579ff3f00fe03973d22202b7589eb41339d Mon Sep 17 00:00:00 2001
From: fangxiang <fangxiang@cloudview.work>
Date: Mon, 12 Dec 2022 10:17:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE->=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E=E7=82=B9=E5=87=BB=E6=AC=A1=E6=95=B0=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?20.=20=E9=AD=94=E5=A2=99=E5=A2=9E=E5=8A=A0=E6=97=8B=E8=BD=AC?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/ClientConnection.ts         | 10 +++++++++
 src/components/SystemSettingDialog.vue | 10 +++------
 src/entities/MagicWallConfig.ts        |  4 ++--
 src/entities/RectF.ts                  | 22 ++++++++++++++++++-
 src/entities/WSProtocol.ts             | 30 ++++++++++++++++++++++++++
 5 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts
index ef3e41e..91e6af8 100644
--- a/src/common/ClientConnection.ts
+++ b/src/common/ClientConnection.ts
@@ -1253,6 +1253,16 @@ export default class ClientConnection {
     }
   }
 
+  public async testA() {
+    try {
+      return await this.doRpc<Protocol.RpcTestAResponseEntity>(
+        new Protocol.RpcTestARequestEntity()
+      );
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
   public async setHdmiInDecodeType(index: number, type: string) {
     try {
       return await this.doRpc<Protocol.SetHdmiInDecodeTypeResponseEntity>(
diff --git a/src/components/SystemSettingDialog.vue b/src/components/SystemSettingDialog.vue
index 07ad765..8a51d81 100644
--- a/src/components/SystemSettingDialog.vue
+++ b/src/components/SystemSettingDialog.vue
@@ -1166,9 +1166,7 @@
 
                     <div
                       v-if="
-                        (click_count >= target_click_count &&
-                          (click_count % target_click_count == 0 ||
-                            click_count % target_click_count == 1)) ||
+                        click_count >= target_click_count ||
                         $store.state.advanced_debug
                       "
                     >
@@ -1361,8 +1359,6 @@ import { EWeekDays } from "src/entities/EWeekDays";
 import SystenSettingAdvancedNetworkDialog from "src/components/SystenSettingAdvancedNetworkDialog.vue";
 import { AdvancedIpAddressEntity } from "src/entities/AdvancedIpAddressEntity";
 
-import { EDeviceAttribute } from "src/entities/EDeviceAttribute";
-
 import version from "../../package.json";
 
 import { Md5 } from "ts-md5";
@@ -1521,7 +1517,7 @@ export default defineComponent({
     const timing_tasks: Ref<TimingTaskEntity[]> = ref([]);
 
     let click_count = ref(0);
-    const target_click_count = ref(30);
+    const target_click_count = ref(20);
     let client_version = ref(version);
     let server_version = ref("unknow");
     let server_commit_hash = ref("unknow");
@@ -1990,7 +1986,7 @@ export default defineComponent({
               Cookies.remove("auto_login");
               SessionStorage.clear();
               try {
-                   $q.fullscreen.exit();
+                $q.fullscreen.exit();
               } catch {}
               window.location.reload();
             }
diff --git a/src/entities/MagicWallConfig.ts b/src/entities/MagicWallConfig.ts
index 5950e39..8917983 100644
--- a/src/entities/MagicWallConfig.ts
+++ b/src/entities/MagicWallConfig.ts
@@ -1,8 +1,8 @@
-import RectF from "./RectF";
+import RotatedRectF from "./RectF";
 
 export default class MagicWallConfig {
   magic_wall_enable = false;
   row = 0;
   col = 0;
-  windows: RectF[] = [];
+  windows: RotatedRectF[] = [];
 }
diff --git a/src/entities/RectF.ts b/src/entities/RectF.ts
index 09048f5..d84612e 100644
--- a/src/entities/RectF.ts
+++ b/src/entities/RectF.ts
@@ -2,13 +2,33 @@ export default class RectF {
   lt: PointF = new PointF(0, 0);
   w: number = 0;
   h: number = 0;
+
+  constructor(lt: PointF = new PointF(0, 0), h: number = 0, w: number = 0) {
+    this.lt = lt;
+    this.h = h;
+    this.w = w;
+  }
 }
 
 export class PointF {
-  constructor(x: number, y: number) {
+  constructor(x: number = 0, y: number = 0) {
     this.x = x;
     this.y = y;
   }
   x: number = 0;
   y: number = 0;
 }
+
+export class RotatedRectF extends RectF {
+  angle: number = 0;
+
+  constructor(
+    lt: PointF = new PointF(0, 0),
+    h: number = 0,
+    w: number = 0,
+    angle: number = 0
+  ) {
+    super(lt, h, w);
+    this.angle = angle;
+  }
+}
diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts
index f0b8f1a..db26a97 100644
--- a/src/entities/WSProtocol.ts
+++ b/src/entities/WSProtocol.ts
@@ -483,6 +483,10 @@ export namespace Protocol {
       return Commands.PROTOCOL_PREFIX + "RpcGetMagicWallConfig";
     }
 
+    public static get kRpcTestA() {
+      return Commands.PROTOCOL_PREFIX + "RpcTestA";
+    }
+
     static _all_commands = new Set([
       Commands.kUnKnowCommand,
       Commands.kSearchDevice,
@@ -601,6 +605,7 @@ export namespace Protocol {
       Commands.kSetHDMIRotation,
       Commands.kRpcGetMagicWallConfig,
       Commands.kRpcSetMagicWallConfig,
+      Commands.kRpcTestA,
     ]);
     public static get AllCommands() {
       return this._all_commands;
@@ -3088,4 +3093,29 @@ export namespace Protocol {
     config: MagicWallConfig = new MagicWallConfig();
     success = false;
   }
+
+  export class RpcTestARequestEntity extends PacketEntity {
+    constructor(rpc_id = 0) {
+      super();
+      super.command = Commands.kRpcTestA;
+      super.flag = PacketEntity.FLAG_REQUEST;
+      super.rpc_id = rpc_id;
+    }
+    timestamp = 0;
+  }
+
+  export class RpcTestAResponseEntity extends PacketEntity {
+    constructor() {
+      super();
+      super.flag = PacketEntity.FLAG_RESPONSE;
+    }
+    lt_t = 0;
+    lt_l = 0;
+    rt_t = 0;
+    rt_r = 0;
+    rb_b = 0;
+    rb_r = 0;
+    lb_b = 0;
+    lb_l = 0;
+  }
 }