20201-11-19-01

温居城

2021-11-19 1a204747c1074d4c56c5926f7c15e5c134d516fa

20201-11-19-01

备份一下代码

 HDL_ON/UI/UI2/3-Intelligence/Automation 2.zip

Binary files differ

 HDL_ON/UI/UI2/3-Intelligence/Automation.zip

Binary files differ

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

@@ -193,12 +193,17 @@
                        //离开地点
                        strname = Language.StringByID(StringId.likai);
                    }
                    //纬度
                    latitude = Convert.ToDouble(input.geo_fence.latitude);
                    //经度
                    longitude = Convert.ToDouble(input.geo_fence.longitude);
                    //半径
                    r = int.Parse(input.geo_fence.radius);
                    if (!string.IsNullOrEmpty(input.geo_fence.latitude) && !string.IsNullOrEmpty(input.geo_fence.longitude))
                    {
                        //纬度
                        var latitude1 = Convert.ToDouble(input.geo_fence.latitude);
                        //经度
                        var longitude1 = Convert.ToDouble(input.geo_fence.longitude);
                        //半径
                        r = int.Parse(input.geo_fence.radius);
                        //WGS84坐标转高德坐标
                        LogicMethod.CurrLogicMethod.WGS84_to_GCJ02(longitude1, latitude1, out longitude, out latitude);
                    }
                }
            }
            PublicInterface publicInterface = new PublicInterface();

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

@@ -216,7 +216,8 @@
                    var conditionArray = new JArray { };
                    foreach (var dic in dictionary.condition)
                    {
                        var conditionJOb = new JObject { };
                        
                           var conditionJOb = new JObject { };
                        conditionJOb.Add("key", dic["key"]);
                        var c1 = "";
                        dic.TryGetValue("comparator", out c1);

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

@@ -108,9 +108,6 @@
                        index = i;
                        break;
                    }
                    ///找到标记索引，退出循环体
                    index = i;
                    break;
                }
            }
            if (index != -1)