From 6bf515816c3c971f57722c5195208f65446ef335 Mon Sep 17 00:00:00 2001
From: tzy <274116637@qq.com>
Date: 星期一, 29 三月 2021 17:49:15 +0800
Subject: [PATCH] 完成新风功能
---
HDL-ON_Android/HDL-ON_Android.csproj | 19 +++++++++
HDL-ON_iOS/Resources/Language.ini | 30 ++++++++++++--
HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/airFreshjinmao.png | 0
HDL-ON_iOS/HDL-ON_iOS.csproj | 19 +++++++++
HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/airFreshjinmao_white.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/airFreshjinmao_blue.png | 0
HDL_ON/DAL/DriverLayer/Control_Udp.cs | 2
HDL_ON/HDL_ON.projitems | 1
8 files changed, 65 insertions(+), 6 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 00f6003..08a3a02 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -1076,6 +1076,25 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\0.png" />
<AndroidAsset Include="Assets\Phone\PirIcon\add.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\More.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\VentilateSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\EnergySelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan2Select.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan3.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Energy.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\ComfortableSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan1.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan3Select.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\TempAndHumiBack.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Comfortable.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Humidification.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\HumidificationSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Ventilate.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan1Select.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\airFreshjinmao.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_white.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 48b10a5..58f270c 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1195,6 +1195,25 @@
<BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\TvocIcon.png" />
<BundleResource Include="Resources\Phone\PirIcon\add.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\AC\More.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\VentilateSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\EnergySelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan2Select.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan3.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Energy.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\ComfortableSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan3Select.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\TempAndHumiBack.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Comfortable.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Humidification.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\HumidificationSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Ventilate.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan1Select.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\airFreshjinmao.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_white.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 9851c94..80b5676 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -423,13 +423,11 @@
437=Device List
438=humidity:{0}% air:{1} wind:{2}
-
-
-1000=Indoor Humidity
+1000=Room Humidity
1001=V-chip
1002=Anion
1003=Sterilization
-1004=Humidification
+1004=Humidify
1005=Filter Element Reset
1006=Lighting
1007=Automatic
@@ -501,7 +499,18 @@
1073=Please turn on Bluetooth
1074=Location information(GBS) unavailable
1075=Network unavailable
-1076=Select infrared remote control
+1076=Select infrared remote control
+1077=Air Fresh
+1078=Residual filter screen
+1079=Energy
+1080=Ventilated
+;鍒湅涓嬮潰閮戒竴鏍�,閮芥槸UI鐗规畩瑕佹眰鏁寸殑,鍐嶅姞涓婅�冭檻鑻辨枃闀垮害
+1081=1st Gear
+1082=2nd Gear
+1083=3rd Gear
+1084=1st Gear
+1085=2nd Gear
+1086=3rd Gear
5000=Music
5001=Group
@@ -1265,6 +1274,17 @@
1074=浣嶇疆淇℃伅(GBS)涓嶅彲鐢�
1075=缃戠粶涓嶅彲鐢�
1076=閫夋嫨绾㈠閬ユ帶鍣�
+1077=鏂伴
+1078=褰撳墠婊ょ綉鍓╀綑
+1079=鑺傝兘
+1080=閫氶
+1081=1妗�
+1082=2妗�
+1083=3妗�
+1084=椋庨��1妗�
+1085=椋庨��2妗�
+1086=椋庨��3妗�
+
5000=闊充箰
5001=缁勫悎
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/airFreshjinmao_blue.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/airFreshjinmao_blue.png
new file mode 100644
index 0000000..60153b5
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/airFreshjinmao_blue.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/airFreshjinmao_white.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/airFreshjinmao_white.png
new file mode 100644
index 0000000..0c3b90b
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/airFreshjinmao_white.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/airFreshjinmao.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/airFreshjinmao.png
new file mode 100644
index 0000000..b82b93d
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/airFreshjinmao.png
Binary files differ
diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
index a87374e..fdb18ee 100644
--- a/HDL_ON/DAL/DriverLayer/Control_Udp.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -711,7 +711,7 @@
//4 杩愯妯″紡 1 - 閫氶锛�2 - 鍔犳箍
byte airFreshMode = 1;
if (commandDictionary.ContainsKey(FunctionAttributeKey.Mode) == true
- && commandDictionary[FunctionAttributeKey.Mode] == "fan")
+ && commandDictionary[FunctionAttributeKey.Mode] == "humidification")
{
airFreshMode = 2;
}
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index 51f3383..f6b8350 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -391,6 +391,7 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\Send.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Energy\EnergyMainPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)DAL\ThirdPartySdk\ESOnVideo.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\AirFreshControlPage.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)DAL\" />
--
Gitblit v1.8.0