2023年11月06日11:23:46

mac

2023-11-06 54c202bd4867092fca2bc6f96bec0cfd1056a46a

 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());
@@ -180,7 +185,8 @@
                    };

                    break;
                //开关灯光 
                //开关灯光
                case SPK.OtherCommon:
                case SPK.AirSwitch:
                case SPK.LightSwitch:
                case SPK.ElectricSocket:
@@ -1040,7 +1046,7 @@
            LogicView.FunTypeView delayView = new LogicView.FunTypeView();
            delayView.frameLayout.Y = bottomY;
            delayView.btnText.TextID = StringId.Delay;
            delayView.btnState.Text = strdelay + "s";
            delayView.btnState.Text = LogicMethod.Current.getTimeStr(strdelay);
            fLayout.AddChidren(delayView.FLayoutView());
            ///赋值对象
            this.btnDelay = delayView.btnState;
@@ -1050,9 +1056,9 @@
                InpOrOutLogicMethod inpOrOutLogicMethod = new InpOrOutLogicMethod();
                inpOrOutLogicMethod.Delayed(this, strdelay, (value) =>
                {
                    selectedState = "delay_" + strdelay;
                    strdelay = value.ToString();
                    delayView.btnState.Text = strdelay + "s";
                    delayView.btnState.Text = LogicMethod.Current.getTimeStr(strdelay);
                    selectedState = "delay_" + strdelay;
                });
            };

@@ -1091,6 +1097,7 @@
                        }
                        break;
                }
            
                //界面显示选中值
                button.TextID = id;
                selectedState = device.spk + "_" + value;
@@ -1111,6 +1118,15 @@
                            if (button.Name == "colorful")
                            {
                                key = "colorful";
                            }

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

                        }
@@ -1275,7 +1291,7 @@
            if (this.btnDelay != null)
            {
                ///延时显示文本
                this.btnDelay.Text = outputs.delay + "s";
                this.btnDelay.Text =LogicMethod.Current.getTimeStr(outputs.delay);
                this.strdelay = outputs.delay;
            }
            InpOrOutLogicMethod.Current.EditDeviceState(device, dicList, button1, button2, button3, button4, attribute);
@@ -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>