20200706

wxr

2020-07-06 23c075a9c27946773feccf05abc90489a6bf5203

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

@@ -58,7 +58,6 @@
            }
            LoadDiv();


            if (function.functionCategory == FunctionCategory.Curtain || function.functionCategory == FunctionCategory.Scene)//窗帘没有开关按钮
            {
                switch (function.functionCategory)
@@ -147,8 +146,28 @@
                        btnSwitch.IsSelected = function.on_off == "on";
                        LoadLightControl();
                        break;
                    case FunctionCategory.SwitchDevice:
                        switch (function.functionType)
                        {
                            case FunctionType.Socket:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketThinIcon.png";
                                break;
                        }
                        btnSwitch.IsSelected = function.on_off == "on";
                        break;
                    case FunctionCategory.Electrical:
                        switch (function.functionType)
                        {
                            case FunctionType.Fan:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanThinIcon.png";
                                break;
                            case FunctionType.TV:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVThinIcon.png";
                                break;
                        }
                        btnSwitch.IsSelected = function.on_off == "on";
                        break;
                }

                #endregion
            }

@@ -210,7 +229,6 @@
                IsSelected = function.collection
            };
            bodyDiv.AddChidren(btnCollectionIcon);

        }

        /// <summary>
@@ -238,7 +256,7 @@

                    var dimmerControlBar = new DiyImageSeekBar()
                    {
                        X = Application.GetRealWidth(14+ 22),
                        X = Application.GetRealWidth(14 + 22),
                        Y = Application.GetRealHeight(68),//91,设计数据
                        Width = Application.GetRealWidth(180),
                        Height = Application.GetRealHeight(54),
@@ -337,6 +355,5 @@
            };
            bodyDiv.AddChidren(btnLastStates);
        }

    }
}
}