Merge branch 'dev-tzy' into temp-wxr

wxr

2021-03-09 134811c790a982d505567e2ba69b5de566410367

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

@@ -189,6 +189,15 @@
                                    break;
                            }
                            break;
                        case FunctionCategory.IR:
                            switch(function.spk)
                            {
                                case SPK.AcIr:
                                    btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon1.png";
                                    LoadLastStatesButton();
                                    break;
                            }
                            break;
                        case FunctionCategory.FloorHeat:
                            switch (function.spk)
                            {
@@ -331,7 +340,7 @@
                        ProgressTextColor = CSS_Color.FirstLevelTitleColor,
                        ProgressTextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
                        MaxValue = 100,
                        Progress = (function as Light).brightness,
                        Progress = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.BatteryState)),
                        Tag = function.sid + "_DimmerBar",
                        SeekBarPadding = Application.GetRealWidth(20),
                    };
@@ -399,7 +408,7 @@
                IsSelected = function.GetAttrState(FunctionAttributeKey.Percent) != "0"
            };
            bodyDiv.AddChidren(btnCurtainOpen);
            LoadEvent_ControlCurtain(btnCurtainStop, btnCurtainOpen, btnCurtainClose, function as Curtain);
            LoadEvent_ControlCurtain(btnCurtainStop, btnCurtainOpen, btnCurtainClose, function);
            #endregion
        }
        /// <summary>