Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project...

wei

2021-08-27 eda3fb873e59544ff36301b51e05aef64f87b0f9

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

@@ -263,7 +263,7 @@
        /// <param name="list">显示数据源</param>
        /// <param name="titleText">标题</param>
        /// <param name="action">返回值索引值</param>
        public void FrameOrVv(FrameLayout frame, List<string> list, int titleText, Action<int> action)
        public void FrameOrVv(FrameLayout frame, List<string> list, List<string> stateList, int titleText, Action<int> action)
        {

            int line = 0;
@@ -366,6 +366,11 @@
                {
                    verticalRefresh.AddChidren(checkView.FLayoutView());
                }

                if (stateList.Contains(strName))
                {
                    checkView.btnCheckIcon.IsSelected = true;
                }
                checkView.btnText.Text = strName;
                checkView.btnClick.Tag = i;//标记
                //点击事件
@@ -391,8 +396,7 @@
                frameLayout.RemoveFromParent();
            };

        }

        }  
        /// <summary>
        /// 超出5个元素该用滑动控件
        /// </summary>
@@ -400,7 +404,7 @@
        /// <param name="list">显示数据源</param>
        /// <param name="stateList">之前状态数据源</param>
        /// <param name="titleText">标题</param>
        /// <param name="action">返回值索引值</param>
        /// <param name="action">返回值列表</param>
        public void FrameOrVvList(FrameLayout frame, List<string> list, List<string> stateList, int titleText, Action<List<string>> action)
        {

@@ -644,6 +648,16 @@
                            };
                    }
                    break;
                case "airFresh":
                    {
                        list = new List<string> {
                                Language.StringByID(StringId.zidong),
                                 Language.StringByID(StringId.shoudong),
                                  Language.StringByID(StringId.dingshi),
                                   Language.StringByID(StringId.zhineng),
                            };
                    }
                    break;
                case "week":
                    {
                        list = new List<string> {
@@ -690,18 +704,26 @@
                case "co2":
                    {
                        list = new List<string> {
             Language.StringByID(StringId.zhengchang),
             Language.StringByID(StringId.piangao),
             Language.StringByID(StringId.chaobiao),
             Language.StringByID(StringId.zhengchang)+ ":0~1000PPM",
             Language.StringByID(StringId.piangao) + ":1001~2000PPM",
             Language.StringByID(StringId.chaobiao) + ":>2000PPM",
                      };
                    }
                    break;
                case "tvoc":
                    {
                        list = new List<string> {
             Language.StringByID(StringId.zhengchang),
             Language.StringByID(StringId.chaobiao),
             Language.StringByID(StringId.yanzhong),
             Language.StringByID(StringId.zhengchang)+ ":0~399PPB",
             Language.StringByID(StringId.chaobiao)+ ":400~699PPB",
             Language.StringByID(StringId.yanzhong)+":>700PPB",
                      };
                    }
                    break;
                case "security":
                    {
                        list = new List<string> {
             Language.StringByID(StringId.bufang ),
             Language.StringByID(StringId.chefang),
                      };
                    }
                    break;
@@ -781,6 +803,27 @@
                        else if (text == Language.StringByID(StringId.timeMode))
                        {
                            str = "timer";
                        }
                    }
                    break;
                case "airFresh":
                    {

                        if (text == Language.StringByID(StringId.autoLogic))
                        {
                            str = "auto";
                        }
                        else if (text == Language.StringByID(StringId.shoudong))
                        {
                            str = "manual";
                        }
                        else if (text == Language.StringByID(StringId.dingshi))
                        {
                            str = "timer";
                        }
                        else if (text == Language.StringByID(StringId.zhineng))
                        {
                            str = "smart";
                        }
                    }
                    break;
@@ -899,19 +942,19 @@
                case "pm25":
                    {

                        if (intValue > 0 && intValue < 35)
                        if (intValue >= 0 && intValue <= 35)
                        {
                            text = Language.StringByID(StringId.pmyou);
                        }
                        else if (intValue > 35 && intValue < 75)
                        else if (intValue >35 && intValue <= 75)
                        {
                            text = Language.StringByID(StringId.pmliang);
                        }
                        else if (intValue > 75 && intValue < 115)
                        else if (intValue > 75 && intValue <= 115)
                        {
                            text = Language.StringByID(StringId.pmqingdu);
                        }
                        else if (intValue > 115 && intValue < 150)
                        else if (intValue >115 && intValue <= 150)
                        {
                            text = Language.StringByID(StringId.pmzhongdu);
                        }
@@ -924,17 +967,17 @@
                case "co2":
                    {

                        if (intValue > 0 && intValue < 800)
                        if (intValue >= 0 && intValue <= 1000)
                        {
                            text = Language.StringByID(StringId.zhengchang);
                            text = Language.StringByID(StringId.zhengchang)+ ":0~1000PPM";
                        }
                        else if (intValue > 800 && intValue < 1100)
                        else if (intValue > 1000 && intValue <= 2000)
                        {
                            text = Language.StringByID(StringId.piangao);
                            text = Language.StringByID(StringId.piangao) + ":1001~2000PPM";
                        }
                        else if (intValue > 1100)
                        else if (intValue > 2000)
                        {
                            text = Language.StringByID(StringId.chaobiao);
                            text = Language.StringByID(StringId.chaobiao) + ":>2000PPM";
                        }
                    }
                    break;
@@ -943,15 +986,15 @@

                        if (intValue >=1 && intValue <= 3)
                        {
                            text = Language.StringByID(StringId.zhengchang);
                            text = Language.StringByID(StringId.zhengchang) + ":0~399PPB";
                        }
                        else if (intValue >=4 && intValue<=6)
                        {
                            text = Language.StringByID(StringId.chaobiao);
                            text = Language.StringByID(StringId.chaobiao) + ":400~699PPB";
                        }
                        else if (intValue >= 7 && intValue <= 9)
                        {
                            text = Language.StringByID(StringId.yanzhong);
                            text = Language.StringByID(StringId.yanzhong) + ":>700PPB";
                        }
                    }
                    break;
@@ -996,31 +1039,31 @@
                    break;
                case "co2":
                    {
                        if (text == Language.StringByID(StringId.zhengchang))
                        if (text == Language.StringByID(StringId.zhengchang) + ":0~1000PPM")
                        {
                            value = "400";
                        }
                        else if (text == Language.StringByID(StringId.piangao))
                        else if (text == Language.StringByID(StringId.piangao) + ":1001~2000PPM")
                        {
                            value = "850";
                            value = "1850";
                        }
                        else if (text == Language.StringByID(StringId.chaobiao))
                        else if (text == Language.StringByID(StringId.chaobiao) + ":>2000PPM")
                        {
                            value = "1200";
                            value = "2200";
                        }
                    }
                    break;
                case "tvoc":
                    {
                        if (text == Language.StringByID(StringId.zhengchang))
                        if (text == Language.StringByID(StringId.zhengchang) + ":0~399PPB")
                        {
                            value = "2";
                        }
                        else if (text == Language.StringByID(StringId.chaobiao))
                        else if (text == Language.StringByID(StringId.chaobiao) + ":400~699PPB")
                        {
                            value = "5";
                        }
                        else if (text == Language.StringByID(StringId.yanzhong))
                        else if (text == Language.StringByID(StringId.yanzhong) +":>700PPB")
                        {
                            value = "8";
                        }