From bb6ad792b598927a5459a5fb6f6c27fb1aa9e94e Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 17 十二月 2020 14:06:36 +0800
Subject: [PATCH] 20201217-1

---
 HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index 3b326f5..428a93c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
@@ -19,9 +19,9 @@
                 {
                     if (uCurtain.trait_on_off.curValue.ToString() == "stop")
                     {
-                        bodyView.btnCurtainOpen.IsSelected = true;
+                        bodyView.btnCurtainOpen.IsSelected = false;
                         bodyView.btnCurtainClose.IsSelected = false;
-                        bodyView.btnCurtainStop.IsSelected = false;
+                        bodyView.btnCurtainStop.IsSelected = true;
                     }
                     else if (uCurtain.trait_on_off.curValue.ToString() == "on")
                     {
@@ -58,7 +58,7 @@
             {
                 btnFunctionName.Text = btnFunctionName_Out.Text = curtain.name;
                 btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = curtain.GetRoomListName();
-                curtain.SaveFunctionData(true);
+                //curtain.SaveFunctionData(true);
             };
         }
         /// <summary>
@@ -90,17 +90,20 @@
                 DriverLayer.Control.Ins.SendWriteCommand(curtain, d);
             };
 
-            btnCurtainStop.MouseDownEventHandler = (sender, e) =>
+            //btnCurtainStop.MouseDownEventHandler = (sender, e) =>
+            //{
+            //    btnCurtainStop.IsSelected = true;
+            //    btnCurtainClose.IsSelected = false;
+            //    btnCurtainOpen.IsSelected = false;
+            //};
+            btnCurtainStop.MouseUpEventHandler = (sender, e) =>
             {
+                //btnCurtainOpen.IsSelected = true;
+                //btnCurtainClose.IsSelected = false;
+                //btnCurtainStop.IsSelected = false;
                 btnCurtainStop.IsSelected = true;
                 btnCurtainClose.IsSelected = false;
                 btnCurtainOpen.IsSelected = false;
-            };
-            btnCurtainStop.MouseUpEventHandler = (sender, e) =>
-            {
-                btnCurtainOpen.IsSelected = true;
-                btnCurtainClose.IsSelected = false;
-                btnCurtainStop.IsSelected = false;
                 curtain.trait_on_off.curValue = "stop";
                 System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                 d.Add("on_off", curtain.trait_on_off.curValue.ToString());

--
Gitblit v1.8.0