2023年09月05日10:29:37

mac

2023-09-05 9bb130c33dabc1e33a1264d0723bf4fab52623d7

2023年09月05日10:29:37

自动化输出插座配属由总开关改成开关

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

@@ -1045,7 +1045,8 @@
                                //插座(有USB)
                                case SPK.PanelSocket:
                                    {
                                        string on_off = GetKeyValue("on_off_master", dicList);
                                        //string on_off = GetKeyValue("on_off_master", dicList);
                                        string on_off = GetKeyValue("on_off", dicList);
                                        if (on_off == "on")
                                        {
                                            stateStr = Language.StringByID(StringId.onLogic);

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

@@ -189,7 +189,7 @@
            list.AddRange(list2);
            list.AddRange(FunctionList.List.groupControls);
#if DEBUG
            //GetTestDevice(ref list, true);
            GetTestDevice(ref list, true);
#endif
            return list;
        }
@@ -1223,7 +1223,7 @@
                //模拟设备
                var functions = new List<Function> {
                 new Entity.Function { sid = "1234567890", name = "照明传感器", spk = Entity.SPK.SensorLight },
                 // new Entity.Function { sid = "1234567891", name = "温度传感器", spk = Entity.SPK.SensorTemperature },
                  new Entity.Function { sid = "1234567891", name = "插座", spk = Entity.SPK.PanelSocket },
                 //  new Entity.Function { sid = "1234567892", name = "湿度传感器", spk = Entity.SPK.SensorHumidity },
                    //new Entity.Function { sid = "12345678933456", name = "门锁", spk = Entity.SPK.DoorLock },
                    //  new Entity.Function { sid = "1234567895444", name = "视频门锁", spk = Entity.SPK.VideoDoorLock },

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

@@ -145,8 +145,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);
@@ -1100,10 +1100,10 @@
                {
                    case SPK.PanelSocket:
                        {
                            if (button.Name == "总控开关")
                            {
                                key = "on_off_master";
                            }
                            //if (button.Name == "总控开关")
                            //{
                            //    key = "on_off_master";
                            //}
                        }
                        break;
                    case SPK.GroupControl: