Merge branch 'wjc' into dev--wxr

wxr

2022-12-01 132dc0402e0c5e22a7d54cdddc1700a1842304bd

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

@@ -55,12 +55,35 @@
            #region  编辑设备状态
            switch (device.spk)
            {

                //插座(有USB)
                case SPK.PanelSocket:
                    {
                        #region 界面
                        ///总控开关
                        LogicView.FunTypeView view1 = new LogicView.FunTypeView();
                        view1.btnText.TextID = StringId.zongkogkaiguan;
                        view1.btnState.Name = "总控开关";
                        fLayout.AddChidren(view1.FLayoutView());
                        ///设备延时iewv
                        DelayView(fLayout, view1.frameLayout.Bottom);
                        #endregion
                        #region 点击事件
                        ///总控开关点击事件
                        view1.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            SwitchViewMethod(device, view1.btnState, 2);
                        };
                        if (edit)
                        {
                            //显示编辑之前的设备状态
                            GetEditDeviceState(device, index, view1.btnState, null, null, null);
                        }
                        #endregion
                    }
                    break;
                //开关灯光 
                case SPK.AirSwitch:
                case SPK.LightSwitch:
                //插座
                case SPK.PanelSocket:
                case SPK.ElectricSocket:
                //机械手
                case SPK.MechanicalArm:
@@ -820,6 +843,17 @@
                selectedState = device.spk + "_" + strValue;
                //设备属性值，云雀上定义好的;
                string keyVlaue = "on_off";
                switch (device.spk)
                {
                    case SPK.PanelSocket:
                        {
                            if (button.Name == "总控开关")
                            {
                                keyVlaue = "on_off_master";
                            }
                        }
                        break;
                }
                //数据封装
                AddDictionary(keyVlaue, strValue);
            });