From 03d8399009aacc15efde15f08e37893e47dc2427 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 07 十二月 2022 10:45:20 +0800
Subject: [PATCH] 大华摄像头，金茂科技系统
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 95 ++-
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 5
HDL-ON_Android/Assets/Language.ini | 10
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs | 33 +
HDL_ON/UI/UI2/UserPage.cs | 106 ++--
HDL_ON/Common/ApiUtlis.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs | 112 ++++
HDL_ON/Entity/Function/Sensor.cs | 13
HDL-ON_Android/HDL-ON_Android.csproj | 3
HDL-ON_iOS/Resources/Language.ini | 12
HDL-ON_Android/Resources/values/styles.xml | 8
DLL/LC/Android/LCDeviceAddModule.dll | 0
HDL-ON_Android/Resources/Resource.designer.cs | 506 +++++++++---------
DLL/LC/Android/LcVideoSdk.dll | 0
HDL_ON/UI/MainPage.cs | 60 +-
HDL_ON/UI/UI1-Login/LoginPage.cs | 31
HDL-ON_Android/Application.cs | 14
SiriIntents/Server/HttpUtil.cs | 4
HDL_ON/Entity/Function/Scene.cs | 6
DLL/LC/Android/LCDeviceAddModule-2022-12-06.dll | 0
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 340 +++++++++---
HDL_ON/Entity/DB_ResidenceData.cs | 7
HDL_ON/DAL/DriverLayer/Control_Udp.cs | 23
HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs | 4
HDL_ON/Entity/FunctionList.cs | 3
HDL_ON/Entity/Function/Function.cs | 9
HDL_ON/Common/R.cs | 9
HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs | 109 ++++
HDL-ON_Android/Resources/values/colors.xml | 2
30 files changed, 1,031 insertions(+), 497 deletions(-)
diff --git a/DLL/LC/Android/LCDeviceAddModule-2022-12-06.dll b/DLL/LC/Android/LCDeviceAddModule-2022-12-06.dll
new file mode 100644
index 0000000..2fd62e7
--- /dev/null
+++ b/DLL/LC/Android/LCDeviceAddModule-2022-12-06.dll
Binary files differ
diff --git a/DLL/LC/Android/LCDeviceAddModule.dll b/DLL/LC/Android/LCDeviceAddModule.dll
index 2fd62e7..da5ab2f 100644
--- a/DLL/LC/Android/LCDeviceAddModule.dll
+++ b/DLL/LC/Android/LCDeviceAddModule.dll
Binary files differ
diff --git a/DLL/LC/Android/LcVideoSdk.dll b/DLL/LC/Android/LcVideoSdk.dll
index 2ebc2d1..be0179d 100644
--- a/DLL/LC/Android/LcVideoSdk.dll
+++ b/DLL/LC/Android/LcVideoSdk.dll
Binary files differ
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index 09f5697..7e4223d 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -43,6 +43,20 @@
}
base.OnCreate();
+
+ Language.CurrentLanguage = "Chinese";
+ Locale locale1 = Locale.Default;
+ var localeList = Resources.Configuration.Locale;
+ Console.WriteLine("褰撳墠璇█锛�" + localeList.Language);
+ if (localeList.Language == "zh")
+ {
+ Language.CurrentLanguage = "Chinese";
+ }
+ else
+ {
+ Language.CurrentLanguage = "English";
+ }
+
RegisterActivityLifecycleCallbacks(this);
}
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 18486ef..44be1bb 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -568,6 +568,8 @@
581=
582=Are you sure to delete this device?
583=EZVIZ
+584=Deployment status
+585=Failed to obtain third-party platform information
2532=Visitor Invitation Record
@@ -1805,6 +1807,8 @@
581=
582=纭畾鍒犻櫎璇ヨ澶囧悧?
583=钀ょ煶鎽勫儚澶�
+584=甯冮槻鐘舵��
+585=鑾峰彇绗笁鏂瑰钩鍙颁俊鎭け璐�
2532=璁垮閭�璇疯褰�
@@ -3018,6 +3022,8 @@
581=
582=Are you sure to delete this device?
583=EZVIZ
+584=Deployment status
+585=Failed to obtain third-party platform information
2532=Visitor Invitation Record
@@ -4235,6 +4241,8 @@
581=
582=Are you sure to delete this device?
583=EZVIZ
+584=Deployment status
+585=Failed to obtain third-party platform information
@@ -5438,6 +5446,8 @@
581=
582=Are you sure to delete this device?
583=EZVIZ
+584=Deployment status
+585=Failed to obtain third-party platform information
1000=袙谢邪卸薪芯褋褌 胁 褋褌邪褟褌邪
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index c5bff4d..e31d9a2 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -1630,9 +1630,6 @@
<Folder Include="Assets\Phone\FunctionIcon\Inverter\" />
<Folder Include="Assets\Phone\FunctionIcon\Electrical\MechanicalArm\" />
</ItemGroup>
- <ItemGroup>
- <AndroidJavaLibrary Include="libs\eventbus-3.0.0.jar" />
- </ItemGroup>
<Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index c72755c..b46b360 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202211251">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202212063">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<!--鍙嬬洘-->
<!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index 6943b3e..61c599d 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/HDL-ON_Android/Resources/Resource.designer.cs
@@ -2849,694 +2849,700 @@
public const int color_background = 2131099741;
// aapt resource value: 0x7F06005E
- public const int color_default = 2131099742;
+ public const int color_bar = 2131099742;
// aapt resource value: 0x7F06005F
- public const int color_disable = 2131099743;
+ public const int color_bg = 2131099743;
+
+ // aapt resource value: 0x7F060060
+ public const int color_default = 2131099744;
+
+ // aapt resource value: 0x7F060061
+ public const int color_disable = 2131099745;
// aapt resource value: 0x7F06005C
public const int color_F6F6F6 = 2131099740;
- // aapt resource value: 0x7F060060
- public const int color_r1_cancel_color = 2131099744;
-
- // aapt resource value: 0x7F060061
- public const int color_select = 2131099745;
-
// aapt resource value: 0x7F060062
- public const int color_white = 2131099746;
+ public const int color_r1_cancel_color = 2131099746;
// aapt resource value: 0x7F060063
- public const int common_bg = 2131099747;
+ public const int color_select = 2131099747;
// aapt resource value: 0x7F060064
- public const int common_hint_text = 2131099748;
+ public const int color_white = 2131099748;
// aapt resource value: 0x7F060065
- public const int common_line = 2131099749;
+ public const int common_bg = 2131099749;
// aapt resource value: 0x7F060066
- public const int common_sub_text = 2131099750;
+ public const int common_hint_text = 2131099750;
// aapt resource value: 0x7F060067
- public const int common_text = 2131099751;
+ public const int common_line = 2131099751;
// aapt resource value: 0x7F060068
- public const int common_text_sel = 2131099752;
+ public const int common_sub_text = 2131099752;
// aapt resource value: 0x7F060069
- public const int common_title_tab_text_color = 2131099753;
+ public const int common_text = 2131099753;
// aapt resource value: 0x7F06006A
- public const int common_title_text_color = 2131099754;
+ public const int common_text_sel = 2131099754;
// aapt resource value: 0x7F06006B
- public const int corsor_color = 2131099755;
+ public const int common_title_tab_text_color = 2131099755;
// aapt resource value: 0x7F06006C
- public const int dark_bg_20p = 2131099756;
+ public const int common_title_text_color = 2131099756;
// aapt resource value: 0x7F06006D
- public const int dark_bg_70p = 2131099757;
+ public const int corsor_color = 2131099757;
// aapt resource value: 0x7F06006E
- public const int del_button_text_selector = 2131099758;
+ public const int dark_bg_20p = 2131099758;
// aapt resource value: 0x7F06006F
- public const int design_bottom_navigation_shadow_color = 2131099759;
+ public const int dark_bg_70p = 2131099759;
// aapt resource value: 0x7F060070
- public const int design_error = 2131099760;
+ public const int del_button_text_selector = 2131099760;
// aapt resource value: 0x7F060071
- public const int design_fab_shadow_end_color = 2131099761;
+ public const int design_bottom_navigation_shadow_color = 2131099761;
// aapt resource value: 0x7F060072
- public const int design_fab_shadow_mid_color = 2131099762;
+ public const int design_error = 2131099762;
// aapt resource value: 0x7F060073
- public const int design_fab_shadow_start_color = 2131099763;
+ public const int design_fab_shadow_end_color = 2131099763;
// aapt resource value: 0x7F060074
- public const int design_fab_stroke_end_inner_color = 2131099764;
+ public const int design_fab_shadow_mid_color = 2131099764;
// aapt resource value: 0x7F060075
- public const int design_fab_stroke_end_outer_color = 2131099765;
+ public const int design_fab_shadow_start_color = 2131099765;
// aapt resource value: 0x7F060076
- public const int design_fab_stroke_top_inner_color = 2131099766;
+ public const int design_fab_stroke_end_inner_color = 2131099766;
// aapt resource value: 0x7F060077
- public const int design_fab_stroke_top_outer_color = 2131099767;
+ public const int design_fab_stroke_end_outer_color = 2131099767;
// aapt resource value: 0x7F060078
- public const int design_snackbar_background_color = 2131099768;
+ public const int design_fab_stroke_top_inner_color = 2131099768;
// aapt resource value: 0x7F060079
- public const int design_tint_password_toggle = 2131099769;
+ public const int design_fab_stroke_top_outer_color = 2131099769;
// aapt resource value: 0x7F06007A
- public const int device_top_item_text_normal = 2131099770;
+ public const int design_snackbar_background_color = 2131099770;
// aapt resource value: 0x7F06007B
- public const int dim_foreground_disabled_material_dark = 2131099771;
+ public const int design_tint_password_toggle = 2131099771;
// aapt resource value: 0x7F06007C
- public const int dim_foreground_disabled_material_light = 2131099772;
+ public const int device_top_item_text_normal = 2131099772;
// aapt resource value: 0x7F06007D
- public const int dim_foreground_material_dark = 2131099773;
+ public const int dim_foreground_disabled_material_dark = 2131099773;
// aapt resource value: 0x7F06007E
- public const int dim_foreground_material_light = 2131099774;
+ public const int dim_foreground_disabled_material_light = 2131099774;
// aapt resource value: 0x7F06007F
- public const int divider = 2131099775;
+ public const int dim_foreground_material_dark = 2131099775;
// aapt resource value: 0x7F060080
- public const int emui_color_gray_1 = 2131099776;
+ public const int dim_foreground_material_light = 2131099776;
// aapt resource value: 0x7F060081
- public const int emui_color_gray_10 = 2131099777;
+ public const int divider = 2131099777;
// aapt resource value: 0x7F060082
- public const int emui_color_gray_7 = 2131099778;
+ public const int emui_color_gray_1 = 2131099778;
// aapt resource value: 0x7F060083
- public const int error_color_material = 2131099779;
+ public const int emui_color_gray_10 = 2131099779;
// aapt resource value: 0x7F060084
- public const int event_message_bg_selector = 2131099780;
+ public const int emui_color_gray_7 = 2131099780;
// aapt resource value: 0x7F060085
- public const int event_message_from_tv = 2131099781;
+ public const int error_color_material = 2131099781;
// aapt resource value: 0x7F060086
- public const int event_message_play_btn = 2131099782;
+ public const int event_message_bg_selector = 2131099782;
// aapt resource value: 0x7F060087
- public const int ez_c1 = 2131099783;
+ public const int event_message_from_tv = 2131099783;
// aapt resource value: 0x7F060088
- public const int ez_playback_tab_color_selector = 2131099784;
+ public const int event_message_play_btn = 2131099784;
// aapt resource value: 0x7F060089
- public const int foreground_material_dark = 2131099785;
+ public const int ez_c1 = 2131099785;
// aapt resource value: 0x7F06008A
- public const int foreground_material_light = 2131099786;
+ public const int ez_playback_tab_color_selector = 2131099786;
// aapt resource value: 0x7F06008B
- public const int fragment_line_color = 2131099787;
+ public const int foreground_material_dark = 2131099787;
// aapt resource value: 0x7F06008C
- public const int gd_top_view = 2131099788;
+ public const int foreground_material_light = 2131099788;
// aapt resource value: 0x7F06008D
- public const int gray = 2131099789;
+ public const int fragment_line_color = 2131099789;
// aapt resource value: 0x7F06008E
- public const int gray_bg = 2131099790;
+ public const int gd_top_view = 2131099790;
// aapt resource value: 0x7F06008F
- public const int gray_text = 2131099791;
+ public const int gray = 2131099791;
// aapt resource value: 0x7F060090
- public const int green = 2131099792;
+ public const int gray_bg = 2131099792;
// aapt resource value: 0x7F060091
- public const int green_text = 2131099793;
+ public const int gray_text = 2131099793;
// aapt resource value: 0x7F060092
- public const int grey = 2131099794;
+ public const int green = 2131099794;
// aapt resource value: 0x7F060093
- public const int grouplayout_item_bg_sel = 2131099795;
+ public const int green_text = 2131099795;
// aapt resource value: 0x7F060094
- public const int help_link = 2131099796;
+ public const int grey = 2131099796;
// aapt resource value: 0x7F060095
- public const int highlighted_text_material_dark = 2131099797;
+ public const int grouplayout_item_bg_sel = 2131099797;
// aapt resource value: 0x7F060096
- public const int highlighted_text_material_light = 2131099798;
+ public const int help_link = 2131099798;
// aapt resource value: 0x7F060097
- public const int ic_launcher_background = 2131099799;
+ public const int highlighted_text_material_dark = 2131099799;
// aapt resource value: 0x7F060098
- public const int lc_color_4ea7f2 = 2131099800;
+ public const int highlighted_text_material_light = 2131099800;
// aapt resource value: 0x7F060099
- public const int lc_demo_color_000000 = 2131099801;
+ public const int ic_launcher_background = 2131099801;
// aapt resource value: 0x7F06009A
- public const int lc_demo_color_00ffffff = 2131099802;
+ public const int lc_color_4ea7f2 = 2131099802;
// aapt resource value: 0x7F06009B
- public const int lc_demo_color_0B8C0D = 2131099803;
+ public const int lc_demo_color_000000 = 2131099803;
// aapt resource value: 0x7F06009C
- public const int lc_demo_color_2c2c2c = 2131099804;
+ public const int lc_demo_color_00ffffff = 2131099804;
// aapt resource value: 0x7F06009D
- public const int lc_demo_color_442c2c2c = 2131099805;
+ public const int lc_demo_color_0B8C0D = 2131099805;
// aapt resource value: 0x7F06009E
- public const int lc_demo_color_66000000 = 2131099806;
+ public const int lc_demo_color_2c2c2c = 2131099806;
// aapt resource value: 0x7F06009F
- public const int lc_demo_color_66f18d00 = 2131099807;
+ public const int lc_demo_color_442c2c2c = 2131099807;
// aapt resource value: 0x7F0600A0
- public const int lc_demo_color_880B8C0D = 2131099808;
+ public const int lc_demo_color_66000000 = 2131099808;
// aapt resource value: 0x7F0600A1
- public const int lc_demo_color_8f8f8f = 2131099809;
-
- // aapt resource value: 0x7F0600A3
- public const int lc_demo_color_d9d9d9 = 2131099811;
-
- // aapt resource value: 0x7F0600A4
- public const int lc_demo_color_f18d00 = 2131099812;
-
- // aapt resource value: 0x7F0600A5
- public const int lc_demo_color_f2f2f2 = 2131099813;
+ public const int lc_demo_color_66f18d00 = 2131099809;
// aapt resource value: 0x7F0600A2
- public const int lc_demo_color_FF4F4F = 2131099810;
+ public const int lc_demo_color_880B8C0D = 2131099810;
+
+ // aapt resource value: 0x7F0600A3
+ public const int lc_demo_color_8f8f8f = 2131099811;
+
+ // aapt resource value: 0x7F0600A5
+ public const int lc_demo_color_d9d9d9 = 2131099813;
// aapt resource value: 0x7F0600A6
- public const int lc_demo_color_ffffff = 2131099814;
+ public const int lc_demo_color_f18d00 = 2131099814;
// aapt resource value: 0x7F0600A7
- public const int leavemessage_gray = 2131099815;
+ public const int lc_demo_color_f2f2f2 = 2131099815;
+
+ // aapt resource value: 0x7F0600A4
+ public const int lc_demo_color_FF4F4F = 2131099812;
// aapt resource value: 0x7F0600A8
- public const int leavemessage_text_color = 2131099816;
+ public const int lc_demo_color_ffffff = 2131099816;
// aapt resource value: 0x7F0600A9
- public const int leavemessage_time_text_color = 2131099817;
+ public const int leavemessage_gray = 2131099817;
// aapt resource value: 0x7F0600AA
- public const int line_color = 2131099818;
+ public const int leavemessage_text_color = 2131099818;
// aapt resource value: 0x7F0600AB
- public const int loading_text = 2131099819;
+ public const int leavemessage_time_text_color = 2131099819;
// aapt resource value: 0x7F0600AC
- public const int login_line_color = 2131099820;
+ public const int line_color = 2131099820;
// aapt resource value: 0x7F0600AD
- public const int lpsdk_app_bg = 2131099821;
+ public const int loading_text = 2131099821;
// aapt resource value: 0x7F0600AE
- public const int lpsdk_app_line = 2131099822;
+ public const int login_line_color = 2131099822;
// aapt resource value: 0x7F0600AF
- public const int lpsdk_color_white = 2131099823;
+ public const int lpsdk_app_bg = 2131099823;
// aapt resource value: 0x7F0600B0
- public const int lpsdk_textColor = 2131099824;
+ public const int lpsdk_app_line = 2131099824;
// aapt resource value: 0x7F0600B1
- public const int material_blue_grey_800 = 2131099825;
+ public const int lpsdk_color_white = 2131099825;
// aapt resource value: 0x7F0600B2
- public const int material_blue_grey_900 = 2131099826;
+ public const int lpsdk_textColor = 2131099826;
// aapt resource value: 0x7F0600B3
- public const int material_blue_grey_950 = 2131099827;
+ public const int material_blue_grey_800 = 2131099827;
// aapt resource value: 0x7F0600B4
- public const int material_deep_teal_200 = 2131099828;
+ public const int material_blue_grey_900 = 2131099828;
// aapt resource value: 0x7F0600B5
- public const int material_deep_teal_500 = 2131099829;
+ public const int material_blue_grey_950 = 2131099829;
// aapt resource value: 0x7F0600B6
- public const int material_grey_100 = 2131099830;
+ public const int material_deep_teal_200 = 2131099830;
// aapt resource value: 0x7F0600B7
- public const int material_grey_300 = 2131099831;
+ public const int material_deep_teal_500 = 2131099831;
// aapt resource value: 0x7F0600B8
- public const int material_grey_50 = 2131099832;
+ public const int material_grey_100 = 2131099832;
// aapt resource value: 0x7F0600B9
- public const int material_grey_600 = 2131099833;
+ public const int material_grey_300 = 2131099833;
// aapt resource value: 0x7F0600BA
- public const int material_grey_800 = 2131099834;
+ public const int material_grey_50 = 2131099834;
// aapt resource value: 0x7F0600BB
- public const int material_grey_850 = 2131099835;
+ public const int material_grey_600 = 2131099835;
// aapt resource value: 0x7F0600BC
- public const int material_grey_900 = 2131099836;
+ public const int material_grey_800 = 2131099836;
// aapt resource value: 0x7F0600BD
- public const int material_red_500 = 2131099837;
+ public const int material_grey_850 = 2131099837;
// aapt resource value: 0x7F0600BE
- public const int message_bg = 2131099838;
+ public const int material_grey_900 = 2131099838;
// aapt resource value: 0x7F0600BF
- public const int message_button_text = 2131099839;
+ public const int material_red_500 = 2131099839;
// aapt resource value: 0x7F0600C0
- public const int message_button_text_selector = 2131099840;
+ public const int message_bg = 2131099840;
// aapt resource value: 0x7F0600C1
- public const int mobile_common_text_edit_enable_selector = 2131099841;
+ public const int message_button_text = 2131099841;
// aapt resource value: 0x7F0600C2
- public const int mobile_common_text_name_enable_selector = 2131099842;
+ public const int message_button_text_selector = 2131099842;
// aapt resource value: 0x7F0600C3
- public const int mobile_common_title_text_color_selector = 2131099843;
+ public const int mobile_common_text_edit_enable_selector = 2131099843;
// aapt resource value: 0x7F0600C4
- public const int mobile_common_transparent = 2131099844;
+ public const int mobile_common_text_name_enable_selector = 2131099844;
// aapt resource value: 0x7F0600C5
- public const int mode_bg = 2131099845;
+ public const int mobile_common_title_text_color_selector = 2131099845;
// aapt resource value: 0x7F0600C6
- public const int more_color = 2131099846;
+ public const int mobile_common_transparent = 2131099846;
// aapt resource value: 0x7F0600C7
- public const int my_list_deviver = 2131099847;
+ public const int mode_bg = 2131099847;
// aapt resource value: 0x7F0600C8
- public const int normal_color = 2131099848;
+ public const int more_color = 2131099848;
// aapt resource value: 0x7F0600C9
- public const int notification_action_color_filter = 2131099849;
+ public const int my_list_deviver = 2131099849;
// aapt resource value: 0x7F0600CA
- public const int notification_icon_bg_color = 2131099850;
+ public const int normal_color = 2131099850;
// aapt resource value: 0x7F0600CB
- public const int notification_material_background_media_default_color = 2131099851;
+ public const int notification_action_color_filter = 2131099851;
// aapt resource value: 0x7F0600CC
- public const int on_off_text_selector = 2131099852;
+ public const int notification_icon_bg_color = 2131099852;
// aapt resource value: 0x7F0600CD
- public const int opensdk_cameralist_bg = 2131099853;
+ public const int notification_material_background_media_default_color = 2131099853;
// aapt resource value: 0x7F0600CE
- public const int orange = 2131099854;
+ public const int on_off_text_selector = 2131099854;
// aapt resource value: 0x7F0600CF
- public const int orange_text = 2131099855;
+ public const int opensdk_cameralist_bg = 2131099855;
// aapt resource value: 0x7F0600D0
- public const int page_bg_color = 2131099856;
+ public const int orange = 2131099856;
// aapt resource value: 0x7F0600D1
- public const int page_change_gray = 2131099857;
+ public const int orange_text = 2131099857;
// aapt resource value: 0x7F0600D2
- public const int pickerview_bgColor_default = 2131099858;
+ public const int page_bg_color = 2131099858;
// aapt resource value: 0x7F0600D3
- public const int pickerview_bgColor_overlay = 2131099859;
+ public const int page_change_gray = 2131099859;
// aapt resource value: 0x7F0600D4
- public const int pickerview_bg_topbar = 2131099860;
+ public const int pickerview_bgColor_default = 2131099860;
// aapt resource value: 0x7F0600D5
- public const int pickerview_timebtn_nor = 2131099861;
+ public const int pickerview_bgColor_overlay = 2131099861;
// aapt resource value: 0x7F0600D6
- public const int pickerview_timebtn_pre = 2131099862;
+ public const int pickerview_bg_topbar = 2131099862;
// aapt resource value: 0x7F0600D7
- public const int pickerview_topbar_title = 2131099863;
+ public const int pickerview_timebtn_nor = 2131099863;
// aapt resource value: 0x7F0600D8
- public const int pickerview_wheelview_textcolor_center = 2131099864;
+ public const int pickerview_timebtn_pre = 2131099864;
// aapt resource value: 0x7F0600D9
- public const int pickerview_wheelview_textcolor_divider = 2131099865;
+ public const int pickerview_topbar_title = 2131099865;
// aapt resource value: 0x7F0600DA
- public const int pickerview_wheelview_textcolor_out = 2131099866;
+ public const int pickerview_wheelview_textcolor_center = 2131099866;
// aapt resource value: 0x7F0600DB
- public const int play_translucent_bg = 2131099867;
+ public const int pickerview_wheelview_textcolor_divider = 2131099867;
// aapt resource value: 0x7F0600DC
- public const int possible_result_points = 2131099868;
+ public const int pickerview_wheelview_textcolor_out = 2131099868;
// aapt resource value: 0x7F0600DD
- public const int preview_quality_color = 2131099869;
+ public const int play_translucent_bg = 2131099869;
// aapt resource value: 0x7F0600DE
- public const int primary_dark_material_dark = 2131099870;
+ public const int possible_result_points = 2131099870;
// aapt resource value: 0x7F0600DF
- public const int primary_dark_material_light = 2131099871;
+ public const int preview_quality_color = 2131099871;
// aapt resource value: 0x7F0600E0
- public const int primary_material_dark = 2131099872;
+ public const int primary_dark_material_dark = 2131099872;
// aapt resource value: 0x7F0600E1
- public const int primary_material_light = 2131099873;
+ public const int primary_dark_material_light = 2131099873;
// aapt resource value: 0x7F0600E2
- public const int primary_text_default_material_dark = 2131099874;
+ public const int primary_material_dark = 2131099874;
// aapt resource value: 0x7F0600E3
- public const int primary_text_default_material_light = 2131099875;
+ public const int primary_material_light = 2131099875;
// aapt resource value: 0x7F0600E4
- public const int primary_text_disabled_material_dark = 2131099876;
+ public const int primary_text_default_material_dark = 2131099876;
// aapt resource value: 0x7F0600E5
- public const int primary_text_disabled_material_light = 2131099877;
+ public const int primary_text_default_material_light = 2131099877;
// aapt resource value: 0x7F0600E6
- public const int progress_back = 2131099878;
+ public const int primary_text_disabled_material_dark = 2131099878;
// aapt resource value: 0x7F0600E7
- public const int progress_select = 2131099879;
+ public const int primary_text_disabled_material_light = 2131099879;
// aapt resource value: 0x7F0600E8
- public const int pureblack = 2131099880;
+ public const int progress_back = 2131099880;
// aapt resource value: 0x7F0600E9
- public const int quality_color_selector = 2131099881;
+ public const int progress_select = 2131099881;
// aapt resource value: 0x7F0600EA
- public const int quality_focused_color = 2131099882;
+ public const int pureblack = 2131099882;
// aapt resource value: 0x7F0600EB
- public const int r1_item_bg = 2131099883;
+ public const int quality_color_selector = 2131099883;
// aapt resource value: 0x7F0600EC
- public const int read_button_text_selector = 2131099884;
+ public const int quality_focused_color = 2131099884;
// aapt resource value: 0x7F0600ED
- public const int realplay_loading_text = 2131099885;
+ public const int r1_item_bg = 2131099885;
// aapt resource value: 0x7F0600EE
- public const int record_alarm = 2131099886;
+ public const int read_button_text_selector = 2131099886;
// aapt resource value: 0x7F0600EF
- public const int record_normal = 2131099887;
+ public const int realplay_loading_text = 2131099887;
// aapt resource value: 0x7F0600F0
- public const int record_osd = 2131099888;
+ public const int record_alarm = 2131099888;
// aapt resource value: 0x7F0600F1
- public const int record_point = 2131099889;
+ public const int record_normal = 2131099889;
// aapt resource value: 0x7F0600F2
- public const int record_time = 2131099890;
+ public const int record_osd = 2131099890;
// aapt resource value: 0x7F0600F3
- public const int red = 2131099891;
+ public const int record_point = 2131099891;
// aapt resource value: 0x7F0600F4
- public const int reg_deal_text_bule = 2131099892;
+ public const int record_time = 2131099892;
// aapt resource value: 0x7F0600F5
- public const int remotefile_line_color = 2131099893;
+ public const int red = 2131099893;
// aapt resource value: 0x7F0600F6
- public const int remotefile_timebar_alarm_color = 2131099894;
+ public const int reg_deal_text_bule = 2131099894;
// aapt resource value: 0x7F0600F7
- public const int remotefile_timebar_color = 2131099895;
+ public const int remotefile_line_color = 2131099895;
// aapt resource value: 0x7F0600F8
- public const int remotelist_item_duration_text_color = 2131099896;
+ public const int remotefile_timebar_alarm_color = 2131099896;
// aapt resource value: 0x7F0600F9
- public const int remotelist_item_select = 2131099897;
+ public const int remotefile_timebar_color = 2131099897;
// aapt resource value: 0x7F0600FA
- public const int result_view = 2131099898;
+ public const int remotelist_item_duration_text_color = 2131099898;
// aapt resource value: 0x7F0600FB
- public const int ripple_material_dark = 2131099899;
+ public const int remotelist_item_select = 2131099899;
// aapt resource value: 0x7F0600FC
- public const int ripple_material_light = 2131099900;
+ public const int result_view = 2131099900;
// aapt resource value: 0x7F0600FD
- public const int scan_yellow = 2131099901;
+ public const int ripple_material_dark = 2131099901;
// aapt resource value: 0x7F0600FE
- public const int secondary_text_default_material_dark = 2131099902;
+ public const int ripple_material_light = 2131099902;
// aapt resource value: 0x7F0600FF
- public const int secondary_text_default_material_light = 2131099903;
+ public const int scan_yellow = 2131099903;
// aapt resource value: 0x7F060100
- public const int secondary_text_disabled_material_dark = 2131099904;
+ public const int secondary_text_default_material_dark = 2131099904;
// aapt resource value: 0x7F060101
- public const int secondary_text_disabled_material_light = 2131099905;
+ public const int secondary_text_default_material_light = 2131099905;
// aapt resource value: 0x7F060102
- public const int setting_hint_text = 2131099906;
+ public const int secondary_text_disabled_material_dark = 2131099906;
// aapt resource value: 0x7F060103
- public const int shadow = 2131099907;
+ public const int secondary_text_disabled_material_light = 2131099907;
// aapt resource value: 0x7F060104
- public const int share_bule = 2131099908;
+ public const int setting_hint_text = 2131099908;
// aapt resource value: 0x7F060105
- public const int share_green = 2131099909;
+ public const int shadow = 2131099909;
// aapt resource value: 0x7F060106
- public const int share_red = 2131099910;
+ public const int share_bule = 2131099910;
// aapt resource value: 0x7F060107
- public const int share_tip_red = 2131099911;
+ public const int share_green = 2131099911;
// aapt resource value: 0x7F060108
- public const int source_detection_btn_color = 2131099912;
+ public const int share_red = 2131099912;
// aapt resource value: 0x7F060109
- public const int state_abnormal_text = 2131099913;
+ public const int share_tip_red = 2131099913;
// aapt resource value: 0x7F06010A
- public const int state_normal_text = 2131099914;
+ public const int source_detection_btn_color = 2131099914;
// aapt resource value: 0x7F06010B
- public const int state_off_text = 2131099915;
+ public const int state_abnormal_text = 2131099915;
// aapt resource value: 0x7F06010C
- public const int switch_thumb_disabled_material_dark = 2131099916;
+ public const int state_normal_text = 2131099916;
// aapt resource value: 0x7F06010D
- public const int switch_thumb_disabled_material_light = 2131099917;
+ public const int state_off_text = 2131099917;
// aapt resource value: 0x7F06010E
- public const int switch_thumb_material_dark = 2131099918;
+ public const int switch_thumb_disabled_material_dark = 2131099918;
// aapt resource value: 0x7F06010F
- public const int switch_thumb_material_light = 2131099919;
+ public const int switch_thumb_disabled_material_light = 2131099919;
// aapt resource value: 0x7F060110
- public const int switch_thumb_normal_material_dark = 2131099920;
+ public const int switch_thumb_material_dark = 2131099920;
// aapt resource value: 0x7F060111
- public const int switch_thumb_normal_material_light = 2131099921;
-
- // aapt resource value: 0x7F060114
- public const int table_value = 2131099924;
+ public const int switch_thumb_material_light = 2131099921;
// aapt resource value: 0x7F060112
- public const int tab_color = 2131099922;
+ public const int switch_thumb_normal_material_dark = 2131099922;
// aapt resource value: 0x7F060113
- public const int tab_sel_color = 2131099923;
+ public const int switch_thumb_normal_material_light = 2131099923;
// aapt resource value: 0x7F060116
- public const int textview_txtcolor_selector = 2131099926;
+ public const int table_value = 2131099926;
+
+ // aapt resource value: 0x7F060114
+ public const int tab_color = 2131099924;
// aapt resource value: 0x7F060115
- public const int text_black = 2131099925;
-
- // aapt resource value: 0x7F060117
- public const int tip_bg = 2131099927;
+ public const int tab_sel_color = 2131099925;
// aapt resource value: 0x7F060118
- public const int tip_color = 2131099928;
+ public const int textview_txtcolor_selector = 2131099928;
+
+ // aapt resource value: 0x7F060117
+ public const int text_black = 2131099927;
// aapt resource value: 0x7F060119
- public const int title_down_text_selector = 2131099929;
+ public const int tip_bg = 2131099929;
// aapt resource value: 0x7F06011A
- public const int title_line = 2131099930;
+ public const int tip_color = 2131099930;
// aapt resource value: 0x7F06011B
- public const int title_text = 2131099931;
+ public const int title_down_text_selector = 2131099931;
// aapt resource value: 0x7F06011C
- public const int tooltip_background_dark = 2131099932;
+ public const int title_line = 2131099932;
// aapt resource value: 0x7F06011D
- public const int tooltip_background_light = 2131099933;
+ public const int title_text = 2131099933;
// aapt resource value: 0x7F06011E
- public const int topbar_title_color = 2131099934;
-
- // aapt resource value: 0x7F060120
- public const int translucent_black = 2131099936;
-
- // aapt resource value: 0x7F060121
- public const int transparent = 2131099937;
-
- // aapt resource value: 0x7F060122
- public const int transparent_bg = 2131099938;
+ public const int tooltip_background_dark = 2131099934;
// aapt resource value: 0x7F06011F
- public const int trans_bg_color = 2131099935;
+ public const int tooltip_background_light = 2131099935;
+
+ // aapt resource value: 0x7F060120
+ public const int topbar_title_color = 2131099936;
+
+ // aapt resource value: 0x7F060122
+ public const int translucent_black = 2131099938;
// aapt resource value: 0x7F060123
- public const int tv_my_blue = 2131099939;
+ public const int transparent = 2131099939;
// aapt resource value: 0x7F060124
- public const int unopen = 2131099940;
+ public const int transparent_bg = 2131099940;
+
+ // aapt resource value: 0x7F060121
+ public const int trans_bg_color = 2131099937;
// aapt resource value: 0x7F060125
- public const int upgrade_gray = 2131099941;
+ public const int tv_my_blue = 2131099941;
// aapt resource value: 0x7F060126
- public const int upgrade_green = 2131099942;
+ public const int unopen = 2131099942;
// aapt resource value: 0x7F060127
- public const int upgrade_orange = 2131099943;
+ public const int upgrade_gray = 2131099943;
// aapt resource value: 0x7F060128
- public const int upgrade_red = 2131099944;
+ public const int upgrade_green = 2131099944;
// aapt resource value: 0x7F060129
- public const int upload_sel_count = 2131099945;
+ public const int upgrade_orange = 2131099945;
// aapt resource value: 0x7F06012A
- public const int upsdk_color_gray_1 = 2131099946;
+ public const int upgrade_red = 2131099946;
// aapt resource value: 0x7F06012B
- public const int upsdk_color_gray_10 = 2131099947;
+ public const int upload_sel_count = 2131099947;
// aapt resource value: 0x7F06012C
- public const int upsdk_color_gray_7 = 2131099948;
+ public const int upsdk_color_gray_1 = 2131099948;
// aapt resource value: 0x7F06012D
- public const int version_gray = 2131099949;
+ public const int upsdk_color_gray_10 = 2131099949;
// aapt resource value: 0x7F06012E
- public const int video_talk_sdk_black = 2131099950;
+ public const int upsdk_color_gray_7 = 2131099950;
// aapt resource value: 0x7F06012F
- public const int video_talk_sdk_hint_color_gray = 2131099951;
+ public const int version_gray = 2131099951;
// aapt resource value: 0x7F060130
- public const int video_talk_sdk_text_color_black = 2131099952;
+ public const int video_talk_sdk_black = 2131099952;
// aapt resource value: 0x7F060131
- public const int video_talk_sdk_text_color_gray = 2131099953;
+ public const int video_talk_sdk_hint_color_gray = 2131099953;
// aapt resource value: 0x7F060132
- public const int video_talk_sdk_white = 2131099954;
+ public const int video_talk_sdk_text_color_black = 2131099954;
// aapt resource value: 0x7F060133
- public const int viewfinder_frame = 2131099955;
+ public const int video_talk_sdk_text_color_gray = 2131099955;
// aapt resource value: 0x7F060134
- public const int viewfinder_laser = 2131099956;
+ public const int video_talk_sdk_white = 2131099956;
// aapt resource value: 0x7F060135
- public const int viewfinder_mask = 2131099957;
+ public const int viewfinder_frame = 2131099957;
// aapt resource value: 0x7F060136
- public const int white = 2131099958;
+ public const int viewfinder_laser = 2131099958;
// aapt resource value: 0x7F060137
- public const int yahei = 2131099959;
+ public const int viewfinder_mask = 2131099959;
// aapt resource value: 0x7F060138
- public const int yellow_text = 2131099960;
+ public const int white = 2131099960;
// aapt resource value: 0x7F060139
- public const int zxing_custom_possible_result_points = 2131099961;
+ public const int yahei = 2131099961;
// aapt resource value: 0x7F06013A
- public const int zxing_custom_result_view = 2131099962;
+ public const int yellow_text = 2131099962;
// aapt resource value: 0x7F06013B
- public const int zxing_custom_viewfinder_laser = 2131099963;
+ public const int zxing_custom_possible_result_points = 2131099963;
// aapt resource value: 0x7F06013C
- public const int zxing_custom_viewfinder_mask = 2131099964;
+ public const int zxing_custom_result_view = 2131099964;
// aapt resource value: 0x7F06013D
- public const int zxing_possible_result_points = 2131099965;
+ public const int zxing_custom_viewfinder_laser = 2131099965;
// aapt resource value: 0x7F06013E
- public const int zxing_result_view = 2131099966;
+ public const int zxing_custom_viewfinder_mask = 2131099966;
// aapt resource value: 0x7F06013F
- public const int zxing_status_text = 2131099967;
+ public const int zxing_possible_result_points = 2131099967;
// aapt resource value: 0x7F060140
- public const int zxing_transparent = 2131099968;
+ public const int zxing_result_view = 2131099968;
// aapt resource value: 0x7F060141
- public const int zxing_viewfinder_laser = 2131099969;
+ public const int zxing_status_text = 2131099969;
// aapt resource value: 0x7F060142
- public const int zxing_viewfinder_mask = 2131099970;
+ public const int zxing_transparent = 2131099970;
+
+ // aapt resource value: 0x7F060143
+ public const int zxing_viewfinder_laser = 2131099971;
+
+ // aapt resource value: 0x7F060144
+ public const int zxing_viewfinder_mask = 2131099972;
static Color()
{
@@ -20214,7 +20220,7 @@
public const int AppTheme = 2131755015;
// aapt resource value: 0x7F10000A
- public const int AppThemeXx = 2131755018;
+ public const int AppThemeLc = 2131755018;
// aapt resource value: 0x7F100008
public const int AppTheme_Base = 2131755016;
diff --git a/HDL-ON_Android/Resources/values/colors.xml b/HDL-ON_Android/Resources/values/colors.xml
index df49583..81aec40 100644
--- a/HDL-ON_Android/Resources/values/colors.xml
+++ b/HDL-ON_Android/Resources/values/colors.xml
@@ -8,4 +8,6 @@
<color name="color_disable">#CCCCCC</color>
<color name="color_select">#FB744A</color>
<color name="color_default">#FF333333</color>
+ <color name="color_bar">#33333333</color>
+ <color name="color_bg">#F2F3F4</color>
</resources>
\ No newline at end of file
diff --git a/HDL-ON_Android/Resources/values/styles.xml b/HDL-ON_Android/Resources/values/styles.xml
index dc122bb..e025194 100644
--- a/HDL-ON_Android/Resources/values/styles.xml
+++ b/HDL-ON_Android/Resources/values/styles.xml
@@ -18,6 +18,14 @@
<item name="android:windowNoTitle">true</item>
</style>
+ <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+ <!-- Customize your theme here. -->
+ <item name="background_color">@color/color_bg</item>
+ <item name="android:windowNoTitle">true</item>
+ <item name="android:windowIsTranslucent">false</item>
+ <item name="android:statusBarColor">@color/color_bar</item>
+ </style>
+
<style name="MyDialogStyle">
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 23ba050..44be1bb 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -568,6 +568,8 @@
581=
582=Are you sure to delete this device?
583=EZVIZ
+584=Deployment status
+585=Failed to obtain third-party platform information
2532=Visitor Invitation Record
@@ -1118,6 +1120,7 @@
7165=Area intrusion alarm
7166=camera
7167=main switch
+
@@ -1804,6 +1807,8 @@
581=
582=纭畾鍒犻櫎璇ヨ澶囧悧?
583=钀ょ煶鎽勫儚澶�
+584=甯冮槻鐘舵��
+585=鑾峰彇绗笁鏂瑰钩鍙颁俊鎭け璐�
2532=璁垮閭�璇疯褰�
@@ -2339,6 +2344,7 @@
7165=鍖哄煙鍏ヤ镜鍛婅
7166=鎽勫儚澶�
7167=鎬绘帶寮�鍏�
+
@@ -3016,6 +3022,8 @@
581=
582=Are you sure to delete this device?
583=EZVIZ
+584=Deployment status
+585=Failed to obtain third-party platform information
2532=Visitor Invitation Record
@@ -4233,6 +4241,8 @@
581=
582=Are you sure to delete this device?
583=EZVIZ
+584=Deployment status
+585=Failed to obtain third-party platform information
@@ -5436,6 +5446,8 @@
581=
582=Are you sure to delete this device?
583=EZVIZ
+584=Deployment status
+585=Failed to obtain third-party platform information
1000=袙谢邪卸薪芯褋褌 胁 褋褌邪褟褌邪
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index eb7f100..0181540 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -171,7 +171,7 @@
var deviceResult = Ins.HttpRequest.GetDeviceList("30", "1");
if (deviceResult.Code == StateCode.SUCCESS)
{
-
+ FunctionList.List.Clear();
//MainPage.Log($"璇诲彇璁惧淇℃伅鎴愬姛");
//MainPage.Log($"sid鍒楄〃鑾峰彇====" + deviceResult.Data.ToString());
var deviceList = JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 136f9a9..7cd18a1 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,6 +4,15 @@
{
public static class StringId
{
+
+ /// <summary>
+ /// 鑾峰彇绗笁鏂瑰钩鍙颁俊鎭け璐�
+ /// </summary>
+ public const int Get3tyIotInfoFailed = 585;
+ /// <summary>
+ /// 甯冮槻鐘舵��
+ /// </summary>
+ public const int DeploymentStatus = 584;
/// <summary>
/// 钀ょ煶鎽勫儚澶�
/// </summary>
diff --git a/HDL_ON/DAL/DriverLayer/Control_Udp.cs b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
index 2791215..5dba3fd 100644
--- a/HDL_ON/DAL/DriverLayer/Control_Udp.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_Udp.cs
@@ -552,7 +552,28 @@
}
else
{
- ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { (byte)(((int)function.bus.LoopId) + 16), Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Percent)) });
+ if (commandDictionary.ContainsKey(FunctionAttributeKey.Percent))
+ {
+ ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { (byte)(((int)function.bus.LoopId) + 16), Convert.ToByte(function.GetAttrState(FunctionAttributeKey.Percent)) });
+ }
+ else
+ {
+
+ byte tempCurtainState = 0;
+ if (function.trait_on_off.curValue.ToString() == "stop")
+ {
+ tempCurtainState = 0;
+ }
+ else if (function.trait_on_off.curValue.ToString() == "on")
+ {
+ tempCurtainState = 1;
+ }
+ else
+ {
+ tempCurtainState = 2;
+ }
+ ControlBytesSend(Command.SetCurtainModelStutas, subnetId, deviceId, new byte[] { function.bus.LoopId, tempCurtainState });
+ }
}
break;
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 2f384e8..5030525 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -70,12 +70,13 @@
ShowFunction.Light,ShowFunction.AC,ShowFunction.Curtain,
ShowFunction.FloorHeating,ShowFunction.Music,
ShowFunction.Electric,ShowFunction.Environmental,
- ShowFunction.EnergyMonitoring,
+ ShowFunction.EnergyMonitoring,ShowFunction.IpCam,
ShowFunction.FreshAir,ShowFunction.DoorLock,
- ShowFunction.Panel,ShowFunction.SecurityMonitoring,
+ ShowFunction.Panel,
ShowFunction.Sensor,ShowFunction.VideoIntercom,
ShowFunction.SecurityCenter,ShowFunction.Acst,
- ShowFunction.MechanicalArm ,ShowFunction.IpCam};
+ ShowFunction.MechanicalArm ,
+ ShowFunction.SecurityMonitoring,};
}
return dddd;
}
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index e7a7da8..a9d05c9 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -753,6 +753,7 @@
case FunctionAttributeKey.CCT:
case FunctionAttributeKey.RGB:
case FunctionAttributeKey.Angle:
+ case "security":
//case FunctionAttributeKey.FadeTime:
if (attr.curValue.ToString() == "{}")
{
@@ -777,6 +778,10 @@
attr.curValue = "day";
}
}
+ }
+ else if(attr.key == "security")
+ {
+ attr.curValue = "false";
}
else
{
@@ -1006,6 +1011,10 @@
{
public const string _null = "";
/// <summary>
+ /// 瀹夐槻甯冮槻鐘舵��
+ /// </summary>
+ public const string Security = "security";
+ /// <summary>
/// 寮�鍏�
/// </summary>
public const string OnOff = "on_off";
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 074f835..a6b5568 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -692,6 +692,9 @@
case "angle":
text = Language.StringByID(StringId.Angle);
break;
+ case "security":
+ text = Language.StringByID(StringId.DeploymentStatus);
+ break;
}
return text;
}
@@ -743,6 +746,9 @@
string text = "";
switch (key)
{
+ case FunctionAttributeKey.Security:
+ text = catchString == "true" ? Language.StringByID(StringId.Defense) : Language.StringByID(StringId.Undefense);
+ break;
case FunctionAttributeKey.OnOff:
text = catchString == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
break;
diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs
index aff130f..b53b38a 100644
--- a/HDL_ON/Entity/Function/Sensor.cs
+++ b/HDL_ON/Entity/Function/Sensor.cs
@@ -78,12 +78,23 @@
function.SetAttrState(FunctionAttributeKey.Value, value);
}
+ List<string> _intervalValue = new List<string>();
+
+ public void SetIntervalValue(List<string> intervalValue)
+ {
+ _intervalValue = intervalValue;
+ }
+
/// <summary>
/// 姣忎釜绛夌骇瀵瑰尯闂村��
/// </summary>
public List<string> GetIntervalValue(string spk)
{
- var _intervalValue = new List<string>();
+ if(_intervalValue.Count != 0)
+ {
+ return _intervalValue;
+ }
+ _intervalValue = new List<string>();
switch (spk)
{
case SPK.SensorPm25:
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 3f2a267..a6882cf 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -18,6 +18,7 @@
{
try
{
+ _FunctionList._IpCamImou = null;
_FunctionList.Clear();
_FunctionList = null;
}
@@ -76,6 +77,8 @@
if (_IpCamImou.Count > 0)
{
Com.Utils.HdlToLcUtils.Instance.InitData(Shared.Application.Activity, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
+ Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
+ Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
}
}
return _IpCamImou;
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index ab0c1e5..3d3d5ad 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -120,7 +120,7 @@
SPK.AirFreshStandard,SPK.HvacAirFresh,
SPK.AirSwitch,
SPK.PanelSocket,SPK.ElectricSocket,
- SPK.MechanicalArm,
+ SPK.MechanicalArm,SPK.IpCam_Imou,
};
@@ -400,30 +400,30 @@
{
Entity.FunctionList.List.Clear();
Entity.SpatialInfo.CurrentSpatial.Clear();
- ///绛夊緟鑾峰彇浣忓畢淇℃伅
- Application.RunOnMainThread(() =>
- {
- if (waitPage != null)
+ ///绛夊緟鑾峰彇浣忓畢淇℃伅
+ Application.RunOnMainThread(() =>
{
- waitPage.RemoveFromParent();
- waitPage = null;
- }
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
- //璺宠浆椤甸潰----
- UserBasePage = new UserPage();
- BasePageView.AddChidren(UserBasePage);
- UserBasePage.LoadPage();
- BasePageView.PageIndex = 0;
+ //璺宠浆椤甸潰----
+ UserBasePage = new UserPage();
+ BasePageView.AddChidren(UserBasePage);
+ UserBasePage.LoadPage();
+ BasePageView.PageIndex = 0;
- if (isFirstOpen)
- {
- //鍚姩瀵嗙爜楠岃瘉
- new AppUnlockPage().LoadPage(isFirstOpen);
- }
- //涓婚〉鍔犺浇瀹屾垚,鍥炶皟浜嬩欢
- pageShowEvent?.Invoke();
- pageShowEvent = null;
- });
+ if (isFirstOpen)
+ {
+ //鍚姩瀵嗙爜楠岃瘉
+ new AppUnlockPage().LoadPage(isFirstOpen);
+ }
+ //涓婚〉鍔犺浇瀹屾垚,鍥炶皟浜嬩欢
+ pageShowEvent?.Invoke();
+ pageShowEvent = null;
+ });
}
catch (Exception ex)
{
@@ -432,14 +432,14 @@
finally
{
Application.RunOnMainThread(() =>
- {
- if (downloadData)
- {
- DB_ResidenceData.Instance.EixtAccount();
- ///鍒濆鍖朼pp鏁版嵁
- Common.ApiUtlis.Ins.DownloadData();
- };
- });
+ {
+ if (downloadData)
+ {
+ DB_ResidenceData.Instance.EixtAccount();
+ ///鍒濆鍖朼pp鏁版嵁
+ Common.ApiUtlis.Ins.DownloadData();
+ };
+ });
}
}).Start();
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 78a0c6a..3a74f8e 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -234,65 +234,78 @@
break;
case SPK.IpCam_Imou:
FunctionList.List.GetIpCamImouList();
-
- var waitPage = new Loading();
- MainPage.BaseView.AddChidren(waitPage);
- waitPage.Start("");
- new System.Threading.Thread(() =>
+ if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken))
{
- try
+ var waitPage = new Loading();
+ MainPage.BaseView.AddChidren(waitPage);
+ waitPage.Start("");
+ new System.Threading.Thread(() =>
{
- var http = new HttpServerRequest();
- var pack = http.GetLcSubAccountToken();
- if (pack.Code == StateCode.SUCCESS)
+ try
{
- if (pack.Data == null || string.IsNullOrEmpty(pack.Data.ToString()))
+ var http = new HttpServerRequest();
+ var pack = http.GetLcSubAccountToken();
+ if (pack.Code == StateCode.SUCCESS)
+ {
+ if (pack.Data == null || string.IsNullOrEmpty(pack.Data.ToString()))
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao));
+ });
+ }
+#if __ANDROID__
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
+ Com.Utils.HdlToLcUtils.Instance.Play(function.extDevId, function.name);
+ }
+ catch (Exception ex)
+ {
+
+ }
+ });
+#endif
+ }
+ else
{
Application.RunOnMainThread(() =>
{
- new PublicAssmebly().TipMsg("", $"鑾峰彇涔愭鏁版嵁澶辫触");
+ new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao) + $"({pack.Code})");
});
}
-#if __ANDROID__
- Application.RunOnMainThread(() =>
- {
- try
- {
- Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
- Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
- Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
- Com.Utils.HdlToLcUtils.Instance.Play(function.extDevId, function.name);
- }
- catch (Exception ex)
- {
-
- }
- });
-#endif
}
- else
+ catch (Exception ex)
+ {
+ MainPage.Log("鍔犺浇涔愭鎽勫儚澶村紓甯�");
+ }
+ finally
{
Application.RunOnMainThread(() =>
{
- new PublicAssmebly().TipMsg("", $"鑾峰彇涔愭鏁版嵁澶辫触({pack.Code})");
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
});
}
- }catch(Exception ex)
+ })
+ { IsBackground = true }.Start();
+ }
+ else
+ {
+ try
{
- MainPage.Log("鍔犺浇涔愭鎽勫儚澶村紓甯�");
+ Com.Utils.HdlToLcUtils.Instance.Play(function.extDevId, function.name);
}
- finally
+ catch (Exception ex)
{
- Application.RunOnMainThread(() => {
- if (waitPage != null)
- {
- waitPage.RemoveFromParent();
- waitPage = null;
- }
- });
+
}
- })
- { IsBackground = true }.Start();
+ }
break;
}
};
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 9288a97..d4f098f 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -215,12 +215,16 @@
//etAccount.Text = "13226233133";//璞嗚眴
//etAccount.Text = "18316120654";//tujie
//etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
- etAccount.Text = "tf@smarttech.com.ua";
- etAccount.Text = "455740454@qq.com";
- etAccount.Text = "18688565449";
- etAccount.Text = "support7@hdlautomation.com";
- etAccount.Text = "13288623489";
- etAccount.Text = "18570064522";
+ //etAccount.Text = "tf@smarttech.com.ua";
+ //etAccount.Text = "455740454@qq.com";
+ //etAccount.Text = "18688565449";
+ //etAccount.Text = "support7@hdlautomation.com";
+ //etAccount.Text = "18570064522";
+ //etAccount.Text = "18718417827";
+ //etAccount.Text = "ablis-nn@yandex.ru";
+ //etAccount.Text = "13143792049";
+ //etAccount.Text = "13288623489";//缃楁檽涓�
+ etAccount.Text = "18244942707";
}
else
{
@@ -248,19 +252,22 @@
//etAccount.Text = "info@smartlife-ks.com";
//etAccount.Text = "551775569@qq.com";//wcf
etAccount.Text = "15626203746";
- //etAccount.Text = "18244942707";
//etAccount.Text = "zhangquansongjava@163.com";
//etAccount.Text = "s.savinov@hdlautomation.ru";
+
}
b = !b;
etPassword.Text = "123456";
- if(etAccount.Text == "13288623489")
+ if(etAccount.Text == "ablis-nn@yandex.ru")
+ {
+ etPassword.Text = "07112001Ulyna";
+ }
+ else if(etAccount.Text == "13143792049")
+ {
+ etPassword.Text = "BVVBQATD";
+ }else if(etAccount.Text == "13288623489")
{
etPassword.Text = "luoxiaodong";
- }
- else if(etAccount.Text == "18570064522")
- {
- etPassword.Text = "BWMSRYWN";
}
//etPassword.Text = "Hdl85521566";
btnLogin.IsSelected = true;
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 832ac88..6d324a2 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -208,10 +208,9 @@
{
Application.RunOnMainThread(() =>
{
- new PublicAssmebly().TipMsg("", $"鑾峰彇涔愭鏁版嵁澶辫触");
+ new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao));
});
}
- Com.Utils.HdlToLcUtils.Instance.InitData(Shared.Application.Activity, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
@@ -233,7 +232,7 @@
{
Application.RunOnMainThread(() =>
{
- new PublicAssmebly().TipMsg("", $"鑾峰彇涔愭鏁版嵁澶辫触({pack.Code})");
+ new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao) + $"({pack.Code})");
});
}
})
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
index 5a59137..6f695e2 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
@@ -79,6 +79,9 @@
case "angle"://瑙掑害
LoadFunctionRow(sceneFunction.status.Find((obj) => obj.key == "angle"));
break;
+ case "security"://澶у崕鎽勫儚甯冮槻鎾ら槻
+ LoadFunctionRow(sceneFunction.status.Find((obj) => obj.key == "security"));
+ break;
}
}
@@ -332,6 +335,9 @@
{
switch (sceneStatus.key)
{
+ case FunctionAttributeKey.Security:
+ LoadEditDialog_Security(sceneStatus, btnFunctionText);
+ break;
case FunctionAttributeKey.OnOff:
LoadEditDialog_OnOff(sceneStatus, btnFunctionText);
break;
@@ -583,6 +589,109 @@
}
+
+ /// <summary>
+ /// 鍔犺浇瀹夐槻甯冮槻閫夋嫨寮圭獥
+ /// </summary>
+ /// <param name="function"></param>
+ /// <param name="btn"></param>
+ void LoadEditDialog_Security(SceneFunctionStatus trait, Button btn)
+ {
+ Dialog dialog = new Dialog();
+
+ var pView = new FrameLayout()
+ {
+ BackgroundColor = CSS_Color.DialogTransparentColor1,
+ };
+ dialog.AddChidren(pView);
+
+ var optionBaseView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(500),
+ Height = Application.GetRealHeight(160),
+ AnimateSpeed = 0.3f,
+ Animate = Animate.DownToUp,
+ };
+ pView.AddChidren(optionBaseView);
+
+ var optionView = new VerticalScrolViewLayout()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(100),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ Radius = (uint)Application.GetRealWidth(12),
+ ScrollEnabled = false,
+ };
+ optionBaseView.AddChidren(optionView);
+
+ var btnOn = new Button()
+ {
+ Height = Application.GetRealHeight(50),
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.TextualColor,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextID = StringId.Defense,
+ IsSelected = trait.value.ToString() == "true"
+ };
+ optionView.AddChidren(btnOn);
+
+ optionView.AddChidren(new Button() { Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });
+
+ var btnOff = new Button()
+ {
+ Height = Application.GetRealHeight(50),
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.TextualColor,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextID = StringId.Undefense,
+ IsSelected = trait.value.ToString() == "false"
+ };
+ optionView.AddChidren(btnOff);
+
+ var btnCancel = new Button()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(8) + optionView.Bottom,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(50),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ Radius = (uint)Application.GetRealWidth(12),
+ TextID = StringId.Cancel,
+ TextColor = CSS_Color.WarningColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ };
+ optionBaseView.AddChidren(btnCancel);
+
+ dialog.Show();
+
+ pView.MouseUpEventHandler = (sender, e) => {
+ dialog.Close();
+ };
+
+ btnCancel.MouseUpEventHandler = (sender, e) => {
+ dialog.Close();
+ };
+ btnOn.MouseUpEventHandler = (sender, e) => {
+ dialog.Close();
+ trait.value = "true";
+ sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Security).value = "true";
+ btn.Text = trait.GetValueText() + trait.GetUintString();
+
+ };
+ btnOff.MouseUpEventHandler = (sender, e) => {
+ dialog.Close();
+ trait.value = "false";
+ sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Security).value = "false";
+ btn.Text = trait.GetValueText() + trait.GetUintString();
+
+ };
+
+ }
+
+
/// <summary>
/// 鍔犺浇娓╁害閫夋嫨寮圭獥
/// </summary>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
index 87fe48e..2496657 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -26,15 +26,115 @@
{
Action<string, string> action = (s, a) =>
{
- if (brand.productBrand == "")
+ if (brand.productBrand == "IMOU")
{
#if __ANDROID__
- var backTemp = new AddLcCam();
- backTemp.backAction = () =>
+
+ FunctionList.List.GetIpCamImouList();
+
+
+ if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken))
{
- Load3tyBrandDeviceList();
- };
- Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);
+
+ var waitPage = new Loading();
+ MainPage.BaseView.AddChidren(waitPage);
+ waitPage.Start("");
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+
+#if DEBUG
+ Com.Utils.HdlToLcUtils.Instance.ShowErrorInfo(true);
+#endif
+
+ var http = new HttpServerRequest();
+ var pack = http.GetLcSubAccountToken();
+ if (pack.Code == StateCode.SUCCESS)
+ {
+ if (pack.Data == null || string.IsNullOrEmpty(pack.Data.ToString()))
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.Get3tyIotInfoFailed));
+ return;
+ });
+ }
+ Com.Utils.HdlToLcUtils.Instance.InitData(Shared.Application.Activity, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
+ Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
+ Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
+ Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
+#if __ANDROID__
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+
+ var result = Com.Utils.HdlToLcUtils.Instance.CheckCameraPermissions();
+ if (result)
+ {
+ var backTemp = new AddLcCam();
+ backTemp.backAction = () =>
+ {
+ Load3tyBrandDeviceList();
+ };
+ Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);
+ }
+ else
+ {
+ Com.Utils.HdlToLcUtils.Instance.RequestCameraPermissions();
+ }
+ }
+ catch (Exception ex)
+ {
+
+ }
+ });
+#endif
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao) + $"({pack.Code})");
+ });
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log("鍔犺浇涔愭鎽勫儚澶村紓甯�");
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ });
+ }
+ })
+ { IsBackground = true }.Start();
+ }
+ else
+ {
+ var result = Com.Utils.HdlToLcUtils.Instance.CheckCameraPermissions();
+ if (result)
+ {
+ var backTemp = new AddLcCam();
+ backTemp.backAction = () =>
+ {
+ Load3tyBrandDeviceList();
+ };
+ Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);
+ }
+ else
+ {
+ Com.Utils.HdlToLcUtils.Instance.RequestCameraPermissions();
+ }
+ }
#endif
}
else
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index cfdd23b..7ed2eea 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -98,110 +98,103 @@
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- var dialog = new Dialog();
- var dialogBody = new FrameLayout();
- dialog.AddChidren(dialogBody);
- dialogBody.MouseUpEventHandler = (sender1, e1) =>
+ if (UserInfo.Current.regionList.Count < 20)
{
- dialog.Close();
- };
+ var dialog = new Dialog();
+ var dialogBody = new FrameLayout();
+ dialog.AddChidren(dialogBody);
+ dialogBody.MouseUpEventHandler = (sender1, e1) =>
+ {
+ dialog.Close();
+ };
- var dispalyView = new FrameLayout()
- {
- X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(268),
- Width = Application.GetRealWidth(160),
- Height = Application.GetRealHeight(110),
- BackgroundImagePath = "PersonalCenter/HomeList1bg.png",
- };
- dialogBody.AddChidren(dispalyView);
-
- var contentView = new VerticalScrolViewLayout()
- {
- X = Application.GetRealWidth(22),
- Y = Application.GetRealHeight(15),
- Width = Application.GetRealWidth(150),
- Height = Application.GetRealHeight(45),
- ScrollEnabled = false
- };
- dispalyView.AddChidren(contentView);
-
- if (UserInfo.Current.regionList.Count < 2)
- {
-
- }
- else if (UserInfo.Current.regionList.Count < 3)
- {
- dispalyView = new FrameLayout()
+ var dispalyView = new FrameLayout()
{
X = Application.GetRealWidth(10),
Y = Application.GetRealHeight(268),
Width = Application.GetRealWidth(160),
- Height = Application.GetRealHeight(105),
+ Height = Application.GetRealHeight(110),
BackgroundImagePath = "PersonalCenter/HomeList1bg.png",
};
dialogBody.AddChidren(dispalyView);
- contentView.Height = Application.GetRealHeight(45 * 2);
- dispalyView.AddChidren(contentView);
- }
- else if (UserInfo.Current.regionList.Count < 4)
- {
- dispalyView = new FrameLayout()
+ var contentView = new VerticalScrolViewLayout()
{
- X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(268),
- Width = Application.GetRealWidth(160),
- Height = Application.GetRealHeight(155),
- BackgroundImagePath = "PersonalCenter/HomeList2bg.png",
+ X = Application.GetRealWidth(22),
+ Y = Application.GetRealHeight(15),
+ Width = Application.GetRealWidth(150),
+ Height = Application.GetRealHeight(45),
+ ScrollEnabled = false
};
- dialogBody.AddChidren(dispalyView);
-
- contentView.Height = Application.GetRealHeight(45 * 3);
dispalyView.AddChidren(contentView);
- }
- else if (UserInfo.Current.regionList.Count < 5)
- {
- dispalyView = new FrameLayout()
+
+ if (UserInfo.Current.regionList.Count < 2)
{
- X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(268),
- Width = Application.GetRealWidth(160),
- Height = Application.GetRealHeight(200),
- BackgroundImagePath = "PersonalCenter/HomeList3bg.png",
- };
- dialogBody.AddChidren(dispalyView);
- contentView.Height = Application.GetRealHeight(45 * 4);
- dispalyView.AddChidren(contentView);
- }
- else
- {
- dispalyView = new FrameLayout()
+ }
+ else if (UserInfo.Current.regionList.Count < 3)
{
- X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(268),
- Width = Application.GetRealWidth(160),
- Height = Application.GetRealHeight(245),
- BackgroundImagePath = "PersonalCenter/HomeList4bg.png",
- };
- dialogBody.AddChidren(dispalyView);
+ dispalyView = new FrameLayout()
+ {
+ X = Application.GetRealWidth(10),
+ Y = Application.GetRealHeight(268),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealHeight(105),
+ BackgroundImagePath = "PersonalCenter/HomeList1bg.png",
+ };
+ dialogBody.AddChidren(dispalyView);
- contentView.Height = Application.GetRealHeight(45 * 5);
- contentView.ScrollEnabled = true;
- dispalyView.AddChidren(contentView);
- }
+ contentView.Height = Application.GetRealHeight(45 * 2);
+ dispalyView.AddChidren(contentView);
+ }
+ else if (UserInfo.Current.regionList.Count < 4)
+ {
+ dispalyView = new FrameLayout()
+ {
+ X = Application.GetRealWidth(10),
+ Y = Application.GetRealHeight(268),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealHeight(155),
+ BackgroundImagePath = "PersonalCenter/HomeList2bg.png",
+ };
+ dialogBody.AddChidren(dispalyView);
- int iii = 0;
- //while(iii<20)
- {
+ contentView.Height = Application.GetRealHeight(45 * 3);
+ dispalyView.AddChidren(contentView);
+ }
+ else if (UserInfo.Current.regionList.Count < 5)
+ {
+ dispalyView = new FrameLayout()
+ {
+ X = Application.GetRealWidth(10),
+ Y = Application.GetRealHeight(268),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealHeight(200),
+ BackgroundImagePath = "PersonalCenter/HomeList3bg.png",
+ };
+ dialogBody.AddChidren(dispalyView);
+
+ contentView.Height = Application.GetRealHeight(45 * 4);
+ dispalyView.AddChidren(contentView);
+ }
+ else
+ {
+ dispalyView = new FrameLayout()
+ {
+ X = Application.GetRealWidth(10),
+ Y = Application.GetRealHeight(268),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealHeight(245),
+ BackgroundImagePath = "PersonalCenter/HomeList4bg.png",
+ };
+ dialogBody.AddChidren(dispalyView);
+
+ contentView.Height = Application.GetRealHeight(45 * 5);
+ contentView.ScrollEnabled = true;
+ dispalyView.AddChidren(contentView);
+ }
foreach (var home in UserInfo.Current.regionList)
{
- if (iii > 100)
- {
- break;
- }
- iii++;
var btnHomeName = new Button()
{
Width = Application.GetRealWidth(112),
@@ -235,14 +228,191 @@
LoadContentView();
};
}
+ dialog.Show();
}
- dialog.Show();
+ else
+ {
+ List<RegionInfoRes> newlist = UserInfo.Current.regionList;
+ int pageIndex = 0;
+ int pageCount = UserInfo.Current.regionList.Count / 6 + 1;
+ var dialog = new Dialog();
+ var dialogBody = new FrameLayout();
+ dialog.AddChidren(dialogBody);
+ dialogBody.MouseUpEventHandler = (sender1, e1) =>
+ {
+ dialog.Close();
+ };
+
+ var dispalyView = new FrameLayout()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(267),
+ Height = Application.GetRealHeight(667- 267 + 20),
+ Radius = (uint)Application.GetRealWidth(16),
+ BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
+ };
+ dialogBody.AddChidren(dispalyView);
+
+ #region 鎼滅储鏍�
+ FrameLayout searchView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(50),
+ };
+ dispalyView.AddChidren(searchView);
+
+ var searchTv = new EditText()
+ {
+ X = Application.GetRealWidth(16),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetRealWidth(330),
+ Height = Application.GetRealHeight(38),
+ BorderColor = CSS.CSS_Color.DividingLineColor,
+ BorderWidth = 3,
+ TextColor = CSS.CSS_Color.TextualColor,
+ };
+ searchView.AddChidren(searchTv);
+
+
+ #endregion
+
+ #region 鍒楄〃
+ var showListView = new VerticalScrolViewLayout()
+ {
+ Y = Application.GetRealHeight(50),
+ Height = Application.GetRealHeight(667 - 267 - 100),
+ ScrollEnabled = false,
+ };
+ dispalyView.AddChidren(showListView);
+
+ ChangeShowHomeList(pageIndex, dialog, showListView,newlist);
+
+ #endregion
+
+ #region 涓婁笅椤�
+ var bottomOptionView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(667 - 268 - 50),
+ Height = Application.GetRealHeight(50),
+ BackgroundColor = CSS.CSS_Color.DividingLineColor
+ };
+ dispalyView.AddChidren(bottomOptionView);
+
+ var btnPre = new Button()
+ {
+ Y = 1,
+ Width = Application.GetRealWidth(374 / 2),
+ Height = Application.GetRealHeight(50) - 1,
+ BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
+ Text = "涓婁竴椤�",
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS.CSS_Color.TextualColor,
+ TextSize = CSS.CSS_FontSize.TextFontSize,
+ };
+ bottomOptionView.AddChidren(btnPre);
+ btnPre.MouseUpEventHandler = (sender, e) => {
+ if (pageIndex < 1)
+ {
+ return;
+ }
+ pageIndex--;
+ ChangeShowHomeList(pageIndex, dialog, showListView, newlist);
+ };
+
+ var btnNext = new Button()
+ {
+ Y = 1,
+ X = Application.GetRealWidth(374 / 2)+1,
+ Width = Application.GetRealWidth(374 / 2),
+ Height = Application.GetRealHeight(50) - 1,
+ BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
+ Text = "涓嬩竴椤�",
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS.CSS_Color.TextualColor,
+ TextSize = CSS.CSS_FontSize.TextFontSize,
+ };
+ bottomOptionView.AddChidren(btnNext);
+ btnNext.MouseUpEventHandler = (sender, e) => {
+ pageIndex++;
+ if (pageIndex > pageCount-1)
+ {
+ return;
+ }
+ ChangeShowHomeList(pageIndex, dialog, showListView,newlist);
+ };
+
+ #endregion
+
+
+ searchTv.TextChangeEventHandler = (sender, e) => {
+ new System.Threading.Thread(() => {
+ newlist = UserInfo.Current.regionList.FindAll((obj) => obj.homeName.Contains(e));
+ pageCount = newlist.Count;
+ pageIndex = 0;
+ Application.RunOnMainThread(() => {
+ ChangeShowHomeList(pageIndex, dialog, showListView, newlist);
+ });
+ }).Start();
+ };
+
+ dialog.Show();
+ }
};
btnResidenceDownIcon.MouseUpEventHandler = eventHandler;
btnCurResidenceName.MouseUpEventHandler = eventHandler;
}
/// <summary>
+ /// 鍒囨崲浣忓畢鍒楄〃鏄剧ず
+ /// </summary>
+ void ChangeShowHomeList(int pageIndex,Dialog dialog, VerticalScrolViewLayout showListView, List<RegionInfoRes> newlist)
+ {
+ if(newlist.Count == 0)
+ {
+ return;
+ }
+ showListView.RemoveAll();
+ for (int i = 0; i < 6; i++)
+ {
+ if ((i + pageIndex * 6) >= newlist.Count)
+ {
+ return;
+ }
+ var home = newlist[i + pageIndex * 6];
+ var btnHomeName = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(300),
+ Height = Application.GetRealHeight(50) - 1,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS.CSS_Color.FirstLevelTitleColor,
+ SelectedTextColor = CSS.CSS_Color.MainColor,
+ Text = home.homeName,
+ TextSize = home.homeName.Length > 14 ? CSS.CSS_FontSize.TextFontSize : CSS.CSS_FontSize.SubheadingFontSize,
+ IsSelected = DB_ResidenceData.Instance.CurrentRegion.id == home.id,
+ IsMoreLines = true,
+ Tag = home.id
+ };
+ showListView.AddChidren(btnHomeName);
+
+ showListView.AddChidren(new Button()
+ {
+ Height = Application.GetRealHeight(1),
+ BackgroundColor = CSS.CSS_Color.BackgroundColor
+ });
+
+ btnHomeName.MouseUpEventHandler += (senderH, en) =>
+ {
+ var regionId = (string)btnHomeName.Tag;
+ dialog.Close();
+ LoadEvent_ChangeCurHome(home);
+ LoadContentView();
+ };
+ }
+
+
+ }
+
+ /// <summary>
/// 鏇存崲褰撳墠閫変腑浣忓畢
/// </summary>
/// <param name="homeTemp"></param>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs
index 1e6e44d..8b7011b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs
@@ -618,6 +618,10 @@
{
try
{
+#if DEBUG
+ System.Threading.Thread.Sleep(200);
+#endif
+
foreach (var sub in FunctionList.List.GetAcstSubList())
{
if (subViewList.ContainsKey(sub.sid))
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
index ea27379..6c33b71 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
@@ -488,8 +488,33 @@
/// </summary>
void LoadInfo(Function sensor)
{
- var levelColorList = sensorTemp.GetLevelColorList(sensor.spk);
- var levelTextList = sensorTemp.GetLevelTextList(sensor.spk);
+ List<uint> levelColorList = new List<uint>();
+ List<int> levelTextList = new List<int>();
+ List<string> levelText = new List<string>();
+ var configs = sensor.GetAttrKeyConfigs(sensor.SpkClassification);
+
+
+ int i = 0;
+ foreach(var info in configs)
+ {
+ foreach(var config in info.configs)
+ {
+ var color = Convert.ToUInt32(config.color,16);
+ var text = config.desc;
+ levelColorList.Add(color);
+ levelText.Add(text);
+ levelTextList.Add(i++);
+ }
+ }
+ if (levelColorList.Count == 0)
+ {
+ levelColorList = sensorTemp.GetLevelColorList(sensor.spk);
+ levelTextList = sensorTemp.GetLevelTextList(sensor.spk);
+ foreach(var iii in levelTextList)
+ {
+ levelText.Add(Language.StringByID(iii));
+ }
+ }
Dialog dialog = new Dialog();
FrameLayout dialogBodyView = new FrameLayout();
@@ -582,7 +607,7 @@
IsBold = true,
TextID = StringId.ColorValue,
});
- for (int index = 0; index < levelTextList.Count; index++)
+ for (int index = 0; index < levelText.Count; index++)
{
infoView.AddChidren(new Button()
{
@@ -617,7 +642,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
IsBold = true,
- TextID = levelTextList[index]
+ Text = levelText[index]
});
subInfoView.AddChidren(new Button()
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 506cee4..fc552fb 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -333,6 +333,7 @@
{
return;
}
+ MainPage.CurPageIndex = 0;
btnClassificationIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
@@ -344,10 +345,8 @@
//绉诲姩璺濈
var distance = navigationSelectionView.X - collectionView.X + Application.GetRealWidth(94*3);
int total = 10;
- int sleepTime = 300;
if (distance > 200)
{
- sleepTime = 400;
total = 30;
}
else if (distance > 100)
@@ -357,7 +356,6 @@
distance /= total;
new System.Threading.Thread(() => {
int index = 0;
- MainPage.CurPageIndex = 0;
while (index < total+1)
{
if (MainPage.CurPageIndex != 0)
@@ -371,11 +369,14 @@
{
navigationSelectionView.X -= distance;
}
+ else if (index == (total / 2))
+ {
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/HomePageIconOn.png";
+ }
else
{
navigationSelectionView.X = collectionView.X - Application.GetRealWidth(94 * 3);
btnCollectionText.IsSelected = true;
- btnCollectionIcon.IsSelected = true;
btnClassificationIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
@@ -384,27 +385,27 @@
btnPersonalCenterText.IsSelected = false;
btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/HomePageIconOn.png";
}
- if (index == (total/2))
+ if (index < (total - 2))
{
- btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/HomePageIconOn.png";
+ btnCollectionIcon.IsSelected = true;
}
//鏃嬭浆
btnNavigationSelectionIcon.SetRotation(-36f * index);
});
- System.Threading.Thread.Sleep(sleepTime / total);
+ System.Threading.Thread.Sleep(5);
index++;
}
Application.RunOnMainThread(() =>
{
btnNavigationSelectionIcon.SetRotation(0f);
+ ContextView.RemoveAll();
+ var homePage = new HomePage();
+ ContextView.AddChidren(homePage);
+ homePage.LoadPage();
});
- }) { IsBackground = true ,Priority = System.Threading.ThreadPriority.Highest}.Start();
+ }) { IsBackground = true ,Priority = System.Threading.ThreadPriority.Lowest}.Start();
#endregion
- ContextView.RemoveAll();
- var homePage = new HomePage();
- ContextView.AddChidren(homePage);
- homePage.LoadPage();
}
/// <summary>
/// 鍒囨崲鍒板垎绫荤晫闈�
@@ -415,6 +416,7 @@
{
return;
}
+ MainPage.CurPageIndex = 1;
btnCollectionIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
@@ -425,7 +427,6 @@
#region 绉诲姩鍔ㄧ敾
var distance = navigationSelectionView.X - classificationView.X + Application.GetRealWidth(94 * 3);
int total = 10;
- int sleepTime = 300;
if (distance > 100 || distance < -100)
{
total = 20;
@@ -433,11 +434,6 @@
distance /= total;
new System.Threading.Thread(() =>
{
- if (MainPage.CurPageIndex == 1)
- {
- return;
- }
- MainPage.CurPageIndex = 1;
int index = 0;
while (index < total+1)
{
@@ -452,11 +448,14 @@
{
navigationSelectionView.X -= distance;
}
+ else if (index == (total / 2))
+ {
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/ClassificationIconOn.png";
+ }
else
{
navigationSelectionView.X = classificationView.X - Application.GetRealWidth(94 * 3);
btnClassificationText.IsSelected = true;
- btnClassificationIcon.IsSelected = true;
btnCollectionIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
@@ -465,9 +464,9 @@
btnPersonalCenterText.IsSelected = false;
btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/ClassificationIconOn.png";
}
- if (index == (total / 2 ))
+ if (index < (total - 2))
{
- btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/ClassificationIconOn.png";
+ btnClassificationIcon.IsSelected = true;
}
//鏃嬭浆
if (distance < 0)
@@ -479,21 +478,21 @@
btnNavigationSelectionIcon.SetRotation(-36f * index);
}
});
- System.Threading.Thread.Sleep(sleepTime / total);
+ System.Threading.Thread.Sleep(5);
index++;
}
Application.RunOnMainThread(() =>
{
btnNavigationSelectionIcon.SetRotation(0f);
+ ContextView.RemoveAll();
+ var classificaitionView = new ClassificationPage();
+ ContextView.AddChidren(classificaitionView);
+ classificaitionView.LoadPage();
});
})
- { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Lowest }.Start();
#endregion
- ContextView.RemoveAll();
- var classificaitionView = new ClassificationPage();
- ContextView.AddChidren(classificaitionView);
- classificaitionView.LoadPage();
}
@@ -506,6 +505,7 @@
{
return;
}
+ MainPage.CurPageIndex = 2;
btnCollectionText.IsSelected = false;
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
@@ -516,18 +516,12 @@
#region 绉诲姩鍔ㄧ敾
var distance = navigationSelectionView.X - intellectualizationView.X + Application.GetRealWidth(94 * 3);
int total = 10;
- int sleepTime = 300;
if (distance > 100 || distance < -100)
{
total = 20;
}
distance /= total;
new System.Threading.Thread(() => {
- if (MainPage.CurPageIndex == 2)
- {
- return;
- }
- MainPage.CurPageIndex = 2;
int index = 0;
while (index < total+1)
{
@@ -542,11 +536,14 @@
{
navigationSelectionView.X -= distance;
}
+ else if (index == (total / 2))
+ {
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/IntellectualizationIconOn.png";
+ }
else
{
navigationSelectionView.X = intellectualizationView.X - Application.GetRealWidth(94 * 3);
btnIntellectualizationText.IsSelected = true;
- btnIntellectualizationIcon.IsSelected = true;
btnCollectionText.IsSelected = false;
btnClassificationText.IsSelected = false;
btnPersonalCenterText.IsSelected = false;
@@ -555,9 +552,9 @@
btnPersonalCenterIcon.IsSelected = false;
btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/IntellectualizationIconOn.png";
}
- if (index == (total / 2 ))
+ if (index < (total - 2))
{
- btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/IntellectualizationIconOn.png";
+ btnIntellectualizationIcon.IsSelected = true;
}
//鏃嬭浆
if (distance < 0)
@@ -569,21 +566,21 @@
btnNavigationSelectionIcon.SetRotation(-36f * index);
}
});
- System.Threading.Thread.Sleep(sleepTime / total);
+ System.Threading.Thread.Sleep(5);
index++;
}
Application.RunOnMainThread(() =>
{
btnNavigationSelectionIcon.SetRotation(0f);
+ ContextView.RemoveAll();
+ var intelligenceView = new IntelligencePage();
+ ContextView.AddChidren(intelligenceView);
+ intelligenceView.LoadPage();
});
})
- { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Lowest }.Start();
#endregion
- ContextView.RemoveAll();
- var intelligenceView = new IntelligencePage();
- ContextView.AddChidren(intelligenceView);
- intelligenceView.LoadPage();
}
@@ -597,6 +594,7 @@
{
return;
}
+ MainPage.CurPageIndex = 3;
btnCollectionText.IsSelected = false;
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
@@ -607,10 +605,8 @@
#region 绉诲姩鍔ㄧ敾
var distance = navigationSelectionView.X - personalCenterView.X + Application.GetRealWidth(94 * 3);
int total = 10;
- int sleepTime = 300;
if (distance < -200)
{
- sleepTime = 400;
total = 30;
}
else if (distance < -100)
@@ -619,7 +615,6 @@
}
distance /= total;
new System.Threading.Thread(() => {
- MainPage.CurPageIndex = 3;
int index = 0;
while (index < total+1)
{
@@ -634,11 +629,14 @@
{
navigationSelectionView.X -= distance;
}
+ else if (index == (total / 2))
+ {
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/PersonalCenterIconOn.png";
+ }
else
{
navigationSelectionView.X = personalCenterView.X - Application.GetRealWidth(94 * 3);
btnPersonalCenterText.IsSelected = true;
- btnPersonalCenterIcon.IsSelected = true;
btnCollectionText.IsSelected = false;
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
@@ -647,28 +645,28 @@
btnIntellectualizationIcon.IsSelected = false;
btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/PersonalCenterIconOn.png";
}
- if (index == (total / 2 ))
+ if (index < (total - 2))
{
- btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/PersonalCenterIconOn.png";
+ btnPersonalCenterIcon.IsSelected = true;
}
//鏃嬭浆
btnNavigationSelectionIcon.SetRotation(36f * index);
});
- System.Threading.Thread.Sleep(sleepTime / total);
+ System.Threading.Thread.Sleep(5);
index++;
}
Application.RunOnMainThread(() =>
{
btnNavigationSelectionIcon.SetRotation(0f);
+ ContextView.RemoveAll();
+ var personalCenterPage = new UI.PersonalCenterPage();
+ ContextView.AddChidren(personalCenterPage);
+ personalCenterPage.LoadView();
});
})
- { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Lowest }.Start();
#endregion
- ContextView.RemoveAll();
- var personalCenterPage = new UI.PersonalCenterPage();
- ContextView.AddChidren(personalCenterPage);
- personalCenterPage.LoadView();
}
/// <summary>
diff --git a/SiriIntents/Server/HttpUtil.cs b/SiriIntents/Server/HttpUtil.cs
index 56a78a0..f61de04 100644
--- a/SiriIntents/Server/HttpUtil.cs
+++ b/SiriIntents/Server/HttpUtil.cs
@@ -16,8 +16,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+ public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
--
Gitblit v1.8.0