2023年09月27日11:52:00

mac

2023-09-27 7952f847fbe8f506106587785fc097467f4b1801

2023年09月27日11:52:00

自动化输出添加通用开关舍设备

 HDL_ON/Common/Utlis.cs

@@ -42,7 +42,7 @@
                }
            }
            string text = tag + "======" + url + "\r\n" + content;
            //Console.WriteLine(text);
            Console.WriteLine(text);
#endif
        }


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

@@ -1055,6 +1055,7 @@
                                        }
                                    }
                                    break;
                                case SPK.OtherCommon:
                                case SPK.AirSwitch:
                                case SPK.LightSwitch:
                                //插座
@@ -1715,6 +1716,7 @@
                    break;
                case SPK.ElectricSocket:
                //开关灯光
                case SPK.OtherCommon:
                case SPK.AirSwitch:
                case SPK.LightSwitch:
                //机械手

 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;
        }
@@ -371,7 +371,9 @@
                return "FunctionIcon/DoorLock/DoorLock.png";
            }
            else if (SPK.SensorDryContact == device.spk
                || SPK.SensorDryContact2 == device.spk)
                || SPK.SensorDryContact2 == device.spk
                || SPK.OtherCommon == device.spk
                )
            {
                return "LogicIcon/ganjiedian.png";
            }
@@ -382,7 +384,7 @@
            //LogicIcon/heatlogic.png"
            return $"FunctionIcon/Icon/{device.IconName}.png";

        }
    }
        /// <summary>
        /// 获取设备类型图标(已弃用 2022年11月25日14:07:30)
        /// </summary>
@@ -527,6 +529,7 @@
            || device.spk == SPK.LightCCT
            || device.spk == SPK.LightRGB
            || device.spk == SPK.LightRGBW
            || device.spk == SPK.OtherCommon
            );
            if (lightjosn != null)
            {
@@ -660,6 +663,7 @@
                functionTypeList.Add(SPK.AirSwitch);
                functionTypeList.Add(SPK.PanelSocket);
                functionTypeList.Add(SPK.ElectricSocket);
                functionTypeList.Add(SPK.OtherCommon);
            }
            //群控
            else if (deviceType == Language.StringByID(StringId.GroupControl))
@@ -824,6 +828,7 @@
                functionTypeList.Add(SPK.SensorPirHold);
                functionTypeList.Add(SPK.ElectricalTvHisense);
                functionTypeList.Add(SPK.SensorLight);
                functionTypeList.Add(SPK.OtherCommon);

            }

@@ -915,6 +920,7 @@
                        deviceTypeList.Add(SPK.MechanicalArm);
                        deviceTypeList.Add(SPK.AcIr);
                        deviceTypeList.Add(SPK.ElectricalTvHisense);
                        deviceTypeList.Add(SPK.OtherCommon);
                    }
                    break;
            }
@@ -1233,6 +1239,7 @@
                 new Entity.Function { sid = "1234567890", name = "光照传感器", spk = Entity.SPK.SensorLight },
                  new Entity.Function { sid = "1234567891", name = "干节点", spk = Entity.SPK.SensorDryContact },
                   new Entity.Function { sid = "1234567892", name = "紧急求助传感器", spk = Entity.SPK.SensorHelp },
                        new Entity.Function { sid = "12345678921", name = "通用开关", spk = Entity.SPK.OtherCommon },
                    //new Entity.Function { sid = "12345678933456", name = "门锁", spk = Entity.SPK.DoorLock },
                    //  new Entity.Function { sid = "1234567895444", name = "视频门锁", spk = Entity.SPK.VideoDoorLock },
                      //new Entity.Function { sid = "12345678968888", name = "人体存在传感器", spk = Entity.SPK.SensorPirHold },

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

@@ -185,7 +185,8 @@
                    };

                    break;
                //开关灯光 
                //开关灯光
                case SPK.OtherCommon:
                case SPK.AirSwitch:
                case SPK.LightSwitch:
                case SPK.ElectricSocket:

 HDL_ON/UI/UI2/FuntionControlView/HisenseTV /HisenseTvPage.cs

@@ -302,7 +302,7 @@
                    return;
                }

                if (!this.device.online)
                if (!this.device.online&& key!= HisenseTVFunctionalAttributeConstant.wol)
                {
                    //设备不在线控制失败
                    Application.RunOnMainThread(() =>