IOS库更新

wxr

2023-10-17 46a177eb1acf7ce91af7fe9ff57af87228de938d

 HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs

@@ -22,6 +22,10 @@
        /// </summary>
        private Button btnDelay =null;
        /// <summary>
        /// 当前设备
        /// </summary>
        private Function device;
        /// <summary>
        /// 定义一个记录选中设备状态列表；
        /// </summary>
        private List<Dictionary<string, string>> dicSateteList = new List<Dictionary<string, string>>();
@@ -32,6 +36,7 @@
        public void Show(Entity.Function device, int index, bool edit)
        {
            #region 界面布局
            this.device = device;
            this.BackgroundColor = CSS.CSS_Color.viewMiddle;
            LogicView.TopView topView = new LogicView.TopView();
            this.AddChidren(topView.FLayoutView());
@@ -145,8 +150,8 @@
                        #region 界面
                        ///总控开关
                        LogicView.FunTypeView view1 = new LogicView.FunTypeView();
                        view1.btnText.TextID = StringId.zongkogkaiguan;
                        view1.btnState.Name = "总控开关";
                        view1.btnText.TextID = StringId.switchLogic;
                        //view1.btnState.Name = "总控开关";
                        fLayout.AddChidren(view1.FLayoutView());
                        ///设备延时iewv
                        DelayView(fLayout, view1.frameLayout.Bottom);
@@ -180,7 +185,8 @@
                    };

                    break;
                //开关灯光 
                //开关灯光
                case SPK.OtherCommon:
                case SPK.AirSwitch:
                case SPK.LightSwitch:
                case SPK.ElectricSocket:
@@ -1091,6 +1097,7 @@
                        }
                        break;
                }
            
                //界面显示选中值
                button.TextID = id;
                selectedState = device.spk + "_" + value;
@@ -1100,10 +1107,10 @@
                {
                    case SPK.PanelSocket:
                        {
                            if (button.Name == "总控开关")
                            {
                                key = "on_off_master";
                            }
                            //if (button.Name == "总控开关")
                            //{
                            //    key = "on_off_master";
                            //}
                        }
                        break;
                    case SPK.GroupControl:
@@ -1111,6 +1118,15 @@
                            if (button.Name == "colorful")
                            {
                                key = "colorful";
                            }

                        }
                        break;
                    case SPK.ElectricalTvHisense:
                        {
                            if ("on" == value)
                            {
                                key = "wol";
                            }

                        }
@@ -1301,6 +1317,22 @@
        /// <returns></returns>
        private void AddDictionaryList(string key, Dictionary<string, string> dictionary)
        {

            if (this.device.spk == SPK.ElectricalTvHisense)
            {
                //特殊处理
                if (key == "on_off")
                {
                    key = "wol";
                }
                else if (key == "wol")
                {
                    key = "on_off";
                }

            }


            int indexValue = -1;
            for (int i = 0; i < dicSateteList.Count; i++)
            {
@@ -1326,7 +1358,8 @@
                dicSateteList.Add(dictionary);
            }

        } 
        }
       
        /// <summary>
        /// 添加目标
        /// </summary>