Revert "Merge branch 'tzy' into NewFilePath"

wxr

2020-12-17 1a13c963a5fb8cad92bf03667e411f46d6a6a843

 HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs

@@ -1,4 +1,5 @@
using System;
using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using Shared;

@@ -18,21 +19,21 @@
                }
                if (uCurtain.functionType == bodyView.curtain.functionType && uCurtain.sid == bodyView.curtain.sid)
                {
                    if (uCurtain.trait_on_off.value.ToString() == "stop")
                    if (uCurtain.trait_on_off.curValue.ToString() == "stop")
                    {
                        //bodyView.btnCurtainOpen.IsSelected = true;
                        //bodyView.btnCurtainClose.IsSelected = false;
                        //bodyView.btnCurtainStop.IsSelected = false;
                        //bodyView.btnCurtainBgIcon.IsSelected = true;
                    }
                    else if (uCurtain.trait_on_off.value.ToString() == "on")
                    else if (uCurtain.trait_on_off.curValue.ToString() == "on")
                    {
                        //bodyView.btnCurtainOpen.IsSelected = true;
                        //bodyView.btnCurtainClose.IsSelected = false;
                        //bodyView.btnCurtainStop.IsSelected = false;
                        bodyView.btnCurtainBgIcon.IsSelected = true;
                    }
                    else if (uCurtain.trait_on_off.value.ToString() == "off")
                    else if (uCurtain.trait_on_off.curValue.ToString() == "off")
                    {
                        //bodyView.btnCurtainOpen.IsSelected = false;
                        //bodyView.btnCurtainClose.IsSelected = true;
@@ -51,6 +52,7 @@
            actionRefresh = () => {
                btnFunctionName.Text = btnFunctionName_Out.Text = curtain.name;
                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = curtain.GetRoomListName();
                //curtain.SaveFunctionData(true);
            };
            UpdataState(curtain);
        }
@@ -60,8 +62,8 @@
        void LoadCollectionEvent()
        {
            btnCollection.MouseUpEventHandler += (sender, e) => {
                btnCollection.IsSelected = curtain.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
                curtain.SaveFunctionData();
                btnCollection.IsSelected = curtain.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
                curtain.SaveFunctionData(true);
            };
        }

@@ -74,11 +76,11 @@
                btnCurtainClose.IsSelected = false;
                //btnCurtainStop.IsSelected = false;
                //btnCurtainOpen.IsSelected = false;
                curtain.trait_on_off.value = "off";
                curtain.trait_on_off.curValue = "off";
                //Control.Send(CommandType_A.write,curtain);
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add("on_off", curtain.trait_on_off.value.ToString());
                Control.SendWriteCommand(curtain, d);
                d.Add("on_off", curtain.trait_on_off.curValue.ToString());
                Control.Ins.SendWriteCommand(curtain, d);
            };

            btnCurtainStop.MouseDownEventHandler = (sender, e) =>
@@ -98,22 +100,22 @@
                //btnCurtainOpen.IsSelected = false;
                //btnCurtainClose.IsSelected = false;
                btnCurtainStop.IsSelected = false;
                curtain.trait_on_off.value = "stop";
                curtain.trait_on_off.curValue = "stop";
                //Control.Send(CommandType_A.write, curtain);
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add("on_off", curtain.trait_on_off.value.ToString());
                Control.SendWriteCommand(curtain, d);
                d.Add("on_off", curtain.trait_on_off.curValue.ToString());
                Control.Ins.SendWriteCommand(curtain, d);
            };
            btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
            {
                btnCurtainOpen.IsSelected = false;
                //btnCurtainClose.IsSelected = false;
                //btnCurtainStop.IsSelected = false;
                curtain.trait_on_off.value = "on";
                curtain.trait_on_off.curValue = "on";
                //Control.Send(CommandType_A.write, curtain);
                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                d.Add("on_off", curtain.trait_on_off.value.ToString());
                Control.SendWriteCommand(curtain, d);
                d.Add("on_off", curtain.trait_on_off.curValue.ToString());
                Control.Ins.SendWriteCommand(curtain, d);
            };

        }