2021-11-23-01

JLChen

2021-11-23 9b3b40e8f334714a1e22181f3c9ee7083302b7eb

2021-11-23-01

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

@@ -57,17 +57,17 @@
                    if (text == Language.StringByID(StringId.kongqiyou))
                    {
                        //优
                        value = "excellent";
                        value = "Excellent";
                    }
                    else if (text == Language.StringByID(StringId.kongqiliang))
                    {
                        //良
                        value = "good";
                        value = "Good";
                    }
                    else if (text == Language.StringByID(StringId.kongqicha))
                    {
                        //差
                        value = "poor";
                        value = "Poor";
                    }
                    AddDic(value);
                };

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

@@ -490,20 +490,20 @@
                                            strtext = Language.StringByID(StringId.tianqibianhua);
                                            switch (value)
                                            {
                                                case "sunny":
                                                case "Sunny":
                                                    {
                                                        strtext = Language.StringByID(StringId.clearday);

                                                    }
                                                    break;
                                                case "cloudy":
                                                case "Cloudy":
                                                    {

                                                        strtext = Language.StringByID(StringId.cloudy);

                                                    }
                                                    break;
                                                case "rainy":
                                                case "Rain":
                                                    {
                                                        strtext = Language.StringByID(StringId.rain);
                                                    }
@@ -518,20 +518,20 @@
                                            strtext = Language.StringByID(StringId.kongqizhiliang);
                                            switch (value)
                                            {
                                                case "excellent":
                                                case "Excellent":
                                                    {
                                                        strtext = Language.StringByID(StringId.kongqiyou);

                                                    }
                                                    break;
                                                case "good":
                                                case "Good":
                                                    {

                                                        strtext = Language.StringByID(StringId.kongqiliang);

                                                    }
                                                    break;
                                                case "poor":
                                                case "Poor":
                                                    {
                                                        strtext = Language.StringByID(StringId.kongqicha);
                                                    }

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

@@ -867,9 +867,9 @@
                        //经纬度为空,认为自动化没有配置地理围栏，不处理;
                        continue;
                    }
                    //自动化纬度
                    //自动化配置输入条件纬度
                    double lat = Convert.ToDouble(logicDate.geo_fence.latitude);
                    //自动化经度
                    //自动化配置输入条件经度
                    double lon = Convert.ToDouble(logicDate.geo_fence.longitude);
                    //自动化配置输入条件<地理围栏半径><单位，公里、千米.米>
                    int radius = int.Parse(logicDate.geo_fence.radius);
@@ -885,7 +885,8 @@
                        //离开
                        direction = "leave";
                    }
                     bool f= Send.GeoFenceStateReport(logicDate.userLogicId,logicDate.sid, direction);
                    //推送给云端是否成功
                    bool f= Send.GeoFenceStateReport(logicDate.userLogicId,logicDate.sid, direction);
                    //if () { }
                    //Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
                }
@@ -894,5 +895,39 @@

        }


       
    }
    public class DD {

        /// <summary>
        /// 云端唯一id
        /// </summary>
        public string userLogicId = "";
        /// <summary>
        /// 网关id
        /// </summary>
        public string gatewayId = "";
        /// <summary>
        /// 逻辑唯一标识
        /// </summary>
        public string sid = "";
        /// <summary>
        /// 住宅id
        /// </summary>
        public string homeId = "";
        /// <summary>
        /// 是否推送过（true：已经推送，false：没有不推送）
        /// </summary>
        public bool IsPush;
        /// <summary>
        /// 到达某地
        /// </summary>
        public string arrive = "";
        /// <summary>
        /// 离开
        /// </summary>
        public string leave = "";

    }
}

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

@@ -56,15 +56,15 @@
                    string text = view.btnClick.Tag.ToString();
                    if (text == Language.StringByID(StringId.clearday))
                    {
                        value = "sunny";
                        value = "Sunny";
                    }
                    else if (text == Language.StringByID(StringId.cloudy))
                    {
                        value = "cloudy";
                        value = "Cloudy";
                    }
                    else if (text == Language.StringByID(StringId.rain))
                    {
                        value = "rainy";
                        value = "Rain";
                    }
                    AddDic(value);
                };