From 132ef8524e38d06da8cf74292a3ac1eff065bb1b Mon Sep 17 00:00:00 2001
From: tzy <274116637@qq.com>
Date: 星期二, 23 三月 2021 16:38:01 +0800
Subject: [PATCH] 整好新风的UI，待真实设备测试
---
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Energy.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan3Select.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan2Select.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan1.png | 0
HDL-ON_iOS/HDL-ON_iOS.csproj | 16 ++++++++
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/HumidificationSelect.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/VentilateSelect.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Ventilate.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Humidification.png | 0
HDL_ON/HDL_ON.projitems | 1
HDL-ON_Android/HDL-ON_Android.csproj | 16 ++++++++
HDL-ON_iOS/Resources/Language.ini | 29 +++++++++++++-
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Comfortable.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan3.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/EnergySelect.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan1Select.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/TempAndHumiBack.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/ComfortableSelect.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/Fan/DialogTitleMenuGroud2.png | 0
20 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 8b7cf06..507aa88 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -966,6 +966,22 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm25Bg.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\0.png" />
<AndroidAsset Include="Assets\Phone\PirIcon\add.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" />
</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 2cf6254..0b1a564 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1193,6 +1193,22 @@
<BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\TempIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\TvocIcon.png" />
<BundleResource Include="Resources\Phone\PirIcon\add.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud2.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" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index ae19318..cd38ac2 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -423,11 +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
@@ -499,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
@@ -1264,6 +1275,17 @@
1074=浣嶇疆淇℃伅(GBS)涓嶅彲鐢�
1075=缃戠粶涓嶅彲鐢�
1076=閫夋嫨绾㈠閬ユ帶鍣�
+1077=鏂伴
+1078=褰撳墠婊ょ綉鍓╀綑
+1079=鑺傝兘
+1080=閫氶
+1081=1妗�
+1082=2妗�
+1083=3妗�
+1084=椋庨��1妗�
+1085=椋庨��2妗�
+1086=椋庨��3妗�
+
5000=闊充箰
5001=缁勫悎
@@ -1392,6 +1414,7 @@
6076=缂栬緫淇℃伅
6077=鐗堟湰鍗囩骇
+
6015=鍦ㄧ嚎
6016=绂荤嚎
6017=鐗堟湰鍙�
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Comfortable.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Comfortable.png
new file mode 100644
index 0000000..6c6a80c
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Comfortable.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/ComfortableSelect.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/ComfortableSelect.png
new file mode 100644
index 0000000..e154c5e
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/ComfortableSelect.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Energy.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Energy.png
new file mode 100644
index 0000000..181f206
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Energy.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/EnergySelect.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/EnergySelect.png
new file mode 100644
index 0000000..69ed7d0
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/EnergySelect.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan1.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan1.png
new file mode 100644
index 0000000..6509e14
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan1.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan1Select.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan1Select.png
new file mode 100644
index 0000000..92931d6
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan1Select.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan2.png
new file mode 100644
index 0000000..84b91c9
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan2Select.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan2Select.png
new file mode 100644
index 0000000..aa86194
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan2Select.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan3.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan3.png
new file mode 100644
index 0000000..05a3e27
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan3.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan3Select.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan3Select.png
new file mode 100644
index 0000000..5cf8062
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan3Select.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Humidification.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Humidification.png
new file mode 100644
index 0000000..193072a
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Humidification.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/HumidificationSelect.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/HumidificationSelect.png
new file mode 100644
index 0000000..b027922
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/HumidificationSelect.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/TempAndHumiBack.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/TempAndHumiBack.png
new file mode 100644
index 0000000..b50509a
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/TempAndHumiBack.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Ventilate.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Ventilate.png
new file mode 100644
index 0000000..22d7028
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Ventilate.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/VentilateSelect.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/VentilateSelect.png
new file mode 100644
index 0000000..6760350
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/VentilateSelect.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/Fan/DialogTitleMenuGroud2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/Fan/DialogTitleMenuGroud2.png
new file mode 100644
index 0000000..efb85b7
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/Fan/DialogTitleMenuGroud2.png
Binary files differ
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index cda2265..b4ae143 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -387,6 +387,7 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\EnvironmentalScience\EnvironmentalPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\EnvironmentalScience\EchartsOption_Pie.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\SetPir.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\AirFreshControlPage.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)DAL\" />
--
Gitblit v1.8.0