Merge branch 'WJC' into wxr7

wxr

2021-08-28 223ed8e3003f9534887b6ae9c9eb4353aebf1748

Merge branch 'WJC' into wxr7

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

@@ -641,8 +641,23 @@
            view.SingleSelectionShow(frame, listStr, Language.StringByID(title), view.GetString(key, stateValue)
               , (text) =>
               {
                  
                   var value = view.GetValue(key, text);
                   selectedState = device.spk + "_" + key;
                   switch (device.spk)
                   {
                       case SPK.SensorTemperature:
                       case SPK.SensorHumidity:
                       case SPK.SensorCO2:
                       case SPK.SensorPm25:
                       case SPK.SensorTVOC:
                       case SPK.SensorHcho:
                           {
                               ///公司传感器key的健值是“value”；
                               key = "value";
                           }
                           break;
                   }
                   AddDictionary(key, value, "integer", "in");
                   Save(device, index, edit);
               });

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

@@ -381,41 +381,41 @@
                                case SPK.SensorTemperature:
                                    {
                                       
                                        string str =new InpOrOutLogicMethod { }.GetText(dicList);
                                        string str =new InpOrOutLogicMethod { }.GetText(dicList, "temperature");
                                        inputView.btnState.Text = str;
                                    }
                                    break;
                                case SPK.SensorHumidity:
                                    {
                                        string str = new InpOrOutLogicMethod { }.GetText(dicList);
                                        string str = new InpOrOutLogicMethod { }.GetText(dicList, "humidity");
                                        inputView.btnState.Text = str;

                                    }
                                    break;
                                case SPK.SensorCO2:
                                    {
                                        string str = new InpOrOutLogicMethod { }.GetText(dicList);
                                        string str = new InpOrOutLogicMethod { }.GetText(dicList, "co2");
                                        inputView.btnState.Text = str;

                                    }
                                    break;
                                case SPK.SensorPm25:
                                    {
                                        string str = new InpOrOutLogicMethod { }.GetText(dicList);
                                        string str = new InpOrOutLogicMethod { }.GetText(dicList, "pm25");
                                        inputView.btnState.Text = str;

                                    }
                                    break;
                                case SPK.SensorTVOC:
                                    {
                                        string str = new InpOrOutLogicMethod { }.GetText(dicList);
                                        string str = new InpOrOutLogicMethod { }.GetText(dicList, "tvoc");
                                        inputView.btnState.Text = str;

                                    }
                                    break;
                                case SPK.SensorHcho:
                                    {
                                        string str = new InpOrOutLogicMethod { }.GetText(dicList);
                                        string str = new InpOrOutLogicMethod { }.GetText(dicList, "hcho");
                                        inputView.btnState.Text = str;

                                    }
@@ -658,12 +658,6 @@
                                if (device.spk == SPK.SensorEnvironment
                                || device.spk == SPK.SensorEnvironment2
                                || device.spk == SPK.SensorEnvironment3
                                || device.spk == SPK.SensorTemperature
                                || device.spk == SPK.SensorHumidity
                                || device.spk == SPK.SensorCO2
                                || device.spk == SPK.SensorPm25
                                || device.spk == SPK.SensorTVOC
                                   || device.spk == SPK.SensorHcho
                                )
                                {
                                    //这个设备比较特殊
@@ -730,6 +724,42 @@
                                                break;
                                        }
                                    }

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

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

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

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

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

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

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

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

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

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

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

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

                                }
                                else
@@ -2108,12 +2138,11 @@
        /// </summary>
        /// <param name="dicList">状态数据列表</param>
        /// <returns></returns>
        private string GetText(List<Dictionary<string, string>> dicList)
        private string GetText(List<Dictionary<string, string>> dicList,string key)
        {
            string strtext = "";
            foreach (var dic in dicList)
            {
                string key = dic["key"];
                string value = dic["value"];
                string comparator = dic["comparator"];
                switch (key)
@@ -2169,7 +2198,71 @@
            }
            return strtext;
        }
        private void SensorView(FrameLayout thisView, Function device,string key, int indexVulae) {
            //这个设备比较特殊
            ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
            ///当前的索引值数据对象
            Input inputedit = Logic.currlogic.input[indexVulae];
            ///状态值
            string stateValue = "";
            foreach (var dic in inputedit.condition)
            {
                string comparator = dic["comparator"];
                stateValue = dic["value"];
                switch (key)
                {

                    case "temperature":
                        {
                            int titleInt = 0;
                            if (comparator == ">")
                            {
                                titleInt = StringId.wendugaoyu;
                            }
                            else if (comparator == "<")
                            {
                                titleInt = StringId.wendudiyu;
                            }
                            conditionDeviceFunList.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
                        }
                        break;
                    case "humidity":
                        {
                            int titleInt = 0;
                            if (comparator == ">")
                            {
                                titleInt = StringId.shidugaoyu;
                            }
                            else if (comparator == "<")
                            {
                                titleInt = StringId.shidudiyu;
                            }
                            conditionDeviceFunList.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
                        }
                        break;
                    case "co2":
                        {
                            conditionDeviceFunList.PmCo2TvocAction(thisView, device, "co2", StringId.co2, indexVulae, true, stateValue);
                        }
                        break;
                    case "pm25":
                        {
                            conditionDeviceFunList.PmCo2TvocAction(thisView, device, "pm25", StringId.pm25, indexVulae, true, stateValue);
                        }
                        break;
                    case "tvoc":
                        {
                            conditionDeviceFunList.PmCo2TvocAction(thisView, device, "tvoc", StringId.tvoc, indexVulae, true, stateValue);
                        }
                        break;
                    case "hcho":
                        {
                            conditionDeviceFunList.PmCo2TvocAction(thisView, device, "hcho", StringId.tvoc, indexVulae, true, stateValue);
                        }
                        break;
                }
            }
        }
    }
}


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

@@ -991,17 +991,17 @@
                    {
                        switch (strValue)
                        {
                            case "(0,1000]":
                            case "(0,399]":
                                {
                                    text = Language.StringByID(StringId.zhengchang) + ":0~399PPB";
                                }
                                break;
                            case "(1001,2000]":
                            case "(400,699]":
                                {
                                    text = Language.StringByID(StringId.chaobiao) + ":400~699PPB";
                                }
                                break;
                            case "(2000,200000]":
                            case "(700,70000]":
                                {
                                    text = Language.StringByID(StringId.yanzhong) + ":>700PPB";
                                }

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

@@ -280,6 +280,8 @@

                logicjArray.Add(logicIfon);
                var jObject = new JObject { { "homeId", LogicMethod.CurrLogicMethod.HomeId }, { "logics", logicjArray } };

                string str = jObject.ToString();
                responsePackNew = RequestServerhomeId(jObject, NewAPI.API_POST_Logic_Update,5);
                //如果是token过期则刷新token
                if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)