From d3c48684c8c4e0467fdf0c7a2193c9c02f122ef8 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 21 四月 2023 15:17:13 +0800
Subject: [PATCH] pm2.5单位修改
---
HDL-ON_iOS/Info.plist | 4 ++--
HDL-ON_Android/Resources/Resource.designer.cs | 2 +-
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs | 2 +-
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs | 6 +++---
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs | 11 +++--------
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs | 2 +-
HDL_ON/UI/UI1-Login/LoginPage.cs | 2 +-
HDL_ON/Entity/Function/Sensor.cs | 2 +-
8 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index e2cf986..67dd43b 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/HDL-ON_Android/Resources/Resource.designer.cs
@@ -14,7 +14,7 @@
{
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.8.165")]
public partial class Resource
{
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index b285c37..68ad9fc 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -11,7 +11,7 @@
<key>CFBundleName</key>
<string>On Pro</string>
<key>CFBundleShortVersionString</key>
- <string>1.6.602303301</string>
+ <string>1.7.1</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
@@ -36,7 +36,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.6.603301</string>
+ <string>1.7.1</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>weixinULAPI</string>
diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs
index b53b38a..b232cab 100644
--- a/HDL_ON/Entity/Function/Sensor.cs
+++ b/HDL_ON/Entity/Function/Sensor.cs
@@ -159,7 +159,7 @@
switch (function.spk)
{
case SPK.SensorPm25:
- unit = "ug/m虏";
+ unit = "ug/m鲁";
break;
case SPK.SensorTemperature:
unit = "掳C";
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index f030bea..a9e2fdb 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -1092,7 +1092,7 @@
// new AttrKeyConfig (){
// key = "pm2.5",
// type = "interval" ,
- // unit = "ug/m虏",
+ // unit = "ug/m鲁",
// configs = new List<AttrKeyInfo>(){
// new AttrKeyInfo(){ start = "0",end = "75",color = "0xFFADE764", desc = "鑹ソ"},
// new AttrKeyInfo(){ start = "76",end = "150",color = "0xFFFFD154",desc = "杞�/涓害姹℃煋"},
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
index 29127b6..b90288d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
@@ -605,17 +605,12 @@
}
if (groupControlLightList.Count == functions.Count)
{
- if (!btnChooseAll.IsSelected)
- {
- btnChooseAll.IsSelected = true;
- }
+ btnChooseAll.TextID = StringId.SelectedAll;
}
else
{
- if (btnChooseAll.IsSelected)
- {
- btnChooseAll.IsSelected = false;
- }
+ if(btnChooseAll.TextID != StringId.Cancel)
+ btnChooseAll.TextID = StringId.Cancel;
}
};
if (groupControl.sids.Find((obj) => obj.sid == function.sid) != null)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs
index cf7936f..2b41c7d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs
@@ -892,7 +892,7 @@
switch (sensorSPK)
{
case SPK.SensorPm25:
- btnTitle.Text = "PM2.5(ug/m虏)";
+ btnTitle.Text = "PM2.5(ug/m鲁)";
break;
case SPK.SensorTemperature:
btnTitle.Text = Language.StringByID(StringId.Temp) + "(掳C)";
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
index 147501a..58cfe45 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
@@ -557,7 +557,7 @@
switch (sensor.spk)
{
case SPK.SensorPm25:
- btnTitle.Text = "PM2.5(ug/m虏)";
+ btnTitle.Text = "PM2.5(ug/m鲁)";//虏
break;
case SPK.SensorTemperature:
btnTitle.Text = Language.StringByID(StringId.Temp) + "(掳C)";
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
index 7a4bc60..8828d13 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
@@ -152,7 +152,7 @@
// Text = "10掳C",
// };
// topWeatherView.AddChidren(btnTempUpperLimitText);
-
+
// var btnTempLowerLimit = new Button()
// {
// X = btnTempUpperLimitText.Right,
@@ -295,7 +295,7 @@
// UnSelectedImagePath = "Public/DownIcon.png",
// };
// contentView.AddChidren(btnFoorDownIcon);
-
+
// btnRoom = new Button()
// {
// X = btnFoorDownIcon.Right,
@@ -514,7 +514,7 @@
// switch (sensor.spk)
// {
// case SPK.SensorPm25:
-// btnTitle.Text = "PM2.5(ug/m虏)";
+// btnTitle.Text = "PM2.5(ug/m鲁)";
// break;
// case SPK.SensorTemperature:
// btnTitle.Text = Language.StringByID(StringId.Temp) + "(掳C)";
--
Gitblit v1.8.0