20200414

wxr

2020-04-14 06696e6f225733a60b03eea4a7c6374053d92c1d

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

@@ -56,7 +56,6 @@


            if (function.functionCategory == FunctionCategory.Curtain || function.functionCategory == FunctionCategory.Scene)//窗帘没有开关按钮

            {
                switch (function.functionCategory)
                {
@@ -126,18 +125,23 @@

                switch (function.functionCategory)
                {
                    case FunctionCategory.AC:
                        btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon.png";
                        LoadLastStatesButton();
                    case FunctionCategory.Thermostat:
                        switch (function.functionType)
                        {
                            case FunctionType.AC:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/AC/AcThinIcon.png";
                                LoadLastStatesButton();
                                break;
                            case FunctionType.FloorHeating:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingThinIcon.png";
                                LoadLastStatesButton();
                                break;
                        }
                        break;
                    case FunctionCategory.Light:
                        btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightThinIcon.png";
                        btnSwitch.IsSelected = function.on_off == "on";
                        LoadLightControl();
                        break;
                    case FunctionCategory.FloorHeating:
                        btnIcon.UnSelectedImagePath = "FunctionIcon/FloorHeating/FloorHeatingThinIcon.png";
                        LoadLastStatesButton();
                        break;
                }

@@ -148,7 +152,7 @@
            {
                LoadEvent_DivSkipEvent();
            }
            LoadCollectionEvent();
            LoadEvent_FunctionCollection();
        }

        /// <summary>