From eace7a4d75c0bea498253f524906c6ce326b80f2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 14 三月 2023 11:33:03 +0800
Subject: [PATCH] 2023年03月14日11:32:57

---
 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs |   41 +++++++++++++++++++++++------------------
 1 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
index 1a58e4d..e4c70ef 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
@@ -71,7 +71,7 @@
         /// <summary>
         /// 琛ㄧず鏉ヨ嚜閭d釜鐣岄潰
         /// </summary>
-        private Comerom Comerom;
+        private UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom Comerom;
         /// <summary>
         /// 鍒犻櫎璁惧鍚庨渶瑕佹洿鏂扮晫闈㈢殑鍥炶皟
         /// </summary>
@@ -85,7 +85,7 @@
         /// <param name="function">璁惧</param>
         /// <param name="btnDeviceName">涓婁竴绾х晫闈㈢殑璁惧鍚嶅瓧鎺т欢</param>
         /// <param name="btnRoomName">涓婁竴绾х晫闈㈢殑鎴块棿鍚嶅瓧鎺т欢</param> 
-        public VideoDoorLockPage(Function function, Button btnDeviceName, Button btnRoomName, Comerom comerom, Action action)
+        public VideoDoorLockPage(Function function, Button btnDeviceName, Button btnRoomName, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom comerom, Action action)
         {
             this.device = function;
             this.btnDeviceName = btnDeviceName;
@@ -277,6 +277,8 @@
             this.topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
             {
                 RemoveFromParent();
+
+              
             };
             //璁剧疆
             this.topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
@@ -339,23 +341,34 @@
         /// </summary>
         private void ReadData()
         {
+            Loading loading = new Loading();
+            this.AddChidren(loading);
+            loading.Start();
             new System.Threading.Thread(() =>
             {
-                HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.Send.Currnet.GetCellValue(this.device, (value) =>
+                try
                 {
+                    var videoDoorLockInfo = UI2.FuntionControlView.VideoDoorLock.VideDoorLockSend.Current.GetVideoDoorLockState(this.device);
+                    var cellInfo =UI2.FuntionControlView.VideoDoorLock.VideDoorLockSend.Current.GetCellValue(this.device);
                     Application.RunOnMainThread(() =>
                     {
                         //this.cellDiyArcSeekBar.Progress = i;
                         //鏇存柊鐢甸噺鍊�
-                        this.btnCell.Text = value + "%";
+                        this.btnCell.Text = cellInfo.remain + "%";
+                        this.btnDoorLockIcon.IsSelected = videoDoorLockInfo.doorStatus == "open";
                     });
-
-                });
-
+                }
+                catch { }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        loading.Hide();
+                    });
+                }
             })
-            { IsBackground = true }.Start();
+            { IsBackground = true }.Start() ;
         }
-
     }
     /// <summary>
     /// 鑷繁寮勪竴涓狥rameLayout
@@ -479,14 +492,6 @@
 
 
     }
-    /// <summary>
-    /// 琛ㄧず鏉ヨ嚜閭d釜鐣岄潰
-    /// </summary>
-    public enum Comerom
-    {
-        function,//鍔熻兘
-        collect,//鏀惰棌
-        room,//鎴块棿
-    }
+   
 
 }

--
Gitblit v1.8.0