2023年07月26日13:12:21

wjc

2023-07-26 9508510f0b27da3278fa1161eb2ba3dd1e3e2030

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

@@ -187,6 +187,7 @@
            var list2 = this.GetVideoDeviceList();
            list.AddRange(list1);
            list.AddRange(list2);
            list.AddRange(FunctionList.List.groupControls);
#if DEBUG
            GetTestDevice(ref list, true);
#endif
@@ -499,7 +500,15 @@
        {
            List<string> deviceStrTypeList = new List<string>();
            deviceStrTypeList.Clear();
           

            //群控
            var gp = deviceList.Find((device) =>
                device.spk == SPK.GroupControl);
            if (gp != null)
            {
                deviceStrTypeList.Add(Language.StringByID(StringId.GroupControl));
            }

            ///灯光类
            var lightjosn = deviceList.Find((device) =>
            device.spk == SPK.LightSwitch
@@ -639,6 +648,11 @@
                functionTypeList.Add(SPK.PanelSocket);
                functionTypeList.Add(SPK.ElectricSocket);
            }
            //群控
            else if (deviceType == Language.StringByID(StringId.GroupControl))
            {
                functionTypeList.Add(SPK.GroupControl);
            }
            ///窗帘类
            else if (deviceType == Language.StringByID(StringId.Curtain))
            {
@@ -734,6 +748,7 @@
            else
            {
                //全部区域
                functionTypeList.Add(SPK.GroupControl);
                functionTypeList.Add(SPK.Peephole);
                functionTypeList.Add(SPK.Ev_Ipcam);
                functionTypeList.Add(SPK.LightSwitch);
@@ -861,6 +876,7 @@
                    break;
                case target_if:
                    {
                        deviceTypeList.Add(SPK.GroupControl);
                        deviceTypeList.Add(SPK.LightSwitch);
                        deviceTypeList.Add(SPK.LightRGB);
                        deviceTypeList.Add(SPK.LightRGBW);
@@ -1207,7 +1223,7 @@
                      // new Entity.Function { sid = "1234567899", name = "门磁传感器", spk = Entity.SPK.SensorDoorWindow },
                      //  new Entity.Function { sid = "12345678991234", name = "HDL机械手", spk = Entity.SPK.MechanicalArm },
                      //    new Entity.Function { sid = "123456789912345", name = "海曼机械手", spk = Entity.SPK.MechanicalArm },
                              new Entity.Function { sid = "123456789912345668", name = "AC", spk = Entity.SPK.AcIr },
                              new Entity.Function { sid = "12345678991234566844", name = "大华摄像头", spk = Entity.SPK.IpCam_Imou },
                                 new Entity.Function { sid = "12345678991234567", name = "RGB", spk = Entity.SPK.LightRGB },
                                  new Entity.Function { sid = "123456789912345678", name = "RGBW", spk = Entity.SPK.LightRGBW },
            };