From 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 九月 2020 15:22:09 +0800
Subject: [PATCH] 2020-09-01

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

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index 496c25f..3abb8c5 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
@@ -17,19 +17,19 @@
                     return;
                 if (uCurtain.functionType == bodyView.curtain.functionType && uCurtain.sid == bodyView.curtain.sid)
                 {
-                    if (uCurtain.on_off == "stop")
+                    if (uCurtain.trait_on_off.value.ToString() == "stop")
                     {
                         bodyView.btnCurtainOpen.IsSelected = true;
                         bodyView.btnCurtainClose.IsSelected = false;
                         bodyView.btnCurtainStop.IsSelected = false;
                     }
-                    else if (uCurtain.on_off == "on")
+                    else if (uCurtain.trait_on_off.value.ToString() == "on")
                     {
                         bodyView.btnCurtainOpen.IsSelected = true;
                         bodyView.btnCurtainClose.IsSelected = false;
                         bodyView.btnCurtainStop.IsSelected = false;
                     }
-                    else if (uCurtain.on_off == "off")
+                    else if (uCurtain.trait_on_off.value.ToString() == "off")
                     {
                         bodyView.btnCurtainOpen.IsSelected = false;
                         bodyView.btnCurtainClose.IsSelected = true;
@@ -66,7 +66,7 @@
         {
             btnCollection.MouseUpEventHandler += (sender, e) => {
                 btnCollection.IsSelected = curtain.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
-                DB_ResidenceData.residenceData.SaveResidenceData();
+                curtain.SaveFunctionData();
             };
         }
 
@@ -79,10 +79,10 @@
                 btnCurtainClose.IsSelected = true;
                 btnCurtainStop.IsSelected = false;
                 btnCurtainOpen.IsSelected = false;
-                curtain.on_off = "off";
+                curtain.trait_on_off.value = "off";
                 curtain.openLevel = 0;
                 System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
-                d.Add("on_off", curtain.on_off);
+                d.Add("on_off", curtain.trait_on_off.value.ToString());
                 Control.SendWriteCommand(curtain, d);
             };
 
@@ -95,9 +95,9 @@
                 btnCurtainOpen.IsSelected = true;
                 btnCurtainClose.IsSelected = false;
                 btnCurtainStop.IsSelected = false;
-                curtain.on_off = "stop";
+                curtain.trait_on_off.value = "stop";
                 System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
-                d.Add("on_off", curtain.on_off);
+                d.Add("on_off", curtain.trait_on_off.value.ToString());
                 Control.SendWriteCommand(curtain,d);
             };
 
@@ -105,10 +105,10 @@
                 btnCurtainOpen.IsSelected = true;
                 btnCurtainClose.IsSelected = false;
                 btnCurtainStop.IsSelected = false;
-                curtain.on_off = "on";
+                curtain.trait_on_off.value = "on";
                 curtain.openLevel = 100;
                 System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
-                d.Add("on_off", curtain.on_off);
+                d.Add("on_off", curtain.trait_on_off.value.ToString());
                 Control.SendWriteCommand(curtain, d);
             };
 

--
Gitblit v1.8.0