Merge branch 'WJC' into newBranch1

wxr

2021-11-19 a170a2ecef6d5c87883ed552dbbc81cfb0358d13

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

@@ -147,9 +147,11 @@
                                case SPK.CurtainRoller:
                                case SPK.CurtainTrietex:
                                //空调
                                case SPK.AcStandard:case SPK.HvacAC:
                                case SPK.AcStandard:
                                case SPK.HvacAC:
                                //地热
                                case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:
                                case SPK.HvacFloorHeat:
                                case SPK.FloorHeatStandard:
                                //新风
                                case SPK.AirFreshStandard:
                                case SPK.HvacAirFresh:
@@ -388,8 +390,8 @@
                                    break;
                                case SPK.SensorTemperature:
                                    {
                                       
                                        string str =new InpOrOutLogicMethod { }.GetText(dicList, "temperature");

                                        string str = new InpOrOutLogicMethod { }.GetText(dicList, "temperature");
                                        inputView.btnState.Text = str;
                                    }
                                    break;
@@ -431,8 +433,9 @@
                            }
                        }
                        break;
                    case "4":
                    case "6":
                        {
                            //inputView.btnIcon.UnSelectedImagePath = "LogicIcon/changesinoutdoor.png";
                            inputView.btnIcon.UnSelectedImagePath = "LogicIcon/changesinoutdoor.png";
                            string strtext = "";
                            string strvalue = "";
@@ -444,8 +447,9 @@

                                switch (key)
                                {
                                    case "outdoor_temp":
                                    case "temperature":
                                        {
                                            //云端天气条件 城市温度触发
                                            strvalue = value + "℃";
                                            if (comparator == ">")
                                            {
@@ -458,8 +462,9 @@

                                        }
                                        break;
                                    case "outdoor_humity":
                                    case "humidity":
                                        {
                                            //云端天气条件 城市湿度触发
                                            strvalue = value + "%";
                                            if (comparator == ">")
                                            {
@@ -472,13 +477,68 @@

                                        }
                                        break;
                                    case "pm2.5":
                                    case "pm25":
                                        {
                                            //云端天气条件 城市pm2.5触发
                                            strtext = Language.StringByID(StringId.PM25);
                                            strvalue = new PublicInterface { }.GetString("pm25", value);
                                        }
                                        break;
                                    case "weather":
                                        {
                                            //云端天气条件 城市天气触发
                                            strtext = Language.StringByID(StringId.tianqibianhua);
                                            switch (value)
                                            {
                                                case "Sunny":
                                                    {
                                                        strtext = Language.StringByID(StringId.clearday);

                                                    }
                                                    break;
                                                case "Cloudy":
                                                    {

                                                        strtext = Language.StringByID(StringId.cloudy);

                                                    }
                                                    break;
                                                case "Rain":
                                                    {
                                                        strtext = Language.StringByID(StringId.rain);
                                                    }
                                                    break;

                                            }
                                        }
                                        break;
                                    case "airquality":
                                        {
                                            //云端天气条件 城市空气质量
                                            strtext = Language.StringByID(StringId.kongqizhiliang);
                                            switch (value)
                                            {
                                                case "Excellent":
                                                    {
                                                        strtext = Language.StringByID(StringId.kongqiyou);

                                                    }
                                                    break;
                                                case "Good":
                                                    {

                                                        strtext = Language.StringByID(StringId.kongqiliang);

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


@@ -487,70 +547,27 @@
                            inputView.btnState.Text = strvalue;
                        }
                        break;
                    case "6":
                    case "8":
                        {
                            inputView.btnIcon.UnSelectedImagePath = "LogicIcon/changesinoutdoor.png";
                            inputView.btnIcon.UnSelectedImagePath = "LogicIcon/location.png";
                            foreach (var dic in dicList)
                            {
                                string strtext = "";
                                string value = dic["value"];
                                switch (value)
                                {
                                    case "sunny":
                                    case "arrive":
                                        {
                                            strtext = Language.StringByID(StringId.clearday);

                                            strtext = Language.StringByID(StringId.daoda);
                                        }
                                        break;
                                    case "cloudy":
                                    case "leave":
                                        {

                                            strtext = Language.StringByID(StringId.cloudy);

                                            strtext = Language.StringByID(StringId.likai);
                                        }
                                        break;
                                    case "rainy":
                                        {
                                            strtext = Language.StringByID(StringId.rain);
                                        }
                                        break;

                                }
                                inputView.btnText.TextID = StringId.tianqibianhua;
                                inputView.btnState.Text = strtext;
                            }
                        }
                        break;
                    case "9":
                        {
                            inputView.btnIcon.UnSelectedImagePath = "LogicIcon/changesinoutdoor.png";
                            foreach (var dic in dicList)
                            {
                                string strtext = "";
                                string value = dic["value"];
                                switch (value)
                                {
                                    case "excellent":
                                        {
                                            strtext = Language.StringByID(StringId.kongqiyou);

                                        }
                                        break;
                                    case "good":
                                        {

                                            strtext = Language.StringByID(StringId.kongqiliang);

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

                                }
                                inputView.btnText.TextID = StringId.kongqizhiliang;
                                inputView.btnText.TextID = StringId.likiadaoda;
                                inputView.btnState.Text = strtext;
                            }
                        }
@@ -737,10 +754,10 @@
                                else if (device.spk == SPK.SensorTemperature)
                                {

                                   new InpOrOutLogicMethod().SensorView(thisView, device, "temperature", indexVulae);
                                    new InpOrOutLogicMethod().SensorView(thisView, device, "temperature", indexVulae);

                                }
                                else if ( device.spk == SPK.SensorHumidity)
                                else if (device.spk == SPK.SensorHumidity)
                                {

                                    new InpOrOutLogicMethod().SensorView(thisView, device, "humidity", indexVulae);
@@ -779,7 +796,7 @@
                                }
                            }
                            break;
                        case "4":
                        case "6":
                            {
                                ///当前的索引值数据对象
                                Input inputedit = Logic.currlogic.input[indexVulae];
@@ -794,7 +811,7 @@
                                    stateValue = dic["value"];
                                    switch (key)
                                    {
                                        case "outdoor_temp":
                                        case "temperature":
                                            {
                                                if (comparator == ">")
                                                {
@@ -808,7 +825,7 @@

                                            }
                                            break;
                                        case "outdoor_humity":
                                        case "humidity":
                                            {

                                                if (comparator == ">")
@@ -822,42 +839,57 @@

                                            }
                                            break;
                                        case "pm2.5":
                                        case "pm25":
                                            {
                                                intValue = StringId.PM25;
                                            }
                                            break;
                                        case "weather":
                                            {
                                                intValue = StringId.tianqibianhua;
                                            }
                                            break;
                                        case "airquality":
                                            {
                                                intValue = StringId.kongqizhiliang;
                                            }
                                            break;

                                    }
                                }
                                OutdoorEnvironment outdoorEnvironment = new OutdoorEnvironment();
                                if (intValue == StringId.PM25)
                                if (intValue == StringId.tianqibianhua)
                                {
                                    //城市天气（晴天，下雨）
                                    WeatherCondition weatherCondition = new WeatherCondition();
                                    MainPage.BasePageView.AddChidren(weatherCondition);
                                    weatherCondition.Show();
                                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                                }
                                else if (intValue == StringId.PM25)
                                {
                                    //城市天气（pm2.5）
                                    outdoorEnvironment.PmAction(thisView, stateValue);
                                }
                                else if (intValue == StringId.kongqizhiliang)
                                {
                                    //城市天气（空气质量）
                                    AirQuality airQuality = new AirQuality();
                                    MainPage.BasePageView.AddChidren(airQuality);
                                    airQuality.Show();
                                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                                }
                                else
                                {
                                    //城市天气（温湿度）
                                    outdoorEnvironment.InputBoxAction(intValue, stateValue);
                                }

                            }
                            break;
                        case "6":
                        case "8":
                            {

                                WeatherCondition weatherCondition = new WeatherCondition();
                                MainPage.BasePageView.AddChidren(weatherCondition);
                                weatherCondition.Show();
                                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                            }
                            break;
                        case "9":
                            {

                                AirQuality airQuality = new AirQuality();
                                MainPage.BasePageView.AddChidren(airQuality);
                                airQuality.Show();
                                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                                AddInputType addInputType = new AddInputType();
                                addInputType.LocationView(thisView, true);
                            }
                            break;