From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 29 八月 2023 09:22:38 +0800
Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc

---
 HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs |   59 ++++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
index 4425f01..b6070f9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
@@ -3,6 +3,7 @@
 using HDL_ON.UI.Music;
 using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
 using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
+using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
 using Shared;
 using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
 namespace HDL_ON.UI.UI2.FuntionControlView.Aks
@@ -59,36 +60,39 @@
 
 
             //鍔熻兘閿帶鍒�
-            cornerTopFram.selectKeyAction += (value) =>
+            cornerTopFram.selectKeyAction += (keypadEntity) =>
             {
-                Console.WriteLine("1");
+                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
             };
 
             //鑿滃崟涓婃寜閿�
-            menuFram.SetTopClickListener((b) =>
+            menuFram.SetTopClickListener((keypadEntity) =>
             {
-
-                Console.WriteLine("5");
+                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
             });
             //鑿滃崟涓嬫寜閿�
-            menuFram.SetBottomClickListener((b) =>
+            menuFram.SetBottomClickListener((keypadEntity) =>
             {
-                Console.WriteLine("6");
+
+                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
             });
             //鑿滃崟宸︽寜閿�
-            menuFram.SetLeftClickListener((b) =>
+            menuFram.SetLeftClickListener((keypadEntity) =>
             {
-                Console.WriteLine("7");
+
+                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
             });
             //鑿滃崟鍙虫寜閿�
-            menuFram.SetRightClickListener((b) =>
+            menuFram.SetRightClickListener((keypadEntity) =>
             {
-                Console.WriteLine("8");
+
+                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
             });
             //鑿滃崟ok鎸夐敭
-            menuFram.SetOkClickListener((b) =>
+            menuFram.SetOkClickListener((keypadEntity) =>
             {
-                Console.WriteLine("9");
+
+                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
             });
             //鏃跺簭鍣�
             typeMultiFramLayout.SetLeftFlClickListener((f) =>
@@ -102,12 +106,11 @@
             //璁惧鍒囨崲
             typeMultiFramLayout.SetRightFlClickListener((f) =>
             {
-                Console.WriteLine("4");
                 action?.Invoke(IntType.Projector);
             });
 
         }
-
+        
         private void InitUI()
         {
             this.BackgroundColor = MusicColor.ViewColor;
@@ -150,5 +153,31 @@
 
             this.AdjustRealHeight(16);
         }
+
+        /// <summary>
+        /// 鎸夐敭鎺у埗
+        /// </summary>
+        /// <param name="keypad"><鎸夐敭鏍囪瘑/param>
+        /// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
+        private void KeyControl(string keypad, string keyName)
+        {
+            //CommonMethod.Current.Loading.Start();
+            CommonMethod.Current.SunThread(() =>
+            {
+                try
+                {
+                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName);
+                }
+                catch { }
+                finally
+                {
+                    CommonMethod.Current.MainThread(() =>
+                    {
+                        //CommonMethod.Current.Loading.Hide();
+                    });
+                }
+            });
+
+        }
     }
 }

--
Gitblit v1.8.0