From 9b76aa77b9c5bf8ccb373cb30e3dca85d224175e Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 25 十月 2024 11:36:49 +0800
Subject: [PATCH] 金茂UI走查，字体更换
---
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneSleepIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneSleepIcon.png | 0
HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoHistroyPage.cs | 2 +-
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon.png | 0
HDL-ON_iOS/HDL-ON_iOS.csproj | 2 +-
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAtHome.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneSleepIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneSleepIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeCoolIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAtHome2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHumiIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/PowerIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAtHome2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeFanIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHumiIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/PowerOffIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon2.png | 0
HDL-ON_iOS/Resources/BEBAS.ttf | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneSleepIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHumiIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeCoolIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeFanIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHumiIcon.png | 0
HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs | 28 +++++++++++++++++-----------
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAtHome2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeFanIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeCoolIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeFanIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHumiIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeCoolIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneSleepIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAtHome2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/PowerIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHumiIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneSleepIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/PowerOffIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHumiIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeFanIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeFanIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/PowerIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon2.png | 0
HDL-ON_Android/Assets/BEBAS2.otf | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeFanIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeCoolIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeFanIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeFanIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeFanIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatIcon2.png | 0
HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs | 18 ++++++++++--------
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeFanIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeCoolIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneSleepIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAtHome.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHumiIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeFanIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHumiIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneSleepIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeCoolIcon2.png | 0
HDL_ON/DAL/Mqtt/MqttClient.cs | 4 ++++
HDL-ON_Android/HDL-ON_Android.csproj | 2 +-
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAtHome.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/PowerIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/PowerIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAtHome2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneSleepIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeCoolIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeCoolIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAtHome.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeFanIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneSleepIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneSleepIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHumiIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeFanIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHumiIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHumiIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAtHome2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/WaterHeater/TempBg.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/PowerIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeCoolIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAtHome.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeCoolIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAtHome.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneSleepIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHumiIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneSleepIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeFanIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeFanIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAtHome.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHumiIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAtHome2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeCoolIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAtHome.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHumiIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon.png | 0
/dev/null | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneSleepIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon2.png | 0
HDL_ON/UI/UI2/FuntionControlView/Acst/WetarHeaterJinmaoHistoryPage.cs | 2 +-
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeCoolIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAtHome2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneSleepIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeCoolIcon2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeCoolIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHumiIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon2.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeCoolIcon2.png | 0
163 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/HDL-ON_Android/Assets/BEBAS.ttf b/HDL-ON_Android/Assets/BEBAS.ttf
deleted file mode 100644
index eaff486..0000000
--- a/HDL-ON_Android/Assets/BEBAS.ttf
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/BEBAS2.otf b/HDL-ON_Android/Assets/BEBAS2.otf
new file mode 100644
index 0000000..2ccf067
--- /dev/null
+++ b/HDL-ON_Android/Assets/BEBAS2.otf
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeCoolIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeCoolIcon.png
index 9c11d3e..9c589ed 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeCoolIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeCoolIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeCoolIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeCoolIcon2.png
index f737e8c..8b249ab 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeCoolIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeCoolIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon.png
index 25663bf..c9c2268 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon2.png
index 44e54fb..4ef838e 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeFanIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeFanIcon.png
index 5f4af29..35fcce6 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeFanIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeFanIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeFanIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeFanIcon2.png
index ed6d76d..ccf7243 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeFanIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeFanIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon.png
index fb4ca03..a60509f 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon2.png
index 0eea8f2..df437ec 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatIcon.png
index 26800a9..ef698ca 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatIcon2.png
index 7ae2edc..ae14a45 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHeatIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHumiIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHumiIcon.png
index b1f5d64..de88b8d 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHumiIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHumiIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHumiIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHumiIcon2.png
index 5029e08..c03b2ae 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHumiIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/ModeHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/PowerIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/PowerIcon.png
index 3e7684c..7591cc5 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/PowerIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/PowerIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAtHome.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAtHome.png
index a8e9743..8cd4e6b 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAtHome.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAtHome.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAtHome2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAtHome2.png
index 0649d8d..913f01a 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAtHome2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAtHome2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon.png
index 98355b8..42f9b86 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon2.png
index dd5ab30..024f996 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneSleepIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneSleepIcon.png
index ffd1fd9..2e12629 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneSleepIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneSleepIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneSleepIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneSleepIcon2.png
index 51b39ae..9698e3d 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneSleepIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/blue/SceneSleepIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeCoolIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeCoolIcon.png
index 3a4b291..6bb07eb 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeCoolIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeCoolIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeCoolIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeCoolIcon2.png
index 0eddc2d..2a3dcf3 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeCoolIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeCoolIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon.png
index bd100bf..ddfeffe 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon2.png
index c91527b..95bb34f 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeFanIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeFanIcon.png
index 74210be..fa7aa08 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeFanIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeFanIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeFanIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeFanIcon2.png
index f2bb414..1886d9d 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeFanIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeFanIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon.png
index e1de801..3b3b53c 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon2.png
index 78b6048..974ae08 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatIcon.png
index 15e1884..260c471 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatIcon2.png
index 66f7e5a..733c3b3 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHeatIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHumiIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHumiIcon.png
index f32ce40..284fe22 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHumiIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHumiIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHumiIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHumiIcon2.png
index 78d5308..f91f935 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHumiIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/ModeHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/PowerOffIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/PowerOffIcon.png
index 56b8ee1..326b573 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/PowerOffIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/PowerOffIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAtHome.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAtHome.png
index f5cf78c..716c291 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAtHome.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAtHome.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAtHome2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAtHome2.png
index b5f9e0b..6849cb5 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAtHome2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAtHome2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon.png
index 90132cc..746767b 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon2.png
index 1afea73..782c717 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneSleepIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneSleepIcon.png
index 9f160cf..f94074f 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneSleepIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneSleepIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneSleepIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneSleepIcon2.png
index 44eaa26..a6437bf 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneSleepIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/grey/SceneSleepIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeCoolIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeCoolIcon.png
index 741a776..c77e9d6 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeCoolIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeCoolIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeCoolIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeCoolIcon2.png
index 13f979e..ee59248 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeCoolIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeCoolIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon.png
index 0020e00..ebaa0c5 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon2.png
index fa1458f..f80fe5e 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeFanIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeFanIcon.png
index 1ed04dd..caff218 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeFanIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeFanIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeFanIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeFanIcon2.png
index c56efeb..1817ca3 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeFanIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeFanIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon.png
index 1a7182f..66e7ec0 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon2.png
index 937be3b..ba252e1 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatIcon.png
index 7f22917..1b79746 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatIcon2.png
index a763a78..afd0274 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHeatIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHumiIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHumiIcon.png
index c130a2f..d193016 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHumiIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHumiIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHumiIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHumiIcon2.png
index 8c4b718..0ee3070 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHumiIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/ModeHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/PowerIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/PowerIcon.png
index 6fbb313..97ed155 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/PowerIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/PowerIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAtHome.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAtHome.png
index c0dba62..3db2297 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAtHome.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAtHome.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAtHome2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAtHome2.png
index 0eba990..344840f 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAtHome2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAtHome2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon.png
index 65d345a..fd95cea 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon2.png
index a4e099f..8f3a725 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneSleepIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneSleepIcon.png
index 2b97168..ba10aa0 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneSleepIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneSleepIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneSleepIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneSleepIcon2.png
index 2353460..88564ec 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneSleepIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/orange/SceneSleepIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeCoolIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeCoolIcon.png
index f21e863..d801bba 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeCoolIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeCoolIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeCoolIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeCoolIcon2.png
index 8301c84..fef141c 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeCoolIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeCoolIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon.png
index 78207ba..2d4d37a 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon2.png
index e9cde12..8d3dfb8 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeFanIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeFanIcon.png
index 1177749..0a6b03d 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeFanIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeFanIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeFanIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeFanIcon2.png
index 967f640..c76b020 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeFanIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeFanIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon.png
index 10bfa81..8db3e2e 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon2.png
index d30bd3c..10fb460 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatIcon.png
index a1a1303..88496f5 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatIcon2.png
index 340bdb2..016beac 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHeatIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHumiIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHumiIcon.png
index 072b382..2b652d0 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHumiIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHumiIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHumiIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHumiIcon2.png
index 494559e..a7c1615 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHumiIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/ModeHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/PowerIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/PowerIcon.png
index 1e1e30f..84d8c11 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/PowerIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/PowerIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAtHome.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAtHome.png
index 9a1d911..6615d4b 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAtHome.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAtHome.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAtHome2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAtHome2.png
index 0e249b8..2419c8e 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAtHome2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAtHome2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon.png
index a2c8e80..e1b76a2 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon2.png
index 663530a..ffb4d3b 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneSleepIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneSleepIcon.png
index 7206526..9e3d425 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneSleepIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneSleepIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneSleepIcon2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneSleepIcon2.png
index 3b9b231..49ac1d1 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneSleepIcon2.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/purple/SceneSleepIcon2.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 452304f..2759767 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -672,9 +672,9 @@
<AndroidAsset Include="Assets\Phone\Collection\TokenInvalidTipIcon.png" />
<AndroidAsset Include="Assets\Phone\Public\RightIcon2.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\Power80pIcon.png" />
- <AndroidAsset Include="Assets\BEBAS.ttf" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvBgDischargeBg.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvBgRunBg.png" />
+ <AndroidAsset Include="Assets\BEBAS2.otf" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\colors.xml" />
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index c5970dc..76514f8 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1850,9 +1850,9 @@
<BundleResource Include="Resources\Phone\Collection\TokenInvalidTipIcon.png" />
<BundleResource Include="Resources\Phone\Public\RightIcon2.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\Power80pIcon.png" />
- <BundleResource Include="Resources\BEBAS.ttf" />
<BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\PvBgDischargeBg.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Acst\Inverter\PvBgRunBg.png" />
+ <BundleResource Include="Resources\BEBAS.ttf" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/BEBAS.ttf b/HDL-ON_iOS/Resources/BEBAS.ttf
index eaff486..35b5622 100644
--- a/HDL-ON_iOS/Resources/BEBAS.ttf
+++ b/HDL-ON_iOS/Resources/BEBAS.ttf
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/WaterHeater/TempBg.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/WaterHeater/TempBg.png
index 8b2adca..623041d 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/WaterHeater/TempBg.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/WaterHeater/TempBg.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeCoolIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeCoolIcon.png
index 9c11d3e..9c589ed 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeCoolIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeCoolIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeCoolIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeCoolIcon2.png
index f737e8c..8b249ab 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeCoolIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeCoolIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon.png
index 25663bf..c9c2268 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon2.png
index 44e54fb..4ef838e 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeDeHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeFanIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeFanIcon.png
index 5f4af29..35fcce6 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeFanIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeFanIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeFanIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeFanIcon2.png
index ed6d76d..ccf7243 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeFanIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeFanIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon.png
index fb4ca03..a60509f 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon2.png
index 0eea8f2..df437ec 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatIcon.png
index 26800a9..ef698ca 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatIcon2.png
index 7ae2edc..ae14a45 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHeatIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHumiIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHumiIcon.png
index b1f5d64..de88b8d 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHumiIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHumiIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHumiIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHumiIcon2.png
index 5029e08..c03b2ae 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHumiIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/ModeHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/PowerIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/PowerIcon.png
index 3e7684c..7591cc5 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/PowerIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/PowerIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAtHome.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAtHome.png
index a8e9743..8cd4e6b 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAtHome.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAtHome.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAtHome2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAtHome2.png
index 0649d8d..913f01a 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAtHome2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAtHome2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon.png
index 98355b8..42f9b86 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon2.png
index dd5ab30..024f996 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneAwayHomeIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneSleepIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneSleepIcon.png
index ffd1fd9..2e12629 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneSleepIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneSleepIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneSleepIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneSleepIcon2.png
index 51b39ae..9698e3d 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneSleepIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/blue/SceneSleepIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeCoolIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeCoolIcon.png
index 3a4b291..6bb07eb 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeCoolIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeCoolIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeCoolIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeCoolIcon2.png
index 0eddc2d..2a3dcf3 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeCoolIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeCoolIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon.png
index bd100bf..ddfeffe 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon2.png
index c91527b..95bb34f 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeDeHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeFanIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeFanIcon.png
index 74210be..fa7aa08 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeFanIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeFanIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeFanIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeFanIcon2.png
index f2bb414..1886d9d 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeFanIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeFanIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon.png
index e1de801..3b3b53c 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon2.png
index 78b6048..974ae08 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatIcon.png
index 15e1884..260c471 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatIcon2.png
index 66f7e5a..733c3b3 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHeatIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHumiIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHumiIcon.png
index f32ce40..284fe22 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHumiIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHumiIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHumiIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHumiIcon2.png
index 78d5308..f91f935 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHumiIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/ModeHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/PowerOffIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/PowerOffIcon.png
index 56b8ee1..326b573 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/PowerOffIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/PowerOffIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAtHome.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAtHome.png
index f5cf78c..716c291 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAtHome.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAtHome.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAtHome2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAtHome2.png
index b5f9e0b..6849cb5 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAtHome2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAtHome2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon.png
index 90132cc..746767b 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon2.png
index 1afea73..782c717 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneAwayHomeIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneSleepIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneSleepIcon.png
index 9f160cf..f94074f 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneSleepIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneSleepIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneSleepIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneSleepIcon2.png
index 44eaa26..a6437bf 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneSleepIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/grey/SceneSleepIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeCoolIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeCoolIcon.png
index 741a776..c77e9d6 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeCoolIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeCoolIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeCoolIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeCoolIcon2.png
index 13f979e..ee59248 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeCoolIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeCoolIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon.png
index 0020e00..ebaa0c5 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon2.png
index fa1458f..f80fe5e 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeDeHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeFanIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeFanIcon.png
index 1ed04dd..caff218 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeFanIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeFanIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeFanIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeFanIcon2.png
index c56efeb..1817ca3 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeFanIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeFanIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon.png
index 1a7182f..66e7ec0 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon2.png
index 937be3b..ba252e1 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatIcon.png
index 7f22917..1b79746 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatIcon2.png
index a763a78..afd0274 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHeatIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHumiIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHumiIcon.png
index c130a2f..d193016 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHumiIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHumiIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHumiIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHumiIcon2.png
index 8c4b718..0ee3070 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHumiIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/ModeHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/PowerIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/PowerIcon.png
index 6fbb313..97ed155 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/PowerIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/PowerIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAtHome.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAtHome.png
index c0dba62..3db2297 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAtHome.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAtHome.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAtHome2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAtHome2.png
index 0eba990..344840f 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAtHome2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAtHome2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon.png
index 65d345a..fd95cea 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon2.png
index a4e099f..8f3a725 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneAwayHomeIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneSleepIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneSleepIcon.png
index 2b97168..ba10aa0 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneSleepIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneSleepIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneSleepIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneSleepIcon2.png
index 2353460..88564ec 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneSleepIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/orange/SceneSleepIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeCoolIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeCoolIcon.png
index f21e863..d801bba 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeCoolIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeCoolIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeCoolIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeCoolIcon2.png
index 8301c84..fef141c 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeCoolIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeCoolIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon.png
index 78207ba..2d4d37a 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon2.png
index e9cde12..8d3dfb8 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeDeHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeFanIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeFanIcon.png
index 1177749..0a6b03d 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeFanIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeFanIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeFanIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeFanIcon2.png
index 967f640..c76b020 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeFanIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeFanIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon.png
index 10bfa81..8db3e2e 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon2.png
index d30bd3c..10fb460 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatIcon.png
index a1a1303..88496f5 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatIcon2.png
index 340bdb2..016beac 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHeatIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHumiIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHumiIcon.png
index 072b382..2b652d0 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHumiIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHumiIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHumiIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHumiIcon2.png
index 494559e..a7c1615 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHumiIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/ModeHumiIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/PowerIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/PowerIcon.png
index 1e1e30f..84d8c11 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/PowerIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/PowerIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAtHome.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAtHome.png
index 9a1d911..6615d4b 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAtHome.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAtHome.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAtHome2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAtHome2.png
index 0e249b8..2419c8e 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAtHome2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAtHome2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon.png
index a2c8e80..e1b76a2 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon2.png
index 663530a..ffb4d3b 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneAwayHomeIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneSleepIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneSleepIcon.png
index 7206526..9e3d425 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneSleepIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneSleepIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneSleepIcon2.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneSleepIcon2.png
index 3b9b231..49ac1d1 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneSleepIcon2.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Acst/purple/SceneSleepIcon2.png
Binary files differ
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 7113136..70e5ffc 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -859,6 +859,10 @@
static void ReceiveNotifySqueezeAsync(string mMes)
{
MainPage.Log($"鎺ㄩ�佹爣璇嗭細{mMes};鏈湴鏍囪瘑锛歿PushSignStr}");
+#if DEBUG
+ MainPage.Log("璋冭瘯妯″紡锛屼笉瑙﹀彂鎸や笅绾裤��");
+ return;
+#endif
if (mMes == PushSignStr) return;//鏄嚜宸辩殑鐧诲綍鎺ㄩ�佷笉澶勭悊//鎴栬�呭綋鍓嶄笉鏄繙绋嬮摼鎺ョ姸鎬�
DisConnectRemoteMqttClient("鎸や笅绾�");
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoHistroyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoHistroyPage.cs
index 8075cb0..edf27e7 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoHistroyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoHistroyPage.cs
@@ -1323,7 +1323,7 @@
Radius = (uint)Application.GetRealWidth(12),
};
optionBaseView.AddChidren(topView);
- topView.AddChidren(new Button() { Y = Application.GetRealHeight(39), Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });
+ optionBaseView.AddChidren(new Button() { Y = Application.GetRealHeight(39), Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });
var btnCancel = new Button()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
index 539b572..b3212d9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
@@ -556,7 +556,7 @@
Y = Application.GetRealWidth(191),
Width = Application.GetRealWidth(100),
Height = Application.GetRealWidth(24),
- Text = "---",
+ Text = "--",
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 18,
@@ -944,7 +944,7 @@
esRunStatus_BatteryIconButton = new Button()
{
- X = Application.GetRealWidth(343 - 12 - 20) - esRunStatus_BatteryValuesButton.Width,
+ X = Application.GetRealWidth(343 - 12 - 18) - esRunStatus_BatteryValuesButton.Width,
Y = Application.GetRealWidth(16),
Width = Application.GetRealWidth(20),
Height = Application.GetRealWidth(20),
@@ -956,10 +956,10 @@
var esRunStatus_ValuesInfoView = new FrameLayout()
{
- Width = Application.GetRealWidth(282),
- Height = Application.GetRealWidth(153),
+ Width = Application.GetRealWidth(564/2),
+ Height = Application.GetRealWidth(306/2),
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealWidth(40),
+ Y = Application.GetRealWidth(40-7),
BackgroundImagePath = "FunctionIcon/Acst/Inverter/EnergyStorageStatusBg.png",
};
esStatusView.AddChidren(esRunStatus_ValuesInfoView);
@@ -968,6 +968,7 @@
var esRunStatus_ChargeValuesView = new FrameLayout()
{
X = Application.GetRealWidth(15),
+ Y = Application.GetRealWidth(6),
Width = Application.GetRealWidth(128),
Height = Application.GetRealWidth(128),
};
@@ -975,21 +976,21 @@
esRunStatus_ChargeValuesButton = new Button()
{
- Y = Application.GetRealWidth(36),
+ Y = Application.GetRealWidth(39),
Height = Application.GetRealWidth(32),
TextAlignment = TextAlignment.Center,
Text = function.GetAttrState(InverterJinmao_AttrEnum.ess_charge_power.ToString()),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 24,
IsBold = true,
- FontName = fontName,
+ FontName = fontName,
};
esRunStatus_ChargeValuesView.AddChidren(esRunStatus_ChargeValuesButton);
var esRunStatus_ChargeTextButton = new Button()
{
X = Application.GetRealWidth(1),
- Y = Application.GetRealWidth(76),
+ Y = Application.GetRealWidth(78),
Height = Application.GetRealWidth(17),
TextAlignment = TextAlignment.Center,
Text = "瀹炴椂鍏呯數鍔熺巼(kw)",
@@ -1003,6 +1004,7 @@
var esRunStatus_DischargeValuesView = new FrameLayout()
{
X = Application.GetRealWidth(132 + 13),
+ Y = Application.GetRealWidth(6),
Width = Application.GetRealWidth(128),
Height = Application.GetRealWidth(128),
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs
index dc0e436..1883669 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs
@@ -144,7 +144,7 @@
Button btnPowerControl;
#if __ANDROID__
- private string fontName = "BEBAS.ttf";
+ private string fontName = "BEBAS2.otf";
#else
private string fontName = "BEBAS";
#endif
@@ -244,22 +244,22 @@
var infoView_Temp_View = new FrameLayout()
{
Gravity = Gravity.Center,
- Width = Application.GetRealWidth(133),
- Height = Application.GetRealWidth(133),
+ Width = Application.GetRealWidth(181),
+ Height = Application.GetRealWidth(181),
BackgroundImagePath = "FunctionIcon/Acst/WaterHeater/TempBg.png"
};
infoView.AddChidren(infoView_Temp_View);
btnTempValues = new Button()
{
- Y = Application.GetRealWidth(34),
+ Y = Application.GetRealWidth(58),
Gravity = Gravity.CenterVertical,
Height = Application.GetRealWidth(43),
IsBold = true,
TextSize = 32,
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.TopCenter,
- Text = function.GetAttrState(WaterHeaterJinmao_AttrEnum.temp.ToString(), "---"),
+ Text = function.GetAttrState(WaterHeaterJinmao_AttrEnum.temp.ToString(), "--"),
FontName = fontName,
};
btnTempValues.Width = btnTempValues.GetTextWidth() + Application.GetRealWidth(6);
@@ -274,7 +274,7 @@
btnTempValuesUint = new Button()
{
X = btnTempValues.Right,
- Y = Application.GetRealWidth(40),
+ Y = Application.GetRealWidth(64),
Height = Application.GetRealWidth(66),
TextAlignment = TextAlignment.TopLeft,
Width = Application.GetRealWidth(30),
@@ -286,7 +286,7 @@
var infoView_Temp_Text = new Button()
{
- Y = Application.GetRealWidth(80),
+ Y = Application.GetRealWidth(104),
Height = Application.GetRealWidth(23),
TextAlignment = TextAlignment.Center,
TextSize = 12,
@@ -543,6 +543,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
Text = "鐑按娴侀噺锛�" + function.GetAttrState(WaterHeaterJinmao_AttrEnum.flow.ToString()) + "L/min",
IsBold = true,
+ FontName = fontName,
};
flowView.AddChidren(flow_ValuesButton);
@@ -578,6 +579,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
+ FontName = fontName,
};
flowView.AddChidren(flow_VolumeButton);
@@ -624,7 +626,8 @@
TextAlignment = TextAlignment.CenterLeft,
TextSize = 14,
TextColor = 0xFF00C22D,
- Text = recyclVolumePercent + "%"
+ Text = recyclVolumePercent + "%",
+ FontName = fontName,
};
flowView.AddChidren(flow_HeatRecoveryProgressButton);
@@ -637,7 +640,8 @@
TextAlignment = TextAlignment.CenterLeft,
TextSize = 14,
TextColor = CSS_Color.FirstLevelTitleColor,
- Text = recyclVolume + "t"
+ Text = recyclVolume + "t",
+ FontName = fontName,
};
flowView.AddChidren(flow_HeatRecoverytValuesButton);
@@ -663,7 +667,8 @@
TextAlignment = TextAlignment.CenterRight,
TextSize = 14,
TextColor = 0xFFFC9C04,
- Text = "0%"
+ Text = "0%",
+ FontName = fontName,
};
if (volume > 0)
{
@@ -680,7 +685,8 @@
TextAlignment = TextAlignment.CenterRight,
TextSize = 14,
TextColor = CSS_Color.FirstLevelTitleColor,
- Text = Math.Round((volume - recyclVolume),1) + "t"
+ Text = Math.Round((volume - recyclVolume),1) + "t",
+ FontName = fontName,
};
flowView.AddChidren(flow_ElectricDriveValuesButton);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/WetarHeaterJinmaoHistoryPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/WetarHeaterJinmaoHistoryPage.cs
index 5ca8360..dfb6147 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/WetarHeaterJinmaoHistoryPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/WetarHeaterJinmaoHistoryPage.cs
@@ -1328,7 +1328,7 @@
Radius = (uint)Application.GetRealWidth(12),
};
optionBaseView.AddChidren(topView);
- topView.AddChidren(new Button() { Y = Application.GetRealHeight(39), Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });
+ optionBaseView.AddChidren(new Button() { Y = Application.GetRealHeight(39), Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });
var btnCancel = new Button()
{
--
Gitblit v1.8.0