jpush更新完成

wxr

2024-05-23 c5cb6840bd986bbd71a9ebc232bbf44ed0e1fc3d

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

@@ -366,13 +366,9 @@
                return "LogicIcon/sensor.png";
            }
            else if (SPK.DoorLock == device.spk
                || SPK.VideoDoorLock == device.spk)
                )
            {
                return "FunctionIcon/DoorLock/DoorLock.png";
            }
            else if (SPK.ElectricalTvHisense == device.spk)
            {
                return "LogicIcon/electricaltvhisense.png";
            }
            return $"FunctionIcon/Icon/{device.IconName}.png";

@@ -476,7 +472,6 @@
            device.spk == SPK.AirSwitch
            || device.spk == SPK.PanelSocket
            || device.spk == SPK.ElectricSocket
            || device.spk == SPK.ElectricalTvHisense
            );
            if (electric != null)
            {
@@ -484,7 +479,7 @@
            }
            ///门锁类
            var doorlock = deviceList.Find((device) => device.spk == SPK.DoorLock
            || device.spk == SPK.VideoDoorLock);
            );
            if (doorlock != null)
            {
                deviceStrTypeList.Add(Language.StringByID(StringId.DoorLock));
@@ -510,7 +505,7 @@
            }
            ///摄像头类
            var camera = deviceList.Find((device) =>
            device.spk == SPK.IpCam_Imou || device.spk == SPK.Ev_Ipcam || device.spk == SPK.Peephole);
            device.spk == SPK.IpCam_Imou || device.spk == SPK.Peephole);
            if (camera != null)
            {
                deviceStrTypeList.Add(Language.StringByID(StringId.shexiangtou));
@@ -608,13 +603,11 @@
                functionTypeList.Add(SPK.AirSwitch);
                functionTypeList.Add(SPK.PanelSocket);
                functionTypeList.Add(SPK.ElectricSocket);
                functionTypeList.Add(SPK.ElectricalTvHisense);
            }
            ///门锁类
            else if (deviceType == Language.StringByID(StringId.DoorLock))
            {
                functionTypeList.Add(SPK.DoorLock);
                functionTypeList.Add(SPK.VideoDoorLock);
            }
            ///音乐类
            else if (deviceType == Language.StringByID(StringId.Music))
@@ -636,7 +629,6 @@
            else if (deviceType == Language.StringByID(StringId.shexiangtou))
            {
                functionTypeList.Add(SPK.IpCam_Imou);
                functionTypeList.Add(SPK.Ev_Ipcam);
                functionTypeList.Add(SPK.Peephole);
            }
            else
@@ -644,7 +636,6 @@
                //全部区域
                functionTypeList.Add(SPK.GroupControl);
                functionTypeList.Add(SPK.Peephole);
                functionTypeList.Add(SPK.Ev_Ipcam);
                functionTypeList.Add(SPK.LightSwitch);
                functionTypeList.Add(SPK.LightDimming);
                functionTypeList.Add(SPK.LightRGB);
@@ -698,10 +689,8 @@
                functionTypeList.Add(SPK.MechanicalArm);
                functionTypeList.Add(SPK.IpCam_Imou);
                functionTypeList.Add(SPK.SensorPm10);
                functionTypeList.Add(SPK.VideoDoorLock);
                functionTypeList.Add(SPK.AcIr);
                functionTypeList.Add(SPK.SensorPirHold);
                functionTypeList.Add(SPK.ElectricalTvHisense);
                functionTypeList.Add(SPK.SensorLight);
                functionTypeList.Add(SPK.OtherCommon);

@@ -722,7 +711,6 @@
            {
                case condition_if:
                    {
                        deviceTypeList.Add(SPK.Ev_Ipcam);
                        deviceTypeList.Add(SPK.Peephole);
                        deviceTypeList.Add(SPK.LightSwitch);
                        deviceTypeList.Add(SPK.LightRGB);
@@ -765,7 +753,6 @@
                        deviceTypeList.Add(SPK.doorgate);
                        deviceTypeList.Add(SPK.IpCam_Imou);
                        deviceTypeList.Add(SPK.SensorPm10);
                        deviceTypeList.Add(SPK.VideoDoorLock);
                        deviceTypeList.Add(SPK.AcIr);
                        deviceTypeList.Add(SPK.SensorPirHold);
                        deviceTypeList.Add(SPK.SensorLight);
@@ -794,7 +781,6 @@
                        deviceTypeList.Add(SPK.AvMusic);
                        deviceTypeList.Add(SPK.MechanicalArm);
                        deviceTypeList.Add(SPK.AcIr);
                        deviceTypeList.Add(SPK.ElectricalTvHisense);
                        deviceTypeList.Add(SPK.OtherCommon);
                    }
                    break;
@@ -1080,18 +1066,17 @@
                //不是主账号直接返回
                return;
            }
            List<LogicData> logicDataList = new List<LogicData>();
            List<LogicIdData> logicDataList = new List<LogicIdData>();
            logicDataList.Clear();
            System.Threading.Tasks.Task.Run(() =>
            {
                try
                {
                    //获取逻辑ID列表，目前针对所有<备注:如果只针对当前手机的话，可以直接拿缓存数据自动化列表遍历>
                    var idStr = Send.Current.GetLogicIdList();
                    if (idStr != null)
                    var idStrList = Send.Current.GetLogicIdList(); 
                    if (idStrList != null)
                    {
                        var date = Newtonsoft.Json.JsonConvert.SerializeObject(idStr.Data);
                        logicDataList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<LogicData>>(date);
                        logicDataList.AddRange(idStrList);
                    }
                    ///有自动列表才处理
                    if (logicDataList.Count > 0)
@@ -1176,7 +1161,6 @@
                    //  new Entity.Function { sid = "1234567895444", name = "视频门锁", spk = Entity.SPK.VideoDoorLock },
                      new Entity.Function { sid = "123456789688889", name = "人体存在传感器", spk = Entity.SPK.SensorPirHold },
                      new Entity.Function { sid = "12345678968888", name = "测试猫眼", spk = Entity.SPK.Peephole },
                      new Entity.Function { sid = "12345678968889", name = "测试萤石摄像头", spk = Entity.SPK.Ev_Ipcam },
                      //  new Entity.Function { sid = "1234567897", name = "毫米波传感器1", spk = Entity.SPK.SenesorMegahealth2 },
                      // new Entity.Function { sid = "1234567899", name = "门磁传感器", spk = Entity.SPK.SensorDoorWindow },
                      //  new Entity.Function { sid = "12345678991234", name = "HDL机械手", spk = Entity.SPK.MechanicalArm },
@@ -1184,7 +1168,6 @@
                              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 },
                                     new Function { spk = SPK.ElectricalTvHisense, name = "海信电视1",sid="123456789"},
            };
                foreach (var function in functions)
                {