From 8e5c8c3d3a964e78a762efb5d23b07d144eb0525 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 26 四月 2022 10:06:56 +0800
Subject: [PATCH] 备份
---
HDL-ON_iOS/Info.plist | 4 ++--
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs | 4 ++--
HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs | 6 +++---
HDL_ON/DAL/DriverLayer/Control.cs | 1 +
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index e5b4b8e..fb0e6ed 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string>
<key>CFBundleShortVersionString</key>
- <string>1.5.502204201</string>
+ <string>1.5.502204211</string>
<key>CFBundleVersion</key>
- <string>1.5.504201</string>
+ <string>1.5.504211</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Use geographic location to provide services such as weather</string>
<key>NSAppleMusicUsageDescription</key>
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 66e423f..ee6895f 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -1195,6 +1195,7 @@
case SPK.AirFreshStandard:
case SPK.HvacAirFresh:
case SPK.SensorGas:
+ case SPK.SensorHelp:
//璁惧鐘舵�佹帹閫�
//鐘舵�佹洿鏂�
Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs
index a4aefbd..22ddee1 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshControlPage.cs
@@ -719,13 +719,13 @@
this.btnMode2.CanClick = this.airFreshData.Open;
//椋庨��
- if (this.airFreshData.Fan == "level_3")
+ if (this.airFreshData.Fan == "level_3" || this.airFreshData.Fan == "high")
{
this.btnFan.UnSelectedImagePath = "FunctionIcon/AirFresh/Fan3.png";
this.btnFan.SelectedImagePath = "FunctionIcon/AirFresh/Fan3Select.png";
this.btnFanView.Text = this.dicText["3妗�"];
}
- else if(this.airFreshData.Fan == "level_2")
+ else if(this.airFreshData.Fan == "level_2" || this.airFreshData.Fan == "medium")
{
this.btnFan.UnSelectedImagePath = "FunctionIcon/AirFresh/Fan2.png";
this.btnFan.SelectedImagePath = "FunctionIcon/AirFresh/Fan2Select.png";
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
index ca2a6d6..90fea50 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
@@ -109,15 +109,15 @@
{ IsBackground = true }.Start();
};
- //鍒锋柊鐣岄潰鐘舵��
- this.RefreshFormStatu();
-
if (fanSpeedList.Count > 0)
{
this.btnFan.UnSelectedImagePath = "FunctionIcon/AirFresh/Fan1.png";
this.btnFan.SelectedImagePath = "FunctionIcon/AirFresh/Fan1Select.png";
this.btnFanView.Text = Language.StringByID(StringId.LowWindSpeed);
}
+ //鍒锋柊鐣岄潰鐘舵��
+ this.RefreshFormStatu();
+
}
#endregion
--
Gitblit v1.8.0