2021-02-05 1.编译冲突修改

JLChen

2021-02-05 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a

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

@@ -53,6 +53,7 @@
        /// </summary>
        public void LoadFunctionDiv()
        {
            //todo 增加设备，增加功能列表卡片
            if (function == null)
            {
                this.RemoveFromParent();
@@ -159,11 +160,21 @@
                            case SPK.ElectricSocket:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketThinIcon.png";
                                break;
                            case SPK.ElectricFan:
                            case SPK.ElectricFan:

                            case SPK.ElectricTuyaFan:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/FanThinIcon.png";
                                break;
                            case SPK.ElectricTV:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVThinIcon.png";
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVThinIcon.png";

                                break;

                            case SPK.ElectricTuyaAirCleaner:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/AirCleanerThiinIcon.png";
                                break;

                            case SPK.ElectricTuyaWeepRobot:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WeepRobotThinIcon.png";
                                break;
                            case SPK.ElectricTuyaWaterValve:
                                btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/WaterValve/WaterValveIcon.png";
                                break;
                        }
                        btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on";