From 9ab5bd54fadd8fc9c542b48c99a117a4e182669b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 14 十月 2021 16:37:56 +0800
Subject: [PATCH] 智能空开能源界面数据更新

---
 HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs |   61 ++++++++++++++++++------------
 1 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index c94975f..af394c5 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
@@ -19,14 +19,14 @@
                     return;
                 if (updateTemp.spk == bodyView.function.spk && updateTemp.sid == bodyView.function.sid)
                 {
-                    var percentString = updateTemp.GetAttrState(FunctionAttributeKey.Percent);
-                    if (percentString != null)
-                    {
-                        int percent = 0;
-                        int.TryParse(percentString, out percent);
-                        bodyView.btnCurtainOpen.IsSelected = percent > 0;
-                        bodyView.btnCurtainClose.IsSelected = percent == 0;
-                    }
+                    //var percentString = updateTemp.GetAttrState(FunctionAttributeKey.Percent);
+                    //if (percentString != null)
+                    //{
+                    //    int percent = 0;
+                    //    int.TryParse(percentString, out percent);
+                    //    bodyView.btnCurtainOpen.IsSelected = percent > 0;
+                    //    bodyView.btnCurtainClose.IsSelected = percent == 0;
+                    //}
                     try
                     {
                         if (!bodyView.onCurtainAnimation)
@@ -53,6 +53,7 @@
             //杩愯鏂瑰悜 鎵撳紑锛堝姞杩涘害锛夛細鍏抽棴锛堝噺杩涘害锛�
             bool runningDirection = progress > curtainSeekBar.Progress;
             int curBarProgress = curtainSeekBar.Progress;
+            btnProgress.Text = progress + "%";
             new System.Threading.Thread(() =>
             {
                 try
@@ -136,13 +137,15 @@
         {
             btnCurtainClose.MouseUpEventHandler = (sender, e) =>
             {
-                //new System.Threading.Thread(() => {
-                //    System.Threading.Thread.Sleep(2000);
-                //    Application.RunOnMainThread(() => {
-                //        btnCurtainClose.IsSelected = false;
-                //    });
-                //})
-                //{ IsBackground = true }.Start();
+                new System.Threading.Thread(() =>
+                {
+                    System.Threading.Thread.Sleep(2000);
+                    Application.RunOnMainThread(() =>
+                    {
+                        btnCurtainClose.IsSelected = false;
+                    });
+                })
+                { IsBackground = true }.Start();
                 function.trait_on_off.curValue = "off";
                 function.SetAttrState(FunctionAttributeKey.Percent, 0);
                 System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
@@ -171,13 +174,15 @@
 
             btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
             {
-                //new System.Threading.Thread(() => {
-                //    System.Threading.Thread.Sleep(2000);
-                //    Application.RunOnMainThread(() => {
-                //        btnCurtainOpen.IsSelected = false;
-                //    });
-                //})
-                //{ IsBackground = true }.Start();
+                new System.Threading.Thread(() =>
+                {
+                    System.Threading.Thread.Sleep(2000);
+                    Application.RunOnMainThread(() =>
+                    {
+                        btnCurtainOpen.IsSelected = false;
+                    });
+                })
+                { IsBackground = true }.Start();
                 function.trait_on_off.curValue = "on";
                 function.SetAttrState(FunctionAttributeKey.Percent, 100);
                 System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
@@ -190,16 +195,20 @@
             btnCurtainStop.MouseDownEventHandler = (sender, e) =>
             {
                 btnCurtainStop.IsSelected = true;
+                btnCurtainClose.IsSelected = false;
+                btnCurtainOpen.IsSelected = false;
             };
             btnCurtainOpen.MouseDownEventHandler = (sender, e) =>
             {
                 btnCurtainOpen.IsSelected = true;
                 btnCurtainClose.IsSelected = false;
+                btnCurtainStop.IsSelected = false;
             };
             btnCurtainClose.MouseDownEventHandler = (sender, e) =>
             {
                 btnCurtainClose.IsSelected = true;
                 btnCurtainOpen.IsSelected = false;
+                btnCurtainStop.IsSelected = false;
             };
 
             //btnMinusSignIcon.MouseUpEventHandler = (sender, e) =>
@@ -220,8 +229,9 @@
             //    DriverLayer.Control.Ins.SendWriteCommand(function, d);
             //};
 
-            //curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
-            //{
+            curtainSeekBar.OnProgressChangedEvent = (sender, e) =>
+            {
+                btnProgress.Text = curtainSeekBar.Progress + "%";
             //    controlBar.Progress = curtainSeekBar.Progress;
             //    new System.Threading.Thread(() =>
             //    {
@@ -235,9 +245,10 @@
             //        }
             //    })
             //    { IsBackground = true }.Start();
-            //};
+            };
             curtainSeekBar.OnStopTrackingTouchEvent = (sender, e) =>
             {
+            btnProgress.Text = curtainSeekBar.Progress + "%";
                 //controlBar.Progress = curtainSeekBar.Progress;
                 new System.Threading.Thread(() =>
                 {

--
Gitblit v1.8.0