From f097afcf1f58422be5dad8b7868a1a6671ce6509 Mon Sep 17 00:00:00 2001
From: fangxiang <fangxiang@cloudview.work>
Date: Wed, 22 Jun 2022 17:51:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=9A=E8=BF=87=E5=8F=B3?=
 =?UTF-8?q?=E9=94=AE=E7=AA=97=E5=8F=A3=E6=B7=BB=E5=8A=A0=E8=BD=AE=E8=AF=A2?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=86=8D=E6=AC=A1=E5=8F=B3=E9=94=AE=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9=E8=BD=AE=E8=AF=A2=E6=97=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9A=84BUG=20=E8=BD=AE=E8=AF=A2=E3=80=81=E9=A2=84?=
 =?UTF-8?q?=E6=A1=88=E5=AF=B9=E8=AF=9D=E6=A1=86=E8=BE=93=E5=85=A5=E5=BB=B6?=
 =?UTF-8?q?=E6=97=B6=E6=97=B6=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                            |  2 +-
 src/common/RemoteDataExangeProcesser.ts | 32 +++++++++++++++++--
 src/components/PlanDialog.vue           | 22 +++++++++++--
 src/components/PollingSettingDialog.vue | 22 +++++++++++--
 src/entities/WSProtocol.ts              | 18 +++++++++--
 src/i18n/zh-CN/index.ts                 |  1 +
 src/pages/WallPage.vue                  | 42 ++++++++++---------------
 7 files changed, 103 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index e1ea03a..96661b3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "media_player_client",
-  "version": "1.4.15",
+  "version": "1.4.16",
   "description": "A Quasar Framework app",
   "productName": "MediaPlayerClient",
   "author": "fangxiang <fangxiang@cloudview.work>",
diff --git a/src/common/RemoteDataExangeProcesser.ts b/src/common/RemoteDataExangeProcesser.ts
index ebbd682..754e15c 100644
--- a/src/common/RemoteDataExangeProcesser.ts
+++ b/src/common/RemoteDataExangeProcesser.ts
@@ -574,13 +574,39 @@ export default class RemoteDataExangeProcesser {
             }
           }
           break;
-        case Protocol.Commands.kSetDeviceAttribute:
+        case Protocol.Commands.kSetDeviceAttribute: {
+          const temp = JSON.parse(
+            notify.data
+          ) as Protocol.SetDeviceAttributeNotifyEntity;
+          if (temp) {
+            $store.commit("setDeviceAttribute", temp.attribute);
+          }
+        }
+        case Protocol.Commands.kWindowPropertyValueChanged:
           {
             const temp = JSON.parse(
               notify.data
-            ) as Protocol.SetDeviceAttributeNotifyEntity;
+            ) as Protocol.WindowPropertyValueChangeNotifyEntity;
             if (temp) {
-              $store.commit("setDeviceAttribute", temp.attribute);
+              const window = $store.state.windows.find(
+                (element) => element && element.window_id == temp.window_id
+              );
+              if (window) {
+                if (temp.name == "polling_uuid") {
+                  $store.commit("setWindowProperty", {
+                    window,
+                    property_name: temp.name,
+                    value: temp.value,
+                  });
+                } else {
+                  console.error(
+                    "kWindowPropertyValueChanged: name:" +
+                      temp.name +
+                      " .not support, value:" +
+                      temp.value
+                  );
+                }
+              }
             }
           }
           break;
diff --git a/src/components/PlanDialog.vue b/src/components/PlanDialog.vue
index 682509c..8766708 100644
--- a/src/components/PlanDialog.vue
+++ b/src/components/PlanDialog.vue
@@ -207,13 +207,31 @@
                       </div>
                       <div v-else-if="props.col.name == 'delay'">
                         {{ props.value }}{{ $t("s") }}
-                        <q-popup-edit v-model="props.row.delay">
+                        <q-popup-edit
+                          v-model="props.row.delay"
+                          :validate="
+                            (val) => !isNaN(parseInt(val)) && parseInt(val) > 9
+                          "
+                          auto-save
+                          v-slot="scope"
+                        >
                           <q-input
                             type="number"
-                            v-model="props.row.delay"
+                            v-model="scope.value"
                             :min="min_delay"
                             dense
                             autofocus
+                            :rules="[
+                              (val) =>
+                                (val != null &&
+                                  val != undefined &&
+                                  val.toString().length > 0) ||
+                                $t('Please type something'),
+                              (val) =>
+                                parseInt(val) >= 10 ||
+                                $t('number must be greater than or equal to ') +
+                                  '10',
+                            ]"
                           >
                             <template v-slot:append>
                               <span>{{ $t("s") }}</span>
diff --git a/src/components/PollingSettingDialog.vue b/src/components/PollingSettingDialog.vue
index 684fb45..d549299 100644
--- a/src/components/PollingSettingDialog.vue
+++ b/src/components/PollingSettingDialog.vue
@@ -139,13 +139,31 @@
                       </div>
                       <div v-else-if="props.col.name == 'delay'">
                         {{ props.value }}{{ $t("s") }}
-                        <q-popup-edit v-model="props.row.delay">
+                        <q-popup-edit
+                          v-model="props.row.delay"
+                          :validate="
+                            (val) => !isNaN(parseInt(val)) && parseInt(val) > 9
+                          "
+                          auto-save
+                          v-slot="scope"
+                        >
                           <q-input
+                            v-model="scope.value"
                             type="number"
-                            v-model="props.row.delay"
                             :min="min_delay"
                             dense
                             autofocus
+                            :rules="[
+                              (val) =>
+                                (val != null &&
+                                  val != undefined &&
+                                  val.toString().length > 0) ||
+                                $t('Please type something'),
+                              (val) =>
+                                parseInt(val) >= 10 ||
+                                $t('number must be greater than or equal to ') +
+                                  '10',
+                            ]"
                           >
                             <template v-slot:append>
                               <span>{{ $t("s") }}</span>
diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts
index 96fff2d..1d694e2 100644
--- a/src/entities/WSProtocol.ts
+++ b/src/entities/WSProtocol.ts
@@ -90,6 +90,10 @@ export namespace Protocol {
       return Commands.PROTOCOL_PREFIX + "WindowOtherStateChanged";
     }
 
+    public static get kWindowPropertyValueChanged() {
+      return Commands.PROTOCOL_PREFIX + "WindowPropertyValueChanged";
+    }
+
     public static get kTopWindow() {
       return Commands.PROTOCOL_PREFIX + "TopWindow";
     }
@@ -325,7 +329,6 @@ export namespace Protocol {
     public static get kPollingStateChanged() {
       return Commands.PROTOCOL_PREFIX + "PollingStateChanged";
     }
-
     public static get kDesktopResolutionChangedNotify() {
       return Commands.PROTOCOL_PREFIX + "DesktopResolutionChangedNotify";
     }
@@ -459,6 +462,7 @@ export namespace Protocol {
       Commands.kTopWindow,
       Commands.kLowerWindow,
       Commands.kWindowOtherStateChanged,
+      Commands.kWindowPropertyValueChanged,
       Commands.kRpcAddSignalSourceGroup,
       Commands.kRpcDeleteSignalSourceGroup,
       Commands.kRpcEditSignalSourceGroup,
@@ -1995,7 +1999,6 @@ export namespace Protocol {
   export class SetWindowPollingDataResponseEntity extends Protocol.PacketEntity {
     success = false;
     polling = false;
-    new_polling_uuid = "";
 
     constructor() {
       super();
@@ -2064,6 +2067,17 @@ export namespace Protocol {
     }
   }
 
+  export class WindowPropertyValueChangeNotifyEntity extends PacketEntity {
+    window_id = 0;
+    name = "";
+    value = "";
+
+    constructor() {
+      super();
+      this.command = Commands.kWindowPropertyValueChanged;
+    }
+  }
+
   export class DesktopDisconnectNotifyEntity extends PacketEntity {
     timestamp: number = 0;
 
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 3e7a568..a7a1039 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -585,4 +585,5 @@ export default {
   "load file error": "文件加载错误",
   "time format error": "时间格式错误",
   "input new file name": "输入新文件名",
+  "number must be greater than or equal to ": "数字必须大于等于 ",
 };
diff --git a/src/pages/WallPage.vue b/src/pages/WallPage.vue
index a5fa7c6..41af651 100644
--- a/src/pages/WallPage.vue
+++ b/src/pages/WallPage.vue
@@ -1055,8 +1055,6 @@ export default defineComponent({
           const polling = GlobalData.getInstance().pollings.find(
             (element) => element && element.uuid == window.polling_uuid
           );
-          console.log(GlobalData.getInstance().pollings);
-          console.log(window.polling_uuid);
           const signal_source = GlobalData.getInstance().signal_source.find(
             (element) =>
               element && element.uuid == window.signal_source_table_uuid
@@ -1072,30 +1070,22 @@ export default defineComponent({
                 const resposne = await GlobalData.getInstance()
                   .getCurrentClient()
                   ?.setWindowPollingData(window_id, name, datas);
-                if (resposne) {
-                  if (resposne.success) {
-                    $store.commit("setWindowProperty", {
-                      window,
-                      property_name: "polling_uuid",
-                      value: resposne.new_polling_uuid,
-                    });
-                    window.polling_uuid = resposne.new_polling_uuid;
-                    $q.notify({
-                      color: "positive",
-                      icon: "done",
-                      message: $t.t("set polling data") + $t.t("success") + "!",
-                      position: "top",
-                      timeout: 1500,
-                    });
-                  } else {
-                    $q.notify({
-                      color: "negative",
-                      icon: "warning",
-                      message: $t.t("set polling data") + $t.t("failed") + "!",
-                      position: "top",
-                      timeout: 1500,
-                    });
-                  }
+                if (resposne && resposne.success) {
+                  $q.notify({
+                    color: "positive",
+                    icon: "done",
+                    message: $t.t("set polling data") + $t.t("success") + "!",
+                    position: "top",
+                    timeout: 1500,
+                  });
+                } else {
+                  $q.notify({
+                    color: "negative",
+                    icon: "warning",
+                    message: $t.t("set polling data") + $t.t("failed") + "!",
+                    position: "top",
+                    timeout: 1500,
+                  });
                 }
               } catch (e) {
                 console.log(e);