2020-09-01

wxr

2020-09-01 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5

 HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs

@@ -41,7 +41,7 @@
                {
                    LoadSceneFunctionControlZone();
                }
                DB_ResidenceData.residenceData.SaveResidenceData();
                function.SaveFunctionData();
                new PublicAssmebly().TipMsgAutoClose(msg, true);
            };
        }
@@ -116,7 +116,7 @@
                        {
                            if (view.Tag.ToString() == function.sid)
                            {
                                var state = function.on_off == "on";
                                var state = function.trait_on_off.value.ToString() == "on";
                                for (int i = 0; i < view.ChildrenCount; i++)
                                {
                                    if (view.GetChildren(i).GetType() == typeof(Button))
@@ -150,19 +150,18 @@
        /// <summary>
        /// 加载场景控制事件
        /// </summary>
        void LoadEvent_ControlScene(Button btnCoverd ,Function function)
        void LoadEvent_ControlScene(Button btnCoverd,Button btnName,Button btnZone ,Function function)
        {
            btnCoverd.MouseDownEventHandler = (sender, e) =>
            {
                btnCoverd.IsSelected = true;
            };
            btnCoverd.MouseUpEventHandler = (sender, e) =>
          
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
                new PublicAssmebly().TipMsgAutoClose(msg, true);
                Control.Send(function as Scene);
            };

            btnCoverd.MouseUpEventHandler = eventHandler;
            btnName.MouseUpEventHandler = eventHandler;
            btnZone.MouseUpEventHandler = eventHandler;
        }

        /// <summary>
@@ -177,10 +176,10 @@
                btnSwitch.IsSelected = !btnSwitch.IsSelected;
                new System.Threading.Thread(() =>
                {
                    function.on_off = btnSwitch.IsSelected ? "on" : "off";
                    function.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
                    //Control.Send(CommandType_A.write, function);
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add("on_off", function.on_off.ToString());
                    d.Add("on_off", function.trait_on_off.value.ToString());
                    Control.SendWriteCommand(function, d);

                })
@@ -212,10 +211,10 @@
            btnClose.MouseUpEventHandler = (sender, e) =>
            {
                btnClose.IsSelected = false;
                curtain.on_off = "off";
                curtain.trait_on_off.value = "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.on_off.ToString());
                d.Add("on_off",curtain.trait_on_off.value.ToString());
                Control.SendWriteCommand(curtain, d);
            };

@@ -226,10 +225,10 @@
            btnOpen.MouseUpEventHandler = (sender, e) =>
            {
                btnOpen.IsSelected = false;
                curtain.on_off = "on";
                curtain.trait_on_off.value = "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.on_off.ToString());
                d.Add("on_off", curtain.trait_on_off.value.ToString());
                Control.SendWriteCommand(curtain, d);
            };
        }