合并xm2021-01-13 wjc2021-02-06

黄学彪

2021-01-14 d78515ac4ac8cf4a1785d9df18058d6724f12b79

 ZigbeeApp/Shared/Phone/Device/Logic/PublicInterface.cs

@@ -456,7 +456,7 @@
        }

        /// <summary>
        /// 获取界面列表
        /// 获取界面显示文本列表
        /// </summary>
        /// <param name="isStr">自己定义自己用</param>
        /// <returns></returns>
@@ -521,7 +521,7 @@
                        list = new List<string> {
                            Language.StringByID(MyInternationalizationString.kongqizhiliang),
                            Language.StringByID(MyInternationalizationString.pm25),
                            Language.StringByID(MyInternationalizationString.co2),
                           //Language.StringByID(MyInternationalizationString.co2),
                            Language.StringByID(MyInternationalizationString.sensortemperature),
                            Language.StringByID(MyInternationalizationString.sensorhumidity),
                            };