From 1f5fdd892e8efc9f1babe1ace9d810803edef396 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 11:29:45 +0800
Subject: [PATCH] 2021-08-27 11:29:39

---
 HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs |   52 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index c94975f..95a00e3 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)
@@ -136,13 +136,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 +173,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 +194,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) =>

--
Gitblit v1.8.0