From 2d6787d9dedca3553ccd9ae5eb1bc7e52d2608e2 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 16 三月 2021 16:44:33 +0800
Subject: [PATCH] 3.
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs | 35 +-
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalracks_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricaltv.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainshades_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalfan_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalfan_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/airFreshstandard_blue.png | 0
HDL-ON_iOS/HDL-ON_iOS.csproj | 83 +++++
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalracks.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/irmodule.png | 0
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs | 21 +
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | 164 +++++++++++
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightrgb.png | 0
HDL_ON/HDL_ON.projitems | 2
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalkoiGhMKwLf2ZP81g_white.png | 0
HDL-ON_Android/HDL-ON_Android.csproj | 83 +++++
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightrgbw.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorhumidity.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalQ1RsefNf91tIXyyQ_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/floorHeatstandard_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/floorHeatstandard_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltyqborgovyzytytz_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainshades_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainswitch_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightdimming_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/irac.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irtv_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/airFreshstandard.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensordoorwindow.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightcct.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorpm25.png | 0
HDL_ON/Entity/Integratedbrand/IntegratedBrand.cs | 81 +++++
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irlearn_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/musicstandard_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/acstandard_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainroller_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtaintrietex_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtaintrietex_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalkoiGhMKwLf2ZP81g_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorwater.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightdimming.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightcct_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricaltyqborgovyzytytz.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/floorHeatstandard.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/curtainswitch.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorco2.png | 0
HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/irmodule.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightdimming_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightrgbw_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightswitch_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalsocket_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalsocket_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/airFreshstandard_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensortvoc.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalai6HtccKFIw3dxo3_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalracks_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/musicstandard_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorsmoke.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainswitch_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irac_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/curtaintrietex.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalsocket.png | 0
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs | 144 ++++++++++
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/ThirdPartyBrandListPage.cs | 166 +++++-----
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltv_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irac_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irlearn_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalfan.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalQ1RsefNf91tIXyyQ_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightcct_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalkoiGhMKwLf2ZP81g.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltv_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/irtv.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorgas.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalai6HtccKFIw3dxo3.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/curtainshades.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalQ1RsefNf91tIXyyQ.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltyqborgovyzytytz_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightrgb_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/irlearn.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalai6HtccKFIw3dxo3_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irtv_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/curtainroller.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightrgb_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightrgbw_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/acstandard.png | 0
HDL_ON/DAL/Server/NewAPI.cs | 4
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorpir.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainroller_white.png | 0
HDL_ON/DAL/Server/HttpServerRequest.cs | 35 ++
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightswitch.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensortemperature.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/acstandard_white.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightswitch_blue.png | 0
HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/musicstandard.png | 0
95 files changed, 714 insertions(+), 104 deletions(-)
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/acstandard_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/acstandard_blue.png
new file mode 100644
index 0000000..66155c5
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/acstandard_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/acstandard_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/acstandard_white.png
new file mode 100644
index 0000000..32e354e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/acstandard_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/airFreshstandard_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/airFreshstandard_blue.png
new file mode 100644
index 0000000..23f6005
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/airFreshstandard_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/airFreshstandard_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/airFreshstandard_white.png
new file mode 100644
index 0000000..9a40fd6
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/airFreshstandard_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainroller_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainroller_blue.png
new file mode 100644
index 0000000..5ae946e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainroller_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainroller_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainroller_white.png
new file mode 100644
index 0000000..1ff8d10
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainroller_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainshades_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainshades_blue.png
new file mode 100644
index 0000000..9053f13
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainshades_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainshades_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainshades_white.png
new file mode 100644
index 0000000..01a5a48
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainshades_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainswitch_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainswitch_blue.png
new file mode 100644
index 0000000..220ff6e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainswitch_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainswitch_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainswitch_white.png
new file mode 100644
index 0000000..f74c97d
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtainswitch_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtaintrietex_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtaintrietex_blue.png
new file mode 100644
index 0000000..e3671a2
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtaintrietex_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtaintrietex_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtaintrietex_white.png
new file mode 100644
index 0000000..259e176
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/curtaintrietex_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalQ1RsefNf91tIXyyQ_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalQ1RsefNf91tIXyyQ_blue.png
new file mode 100644
index 0000000..3caf309
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalQ1RsefNf91tIXyyQ_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalQ1RsefNf91tIXyyQ_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalQ1RsefNf91tIXyyQ_white.png
new file mode 100644
index 0000000..58dbb2d
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalQ1RsefNf91tIXyyQ_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalai6HtccKFIw3dxo3_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalai6HtccKFIw3dxo3_blue.png
new file mode 100644
index 0000000..aab3b24
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalai6HtccKFIw3dxo3_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalai6HtccKFIw3dxo3_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalai6HtccKFIw3dxo3_white.png
new file mode 100644
index 0000000..48e6784
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalai6HtccKFIw3dxo3_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalfan_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalfan_blue.png
new file mode 100644
index 0000000..c59a2e5
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalfan_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalfan_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalfan_white.png
new file mode 100644
index 0000000..8c5ead5
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalfan_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalkoiGhMKwLf2ZP81g_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalkoiGhMKwLf2ZP81g_blue.png
new file mode 100644
index 0000000..e25af0b
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalkoiGhMKwLf2ZP81g_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalkoiGhMKwLf2ZP81g_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalkoiGhMKwLf2ZP81g_white.png
new file mode 100644
index 0000000..4e2f1df
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalkoiGhMKwLf2ZP81g_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalracks_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalracks_blue.png
new file mode 100644
index 0000000..0e89579
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalracks_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalracks_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalracks_white.png
new file mode 100644
index 0000000..4845fa2
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalracks_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalsocket_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalsocket_blue.png
new file mode 100644
index 0000000..84ff63d
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalsocket_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalsocket_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalsocket_white.png
new file mode 100644
index 0000000..1fd6e8e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalsocket_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltv_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltv_blue.png
new file mode 100644
index 0000000..d28c4af
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltv_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltv_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltv_white.png
new file mode 100644
index 0000000..1f42e9f
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltv_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltyqborgovyzytytz_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltyqborgovyzytytz_blue.png
new file mode 100644
index 0000000..c59a2e5
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltyqborgovyzytytz_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltyqborgovyzytytz_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltyqborgovyzytytz_white.png
new file mode 100644
index 0000000..8c5ead5
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricaltyqborgovyzytytz_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/floorHeatstandard_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/floorHeatstandard_blue.png
new file mode 100644
index 0000000..d44a273
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/floorHeatstandard_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/floorHeatstandard_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/floorHeatstandard_white.png
new file mode 100644
index 0000000..06e28c0
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/floorHeatstandard_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irac_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irac_blue.png
new file mode 100644
index 0000000..66155c5
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irac_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irac_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irac_white.png
new file mode 100644
index 0000000..32e354e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irac_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irlearn_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irlearn_blue.png
new file mode 100644
index 0000000..50f52ea
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irlearn_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irlearn_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irlearn_white.png
new file mode 100644
index 0000000..80addfe
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irlearn_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irtv_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irtv_blue.png
new file mode 100644
index 0000000..d28c4af
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irtv_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irtv_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irtv_white.png
new file mode 100644
index 0000000..1f42e9f
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/irtv_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightcct_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightcct_blue.png
new file mode 100644
index 0000000..5e07518
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightcct_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightcct_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightcct_white.png
new file mode 100644
index 0000000..cb36722
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightcct_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightdimming_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightdimming_blue.png
new file mode 100644
index 0000000..b40b6d9
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightdimming_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightdimming_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightdimming_white.png
new file mode 100644
index 0000000..f18a303
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightdimming_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightrgb_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightrgb_blue.png
new file mode 100644
index 0000000..5e07518
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightrgb_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightrgb_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightrgb_white.png
new file mode 100644
index 0000000..cb36722
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightrgb_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightrgbw_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightrgbw_blue.png
new file mode 100644
index 0000000..5e07518
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightrgbw_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightrgbw_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightrgbw_white.png
new file mode 100644
index 0000000..cb36722
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightrgbw_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightswitch_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightswitch_blue.png
new file mode 100644
index 0000000..9df7593
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightswitch_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightswitch_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightswitch_white.png
new file mode 100644
index 0000000..79b5a76
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/lightswitch_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/musicstandard_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/musicstandard_blue.png
new file mode 100644
index 0000000..512f3eb
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/musicstandard_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/musicstandard_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/musicstandard_white.png
new file mode 100644
index 0000000..85065ec
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/musicstandard_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/acstandard.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/acstandard.png
new file mode 100644
index 0000000..6d7221b
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/acstandard.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/airFreshstandard.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/airFreshstandard.png
new file mode 100644
index 0000000..6657bae
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/airFreshstandard.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/curtainroller.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/curtainroller.png
new file mode 100644
index 0000000..10bdb27
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/curtainroller.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/curtainshades.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/curtainshades.png
new file mode 100644
index 0000000..abeae75
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/curtainshades.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/curtainswitch.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/curtainswitch.png
new file mode 100644
index 0000000..8ce4669
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/curtainswitch.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/curtaintrietex.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/curtaintrietex.png
new file mode 100644
index 0000000..0eeb3a0
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/curtaintrietex.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalQ1RsefNf91tIXyyQ.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalQ1RsefNf91tIXyyQ.png
new file mode 100644
index 0000000..f299156
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalQ1RsefNf91tIXyyQ.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalai6HtccKFIw3dxo3.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalai6HtccKFIw3dxo3.png
new file mode 100644
index 0000000..8486852
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalai6HtccKFIw3dxo3.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalfan.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalfan.png
new file mode 100644
index 0000000..0447c4d
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalfan.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalkoiGhMKwLf2ZP81g.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalkoiGhMKwLf2ZP81g.png
new file mode 100644
index 0000000..ed0735d
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalkoiGhMKwLf2ZP81g.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalracks.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalracks.png
new file mode 100644
index 0000000..6f10d54
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalracks.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalsocket.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalsocket.png
new file mode 100644
index 0000000..6a324db
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalsocket.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricaltv.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricaltv.png
new file mode 100644
index 0000000..7f9045f
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricaltv.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricaltyqborgovyzytytz.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricaltyqborgovyzytytz.png
new file mode 100644
index 0000000..0447c4d
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricaltyqborgovyzytytz.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/floorHeatstandard.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/floorHeatstandard.png
new file mode 100644
index 0000000..c067812
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/floorHeatstandard.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/irac.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/irac.png
new file mode 100644
index 0000000..6d7221b
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/irac.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/irlearn.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/irlearn.png
new file mode 100644
index 0000000..f6654d9
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/irlearn.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/irmodule.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/irmodule.png
new file mode 100644
index 0000000..5bb5bb2
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/irmodule.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/irtv.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/irtv.png
new file mode 100644
index 0000000..7f9045f
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/irtv.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightcct.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightcct.png
new file mode 100644
index 0000000..9fabb8e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightcct.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightdimming.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightdimming.png
new file mode 100644
index 0000000..6fd97b5
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightdimming.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightrgb.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightrgb.png
new file mode 100644
index 0000000..9fabb8e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightrgb.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightrgbw.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightrgbw.png
new file mode 100644
index 0000000..9fabb8e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightrgbw.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightswitch.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightswitch.png
new file mode 100644
index 0000000..0aa1f98
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/lightswitch.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/musicstandard.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/musicstandard.png
new file mode 100644
index 0000000..d522bf3
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/musicstandard.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorco2.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorco2.png
new file mode 100644
index 0000000..4d52fc1
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorco2.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensordoorwindow.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensordoorwindow.png
new file mode 100644
index 0000000..6f82b1f
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensordoorwindow.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorgas.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorgas.png
new file mode 100644
index 0000000..6e05b01
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorgas.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorhumidity.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorhumidity.png
new file mode 100644
index 0000000..3549ac7
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorhumidity.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorpir.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorpir.png
new file mode 100644
index 0000000..5afa201
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorpir.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorpm25.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorpm25.png
new file mode 100644
index 0000000..2f07a0b
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorpm25.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorsmoke.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorsmoke.png
new file mode 100644
index 0000000..245f9de
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorsmoke.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensortemperature.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensortemperature.png
new file mode 100644
index 0000000..d852749
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensortemperature.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensortvoc.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensortvoc.png
new file mode 100644
index 0000000..a37cc0e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensortvoc.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorwater.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorwater.png
new file mode 100644
index 0000000..57b566a
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorwater.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index c83cd17..c8c0871 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -842,6 +842,89 @@
<AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\UploadToCloundSelect.png" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\MiniRemoteControlMenuIcon.png" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\WifiAndPhoneConnect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensortvoc.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\irmodule.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorpir.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\electricalai6HtccKFIw3dxo3.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\lightrgb.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\airFreshstandard.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\electricalracks.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\electricalfan.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorpm25.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\acstandard.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\electricalsocket.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorgas.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorhumidity.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\electricalkoiGhMKwLf2ZP81g.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\lightcct.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\curtainroller.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\irlearn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\lightdimming.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorco2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\electricaltv.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\floorHeatstandard.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\curtainswitch.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\curtainshades.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\electricaltyqborgovyzytytz.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\musicstandard.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensordoorwindow.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\lightrgbw.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensortemperature.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\curtaintrietex.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorsmoke.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\electricalQ1RsefNf91tIXyyQ.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\irac.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorwater.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\lightswitch.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\irtv.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\lightrgbw_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irac_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricaltv_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalai6HtccKFIw3dxo3_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\curtaintrietex_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\floorHeatstandard_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\musicstandard_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalfan_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\curtainswitch_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\lightdimming_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\lightrgbw_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricaltyqborgovyzytytz_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\airFreshstandard_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\lightrgb_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irtv_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irlearn_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\musicstandard_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalfan_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\curtainshades_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalkoiGhMKwLf2ZP81g_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irac_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalkoiGhMKwLf2ZP81g_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\acstandard_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\lightcct_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalracks_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalai6HtccKFIw3dxo3_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\lightswitch_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\curtaintrietex_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\airFreshstandard_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\floorHeatstandard_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\curtainshades_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalQ1RsefNf91tIXyyQ_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricaltyqborgovyzytytz_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\lightcct_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\lightrgb_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\curtainroller_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\curtainroller_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalQ1RsefNf91tIXyyQ_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irtv_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalsocket_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\lightswitch_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\lightdimming_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricaltv_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalsocket_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\acstandard_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irlearn_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\curtainswitch_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalracks_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 3eee26f..eb0fd00 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1066,6 +1066,89 @@
<BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\UploadToCloundSelect.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\MiniRemoteControlMenuIcon.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\WifiAndPhoneConnect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensortvoc.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorpir.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalai6HtccKFIw3dxo3.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightrgb.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\airFreshstandard.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalracks.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalfan.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorpm25.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\acstandard.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalsocket.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorgas.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorhumidity.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalkoiGhMKwLf2ZP81g.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightcct.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\curtainroller.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irlearn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightdimming.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorco2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricaltv.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\floorHeatstandard.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\curtainswitch.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\curtainshades.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricaltyqborgovyzytytz.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\musicstandard.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensordoorwindow.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightrgbw.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensortemperature.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\curtaintrietex.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorsmoke.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalQ1RsefNf91tIXyyQ.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irac.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorwater.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\lightswitch.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irtv.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightrgbw_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irac_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricaltv_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalai6HtccKFIw3dxo3_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtaintrietex_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\floorHeatstandard_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\musicstandard_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalfan_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainswitch_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightdimming_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightrgbw_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricaltyqborgovyzytytz_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\airFreshstandard_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightrgb_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irtv_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irlearn_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\musicstandard_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalfan_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainshades_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalkoiGhMKwLf2ZP81g_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irac_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalkoiGhMKwLf2ZP81g_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\acstandard_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightcct_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalracks_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalai6HtccKFIw3dxo3_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightswitch_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtaintrietex_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\airFreshstandard_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\floorHeatstandard_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainshades_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalQ1RsefNf91tIXyyQ_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricaltyqborgovyzytytz_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightcct_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightrgb_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainroller_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainroller_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalQ1RsefNf91tIXyyQ_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irtv_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalsocket_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightswitch_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\lightdimming_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricaltv_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalsocket_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\acstandard_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irlearn_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\curtainswitch_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalracks_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irmodule.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/irmodule.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/irmodule.png
new file mode 100644
index 0000000..5bb5bb2
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/irmodule.png
Binary files differ
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 55f94be..7dd8e14 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -1781,6 +1781,41 @@
return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieList, requestJson);
}
/// <summary>
+ /// 鑾峰彇鎸囧畾绗笁鏂瑰搧鐗岀殑缁戝畾杩囩殑璁惧鍒楄〃
+ /// </summary>
+ /// <param name="productPlatform"></param>
+ /// <param name="productBrand"></param>
+ /// <returns></returns>
+ public ResponsePackNew Get3TyBrandBindDeviceList(string productPlatform, string productBrand)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ d.Add("productPlatform", productPlatform);
+ d.Add("productBrand", productBrand);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetDevcieList, requestJson);
+ }
+ /// <summary>
+ /// 鑾峰彇鎸囧畾绗笁鏂瑰搧鐗岀殑璁惧鍒楄〃
+ /// </summary>
+ /// <param name="productPlatform"></param>
+ /// <param name="productBrand"></param>
+ /// <returns></returns>
+ public ResponsePackNew Get3TyBrandDeviceList(string productPlatform,string productBrand)
+ {
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("categoryType", 1);
+ d.Add("productPlatform", productPlatform);
+ d.Add("productBrand", productBrand);
+
+ var requestJson = HttpUtil.GetSignRequestJson(d);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Get3tyBrandDevcieList, requestJson);
+ }
+
+
+
+ /// <summary>
/// 鑾峰彇璁惧璇︽儏鍒楄〃
/// </summary>
/// <returns></returns>
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index 86fce77..e016870 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -322,6 +322,10 @@
/// </summary>
public const string Api_Post_GetDevcieList = "/home-wisdom/app/device/list";
/// <summary>
+ /// 鑾峰彇绗笁鏂瑰搧鐗岃澶囧垪琛�
+ /// </summary>
+ public const string Api_Post_Get3tyBrandDevcieList = "/home-wisdom/app/product/list";
+ /// <summary>
/// 鑾峰彇璁惧璇︽儏
/// </summary>
public const string Api_Post_GetDevcieInfoList = "/home-wisdom/app/device/info";
diff --git a/HDL_ON/Entity/Integratedbrand/IntegratedBrand.cs b/HDL_ON/Entity/Integratedbrand/IntegratedBrand.cs
index 70be6aa..ca7519b 100644
--- a/HDL_ON/Entity/Integratedbrand/IntegratedBrand.cs
+++ b/HDL_ON/Entity/Integratedbrand/IntegratedBrand.cs
@@ -25,9 +25,82 @@
/// 骞冲彴鏍囪瘑
/// </summary>
public string productPlatform;
-
-
-
-
}
+
+ /// <summary>
+ /// 绗笁鏂硅澶囦俊鎭�
+ /// </summary>
+ public class IntegratedBrandDevice
+ {
+
+ /// <summary>
+ /// 浜у搧鍞竴鏍囪瘑
+ /// </summary>
+ public string productId;
+
+ /// <summary>
+ /// 浜у搧鍚嶇О
+ /// </summary>
+ public string productName;
+
+ /// <summary>
+ /// 浜у搧鍘傚晢
+ /// </summary>
+ public string productSupplier;
+
+ /// <summary>
+ /// 浜у搧鍝佺墝锛堝搧鐗屾爣璇嗭級
+ /// </summary>
+ public string productBrand;
+
+ /// <summary>
+ /// 浜у搧绫诲瀷
+ /// </summary>
+ public string productType;
+
+ /// <summary>
+ /// 绗簩鍝佺被鍚�
+ /// </summary>
+ public string categorySecondName;
+
+ /// <summary>
+ /// 绗簩鍝佺被code
+ /// </summary>
+ public string categorySecondCode;
+
+ /// <summary>
+ /// 绗竴鍝佺被code
+ /// </summary>
+ public string categoryFirstCode;
+
+ /// <summary>
+ /// 绗竴鍝佺被鍚嶇О
+ /// </summary>
+ public string categoryFirstName;
+ /// <summary>
+ /// 浜у搧鍨嬪彿
+ /// </summary>
+ public string productVersion;
+
+ /// <summary>
+ /// 浜у搧骞冲彴锛堝钩鍙版爣璇嗭級
+ /// </summary>
+ public string productPlatform;
+
+ /// <summary>
+ /// 浜у搧鍥剧墖
+ /// </summary>
+ public string productPic;
+
+ /// <summary>
+ /// 鍔熻兘绫诲瀷Key
+ /// </summary>
+ public string spk;
+
+ /// <summary>
+ /// 璁惧缁戝畾鏂瑰紡 WIFI銆丵RSCAN銆乑IG_BEE銆丒THERNET
+ /// </summary>
+ public string bindType;
+ }
+
}
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index 00d6ce3..55400b6 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -375,6 +375,8 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\FrameLayout50.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\PirView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\ControlView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\AddDevciePage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\DeviceListPage.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)DAL\" />
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
new file mode 100644
index 0000000..a876af9
--- /dev/null
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
@@ -0,0 +1,144 @@
+锘縰sing System;
+using System.Collections.Generic;
+using HDL_ON.Entity;
+using HDL_ON.UI.CSS;
+using Shared;
+namespace HDL_ON.UI
+{
+ public class AddDevciePage : FrameLayout
+ {
+ FrameLayout bodyView;
+ IntegratedBrand brand;
+ VerticalRefreshLayout contentView;
+
+ public AddDevciePage(IntegratedBrand integratedBrand)
+ {
+ bodyView = this;
+ brand = integratedBrand;
+ }
+
+ public void LoadPage()
+ {
+ new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice)).LoadTopView();
+ bodyView.BackgroundColor = CSS_Color.BackgroundColor;
+
+ contentView = new VerticalRefreshLayout()
+ {
+ Y = Application.GetRealHeight(64),
+ Height = Application.GetRealHeight(667 - 64),
+ VerticalScrollBarEnabled = false,
+ };
+ bodyView.AddChidren(contentView);
+
+
+
+ Load3tyBrandDeviceList();
+
+ }
+
+ void Load3tyBrandDeviceList()
+ {
+ var waitPage = new Loading();
+ waitPage.Start();
+ new System.Threading.Thread(() => {
+ try
+ {
+ var pm = new DAL.Server.HttpServerRequest();
+ //var result = pm.Get3tyBindBrandList
+ var pack = pm.Get3TyBrandDeviceList(brand.productPlatform, brand.productBrand);
+ if (pack.Code == DAL.Server.StateCode.SUCCESS)
+ {
+ var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrandDevice>>(pack.Data.ToString());
+ Application.RunOnMainThread(() =>
+ {
+ LoadRow(revData);
+ });
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log("1--::" + ex.Message);
+ }
+ finally
+ {
+ Application.RunOnMainThread(() => { waitPage.Hide(); });
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+
+ void LoadRow(List<IntegratedBrandDevice> deviceList)
+ {
+ contentView.RemoveAll();
+ bool isFrist = true;
+ foreach (var device in deviceList)
+ {
+ FrameLayout row = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(50),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ contentView.AddChidren(row);
+
+ if (isFrist)
+ {
+ isFrist = false;
+ }
+ else
+ {
+ Button btnLine = new Button()
+ {
+ X = Application.GetRealWidth(56),
+ Width = Application.GetRealWidth(303),
+ Height = 1,
+ BackgroundColor = CSS_Color.DividingLineColor,
+ };
+ row.AddChidren(btnLine);
+ }
+
+ var btnIcon = new Button()
+ {
+ X = Application.GetRealWidth(12),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
+ Radius = (uint)Application.GetRealWidth(4),
+ UnSelectedImagePath = $"FunctionIcon/Icon/{device.spk.Replace(".","")}.png",
+ };
+ row.AddChidren(btnIcon);
+ Button btnRight = new Button()
+ {
+ X = Application.GetRealWidth(339),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/Right.png",
+ };
+ row.AddChidren(btnRight);
+
+ Button btnName = new Button()
+ {
+ X = Application.GetRealWidth(56),
+ Width = Application.GetRealWidth(303),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ Text = device.productName,
+ };
+ row.AddChidren(btnName);
+
+ btnName.MouseUpEventHandler = (sender, e) => {
+ switch (device.spk)
+ {
+ case SPK.IrModule:
+ var form = new AddMiniRemoteControlDirection1Page();
+ form.AddForm();
+ break;
+ }
+ };
+ }
+
+ }
+
+ }
+}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs
index 9841ea0..f73971c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs
@@ -10,10 +10,11 @@
{
FrameLayout bodyView;
VerticalRefreshLayout contentView;
- List<IntegratedBrand> brandList = new List<IntegratedBrand>();
- public AddThirdPartyBrandListpage()
+ List<IntegratedBrand> brandList;
+ public AddThirdPartyBrandListpage(List<IntegratedBrand> list)
{
bodyView = this;
+ brandList = list;
}
public void LoadPage()
@@ -61,7 +62,6 @@
Button btnLine = new Button()
{
X = Application.GetRealWidth(56),
- Y = Application.GetRealHeight(49),
Width = Application.GetRealWidth(303),
Height = 1,
BackgroundColor = CSS_Color.DividingLineColor,
@@ -102,6 +102,13 @@
row.AddChidren(btnName);
//涓嬭浇绗笁鏂瑰搧鐗宨con
ImageUtlis.Current.Load3tyBrandIconImages(brand.brandName, brand.brandIcon, btnIcon);
+
+ btnName.MouseUpEventHandler = (sender, e) => {
+ var page = new AddDevciePage(brand);
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
}
}
@@ -134,5 +141,13 @@
}
}) { IsBackground = true }.Start();
}
+ /// <summary>
+ /// 璺宠浆娣诲姞璁惧鐣岄潰
+ /// </summary>
+ /// <param name="bandType">鍝佺墝绫诲瀷</param>
+ void SkipPage_AddDevice()
+ {
+
+ }
}
}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
index 8adce32..ae8c28d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
@@ -9,34 +9,36 @@
{
FrameLayout bodyView;
- FrameLayout contentView;
+ VerticalScrolViewLayout contentView;
+
+ List<IntegratedBrand> brandList;
public BrandListPage()
{
bodyView = this;
+ brandList = new List<IntegratedBrand>();
}
public void LoadPage()
{
Action<string,string> action = (s,a) => {
- var page = new AddThirdPartyBrandListpage();
+ var page = new AddThirdPartyBrandListpage(brandList);
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- this.RemoveFromParent();
};
new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView_AddIcon("3ty",action);
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- contentView = new FrameLayout()
+ contentView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(64),
Height = Application.GetRealHeight(603),
};
bodyView.AddChidren(contentView);
-
+ GetBindList();
}
/// <summary>
@@ -53,12 +55,12 @@
var pack = pm.Get3tyBrandList();
if (pack.Code == DAL.Server.StateCode.SUCCESS)
{
- var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrand>>(pack.Data.ToString());
- if (revData.Count > 0)
+ brandList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrand>>(pack.Data.ToString());
+ if (brandList.Count > 0)
{
Application.RunOnMainThread(() =>
{
- LoadRow(revData);
+ LoadRow();
});
}else
{
@@ -83,16 +85,17 @@
}
- void LoadRow(List<IntegratedBrand> brandList)
+ void LoadRow()
{
contentView.RemoveAll();
bool isFrist = true;
foreach (var brand in brandList)
{
- FrameLayout row = new FrameLayout()
+ var row = new RowLayout()
{
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
+ LineColor = 0x00000000,
};
contentView.AddChidren(row);
@@ -105,7 +108,6 @@
Button btnLine = new Button()
{
X = Application.GetRealWidth(56),
- Y = Application.GetRealHeight(49),
Width = Application.GetRealWidth(303),
Height = 1,
BackgroundColor = CSS_Color.DividingLineColor,
@@ -121,7 +123,6 @@
Height = Application.GetRealWidth(32),
Radius = (uint)Application.GetRealWidth(4),
BackgroundColor = CSS_Color.PromptingColor1
- //ImagePath = "tuya_logo.png"
};
row.AddChidren(btnIcon);
Button btnRight = new Button()
@@ -146,10 +147,16 @@
row.AddChidren(btnName);
//涓嬭浇绗笁鏂瑰搧鐗宨con
ImageUtlis.Current.Load3tyBrandIconImages(brand.brandName, brand.brandIcon, btnIcon);
+
+ btnName.MouseUpEventHandler = (sender, e) => {
+ var page = new DeviceListPage(brand);
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
}
}
-
void NotListTipView()
{
@@ -206,7 +213,7 @@
btnAdd.MouseUpEventHandler = (sender, e) => {
- var page = new AddThirdPartyBrandListpage();
+ var page = new AddThirdPartyBrandListpage(brandList);
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
new file mode 100644
index 0000000..df95071
--- /dev/null
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -0,0 +1,164 @@
+锘縰sing System;
+using System.Collections.Generic;
+using HDL_ON.Entity;
+using HDL_ON.UI.CSS;
+using Shared;
+namespace HDL_ON.UI
+{
+ public class DeviceListPage : FrameLayout
+ {
+ FrameLayout bodyView;
+ VerticalRefreshLayout contentView;
+
+ IntegratedBrand brand;
+ public DeviceListPage(IntegratedBrand integratedBrand)
+ {
+ bodyView = this;
+ brand = integratedBrand;
+ }
+
+
+ public void LoadPage()
+ {
+ new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice)).LoadTopView();
+ bodyView.BackgroundColor = CSS_Color.BackgroundColor;
+
+ contentView = new VerticalRefreshLayout()
+ {
+ Y = Application.GetRealHeight(64),
+ Height = Application.GetRealHeight(667 - 64),
+ VerticalScrollBarEnabled = false,
+ };
+ bodyView.AddChidren(contentView);
+
+
+
+ Load3tyBrandDeviceList();
+
+ }
+
+ void Load3tyBrandDeviceList()
+ {
+ var waitPage = new Loading();
+ waitPage.Start();
+ new System.Threading.Thread(() => {
+ try
+ {
+ var pm = new DAL.Server.HttpServerRequest();
+ var pack = pm.Get3TyBrandBindDeviceList(brand.productPlatform, brand.productBrand);
+ if (pack.Code == DAL.Server.StateCode.SUCCESS)
+ {
+ var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<Function3tyBrandObj>(pack.Data.ToString());
+ Application.RunOnMainThread(() =>
+ {
+ LoadRow(revData.list);
+ });
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log("1--::" + ex.Message);
+ }
+ finally
+ {
+ Application.RunOnMainThread(() => { waitPage.Hide(); });
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+
+ void LoadRow(List<Function> deviceList)
+ {
+ deviceList.Add(new Function() { name ="娴嬭瘯绾㈠瀹�",spk = SPK.IrModule});
+
+ contentView.RemoveAll();
+ bool isFrist = true;
+ foreach (var device in deviceList)
+ {
+ FrameLayout row = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(50),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ contentView.AddChidren(row);
+
+ if (isFrist)
+ {
+ isFrist = false;
+ }
+ else
+ {
+ Button btnLine = new Button()
+ {
+ X = Application.GetRealWidth(56),
+ Width = Application.GetRealWidth(303),
+ Height = 1,
+ BackgroundColor = CSS_Color.DividingLineColor,
+ };
+ row.AddChidren(btnLine);
+ }
+
+ var btnIcon = new Button()
+ {
+ X = Application.GetRealWidth(12),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetRealWidth(32),
+ Height = Application.GetRealWidth(32),
+ Radius = (uint)Application.GetRealWidth(4),
+ UnSelectedImagePath = $"FunctionIcon/Icon/{device.spk.Replace(".", "")}.png",
+ };
+ row.AddChidren(btnIcon);
+ Button btnRight = new Button()
+ {
+ X = Application.GetRealWidth(339),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/Right.png",
+ };
+ row.AddChidren(btnRight);
+
+ Button btnName = new Button()
+ {
+ X = Application.GetRealWidth(56),
+ Width = Application.GetRealWidth(303),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ Text = device.name,
+ };
+ row.AddChidren(btnName);
+
+ btnName.MouseUpEventHandler = (sender, e) => {
+ switch (device.spk)
+ {
+ case SPK.IrModule:
+ UI2.PersonalCenter.PirDevice.Method.GetPirDeviceList(this, () =>
+ {
+ Application.RunOnMainThread(() =>
+ {
+ var page = new UI2.PersonalCenter.PirDevice.PirMain();
+ MainPage.BasePageView.AddChidren(page);
+ page.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ });
+ });
+ break;
+ }
+ };
+ }
+
+ }
+
+ }
+
+
+ /// <summary>
+ /// 浜戠杩斿洖鐨勭涓夋柟璁惧鍒楄〃鏁版嵁
+ /// </summary>
+ public class Function3tyBrandObj
+ {
+ public List<Function> list = new List<Function>();
+ }
+
+}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/ThirdPartyBrandListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/ThirdPartyBrandListPage.cs
index bc6f542..b292e9d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/ThirdPartyBrandListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/ThirdPartyBrandListPage.cs
@@ -1,93 +1,93 @@
-锘縰sing System;
-using System.Collections.Generic;
-using HDL_ON.Entity;
-using HDL_ON.UI.CSS;
-using Shared;
-namespace HDL_ON.UI
-{
- public class ThirdPartyBrandListPage : FrameLayout
- {
+锘�//using System;
+//using System.Collections.Generic;
+//using HDL_ON.Entity;
+//using HDL_ON.UI.CSS;
+//using Shared;
+//namespace HDL_ON.UI
+//{
+// public class ThirdPartyBrandListPage : FrameLayout
+// {
- FrameLayout bodyView;
- FrameLayout contentView;
- Button btnAdd;
+// FrameLayout bodyView;
+// FrameLayout contentView;
+// Button btnAdd;
- public ThirdPartyBrandListPage()
- {
- bodyView = this;
- }
+// public ThirdPartyBrandListPage()
+// {
+// bodyView = this;
+// }
- public void LoadPage()
- {
- new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView();
+// public void LoadPage()
+// {
+// new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView();
- contentView = new FrameLayout()
- {
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667-64),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- bodyView.AddChidren(contentView);
+// contentView = new FrameLayout()
+// {
+// Y = Application.GetRealHeight(64),
+// Height = Application.GetRealHeight(667-64),
+// BackgroundColor = CSS_Color.MainBackgroundColor,
+// };
+// bodyView.AddChidren(contentView);
- AddEmptyTipView();
+// AddEmptyTipView();
- Button btnTipMsg = new Button()
- {
- Height = Application.GetRealHeight(17 + 24),
- Y = Application.GetRealHeight(535 - 12),
- TextColor = CSS_Color.TextualColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextAlignment = TextAlignment.Center,
- TextID = StringId.TipAddThirdPartyDeviceMsg,
- };
- bodyView.AddChidren(btnTipMsg);
+// Button btnTipMsg = new Button()
+// {
+// Height = Application.GetRealHeight(17 + 24),
+// Y = Application.GetRealHeight(535 - 12),
+// TextColor = CSS_Color.TextualColor,
+// TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+// TextAlignment = TextAlignment.Center,
+// TextID = StringId.TipAddThirdPartyDeviceMsg,
+// };
+// bodyView.AddChidren(btnTipMsg);
- btnAdd = new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(564),
- Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
- Radius = (uint)Application.GetRealWidth(22),
- BackgroundColor = CSS_Color.MainColor,
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.MainBackgroundColor,
- TextID = StringId.Add,
- };
- bodyView.AddChidren(btnAdd);
+// btnAdd = new Button()
+// {
+// Gravity = Gravity.CenterHorizontal,
+// Y = Application.GetRealHeight(564),
+// Width = Application.GetRealWidth(220),
+// Height = Application.GetRealWidth(44),
+// Radius = (uint)Application.GetRealWidth(22),
+// BackgroundColor = CSS_Color.MainColor,
+// TextAlignment = TextAlignment.Center,
+// TextColor = CSS_Color.MainBackgroundColor,
+// TextID = StringId.Add,
+// };
+// bodyView.AddChidren(btnAdd);
- LoadEvent_SikpAddBrand();
- }
+// LoadEvent_SikpAddBrand();
+// }
- /// <summary>
- /// 娣诲姞鍐呭涓虹┖鎻愮ず椤甸潰
- /// </summary>
- void AddEmptyTipView()
- {
- var emptyTipView = new FrameLayout()
- {
- Height =Application.GetRealWidth(470),
- Width = contentView.Width,
- };
- contentView.AddChidren(emptyTipView);
+// /// <summary>
+// /// 娣诲姞鍐呭涓虹┖鎻愮ず椤甸潰
+// /// </summary>
+// void AddEmptyTipView()
+// {
+// var emptyTipView = new FrameLayout()
+// {
+// Height =Application.GetRealWidth(470),
+// Width = contentView.Width,
+// };
+// contentView.AddChidren(emptyTipView);
- var tipView = new EmptyTipView(Language.StringByID(StringId.TipNotThirdPartyDevice))
- {
- Gravity = Gravity.Center
- };
- emptyTipView.AddChidren(tipView);
- }
- /// <summary>
- /// 璺宠浆缁戝畾绗笁鏂瑰搧鐗岀晫闈�
- /// </summary>
- void LoadEvent_SikpAddBrand()
- {
- btnAdd.MouseUpEventHandler = (sender, e) => {
- var page = new AddThirdPartyBrandListpage();
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
- }
- }
-}
+// var tipView = new EmptyTipView(Language.StringByID(StringId.TipNotThirdPartyDevice))
+// {
+// Gravity = Gravity.Center
+// };
+// emptyTipView.AddChidren(tipView);
+// }
+// /// <summary>
+// /// 璺宠浆缁戝畾绗笁鏂瑰搧鐗岀晫闈�
+// /// </summary>
+// void LoadEvent_SikpAddBrand()
+// {
+// btnAdd.MouseUpEventHandler = (sender, e) => {
+// var page = new AddThirdPartyBrandListpage();
+// MainPage.BasePageView.AddChidren(page);
+// page.LoadPage();
+// MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+// };
+// }
+// }
+//}
--
Gitblit v1.8.0