Merge remote-tracking branch 'origin/newBranch1' into WJC

JLChen

2021-08-28 299f4b1218c0d3721aa92bf091950d6708942583

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

@@ -719,6 +719,15 @@
                      };
                    }
                    break;
                case "tvoc":
                    {
                        list = new List<string> {
             Language.StringByID(StringId.zhengchang)+ ":0~399PPB",
             Language.StringByID(StringId.chaobiao)+ ":400~699PPB",
             Language.StringByID(StringId.yanzhong)+":>700PPB",
                      };
                    }
                    break;
                case "security":
                    {
                        list = new List<string> {
@@ -727,7 +736,6 @@
                      };
                    }
                    break;

            }
            return list;
        }
@@ -1063,7 +1071,7 @@
                        {
                            value = "5";
                        }
                        else if (text == Language.StringByID(StringId.yanzhong) +":>700PPB")
                        else if (text == Language.StringByID(StringId.yanzhong) + ":>700PPB")
                        {
                            value = "8";
                        }