20201221-3

wei

2020-12-21 1887ea937010ff8caba39622e8246a2802ca02c5

 HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs

old mode 100755
new mode 100644
@@ -107,6 +107,8 @@
                        Tag = function.sid + "_Switch",
                    };
                    bodyDiv.AddChidren(btnSwitch);
                    //加载开关按钮事件
                    LoadEvent_SwitchFunction(btnSwitch,function.attributes.Find((obj)=> obj.key == FunctionAttributeKey.FadeTime ));
                }
                else
                {
@@ -122,9 +124,9 @@
                        Tag = function.sid + "_Switch",
                    };
                    bodyDiv.AddChidren(btnSwitch);
                    //加载开关按钮事件
                    LoadEvent_SwitchFunction(btnSwitch);
                }
                //加载开关按钮事件
                LoadEvent_SwitchFunction(btnSwitch);

                switch (function.functionCategory)
                {
@@ -311,7 +313,8 @@
                Height = Application.GetMinRealAverage(32),
                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
                SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
                Tag = function.functionType + "_off_" + function.sid
                IsSelected = function.trait_on_off.curValue.ToString() == "off",
                Tag = function.sid + "_off"
            };
            bodyDiv.AddChidren(btnCurtainClose);

@@ -323,6 +326,8 @@
                Height = Application.GetMinRealAverage(32),
                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainStopIcon.png",
                SelectedImagePath = "FunctionIcon/Curtain/CurtainStopOnIcon.png",
                Tag = function.sid + "_stop",
                IsSelected = function.trait_on_off.curValue.ToString() == "stop"
            };
            bodyDiv.AddChidren(btnCurtainStop);

@@ -334,7 +339,8 @@
                Height = Application.GetMinRealAverage(32),
                UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
                SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
                Tag = function.functionType + "_on_" + function.sid
                Tag = function.sid + "_on",
                IsSelected = function.trait_on_off.curValue.ToString() == "on"
            };
            bodyDiv.AddChidren(btnCurtainOpen);
            LoadEvent_ControlCurtain(btnCurtainStop, btnCurtainOpen, btnCurtainClose, function as Curtain);