From 299f4b1218c0d3721aa92bf091950d6708942583 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 28 八月 2021 15:45:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC

---
 HDL-ON_iOS/Resources/Phone/PersonalCenter/ResidenceInAlarmIcon.png                               |    0 
 HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs |    8 
 HDL-ON_Android/Assets/Language.ini                                                               |   17 
 DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll                                                   |    0 
 HDL-ON_iOS/HDL-ON_iOS.csproj                                                                     |   21 
 HDL_ON/Common/ApiUtlis.cs                                                                        |   66 
 HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs                                      |  152 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/ArmCenter/NoDefenseBigIcon.png                           |    0 
 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs                                     |    8 
 HDL_ON/HDL_ON.projitems                                                                          |    7 
 HDL_ON/Entity/Function/Sensor.cs                                                                 |   52 
 HDL-ON_Android/Assets/Phone/PersonalCenter/ResidenceInAlarmIcon.png                              |    0 
 HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs                                                          |   53 
 HDL_ON/DAL/Server/NewApiRes.cs                                                                   |   19 
 HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs                                |   46 
 HDL-ON_Android/Resources/Resource.designer.cs                                                    | 7440 ++++++++++++++++++++-------------------
 HDL_ON/UI/UI0-Public/PublicAssmebly.cs                                                           |    6 
 HDL_ON/Entity/Function/AirSwitch.cs                                                              |   10 
 HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs                                                    |   73 
 HDL_ON/Common/Constant.cs                                                                        |   12 
 HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalbreaker.png                              |    0 
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs                                          |   42 
 HDL_ON/Entity/DB_ResidenceData.cs                                                                |    4 
 HDL-ON_Android/Assets/Phone/Collection/DefenseAlarmIcon.png                                      |    0 
 HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs                                  |   52 
 HDL_ON/UI/UI0-Public/TopViewDiv.cs                                                               |    4 
 HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorEnvironment/AddSensorEnvironmentPage.cs          |    9 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/electricalbreaker.png                               |    0 
 HDL-ON_Android/Assets/Phone/FunctionIcon/Electrical/AirSwitch/AirSwitchBgOnIcon.png              |    0 
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs                                             |   67 
 HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmDeploymentSettingPage.cs                           |    6 
 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs                            |    7 
 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs                                 |    7 
 HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs                                                            |  175 
 HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs                                                          |  847 ++++
 HDL_ON/Entity/Function/SecurityAlarm.cs                                                          |   35 
 HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingPage.cs                                 |  197 +
 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs                                      |    9 
 HDL-ON_iOS/Resources/Language.ini                                                                |   15 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/AirSwitch/AirSwitchBgOnIcon.png               |    0 
 HDL_ON/DAL/DriverLayer/Control.cs                                                                |   41 
 DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll                                                |    0 
 HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalbreaker_white.png               |    0 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/electricalbreaker_white.png                |    0 
 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs                             |    6 
 HDL-ON_Android/Assets/Phone/FunctionIcon/Electrical/AirSwitch/EnergyIcon.png                     |    0 
 HDL-ON_Android/Assets/Phone/FunctionIcon/EnvirSensor/HchoBg.png                                  |    0 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/AirSwitch/EnergyIcon.png                      |    0 
 HDL_ON/DAL/Server/HttpServerRequest.cs                                                           |   58 
 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/RoomBinglingFloorPage.cs                   |    7 
 HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs                             |    6 
 HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs                                     |  249 +
 HDL-ON_Android/Properties/AndroidManifest.xml                                                    |    4 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvirSensor/HchoBg.png                                   |    0 
 HDL_ON/DAL/Mqtt/MqttClient.cs                                                                    |   34 
 HDL-ON_Android/HDL-ON_Android.csproj                                                             |   18 
 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs                                      |  101 
 HDL-ON_iOS/Info.plist                                                                            |   10 
 HDL_ON/Common/HDLCommon.cs                                                                       |   16 
 HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorhcho.png                                     |    0 
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs                                               |   76 
 HDL-ON_Android/Assets/Phone/FunctionIcon/ArmCenter/InAlarmBigIcon.png                            |    0 
 HDL_ON/UI/UI1-Login/LoginPage.cs                                                                 |   13 
 HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs                                       |    3 
 HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs                                          |    6 
 HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs                                                 |    2 
 HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs                                 |  467 ++
 HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/sensorhcho.png                                      |    0 
 HDL-ON_Android/Assets/Phone/FunctionIcon/EnvirSensor/HchoIcon.png                                |    0 
 HDL_ON/Entity/Function/Function.cs                                                               |   10 
 HDL_ON/DAL/Server/HttpUtil.cs                                                                    |    3 
 HDL-ON_Android/Assets/Phone/PersonalCenter/FacePassage/FailIcon.png                              |    0 
 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs                                                        |    6 
 HDL_ON/UI/UI2/1-HomePage/HomePage.cs                                                             |   40 
 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs                       |   12 
 HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalbreaker_blue.png                |    0 
 HDL-ON_Android/Assets/Phone/PersonalCenter/FacePassage/TrueIcon.png                              |    0 
 HDL-ON_iOS/Resources/Phone/PersonalCenter/FacePassage/TrueIcon.png                               |    0 
 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs                         |    7 
 HDL-ON_iOS/Resources/Phone/PersonalCenter/FacePassage/FailIcon.png                               |    0 
 DLL/Shared.Droid.HDLWidget.dll                                                                   |    0 
 HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs                                          |   14 
 HDL_ON/UI/MainPage.cs                                                                            |   16 
 HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/CustomerObj.cs                                     |   97 
 HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs                                 |    8 
 HDL-ON_Android/Assets/Phone/FunctionIcon/Electrical/AirSwitch/AirSwitchBgIcon.png                |    0 
 HDL-ON_iOS/Resources/Phone/Collection/DefenseAlarmIcon.png                                       |    0 
 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs                        |  148 
 HDL_ON/UI/UI2/FuntionControlView/Video/ObjectClass.cs                                            |    8 
 HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingResultPage.cs                           |   97 
 HDL-ON_Android/Assets/Phone/FunctionIcon/ArmCenter/NoDefenseBigIcon.png                          |    0 
 HDL_ON/DAL/Server/NewAPI.cs                                                                      |   29 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/electricalbreaker_blue.png                 |    0 
 HDL_ON/Common/R.cs                                                                               |   29 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/AirSwitch/AirSwitchBgIcon.png                 |    0 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvirSensor/HchoIcon.png                                 |    0 
 HDL-ON_Android/Other/JPush/JPushReceiver.cs                                                      |    2 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/ArmCenter/InAlarmBigIcon.png                             |    0 
 98 files changed, 7,000 insertions(+), 4,109 deletions(-)

diff --git a/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll b/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll
new file mode 100644
index 0000000..3e29d06
--- /dev/null
+++ b/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll
Binary files differ
diff --git a/DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll b/DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll
new file mode 100644
index 0000000..9e6c7d7
--- /dev/null
+++ b/DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll
Binary files differ
diff --git a/DLL/Shared.Droid.HDLWidget.dll b/DLL/Shared.Droid.HDLWidget.dll
index 4153dfa..95222a6 100644
--- a/DLL/Shared.Droid.HDLWidget.dll
+++ b/DLL/Shared.Droid.HDLWidget.dll
Binary files differ
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index c7f0e01..7cbdacb 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -487,7 +487,13 @@
 499=Add defense function
 500=Add alarm target
 501=Security alarm: {0} is triggered.
-
+502=Clear the security alarm?
+503=Exceeding standard
+504=Secondary standard
+505=Class I standard
+506=Face input succeeded
+507=Face input failed
+508=Formaldehyde
  
 1000=Room Humidity
 1001=V-chip
@@ -996,6 +1002,7 @@
 7148=Disarm
 7149=Manually
 7150=Smart
+
 
     
 9000=Please sign in with new cell phone number.
@@ -1591,6 +1598,13 @@
 499=娣诲姞甯冮槻鍔熻兘
 500=娣诲姞鍛婅鐩爣
 501=瀹夐槻鎶ヨ锛歿0}琚Е鍙戙��
+502=鏄惁瑙i櫎瀹夐槻璀︽姤锛�
+503=瓒呮爣
+504=浜岀骇
+505=涓�绾�
+506=浜鸿劯褰曞叆鎴愬姛
+507=浜鸿劯褰曞叆澶辫触
+508=鐢查啗
  
 1000=瀹ゅ唴婀垮害
 1001=绔ラ攣
@@ -2082,7 +2096,6 @@
 7148=鎾ら槻
 7149=鎵嬪姩
 7150=鏅鸿兘
-
 
  
 9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
diff --git a/HDL-ON_Android/Assets/Phone/Collection/DefenseAlarmIcon.png b/HDL-ON_Android/Assets/Phone/Collection/DefenseAlarmIcon.png
new file mode 100644
index 0000000..c3e0948
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/Collection/DefenseAlarmIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/ArmCenter/InAlarmBigIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/ArmCenter/InAlarmBigIcon.png
new file mode 100644
index 0000000..248a434
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/ArmCenter/InAlarmBigIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/ArmCenter/NoDefenseBigIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/ArmCenter/NoDefenseBigIcon.png
index 0555432..f40f82e 100644
--- a/HDL-ON_Android/Assets/Phone/FunctionIcon/ArmCenter/NoDefenseBigIcon.png
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/ArmCenter/NoDefenseBigIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Electrical/AirSwitch/AirSwitchBgIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Electrical/AirSwitch/AirSwitchBgIcon.png
new file mode 100644
index 0000000..1abcc1e
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Electrical/AirSwitch/AirSwitchBgIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Electrical/AirSwitch/AirSwitchBgOnIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Electrical/AirSwitch/AirSwitchBgOnIcon.png
new file mode 100644
index 0000000..61a12ec
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Electrical/AirSwitch/AirSwitchBgOnIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Electrical/AirSwitch/EnergyIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Electrical/AirSwitch/EnergyIcon.png
new file mode 100644
index 0000000..a2ad64d
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Electrical/AirSwitch/EnergyIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/EnvirSensor/HchoBg.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/EnvirSensor/HchoBg.png
new file mode 100644
index 0000000..77e184b
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/EnvirSensor/HchoBg.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/EnvirSensor/HchoIcon.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/EnvirSensor/HchoIcon.png
new file mode 100644
index 0000000..df9281d
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/EnvirSensor/HchoIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalbreaker_blue.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalbreaker_blue.png
new file mode 100644
index 0000000..784f410
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalbreaker_blue.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalbreaker_white.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalbreaker_white.png
new file mode 100644
index 0000000..300521d
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/electricalbreaker_white.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalbreaker.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalbreaker.png
new file mode 100644
index 0000000..3abfd8b
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/electricalbreaker.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorhcho.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorhcho.png
new file mode 100644
index 0000000..108f4e4
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorhcho.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/FacePassage/FailIcon.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/FacePassage/FailIcon.png
new file mode 100644
index 0000000..b169eb0
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/PersonalCenter/FacePassage/FailIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/FacePassage/TrueIcon.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/FacePassage/TrueIcon.png
new file mode 100644
index 0000000..9606411
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/PersonalCenter/FacePassage/TrueIcon.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/ResidenceInAlarmIcon.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/ResidenceInAlarmIcon.png
new file mode 100644
index 0000000..ea9f614
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/PersonalCenter/ResidenceInAlarmIcon.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 3fb89f0..f952702 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -157,6 +157,9 @@
     <Reference Include="ys">
       <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>
     </Reference>
+    <Reference Include="Shared.Droid.HDLLinphone">
+      <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
@@ -443,6 +446,20 @@
     <AndroidAsset Include="Assets\Phone\Collection\DefenseStatusIcon.png" />
     <AndroidAsset Include="Assets\Phone\Collection\DisarmStatusIcon.png" />
     <AndroidAsset Include="Assets\Phone\PersonalCenter\ResidenceDefenseIcon.png" />
+    <AndroidAsset Include="Assets\Phone\Collection\DefenseAlarmIcon.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\InAlarmBigIcon.png" />
+    <AndroidAsset Include="Assets\Phone\PersonalCenter\ResidenceInAlarmIcon.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\electricalbreaker.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\AirSwitch\AirSwitchBgIcon.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\AirSwitch\AirSwitchBgOnIcon.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\AirSwitch\EnergyIcon.png" />
+    <AndroidAsset Include="Assets\Phone\PersonalCenter\FacePassage\FailIcon.png" />
+    <AndroidAsset Include="Assets\Phone\PersonalCenter\FacePassage\TrueIcon.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorhcho.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\HchoBg.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\HchoIcon.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalbreaker_blue.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalbreaker_white.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\security.png" />
   </ItemGroup>
   <ItemGroup>
@@ -1344,6 +1361,7 @@
     <Folder Include="Assets\Phone\FunctionIcon\IrFan\" />
     <Folder Include="Assets\Phone\PersonalCenter\FacePassage\" />
     <Folder Include="Assets\Phone\FunctionIcon\Light\LightScene\" />
+    <Folder Include="Assets\Phone\FunctionIcon\Electrical\AirSwitch\" />
   </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" />
diff --git a/HDL-ON_Android/Other/JPush/JPushReceiver.cs b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
index 2116ed2..063eb47 100644
--- a/HDL-ON_Android/Other/JPush/JPushReceiver.cs
+++ b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
@@ -1,5 +1,6 @@
 锘�
 using System;
+using Android.App;
 using Android.Content;
 using CN.Jpush.Android.Api;
 using CN.Jpush.Android.Service;
@@ -70,6 +71,7 @@
             {
                 HDLCommon.Current.AdjustPushMessage(pushMes);
             });
+
         }
 
         /// <summary>
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 4ed5671..673bf9a 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202108211" android:versionName="1.2.202108211" package="com.hdl.onpro">
-	<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202108282" android:versionName="1.2.2021082782" package="com.hdl.onpro">
+	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" />
 	<!-- 涔愭鍙瀵硅闇�瑕佺殑鏉冮檺 -->
 	<!--<uses-permission android:name="android.permission.INTERNET" />-->
 	<!--缃戠粶璁块棶-->
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index ab328db..37913039e 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/HDL-ON_Android/Resources/Resource.designer.cs
@@ -2456,391 +2456,400 @@
 			public const int login_line_color = 2131099780;
 			
 			// aapt resource value: 0x7F060085
-			public const int material_blue_grey_800 = 2131099781;
+			public const int lpsdk_app_bg = 2131099781;
 			
 			// aapt resource value: 0x7F060086
-			public const int material_blue_grey_900 = 2131099782;
+			public const int lpsdk_app_line = 2131099782;
 			
 			// aapt resource value: 0x7F060087
-			public const int material_blue_grey_950 = 2131099783;
+			public const int lpsdk_textColor = 2131099783;
 			
 			// aapt resource value: 0x7F060088
-			public const int material_deep_teal_200 = 2131099784;
+			public const int material_blue_grey_800 = 2131099784;
 			
 			// aapt resource value: 0x7F060089
-			public const int material_deep_teal_500 = 2131099785;
+			public const int material_blue_grey_900 = 2131099785;
 			
 			// aapt resource value: 0x7F06008A
-			public const int material_grey_100 = 2131099786;
+			public const int material_blue_grey_950 = 2131099786;
 			
 			// aapt resource value: 0x7F06008B
-			public const int material_grey_300 = 2131099787;
+			public const int material_deep_teal_200 = 2131099787;
 			
 			// aapt resource value: 0x7F06008C
-			public const int material_grey_50 = 2131099788;
+			public const int material_deep_teal_500 = 2131099788;
 			
 			// aapt resource value: 0x7F06008D
-			public const int material_grey_600 = 2131099789;
+			public const int material_grey_100 = 2131099789;
 			
 			// aapt resource value: 0x7F06008E
-			public const int material_grey_800 = 2131099790;
+			public const int material_grey_300 = 2131099790;
 			
 			// aapt resource value: 0x7F06008F
-			public const int material_grey_850 = 2131099791;
+			public const int material_grey_50 = 2131099791;
 			
 			// aapt resource value: 0x7F060090
-			public const int material_grey_900 = 2131099792;
+			public const int material_grey_600 = 2131099792;
 			
 			// aapt resource value: 0x7F060091
-			public const int material_red_500 = 2131099793;
+			public const int material_grey_800 = 2131099793;
 			
 			// aapt resource value: 0x7F060092
-			public const int message_bg = 2131099794;
+			public const int material_grey_850 = 2131099794;
 			
 			// aapt resource value: 0x7F060093
-			public const int message_button_text = 2131099795;
+			public const int material_grey_900 = 2131099795;
 			
 			// aapt resource value: 0x7F060094
-			public const int message_button_text_selector = 2131099796;
+			public const int material_red_500 = 2131099796;
 			
 			// aapt resource value: 0x7F060095
-			public const int mode_bg = 2131099797;
+			public const int message_bg = 2131099797;
 			
 			// aapt resource value: 0x7F060096
-			public const int more_color = 2131099798;
+			public const int message_button_text = 2131099798;
 			
 			// aapt resource value: 0x7F060097
-			public const int my_list_deviver = 2131099799;
+			public const int message_button_text_selector = 2131099799;
 			
 			// aapt resource value: 0x7F060098
-			public const int normal_color = 2131099800;
+			public const int mode_bg = 2131099800;
 			
 			// aapt resource value: 0x7F060099
-			public const int notification_action_color_filter = 2131099801;
+			public const int more_color = 2131099801;
 			
 			// aapt resource value: 0x7F06009A
-			public const int notification_icon_bg_color = 2131099802;
+			public const int my_list_deviver = 2131099802;
 			
 			// aapt resource value: 0x7F06009B
-			public const int notification_material_background_media_default_color = 2131099803;
+			public const int normal_color = 2131099803;
 			
 			// aapt resource value: 0x7F06009C
-			public const int on_off_text_selector = 2131099804;
+			public const int notification_action_color_filter = 2131099804;
 			
 			// aapt resource value: 0x7F06009D
-			public const int opensdk_cameralist_bg = 2131099805;
+			public const int notification_icon_bg_color = 2131099805;
 			
 			// aapt resource value: 0x7F06009E
-			public const int orange = 2131099806;
+			public const int notification_material_background_media_default_color = 2131099806;
 			
 			// aapt resource value: 0x7F06009F
-			public const int orange_text = 2131099807;
+			public const int on_off_text_selector = 2131099807;
 			
 			// aapt resource value: 0x7F0600A0
-			public const int page_bg_color = 2131099808;
+			public const int opensdk_cameralist_bg = 2131099808;
 			
 			// aapt resource value: 0x7F0600A1
-			public const int page_change_gray = 2131099809;
+			public const int orange = 2131099809;
 			
 			// aapt resource value: 0x7F0600A2
-			public const int pickerview_bgColor_default = 2131099810;
+			public const int orange_text = 2131099810;
 			
 			// aapt resource value: 0x7F0600A3
-			public const int pickerview_bgColor_overlay = 2131099811;
+			public const int page_bg_color = 2131099811;
 			
 			// aapt resource value: 0x7F0600A4
-			public const int pickerview_bg_topbar = 2131099812;
+			public const int page_change_gray = 2131099812;
 			
 			// aapt resource value: 0x7F0600A5
-			public const int pickerview_timebtn_nor = 2131099813;
+			public const int pickerview_bgColor_default = 2131099813;
 			
 			// aapt resource value: 0x7F0600A6
-			public const int pickerview_timebtn_pre = 2131099814;
+			public const int pickerview_bgColor_overlay = 2131099814;
 			
 			// aapt resource value: 0x7F0600A7
-			public const int pickerview_topbar_title = 2131099815;
+			public const int pickerview_bg_topbar = 2131099815;
 			
 			// aapt resource value: 0x7F0600A8
-			public const int pickerview_wheelview_textcolor_center = 2131099816;
+			public const int pickerview_timebtn_nor = 2131099816;
 			
 			// aapt resource value: 0x7F0600A9
-			public const int pickerview_wheelview_textcolor_divider = 2131099817;
+			public const int pickerview_timebtn_pre = 2131099817;
 			
 			// aapt resource value: 0x7F0600AA
-			public const int pickerview_wheelview_textcolor_out = 2131099818;
+			public const int pickerview_topbar_title = 2131099818;
 			
 			// aapt resource value: 0x7F0600AB
-			public const int play_translucent_bg = 2131099819;
+			public const int pickerview_wheelview_textcolor_center = 2131099819;
 			
 			// aapt resource value: 0x7F0600AC
-			public const int possible_result_points = 2131099820;
+			public const int pickerview_wheelview_textcolor_divider = 2131099820;
 			
 			// aapt resource value: 0x7F0600AD
-			public const int preview_quality_color = 2131099821;
+			public const int pickerview_wheelview_textcolor_out = 2131099821;
 			
 			// aapt resource value: 0x7F0600AE
-			public const int primary_dark_material_dark = 2131099822;
+			public const int play_translucent_bg = 2131099822;
 			
 			// aapt resource value: 0x7F0600AF
-			public const int primary_dark_material_light = 2131099823;
+			public const int possible_result_points = 2131099823;
 			
 			// aapt resource value: 0x7F0600B0
-			public const int primary_material_dark = 2131099824;
+			public const int preview_quality_color = 2131099824;
 			
 			// aapt resource value: 0x7F0600B1
-			public const int primary_material_light = 2131099825;
+			public const int primary_dark_material_dark = 2131099825;
 			
 			// aapt resource value: 0x7F0600B2
-			public const int primary_text_default_material_dark = 2131099826;
+			public const int primary_dark_material_light = 2131099826;
 			
 			// aapt resource value: 0x7F0600B3
-			public const int primary_text_default_material_light = 2131099827;
+			public const int primary_material_dark = 2131099827;
 			
 			// aapt resource value: 0x7F0600B4
-			public const int primary_text_disabled_material_dark = 2131099828;
+			public const int primary_material_light = 2131099828;
 			
 			// aapt resource value: 0x7F0600B5
-			public const int primary_text_disabled_material_light = 2131099829;
+			public const int primary_text_default_material_dark = 2131099829;
 			
 			// aapt resource value: 0x7F0600B6
-			public const int progress_back = 2131099830;
+			public const int primary_text_default_material_light = 2131099830;
 			
 			// aapt resource value: 0x7F0600B7
-			public const int progress_select = 2131099831;
+			public const int primary_text_disabled_material_dark = 2131099831;
 			
 			// aapt resource value: 0x7F0600B8
-			public const int pureblack = 2131099832;
+			public const int primary_text_disabled_material_light = 2131099832;
 			
 			// aapt resource value: 0x7F0600B9
-			public const int quality_color_selector = 2131099833;
+			public const int progress_back = 2131099833;
 			
 			// aapt resource value: 0x7F0600BA
-			public const int quality_focused_color = 2131099834;
+			public const int progress_select = 2131099834;
 			
 			// aapt resource value: 0x7F0600BB
-			public const int r1_item_bg = 2131099835;
+			public const int pureblack = 2131099835;
 			
 			// aapt resource value: 0x7F0600BC
-			public const int read_button_text_selector = 2131099836;
+			public const int quality_color_selector = 2131099836;
 			
 			// aapt resource value: 0x7F0600BD
-			public const int realplay_loading_text = 2131099837;
+			public const int quality_focused_color = 2131099837;
 			
 			// aapt resource value: 0x7F0600BE
-			public const int record_alarm = 2131099838;
+			public const int r1_item_bg = 2131099838;
 			
 			// aapt resource value: 0x7F0600BF
-			public const int record_normal = 2131099839;
+			public const int read_button_text_selector = 2131099839;
 			
 			// aapt resource value: 0x7F0600C0
-			public const int record_osd = 2131099840;
+			public const int realplay_loading_text = 2131099840;
 			
 			// aapt resource value: 0x7F0600C1
-			public const int record_point = 2131099841;
+			public const int record_alarm = 2131099841;
 			
 			// aapt resource value: 0x7F0600C2
-			public const int record_time = 2131099842;
+			public const int record_normal = 2131099842;
 			
 			// aapt resource value: 0x7F0600C3
-			public const int red = 2131099843;
+			public const int record_osd = 2131099843;
 			
 			// aapt resource value: 0x7F0600C4
-			public const int reg_deal_text_bule = 2131099844;
+			public const int record_point = 2131099844;
 			
 			// aapt resource value: 0x7F0600C5
-			public const int remotefile_line_color = 2131099845;
+			public const int record_time = 2131099845;
 			
 			// aapt resource value: 0x7F0600C6
-			public const int remotefile_timebar_alarm_color = 2131099846;
+			public const int red = 2131099846;
 			
 			// aapt resource value: 0x7F0600C7
-			public const int remotefile_timebar_color = 2131099847;
+			public const int reg_deal_text_bule = 2131099847;
 			
 			// aapt resource value: 0x7F0600C8
-			public const int remotelist_item_duration_text_color = 2131099848;
+			public const int remotefile_line_color = 2131099848;
 			
 			// aapt resource value: 0x7F0600C9
-			public const int remotelist_item_select = 2131099849;
+			public const int remotefile_timebar_alarm_color = 2131099849;
 			
 			// aapt resource value: 0x7F0600CA
-			public const int result_view = 2131099850;
+			public const int remotefile_timebar_color = 2131099850;
 			
 			// aapt resource value: 0x7F0600CB
-			public const int ripple_material_dark = 2131099851;
+			public const int remotelist_item_duration_text_color = 2131099851;
 			
 			// aapt resource value: 0x7F0600CC
-			public const int ripple_material_light = 2131099852;
+			public const int remotelist_item_select = 2131099852;
 			
 			// aapt resource value: 0x7F0600CD
-			public const int scan_yellow = 2131099853;
+			public const int result_view = 2131099853;
 			
 			// aapt resource value: 0x7F0600CE
-			public const int secondary_text_default_material_dark = 2131099854;
+			public const int ripple_material_dark = 2131099854;
 			
 			// aapt resource value: 0x7F0600CF
-			public const int secondary_text_default_material_light = 2131099855;
+			public const int ripple_material_light = 2131099855;
 			
 			// aapt resource value: 0x7F0600D0
-			public const int secondary_text_disabled_material_dark = 2131099856;
+			public const int scan_yellow = 2131099856;
 			
 			// aapt resource value: 0x7F0600D1
-			public const int secondary_text_disabled_material_light = 2131099857;
+			public const int secondary_text_default_material_dark = 2131099857;
 			
 			// aapt resource value: 0x7F0600D2
-			public const int setting_hint_text = 2131099858;
+			public const int secondary_text_default_material_light = 2131099858;
 			
 			// aapt resource value: 0x7F0600D3
-			public const int shadow = 2131099859;
+			public const int secondary_text_disabled_material_dark = 2131099859;
 			
 			// aapt resource value: 0x7F0600D4
-			public const int share_bule = 2131099860;
+			public const int secondary_text_disabled_material_light = 2131099860;
 			
 			// aapt resource value: 0x7F0600D5
-			public const int share_green = 2131099861;
+			public const int setting_hint_text = 2131099861;
 			
 			// aapt resource value: 0x7F0600D6
-			public const int share_red = 2131099862;
+			public const int shadow = 2131099862;
 			
 			// aapt resource value: 0x7F0600D7
-			public const int share_tip_red = 2131099863;
+			public const int share_bule = 2131099863;
 			
 			// aapt resource value: 0x7F0600D8
-			public const int source_detection_btn_color = 2131099864;
+			public const int share_green = 2131099864;
 			
 			// aapt resource value: 0x7F0600D9
-			public const int state_abnormal_text = 2131099865;
+			public const int share_red = 2131099865;
 			
 			// aapt resource value: 0x7F0600DA
-			public const int state_normal_text = 2131099866;
+			public const int share_tip_red = 2131099866;
 			
 			// aapt resource value: 0x7F0600DB
-			public const int state_off_text = 2131099867;
+			public const int source_detection_btn_color = 2131099867;
 			
 			// aapt resource value: 0x7F0600DC
-			public const int switch_thumb_disabled_material_dark = 2131099868;
+			public const int state_abnormal_text = 2131099868;
 			
 			// aapt resource value: 0x7F0600DD
-			public const int switch_thumb_disabled_material_light = 2131099869;
+			public const int state_normal_text = 2131099869;
 			
 			// aapt resource value: 0x7F0600DE
-			public const int switch_thumb_material_dark = 2131099870;
+			public const int state_off_text = 2131099870;
 			
 			// aapt resource value: 0x7F0600DF
-			public const int switch_thumb_material_light = 2131099871;
+			public const int switch_thumb_disabled_material_dark = 2131099871;
 			
 			// aapt resource value: 0x7F0600E0
-			public const int switch_thumb_normal_material_dark = 2131099872;
+			public const int switch_thumb_disabled_material_light = 2131099872;
 			
 			// aapt resource value: 0x7F0600E1
-			public const int switch_thumb_normal_material_light = 2131099873;
-			
-			// aapt resource value: 0x7F0600E4
-			public const int table_value = 2131099876;
+			public const int switch_thumb_material_dark = 2131099873;
 			
 			// aapt resource value: 0x7F0600E2
-			public const int tab_color = 2131099874;
+			public const int switch_thumb_material_light = 2131099874;
 			
 			// aapt resource value: 0x7F0600E3
-			public const int tab_sel_color = 2131099875;
+			public const int switch_thumb_normal_material_dark = 2131099875;
 			
-			// aapt resource value: 0x7F0600E6
-			public const int textview_txtcolor_selector = 2131099878;
-			
-			// aapt resource value: 0x7F0600E5
-			public const int text_black = 2131099877;
+			// aapt resource value: 0x7F0600E4
+			public const int switch_thumb_normal_material_light = 2131099876;
 			
 			// aapt resource value: 0x7F0600E7
-			public const int tip_bg = 2131099879;
+			public const int table_value = 2131099879;
 			
-			// aapt resource value: 0x7F0600E8
-			public const int tip_color = 2131099880;
+			// aapt resource value: 0x7F0600E5
+			public const int tab_color = 2131099877;
+			
+			// aapt resource value: 0x7F0600E6
+			public const int tab_sel_color = 2131099878;
 			
 			// aapt resource value: 0x7F0600E9
-			public const int title_down_text_selector = 2131099881;
+			public const int textview_txtcolor_selector = 2131099881;
+			
+			// aapt resource value: 0x7F0600E8
+			public const int text_black = 2131099880;
 			
 			// aapt resource value: 0x7F0600EA
-			public const int title_line = 2131099882;
+			public const int tip_bg = 2131099882;
 			
 			// aapt resource value: 0x7F0600EB
-			public const int title_text = 2131099883;
+			public const int tip_color = 2131099883;
 			
 			// aapt resource value: 0x7F0600EC
-			public const int tooltip_background_dark = 2131099884;
+			public const int title_down_text_selector = 2131099884;
 			
 			// aapt resource value: 0x7F0600ED
-			public const int tooltip_background_light = 2131099885;
+			public const int title_line = 2131099885;
 			
 			// aapt resource value: 0x7F0600EE
-			public const int topbar_title_color = 2131099886;
-			
-			// aapt resource value: 0x7F0600F0
-			public const int translucent_black = 2131099888;
-			
-			// aapt resource value: 0x7F0600F1
-			public const int transparent = 2131099889;
-			
-			// aapt resource value: 0x7F0600F2
-			public const int transparent_bg = 2131099890;
+			public const int title_text = 2131099886;
 			
 			// aapt resource value: 0x7F0600EF
-			public const int trans_bg_color = 2131099887;
+			public const int tooltip_background_dark = 2131099887;
+			
+			// aapt resource value: 0x7F0600F0
+			public const int tooltip_background_light = 2131099888;
+			
+			// aapt resource value: 0x7F0600F1
+			public const int topbar_title_color = 2131099889;
 			
 			// aapt resource value: 0x7F0600F3
-			public const int tv_my_blue = 2131099891;
+			public const int translucent_black = 2131099891;
 			
 			// aapt resource value: 0x7F0600F4
-			public const int unopen = 2131099892;
+			public const int transparent = 2131099892;
 			
 			// aapt resource value: 0x7F0600F5
-			public const int upgrade_gray = 2131099893;
+			public const int transparent_bg = 2131099893;
+			
+			// aapt resource value: 0x7F0600F2
+			public const int trans_bg_color = 2131099890;
 			
 			// aapt resource value: 0x7F0600F6
-			public const int upgrade_green = 2131099894;
+			public const int tv_my_blue = 2131099894;
 			
 			// aapt resource value: 0x7F0600F7
-			public const int upgrade_orange = 2131099895;
+			public const int unopen = 2131099895;
 			
 			// aapt resource value: 0x7F0600F8
-			public const int upgrade_red = 2131099896;
+			public const int upgrade_gray = 2131099896;
 			
 			// aapt resource value: 0x7F0600F9
-			public const int upload_sel_count = 2131099897;
+			public const int upgrade_green = 2131099897;
 			
 			// aapt resource value: 0x7F0600FA
-			public const int version_gray = 2131099898;
+			public const int upgrade_orange = 2131099898;
 			
 			// aapt resource value: 0x7F0600FB
-			public const int video_talk_sdk_black = 2131099899;
+			public const int upgrade_red = 2131099899;
 			
 			// aapt resource value: 0x7F0600FC
-			public const int video_talk_sdk_hint_color_gray = 2131099900;
+			public const int upload_sel_count = 2131099900;
 			
 			// aapt resource value: 0x7F0600FD
-			public const int video_talk_sdk_text_color_black = 2131099901;
+			public const int version_gray = 2131099901;
 			
 			// aapt resource value: 0x7F0600FE
-			public const int video_talk_sdk_text_color_gray = 2131099902;
+			public const int video_talk_sdk_black = 2131099902;
 			
 			// aapt resource value: 0x7F0600FF
-			public const int video_talk_sdk_white = 2131099903;
+			public const int video_talk_sdk_hint_color_gray = 2131099903;
 			
 			// aapt resource value: 0x7F060100
-			public const int viewfinder_frame = 2131099904;
+			public const int video_talk_sdk_text_color_black = 2131099904;
 			
 			// aapt resource value: 0x7F060101
-			public const int viewfinder_laser = 2131099905;
+			public const int video_talk_sdk_text_color_gray = 2131099905;
 			
 			// aapt resource value: 0x7F060102
-			public const int viewfinder_mask = 2131099906;
+			public const int video_talk_sdk_white = 2131099906;
 			
 			// aapt resource value: 0x7F060103
-			public const int white = 2131099907;
+			public const int viewfinder_frame = 2131099907;
 			
 			// aapt resource value: 0x7F060104
-			public const int yahei = 2131099908;
+			public const int viewfinder_laser = 2131099908;
 			
 			// aapt resource value: 0x7F060105
-			public const int yellow_text = 2131099909;
+			public const int viewfinder_mask = 2131099909;
+			
+			// aapt resource value: 0x7F060106
+			public const int white = 2131099910;
+			
+			// aapt resource value: 0x7F060107
+			public const int yahei = 2131099911;
+			
+			// aapt resource value: 0x7F060108
+			public const int yellow_text = 2131099912;
 			
 			static Color()
 			{
@@ -4003,2731 +4012,2767 @@
 			public const int btn_auto_red_selector = 2131230859;
 			
 			// aapt resource value: 0x7F08008C
-			public const int btn_collect = 2131230860;
+			public const int btn_click_lp_screenshot = 2131230860;
 			
 			// aapt resource value: 0x7F08008D
-			public const int btn_collect_prs = 2131230861;
+			public const int btn_click_lp_unlock = 2131230861;
 			
 			// aapt resource value: 0x7F08008E
-			public const int btn_r1_retry_dis = 2131230862;
+			public const int btn_collect = 2131230862;
 			
 			// aapt resource value: 0x7F08008F
-			public const int btn_r1_retry_normal = 2131230863;
+			public const int btn_collect_prs = 2131230863;
 			
 			// aapt resource value: 0x7F080090
-			public const int btn_r1_retry_pressed = 2131230864;
+			public const int btn_r1_retry_dis = 2131230864;
 			
 			// aapt resource value: 0x7F080091
-			public const int btn_r1_retry_selector = 2131230865;
+			public const int btn_r1_retry_normal = 2131230865;
 			
 			// aapt resource value: 0x7F080092
-			public const int btn_style_alert_dialog_special_normal = 2131230866;
+			public const int btn_r1_retry_pressed = 2131230866;
 			
 			// aapt resource value: 0x7F080093
-			public const int btn_style_alert_dialog_special_pressed = 2131230867;
+			public const int btn_r1_retry_selector = 2131230867;
 			
 			// aapt resource value: 0x7F080094
-			public const int btn_style_one_disabled = 2131230868;
+			public const int btn_style_alert_dialog_special_normal = 2131230868;
 			
 			// aapt resource value: 0x7F080095
-			public const int btn_style_one_focused = 2131230869;
+			public const int btn_style_alert_dialog_special_pressed = 2131230869;
 			
 			// aapt resource value: 0x7F080096
-			public const int btn_style_one_normal = 2131230870;
+			public const int btn_style_one_disabled = 2131230870;
 			
 			// aapt resource value: 0x7F080097
-			public const int btn_style_one_pressed = 2131230871;
+			public const int btn_style_one_focused = 2131230871;
 			
 			// aapt resource value: 0x7F080098
-			public const int btn_white_selector = 2131230872;
+			public const int btn_style_one_normal = 2131230872;
 			
 			// aapt resource value: 0x7F080099
-			public const int c3w_250 = 2131230873;
+			public const int btn_style_one_pressed = 2131230873;
 			
 			// aapt resource value: 0x7F08009A
-			public const int c6c_250_1080 = 2131230874;
+			public const int btn_white_selector = 2131230874;
 			
 			// aapt resource value: 0x7F08009B
-			public const int c6c_250_720 = 2131230875;
+			public const int c3w_250 = 2131230875;
 			
 			// aapt resource value: 0x7F08009C
-			public const int c6h_250 = 2131230876;
+			public const int c6c_250_1080 = 2131230876;
 			
 			// aapt resource value: 0x7F08009D
-			public const int c6p_250 = 2131230877;
+			public const int c6c_250_720 = 2131230877;
 			
 			// aapt resource value: 0x7F08009E
-			public const int c6p_bg = 2131230878;
+			public const int c6h_250 = 2131230878;
 			
 			// aapt resource value: 0x7F08009F
-			public const int calendar_date_sel = 2131230879;
+			public const int c6p_250 = 2131230879;
 			
 			// aapt resource value: 0x7F0800A0
-			public const int calendar_date_today = 2131230880;
-			
-			// aapt resource value: 0x7F0800A8
-			public const int cameralist_add_camer_btn = 2131230888;
-			
-			// aapt resource value: 0x7F0800A9
-			public const int cameralist_add_camer_btn_sel = 2131230889;
-			
-			// aapt resource value: 0x7F0800AA
-			public const int cameralist_button_selector = 2131230890;
-			
-			// aapt resource value: 0x7F0800AB
-			public const int cameralist_history_video_selector = 2131230891;
-			
-			// aapt resource value: 0x7F0800AC
-			public const int cameralist_item_selector = 2131230892;
+			public const int c6p_bg = 2131230880;
 			
 			// aapt resource value: 0x7F0800A1
-			public const int camera_crop_height = 2131230881;
+			public const int calendar_date_sel = 2131230881;
 			
 			// aapt resource value: 0x7F0800A2
-			public const int camera_crop_width = 2131230882;
+			public const int calendar_date_today = 2131230882;
 			
-			// aapt resource value: 0x7F0800A3
-			public const int camera_focus_ring_fail = 2131230883;
+			// aapt resource value: 0x7F0800AA
+			public const int cameralist_add_camer_btn = 2131230890;
 			
-			// aapt resource value: 0x7F0800A4
-			public const int camera_focus_ring_success = 2131230884;
+			// aapt resource value: 0x7F0800AB
+			public const int cameralist_add_camer_btn_sel = 2131230891;
 			
-			// aapt resource value: 0x7F0800A5
-			public const int camera_list_item = 2131230885;
-			
-			// aapt resource value: 0x7F0800A6
-			public const int camera_list_item_press = 2131230886;
-			
-			// aapt resource value: 0x7F0800A7
-			public const int camera_list_refresh = 2131230887;
+			// aapt resource value: 0x7F0800AC
+			public const int cameralist_button_selector = 2131230892;
 			
 			// aapt resource value: 0x7F0800AD
-			public const int capture = 2131230893;
-			
-			// aapt resource value: 0x7F0800B0
-			public const int capturebtn_selector = 2131230896;
+			public const int cameralist_history_video_selector = 2131230893;
 			
 			// aapt resource value: 0x7F0800AE
-			public const int capture_disable = 2131230894;
+			public const int cameralist_item_selector = 2131230894;
+			
+			// aapt resource value: 0x7F0800A3
+			public const int camera_crop_height = 2131230883;
+			
+			// aapt resource value: 0x7F0800A4
+			public const int camera_crop_width = 2131230884;
+			
+			// aapt resource value: 0x7F0800A5
+			public const int camera_focus_ring_fail = 2131230885;
+			
+			// aapt resource value: 0x7F0800A6
+			public const int camera_focus_ring_success = 2131230886;
+			
+			// aapt resource value: 0x7F0800A7
+			public const int camera_list_item = 2131230887;
+			
+			// aapt resource value: 0x7F0800A8
+			public const int camera_list_item_press = 2131230888;
+			
+			// aapt resource value: 0x7F0800A9
+			public const int camera_list_refresh = 2131230889;
 			
 			// aapt resource value: 0x7F0800AF
-			public const int capture_press = 2131230895;
-			
-			// aapt resource value: 0x7F0800B1
-			public const int cc_bg_black_round = 2131230897;
-			
-			// aapt resource value: 0x7F0800B3
-			public const int @checked = 2131230899;
+			public const int capture = 2131230895;
 			
 			// aapt resource value: 0x7F0800B2
-			public const int check_selector = 2131230898;
+			public const int capturebtn_selector = 2131230898;
 			
-			// aapt resource value: 0x7F0800B4
-			public const int circle_roate_drawable = 2131230900;
+			// aapt resource value: 0x7F0800B0
+			public const int capture_disable = 2131230896;
+			
+			// aapt resource value: 0x7F0800B1
+			public const int capture_press = 2131230897;
+			
+			// aapt resource value: 0x7F0800B3
+			public const int cc_bg_black_round = 2131230899;
 			
 			// aapt resource value: 0x7F0800B5
-			public const int ckb_normal = 2131230901;
+			public const int @checked = 2131230901;
+			
+			// aapt resource value: 0x7F0800B4
+			public const int check_selector = 2131230900;
 			
 			// aapt resource value: 0x7F0800B6
-			public const int ckb_selected = 2131230902;
+			public const int circle_roate_drawable = 2131230902;
 			
 			// aapt resource value: 0x7F0800B7
-			public const int ckb_selector = 2131230903;
+			public const int ckb_normal = 2131230903;
 			
 			// aapt resource value: 0x7F0800B8
-			public const int cloud_ad = 2131230904;
+			public const int ckb_selected = 2131230904;
 			
 			// aapt resource value: 0x7F0800B9
-			public const int code = 2131230905;
+			public const int ckb_selector = 2131230905;
 			
 			// aapt resource value: 0x7F0800BA
-			public const int collect_btn_selector = 2131230906;
+			public const int cloud_ad = 2131230906;
 			
 			// aapt resource value: 0x7F0800BB
-			public const int collect_loading = 2131230907;
+			public const int code = 2131230907;
 			
 			// aapt resource value: 0x7F0800BC
-			public const int common_loading = 2131230908;
+			public const int collect_btn_selector = 2131230908;
 			
 			// aapt resource value: 0x7F0800BD
-			public const int common_loading_indeterminate = 2131230909;
+			public const int collect_loading = 2131230909;
 			
 			// aapt resource value: 0x7F0800BE
-			public const int common_number_bg = 2131230910;
+			public const int common_loading = 2131230910;
 			
 			// aapt resource value: 0x7F0800BF
-			public const int common_refresh = 2131230911;
+			public const int common_loading_indeterminate = 2131230911;
 			
 			// aapt resource value: 0x7F0800C0
-			public const int common_refresh_indeterminate = 2131230912;
+			public const int common_number_bg = 2131230912;
 			
 			// aapt resource value: 0x7F0800C1
-			public const int common_title = 2131230913;
+			public const int common_refresh = 2131230913;
 			
 			// aapt resource value: 0x7F0800C2
-			public const int common_title_back = 2131230914;
+			public const int common_refresh_indeterminate = 2131230914;
 			
 			// aapt resource value: 0x7F0800C3
-			public const int common_title_back_dark = 2131230915;
+			public const int common_title = 2131230915;
 			
 			// aapt resource value: 0x7F0800C4
-			public const int common_title_back_sel = 2131230916;
+			public const int common_title_back = 2131230916;
 			
 			// aapt resource value: 0x7F0800C5
-			public const int common_title_back_selector = 2131230917;
+			public const int common_title_back_dark = 2131230917;
 			
 			// aapt resource value: 0x7F0800C6
-			public const int common_title_cancel = 2131230918;
+			public const int common_title_back_sel = 2131230918;
 			
 			// aapt resource value: 0x7F0800C7
-			public const int common_title_cancel_sel = 2131230919;
+			public const int common_title_back_selector = 2131230919;
 			
 			// aapt resource value: 0x7F0800C8
-			public const int common_title_cancel_selector = 2131230920;
+			public const int common_title_cancel = 2131230920;
 			
 			// aapt resource value: 0x7F0800C9
-			public const int common_title_confirm = 2131230921;
+			public const int common_title_cancel_sel = 2131230921;
 			
 			// aapt resource value: 0x7F0800CA
-			public const int common_title_confirm_dis = 2131230922;
+			public const int common_title_cancel_selector = 2131230922;
 			
 			// aapt resource value: 0x7F0800CB
-			public const int common_title_confirm_sel = 2131230923;
+			public const int common_title_confirm = 2131230923;
 			
 			// aapt resource value: 0x7F0800CC
-			public const int common_title_input = 2131230924;
+			public const int common_title_confirm_dis = 2131230924;
 			
 			// aapt resource value: 0x7F0800CD
-			public const int common_title_input_sel = 2131230925;
+			public const int common_title_confirm_sel = 2131230925;
 			
 			// aapt resource value: 0x7F0800CE
-			public const int common_title_input_selector = 2131230926;
+			public const int common_title_input = 2131230926;
 			
 			// aapt resource value: 0x7F0800CF
-			public const int common_title_more = 2131230927;
+			public const int common_title_input_sel = 2131230927;
 			
 			// aapt resource value: 0x7F0800D0
-			public const int common_title_more_sel = 2131230928;
+			public const int common_title_input_selector = 2131230928;
 			
 			// aapt resource value: 0x7F0800D1
-			public const int common_title_refresh = 2131230929;
+			public const int common_title_more = 2131230929;
 			
 			// aapt resource value: 0x7F0800D2
-			public const int common_title_setup = 2131230930;
+			public const int common_title_more_sel = 2131230930;
 			
 			// aapt resource value: 0x7F0800D3
-			public const int common_title_setup_dis = 2131230931;
+			public const int common_title_refresh = 2131230931;
 			
 			// aapt resource value: 0x7F0800D4
-			public const int common_title_setup_sel = 2131230932;
+			public const int common_title_setup = 2131230932;
 			
 			// aapt resource value: 0x7F0800D5
-			public const int common_title_setup_selector = 2131230933;
+			public const int common_title_setup_dis = 2131230933;
 			
 			// aapt resource value: 0x7F0800D6
-			public const int common_title_share = 2131230934;
+			public const int common_title_setup_sel = 2131230934;
 			
 			// aapt resource value: 0x7F0800D7
-			public const int common_title_share_dark = 2131230935;
+			public const int common_title_setup_selector = 2131230935;
 			
 			// aapt resource value: 0x7F0800D8
-			public const int common_title_share_sel = 2131230936;
+			public const int common_title_share = 2131230936;
 			
 			// aapt resource value: 0x7F0800D9
-			public const int common_title_vertical_more = 2131230937;
+			public const int common_title_share_dark = 2131230937;
 			
 			// aapt resource value: 0x7F0800DA
-			public const int common_title_vertical_more_dark = 2131230938;
+			public const int common_title_share_sel = 2131230938;
 			
 			// aapt resource value: 0x7F0800DB
-			public const int common_title_vertical_more_dark_dis = 2131230939;
+			public const int common_title_vertical_more = 2131230939;
 			
 			// aapt resource value: 0x7F0800DC
-			public const int common_title_vertical_more_dark_selector = 2131230940;
+			public const int common_title_vertical_more_dark = 2131230940;
 			
 			// aapt resource value: 0x7F0800DD
-			public const int common_title_vertical_more_sel = 2131230941;
+			public const int common_title_vertical_more_dark_dis = 2131230941;
 			
 			// aapt resource value: 0x7F0800DE
-			public const int connect_img1 = 2131230942;
+			public const int common_title_vertical_more_dark_selector = 2131230942;
 			
 			// aapt resource value: 0x7F0800DF
-			public const int connect_img2 = 2131230943;
+			public const int common_title_vertical_more_sel = 2131230943;
 			
 			// aapt resource value: 0x7F0800E0
-			public const int connect_reset = 2131230944;
+			public const int connect_img1 = 2131230944;
 			
 			// aapt resource value: 0x7F0800E1
-			public const int connect_wifi1 = 2131230945;
+			public const int connect_img2 = 2131230945;
 			
 			// aapt resource value: 0x7F0800E2
-			public const int connect_wifi2 = 2131230946;
+			public const int connect_reset = 2131230946;
 			
 			// aapt resource value: 0x7F0800E3
-			public const int connect_wifi3 = 2131230947;
+			public const int connect_wifi1 = 2131230947;
 			
 			// aapt resource value: 0x7F0800E4
-			public const int connect_wifi4 = 2131230948;
+			public const int connect_wifi2 = 2131230948;
 			
 			// aapt resource value: 0x7F0800E5
-			public const int connect_wifi_bg = 2131230949;
+			public const int connect_wifi3 = 2131230949;
 			
 			// aapt resource value: 0x7F0800E6
-			public const int control_bar_bg = 2131230950;
+			public const int connect_wifi4 = 2131230950;
 			
 			// aapt resource value: 0x7F0800E7
-			public const int decode_failed_tip_bg = 2131230951;
+			public const int connect_wifi_bg = 2131230951;
 			
 			// aapt resource value: 0x7F0800E8
-			public const int defalut_alarm = 2131230952;
+			public const int control_bar_bg = 2131230952;
 			
 			// aapt resource value: 0x7F0800E9
-			public const int default_cover_02 = 2131230953;
+			public const int decode_failed_tip_bg = 2131230953;
 			
 			// aapt resource value: 0x7F0800EA
-			public const int default_figure = 2131230954;
+			public const int defalut_alarm = 2131230954;
 			
 			// aapt resource value: 0x7F0800EB
-			public const int del_button = 2131230955;
+			public const int default_cover_02 = 2131230955;
 			
 			// aapt resource value: 0x7F0800EC
-			public const int del_button_dis = 2131230956;
+			public const int default_figure = 2131230956;
 			
 			// aapt resource value: 0x7F0800ED
-			public const int del_button_sel = 2131230957;
+			public const int del_button = 2131230957;
 			
 			// aapt resource value: 0x7F0800EE
-			public const int del_button_selector = 2131230958;
+			public const int del_button_dis = 2131230958;
 			
 			// aapt resource value: 0x7F0800EF
-			public const int design_bottom_navigation_item_background = 2131230959;
+			public const int del_button_sel = 2131230959;
 			
 			// aapt resource value: 0x7F0800F0
-			public const int design_fab_background = 2131230960;
+			public const int del_button_selector = 2131230960;
 			
 			// aapt resource value: 0x7F0800F1
-			public const int design_ic_visibility = 2131230961;
+			public const int design_bottom_navigation_item_background = 2131230961;
 			
 			// aapt resource value: 0x7F0800F2
-			public const int design_ic_visibility_off = 2131230962;
+			public const int design_fab_background = 2131230962;
 			
 			// aapt resource value: 0x7F0800F3
-			public const int design_password_eye = 2131230963;
+			public const int design_ic_visibility = 2131230963;
 			
 			// aapt resource value: 0x7F0800F4
-			public const int design_snackbar_background = 2131230964;
+			public const int design_ic_visibility_off = 2131230964;
 			
 			// aapt resource value: 0x7F0800F5
-			public const int device_16_nvr_bg = 2131230965;
+			public const int design_password_eye = 2131230965;
 			
 			// aapt resource value: 0x7F0800F6
-			public const int device_4_dvr_bg = 2131230966;
+			public const int design_snackbar_background = 2131230966;
 			
 			// aapt resource value: 0x7F0800F7
-			public const int device_4_nvr_bg = 2131230967;
+			public const int device_16_nvr_bg = 2131230967;
 			
 			// aapt resource value: 0x7F0800F8
-			public const int device_5k_vr104d = 2131230968;
+			public const int device_4_dvr_bg = 2131230968;
 			
 			// aapt resource value: 0x7F0800F9
-			public const int device_5k_vr104d_bg = 2131230969;
+			public const int device_4_nvr_bg = 2131230969;
 			
 			// aapt resource value: 0x7F0800FA
-			public const int device_5k_vr116d = 2131230970;
+			public const int device_5k_vr104d = 2131230970;
 			
 			// aapt resource value: 0x7F0800FB
-			public const int device_5k_vr116d_bg = 2131230971;
+			public const int device_5k_vr104d_bg = 2131230971;
 			
 			// aapt resource value: 0x7F0800FC
-			public const int device_8_16dvr_bg = 2131230972;
+			public const int device_5k_vr116d = 2131230972;
 			
 			// aapt resource value: 0x7F0800FD
-			public const int device_a1 = 2131230973;
-			
-			// aapt resource value: 0x7F0800FF
-			public const int device_a1c = 2131230975;
-			
-			// aapt resource value: 0x7F080100
-			public const int device_a1c_bg = 2131230976;
-			
-			// aapt resource value: 0x7F080101
-			public const int device_a1s = 2131230977;
-			
-			// aapt resource value: 0x7F080102
-			public const int device_a1s_bg = 2131230978;
+			public const int device_5k_vr116d_bg = 2131230973;
 			
 			// aapt resource value: 0x7F0800FE
-			public const int device_a1_bg = 2131230974;
+			public const int device_8_16dvr_bg = 2131230974;
+			
+			// aapt resource value: 0x7F0800FF
+			public const int device_a1 = 2131230975;
+			
+			// aapt resource value: 0x7F080101
+			public const int device_a1c = 2131230977;
+			
+			// aapt resource value: 0x7F080102
+			public const int device_a1c_bg = 2131230978;
 			
 			// aapt resource value: 0x7F080103
-			public const int device_alertor = 2131230979;
+			public const int device_a1s = 2131230979;
 			
 			// aapt resource value: 0x7F080104
-			public const int device_baidu_c2s = 2131230980;
+			public const int device_a1s_bg = 2131230980;
+			
+			// aapt resource value: 0x7F080100
+			public const int device_a1_bg = 2131230976;
 			
 			// aapt resource value: 0x7F080105
-			public const int device_c1 = 2131230981;
+			public const int device_alertor = 2131230981;
 			
 			// aapt resource value: 0x7F080106
-			public const int device_c1_rotate = 2131230982;
+			public const int device_baidu_c2s = 2131230982;
 			
 			// aapt resource value: 0x7F080107
-			public const int device_c2 = 2131230983;
-			
-			// aapt resource value: 0x7F08010A
-			public const int device_c2c = 2131230986;
-			
-			// aapt resource value: 0x7F08010B
-			public const int device_c2mini = 2131230987;
-			
-			// aapt resource value: 0x7F08010C
-			public const int device_c2mini2 = 2131230988;
-			
-			// aapt resource value: 0x7F08010D
-			public const int device_c2plus = 2131230989;
-			
-			// aapt resource value: 0x7F08010E
-			public const int device_c2plus_bg = 2131230990;
-			
-			// aapt resource value: 0x7F08010F
-			public const int device_c2s = 2131230991;
-			
-			// aapt resource value: 0x7F080110
-			public const int device_c2w = 2131230992;
+			public const int device_c1 = 2131230983;
 			
 			// aapt resource value: 0x7F080108
-			public const int device_c2_2 = 2131230984;
+			public const int device_c1_rotate = 2131230984;
 			
 			// aapt resource value: 0x7F080109
-			public const int device_c2_usa = 2131230985;
+			public const int device_c2 = 2131230985;
+			
+			// aapt resource value: 0x7F08010C
+			public const int device_c2c = 2131230988;
+			
+			// aapt resource value: 0x7F08010D
+			public const int device_c2mini = 2131230989;
+			
+			// aapt resource value: 0x7F08010E
+			public const int device_c2mini2 = 2131230990;
+			
+			// aapt resource value: 0x7F08010F
+			public const int device_c2plus = 2131230991;
+			
+			// aapt resource value: 0x7F080110
+			public const int device_c2plus_bg = 2131230992;
 			
 			// aapt resource value: 0x7F080111
-			public const int device_c3 = 2131230993;
+			public const int device_c2s = 2131230993;
 			
 			// aapt resource value: 0x7F080112
-			public const int device_c3c = 2131230994;
+			public const int device_c2w = 2131230994;
+			
+			// aapt resource value: 0x7F08010A
+			public const int device_c2_2 = 2131230986;
+			
+			// aapt resource value: 0x7F08010B
+			public const int device_c2_usa = 2131230987;
 			
 			// aapt resource value: 0x7F080113
-			public const int device_c3e = 2131230995;
+			public const int device_c3 = 2131230995;
 			
 			// aapt resource value: 0x7F080114
-			public const int device_c3e_bg = 2131230996;
+			public const int device_c3c = 2131230996;
 			
 			// aapt resource value: 0x7F080115
-			public const int device_c3s = 2131230997;
+			public const int device_c3e = 2131230997;
 			
 			// aapt resource value: 0x7F080116
-			public const int device_c4 = 2131230998;
+			public const int device_c3e_bg = 2131230998;
 			
 			// aapt resource value: 0x7F080117
-			public const int device_c4c = 2131230999;
+			public const int device_c3s = 2131230999;
 			
 			// aapt resource value: 0x7F080118
-			public const int device_c4c_bg = 2131231000;
+			public const int device_c4 = 2131231000;
 			
 			// aapt resource value: 0x7F080119
-			public const int device_c4e = 2131231001;
+			public const int device_c4c = 2131231001;
 			
 			// aapt resource value: 0x7F08011A
-			public const int device_c4e_bg = 2131231002;
+			public const int device_c4c_bg = 2131231002;
 			
 			// aapt resource value: 0x7F08011B
-			public const int device_c4s = 2131231003;
+			public const int device_c4e = 2131231003;
 			
 			// aapt resource value: 0x7F08011C
-			public const int device_c6 = 2131231004;
+			public const int device_c4e_bg = 2131231004;
 			
 			// aapt resource value: 0x7F08011D
-			public const int device_c6c = 2131231005;
+			public const int device_c4s = 2131231005;
 			
 			// aapt resource value: 0x7F08011E
-			public const int device_c6c_1 = 2131231006;
+			public const int device_c6 = 2131231006;
 			
 			// aapt resource value: 0x7F08011F
-			public const int device_c6c_2 = 2131231007;
+			public const int device_c6c = 2131231007;
 			
 			// aapt resource value: 0x7F080120
-			public const int device_c6h = 2131231008;
+			public const int device_c6c_1 = 2131231008;
 			
 			// aapt resource value: 0x7F080121
-			public const int device_c6p = 2131231009;
+			public const int device_c6c_2 = 2131231009;
 			
 			// aapt resource value: 0x7F080122
-			public const int device_c6t_bg = 2131231010;
+			public const int device_c6h = 2131231010;
 			
 			// aapt resource value: 0x7F080123
-			public const int device_callhelp = 2131231011;
+			public const int device_c6p = 2131231011;
 			
 			// aapt resource value: 0x7F080124
-			public const int device_co2 = 2131231012;
+			public const int device_c6t_bg = 2131231012;
 			
 			// aapt resource value: 0x7F080125
-			public const int device_cs_c3w = 2131231013;
+			public const int device_callhelp = 2131231013;
 			
 			// aapt resource value: 0x7F080126
-			public const int device_cs_vr104d = 2131231014;
+			public const int device_co2 = 2131231014;
 			
 			// aapt resource value: 0x7F080127
-			public const int device_cs_vr108d = 2131231015;
+			public const int device_cs_c3w = 2131231015;
 			
 			// aapt resource value: 0x7F080128
-			public const int device_cs_vr116d = 2131231016;
+			public const int device_cs_vr104d = 2131231016;
 			
 			// aapt resource value: 0x7F080129
-			public const int device_curtain = 2131231017;
+			public const int device_cs_vr108d = 2131231017;
 			
 			// aapt resource value: 0x7F08012A
-			public const int device_d1 = 2131231018;
+			public const int device_cs_vr116d = 2131231018;
 			
 			// aapt resource value: 0x7F08012B
-			public const int device_d1_bg = 2131231019;
+			public const int device_curtain = 2131231019;
 			
 			// aapt resource value: 0x7F08012C
-			public const int device_default_details = 2131231020;
+			public const int device_d1 = 2131231020;
 			
 			// aapt resource value: 0x7F08012D
-			public const int device_dh1 = 2131231021;
+			public const int device_d1_bg = 2131231021;
 			
 			// aapt resource value: 0x7F08012E
-			public const int device_door = 2131231022;
+			public const int device_default_details = 2131231022;
 			
 			// aapt resource value: 0x7F08012F
-			public const int device_doorbell = 2131231023;
+			public const int device_dh1 = 2131231023;
 			
 			// aapt resource value: 0x7F080130
-			public const int device_doorbell_hik = 2131231024;
+			public const int device_door = 2131231024;
 			
 			// aapt resource value: 0x7F080131
-			public const int device_dvr = 2131231025;
+			public const int device_doorbell = 2131231025;
 			
 			// aapt resource value: 0x7F080132
-			public const int device_f1 = 2131231026;
+			public const int device_doorbell_hik = 2131231026;
 			
 			// aapt resource value: 0x7F080133
-			public const int device_gas = 2131231027;
+			public const int device_dvr = 2131231027;
 			
 			// aapt resource value: 0x7F080134
-			public const int device_h2c = 2131231028;
+			public const int device_f1 = 2131231028;
 			
 			// aapt resource value: 0x7F080135
-			public const int device_h2s = 2131231029;
+			public const int device_gas = 2131231029;
 			
 			// aapt resource value: 0x7F080136
-			public const int device_infrared = 2131231030;
+			public const int device_h2c = 2131231030;
 			
 			// aapt resource value: 0x7F080137
-			public const int device_ipc_dome = 2131231031;
+			public const int device_h2s = 2131231031;
 			
 			// aapt resource value: 0x7F080138
-			public const int device_keyboard = 2131231032;
+			public const int device_infrared = 2131231032;
 			
 			// aapt resource value: 0x7F080139
-			public const int device_light = 2131231033;
+			public const int device_ipc_dome = 2131231033;
 			
 			// aapt resource value: 0x7F08013A
-			public const int device_mini_360_plus = 2131231034;
+			public const int device_keyboard = 2131231034;
 			
 			// aapt resource value: 0x7F08013B
-			public const int device_mini_trooper = 2131231035;
+			public const int device_light = 2131231035;
 			
 			// aapt resource value: 0x7F08013C
-			public const int device_move_magnetometer = 2131231036;
+			public const int device_mini_360_plus = 2131231036;
 			
 			// aapt resource value: 0x7F08013D
-			public const int device_n1 = 2131231037;
+			public const int device_mini_trooper = 2131231037;
 			
 			// aapt resource value: 0x7F08013E
-			public const int device_n1w = 2131231038;
+			public const int device_move_magnetometer = 2131231038;
 			
 			// aapt resource value: 0x7F08013F
-			public const int device_n1w_bg = 2131231039;
+			public const int device_n1 = 2131231039;
 			
 			// aapt resource value: 0x7F080140
-			public const int device_normal = 2131231040;
+			public const int device_n1w = 2131231040;
 			
 			// aapt resource value: 0x7F080141
-			public const int device_offline = 2131231041;
+			public const int device_n1w_bg = 2131231041;
 			
 			// aapt resource value: 0x7F080142
-			public const int device_other = 2131231042;
+			public const int device_normal = 2131231042;
 			
 			// aapt resource value: 0x7F080143
-			public const int device_pic_4_dvr = 2131231043;
+			public const int device_offline = 2131231043;
 			
 			// aapt resource value: 0x7F080144
-			public const int device_pic_4_nvr = 2131231044;
+			public const int device_other = 2131231044;
 			
 			// aapt resource value: 0x7F080145
-			public const int device_pic_8_16_dvr = 2131231045;
+			public const int device_pic_4_dvr = 2131231045;
 			
 			// aapt resource value: 0x7F080146
-			public const int device_pic_8_16_nvr = 2131231046;
+			public const int device_pic_4_nvr = 2131231046;
 			
 			// aapt resource value: 0x7F080147
-			public const int device_r1 = 2131231047;
+			public const int device_pic_8_16_dvr = 2131231047;
 			
 			// aapt resource value: 0x7F080148
-			public const int device_r1_bg = 2131231048;
+			public const int device_pic_8_16_nvr = 2131231048;
 			
 			// aapt resource value: 0x7F080149
-			public const int device_r2 = 2131231049;
+			public const int device_r1 = 2131231049;
 			
 			// aapt resource value: 0x7F08014A
-			public const int device_r2_bg = 2131231050;
+			public const int device_r1_bg = 2131231050;
 			
 			// aapt resource value: 0x7F08014B
-			public const int device_remote = 2131231051;
+			public const int device_r2 = 2131231051;
 			
 			// aapt resource value: 0x7F08014C
-			public const int device_smoke = 2131231052;
+			public const int device_r2_bg = 2131231052;
 			
 			// aapt resource value: 0x7F08014D
-			public const int device_vr104d_bg = 2131231053;
+			public const int device_remote = 2131231053;
 			
 			// aapt resource value: 0x7F08014E
-			public const int device_vr108d_bg = 2131231054;
+			public const int device_smoke = 2131231054;
 			
 			// aapt resource value: 0x7F08014F
-			public const int device_vr116d_bg = 2131231055;
+			public const int device_vr104d_bg = 2131231055;
 			
 			// aapt resource value: 0x7F080150
-			public const int device_w1 = 2131231056;
+			public const int device_vr108d_bg = 2131231056;
 			
 			// aapt resource value: 0x7F080151
-			public const int device_w2d = 2131231057;
+			public const int device_vr116d_bg = 2131231057;
 			
 			// aapt resource value: 0x7F080152
-			public const int device_w2d_bg = 2131231058;
+			public const int device_w1 = 2131231058;
 			
 			// aapt resource value: 0x7F080153
-			public const int device_w2s = 2131231059;
+			public const int device_w2d = 2131231059;
 			
 			// aapt resource value: 0x7F080154
-			public const int device_w2s_bg = 2131231060;
+			public const int device_w2d_bg = 2131231060;
 			
 			// aapt resource value: 0x7F080155
-			public const int device_w3 = 2131231061;
+			public const int device_w2s = 2131231061;
 			
 			// aapt resource value: 0x7F080156
-			public const int device_w3_details = 2131231062;
+			public const int device_w2s_bg = 2131231062;
 			
 			// aapt resource value: 0x7F080157
-			public const int device_water = 2131231063;
+			public const int device_w3 = 2131231063;
 			
 			// aapt resource value: 0x7F080158
-			public const int device_wifi = 2131231064;
+			public const int device_w3_details = 2131231064;
 			
 			// aapt resource value: 0x7F080159
-			public const int device_wifi2 = 2131231065;
+			public const int device_water = 2131231065;
 			
 			// aapt resource value: 0x7F08015A
-			public const int device_wifi3 = 2131231066;
+			public const int device_wifi = 2131231066;
 			
 			// aapt resource value: 0x7F08015B
-			public const int device_wlb = 2131231067;
+			public const int device_wifi2 = 2131231067;
 			
 			// aapt resource value: 0x7F08015C
-			public const int device_wlb_bg = 2131231068;
+			public const int device_wifi3 = 2131231068;
 			
 			// aapt resource value: 0x7F08015D
-			public const int device_x1 = 2131231069;
+			public const int device_wlb = 2131231069;
 			
 			// aapt resource value: 0x7F08015E
-			public const int device_x1_bg = 2131231070;
+			public const int device_wlb_bg = 2131231070;
 			
 			// aapt resource value: 0x7F08015F
-			public const int device_x2 = 2131231071;
+			public const int device_x1 = 2131231071;
 			
 			// aapt resource value: 0x7F080160
-			public const int device_x2_bg = 2131231072;
+			public const int device_x1_bg = 2131231072;
 			
 			// aapt resource value: 0x7F080161
-			public const int device_x3 = 2131231073;
-			
-			// aapt resource value: 0x7F080163
-			public const int device_x3c = 2131231075;
-			
-			// aapt resource value: 0x7F080164
-			public const int device_x3c_bg = 2131231076;
+			public const int device_x2 = 2131231073;
 			
 			// aapt resource value: 0x7F080162
-			public const int device_x3_bg = 2131231074;
+			public const int device_x2_bg = 2131231074;
+			
+			// aapt resource value: 0x7F080163
+			public const int device_x3 = 2131231075;
 			
 			// aapt resource value: 0x7F080165
-			public const int device_x4 = 2131231077;
+			public const int device_x3c = 2131231077;
 			
 			// aapt resource value: 0x7F080166
-			public const int device_x4_bg = 2131231078;
+			public const int device_x3c_bg = 2131231078;
 			
-			// aapt resource value: 0x7F080169
-			public const int device_x5c = 2131231081;
-			
-			// aapt resource value: 0x7F08016A
-			public const int device_x5c_bg = 2131231082;
+			// aapt resource value: 0x7F080164
+			public const int device_x3_bg = 2131231076;
 			
 			// aapt resource value: 0x7F080167
-			public const int device_x5_108tp = 2131231079;
+			public const int device_x4 = 2131231079;
 			
 			// aapt resource value: 0x7F080168
-			public const int device_x5_108tp_bg = 2131231080;
+			public const int device_x4_bg = 2131231080;
 			
 			// aapt resource value: 0x7F08016B
-			public const int device_z1 = 2131231083;
+			public const int device_x5c = 2131231083;
 			
 			// aapt resource value: 0x7F08016C
-			public const int dialog_background = 2131231084;
+			public const int device_x5c_bg = 2131231084;
+			
+			// aapt resource value: 0x7F080169
+			public const int device_x5_108tp = 2131231081;
+			
+			// aapt resource value: 0x7F08016A
+			public const int device_x5_108tp_bg = 2131231082;
 			
 			// aapt resource value: 0x7F08016D
-			public const int display_frame = 2131231085;
-			
-			// aapt resource value: 0x7F080170
-			public const int download8 = 2131231088;
+			public const int device_z1 = 2131231085;
 			
 			// aapt resource value: 0x7F08016E
-			public const int down_horizontal = 2131231086;
+			public const int dialog_background = 2131231086;
 			
 			// aapt resource value: 0x7F08016F
-			public const int down_twinkle = 2131231087;
-			
-			// aapt resource value: 0x7F080171
-			public const int edittext_bg = 2131231089;
+			public const int display_frame = 2131231087;
 			
 			// aapt resource value: 0x7F080172
-			public const int edittext_del = 2131231090;
+			public const int download8 = 2131231090;
+			
+			// aapt resource value: 0x7F080170
+			public const int down_horizontal = 2131231088;
+			
+			// aapt resource value: 0x7F080171
+			public const int down_twinkle = 2131231089;
 			
 			// aapt resource value: 0x7F080173
-			public const int edittext_del_sel = 2131231091;
+			public const int edittext_bg = 2131231091;
 			
 			// aapt resource value: 0x7F080174
-			public const int equipment = 2131231092;
+			public const int edittext_del = 2131231092;
 			
 			// aapt resource value: 0x7F080175
-			public const int equipment_sel = 2131231093;
+			public const int edittext_del_sel = 2131231093;
 			
 			// aapt resource value: 0x7F080176
-			public const int equipment_selector = 2131231094;
+			public const int equipment = 2131231094;
 			
 			// aapt resource value: 0x7F080177
-			public const int event_list_fail_pic = 2131231095;
+			public const int equipment_sel = 2131231095;
 			
 			// aapt resource value: 0x7F080178
-			public const int exit = 2131231096;
+			public const int equipment_selector = 2131231096;
 			
 			// aapt resource value: 0x7F080179
-			public const int exit_sel = 2131231097;
+			public const int event_list_fail_pic = 2131231097;
 			
 			// aapt resource value: 0x7F08017A
-			public const int exit_selector = 2131231098;
+			public const int exit = 2131231098;
 			
 			// aapt resource value: 0x7F08017B
-			public const int expression_del = 2131231099;
+			public const int exit_sel = 2131231099;
 			
 			// aapt resource value: 0x7F08017C
-			public const int expression_del_sel = 2131231100;
-			
-			// aapt resource value: 0x7F080186
-			public const int ezopen_vertical_preview_sound_off_selector = 2131231110;
-			
-			// aapt resource value: 0x7F080187
-			public const int ezopen_vertical_preview_sound_selector = 2131231111;
+			public const int exit_selector = 2131231100;
 			
 			// aapt resource value: 0x7F08017D
-			public const int ez_border = 2131231101;
+			public const int expression_del = 2131231101;
 			
 			// aapt resource value: 0x7F08017E
-			public const int ez_border_selector = 2131231102;
-			
-			// aapt resource value: 0x7F08017F
-			public const int ez_btn_r1_retry_selector = 2131231103;
-			
-			// aapt resource value: 0x7F080180
-			public const int ez_leave_message_play_selector = 2131231104;
-			
-			// aapt resource value: 0x7F080181
-			public const int ez_play_video_selector = 2131231105;
-			
-			// aapt resource value: 0x7F080182
-			public const int ez_real_play = 2131231106;
-			
-			// aapt resource value: 0x7F080183
-			public const int ez_real_play_sel = 2131231107;
-			
-			// aapt resource value: 0x7F080184
-			public const int ez_reaty_btn_selector = 2131231108;
-			
-			// aapt resource value: 0x7F080185
-			public const int ez_remote_list_pause_btn_selector = 2131231109;
+			public const int expression_del_sel = 2131231102;
 			
 			// aapt resource value: 0x7F080188
-			public const int face_image3 = 2131231112;
+			public const int ezopen_vertical_preview_sound_off_selector = 2131231112;
 			
 			// aapt resource value: 0x7F080189
-			public const int face_rect = 2131231113;
+			public const int ezopen_vertical_preview_sound_selector = 2131231113;
+			
+			// aapt resource value: 0x7F08017F
+			public const int ez_border = 2131231103;
+			
+			// aapt resource value: 0x7F080180
+			public const int ez_border_selector = 2131231104;
+			
+			// aapt resource value: 0x7F080181
+			public const int ez_btn_r1_retry_selector = 2131231105;
+			
+			// aapt resource value: 0x7F080182
+			public const int ez_leave_message_play_selector = 2131231106;
+			
+			// aapt resource value: 0x7F080183
+			public const int ez_play_video_selector = 2131231107;
+			
+			// aapt resource value: 0x7F080184
+			public const int ez_real_play = 2131231108;
+			
+			// aapt resource value: 0x7F080185
+			public const int ez_real_play_sel = 2131231109;
+			
+			// aapt resource value: 0x7F080186
+			public const int ez_reaty_btn_selector = 2131231110;
+			
+			// aapt resource value: 0x7F080187
+			public const int ez_remote_list_pause_btn_selector = 2131231111;
 			
 			// aapt resource value: 0x7F08018A
-			public const int failure_account = 2131231114;
+			public const int face_image3 = 2131231114;
 			
 			// aapt resource value: 0x7F08018B
-			public const int failure_server = 2131231115;
+			public const int face_rect = 2131231115;
 			
 			// aapt resource value: 0x7F08018C
-			public const int failure_wifi = 2131231116;
+			public const int failure_account = 2131231116;
 			
 			// aapt resource value: 0x7F08018D
-			public const int fingerprint_draw_off = 2131231117;
+			public const int failure_server = 2131231117;
 			
 			// aapt resource value: 0x7F08018E
-			public const int fingerprint_draw_off_animation = 2131231118;
+			public const int failure_wifi = 2131231118;
 			
 			// aapt resource value: 0x7F08018F
-			public const int fingerprint_draw_on = 2131231119;
+			public const int fingerprint_draw_off = 2131231119;
 			
 			// aapt resource value: 0x7F080190
-			public const int fingerprint_draw_on_animation = 2131231120;
+			public const int fingerprint_draw_off_animation = 2131231120;
 			
 			// aapt resource value: 0x7F080191
-			public const int fingerprint_error = 2131231121;
+			public const int fingerprint_draw_on = 2131231121;
 			
 			// aapt resource value: 0x7F080192
-			public const int fingerprint_error_off = 2131231122;
+			public const int fingerprint_draw_on_animation = 2131231122;
 			
 			// aapt resource value: 0x7F080193
-			public const int fingerprint_error_off_animation = 2131231123;
+			public const int fingerprint_error = 2131231123;
 			
 			// aapt resource value: 0x7F080194
-			public const int fingerprint_error_on = 2131231124;
+			public const int fingerprint_error_off = 2131231124;
 			
 			// aapt resource value: 0x7F080195
-			public const int fingerprint_error_on_animation = 2131231125;
+			public const int fingerprint_error_off_animation = 2131231125;
 			
 			// aapt resource value: 0x7F080196
-			public const int fingerprint_error_state_to_fp = 2131231126;
+			public const int fingerprint_error_on = 2131231126;
 			
 			// aapt resource value: 0x7F080197
-			public const int fingerprint_error_state_to_fp_animation = 2131231127;
+			public const int fingerprint_error_on_animation = 2131231127;
 			
 			// aapt resource value: 0x7F080198
-			public const int fingerprint_fingerprint = 2131231128;
+			public const int fingerprint_error_state_to_fp = 2131231128;
 			
 			// aapt resource value: 0x7F080199
-			public const int fingerprint_fp_to_error_state = 2131231129;
+			public const int fingerprint_error_state_to_fp_animation = 2131231129;
 			
 			// aapt resource value: 0x7F08019A
-			public const int fingerprint_fp_to_error_state_animation = 2131231130;
+			public const int fingerprint_fingerprint = 2131231130;
 			
 			// aapt resource value: 0x7F08019B
-			public const int flashlight = 2131231131;
+			public const int fingerprint_fp_to_error_state = 2131231131;
 			
 			// aapt resource value: 0x7F08019C
-			public const int flashlight_closed = 2131231132;
+			public const int fingerprint_fp_to_error_state_animation = 2131231132;
 			
 			// aapt resource value: 0x7F08019D
-			public const int flashlight_selector = 2131231133;
+			public const int flashlight = 2131231133;
 			
 			// aapt resource value: 0x7F08019E
-			public const int fullscreen_button_selector = 2131231134;
+			public const int flashlight_closed = 2131231134;
 			
 			// aapt resource value: 0x7F08019F
-			public const int gd_btn_shape_app_b = 2131231135;
+			public const int flashlight_selector = 2131231135;
 			
 			// aapt resource value: 0x7F0801A0
-			public const int gd_btn_shape_app_g = 2131231136;
+			public const int fullscreen_button_selector = 2131231136;
 			
 			// aapt resource value: 0x7F0801A1
-			public const int gd_btn_shape_app_w = 2131231137;
+			public const int gd_btn_shape_app_b = 2131231137;
 			
 			// aapt resource value: 0x7F0801A2
-			public const int gd_btn_shape_shadow_w = 2131231138;
+			public const int gd_btn_shape_app_g = 2131231138;
 			
 			// aapt resource value: 0x7F0801A3
-			public const int gd_click_effect_select = 2131231139;
+			public const int gd_btn_shape_app_w = 2131231139;
 			
 			// aapt resource value: 0x7F0801A4
-			public const int goback = 2131231140;
+			public const int gd_btn_shape_shadow_w = 2131231140;
 			
 			// aapt resource value: 0x7F0801A5
-			public const int goback_dis = 2131231141;
+			public const int gd_click_effect_select = 2131231141;
 			
 			// aapt resource value: 0x7F0801A6
-			public const int goback_sel = 2131231142;
+			public const int goback = 2131231142;
 			
 			// aapt resource value: 0x7F0801A7
-			public const int gohead = 2131231143;
+			public const int goback_dis = 2131231143;
 			
 			// aapt resource value: 0x7F0801A8
-			public const int gohead_dis = 2131231144;
+			public const int goback_sel = 2131231144;
 			
 			// aapt resource value: 0x7F0801A9
-			public const int gohead_sel = 2131231145;
+			public const int gohead = 2131231145;
 			
 			// aapt resource value: 0x7F0801AA
-			public const int graybtn = 2131231146;
+			public const int gohead_dis = 2131231146;
 			
 			// aapt resource value: 0x7F0801AB
-			public const int graybtn_press = 2131231147;
+			public const int gohead_sel = 2131231147;
 			
 			// aapt resource value: 0x7F0801AC
-			public const int graybtn_secetor = 2131231148;
+			public const int graybtn = 2131231148;
 			
 			// aapt resource value: 0x7F0801AD
-			public const int grouplayout_item_bg_selector = 2131231149;
-			
-			// aapt resource value: 0x7F0801B2
-			public const int hangup = 2131231154;
-			
-			// aapt resource value: 0x7F0801B3
-			public const int hide_bg2_1 = 2131231155;
-			
-			// aapt resource value: 0x7F0801B4
-			public const int hide_bg2_2 = 2131231156;
-			
-			// aapt resource value: 0x7F0801B5
-			public const int hide_bg2_3 = 2131231157;
-			
-			// aapt resource value: 0x7F0801B6
-			public const int hide_bg2_4 = 2131231158;
-			
-			// aapt resource value: 0x7F0801B7
-			public const int hide_bg2_5 = 2131231159;
-			
-			// aapt resource value: 0x7F0801B8
-			public const int hide_bg2_6 = 2131231160;
-			
-			// aapt resource value: 0x7F0801B9
-			public const int hide_bg2_7 = 2131231161;
-			
-			// aapt resource value: 0x7F0801BA
-			public const int hide_bg2_8 = 2131231162;
-			
-			// aapt resource value: 0x7F0801BB
-			public const int hide_bg2_9 = 2131231163;
-			
-			// aapt resource value: 0x7F0801BC
-			public const int history_video = 2131231164;
-			
-			// aapt resource value: 0x7F0801BD
-			public const int history_video_dis = 2131231165;
-			
-			// aapt resource value: 0x7F0801BE
-			public const int history_video_sel = 2131231166;
-			
-			// aapt resource value: 0x7F0801BF
-			public const int horizontal_fullscreen_button_selector = 2131231167;
-			
-			// aapt resource value: 0x7F0801C0
-			public const int horizontal_shrink_screen_normal = 2131231168;
-			
-			// aapt resource value: 0x7F0801C1
-			public const int horizontal_shrink_screen_pressed = 2131231169;
+			public const int graybtn_press = 2131231149;
 			
 			// aapt resource value: 0x7F0801AE
-			public const int h_bg = 2131231150;
+			public const int graybtn_secetor = 2131231150;
 			
 			// aapt resource value: 0x7F0801AF
-			public const int h_bg_sel = 2131231151;
+			public const int grouplayout_item_bg_selector = 2131231151;
 			
-			// aapt resource value: 0x7F0801B0
-			public const int h_talk = 2131231152;
+			// aapt resource value: 0x7F0801B4
+			public const int hangup = 2131231156;
 			
-			// aapt resource value: 0x7F0801B1
-			public const int h_talk_sel = 2131231153;
+			// aapt resource value: 0x7F0801B5
+			public const int hide_bg2_1 = 2131231157;
 			
-			// aapt resource value: 0x7F0801E4
-			public const int icn_btn_bg_plus = 2131231204;
+			// aapt resource value: 0x7F0801B6
+			public const int hide_bg2_2 = 2131231158;
 			
-			// aapt resource value: 0x7F0801E5
-			public const int Icon = 2131231205;
+			// aapt resource value: 0x7F0801B7
+			public const int hide_bg2_3 = 2131231159;
 			
-			// aapt resource value: 0x7F0801E6
-			public const int icon_multi_screen_preview = 2131231206;
+			// aapt resource value: 0x7F0801B8
+			public const int hide_bg2_4 = 2131231160;
+			
+			// aapt resource value: 0x7F0801B9
+			public const int hide_bg2_5 = 2131231161;
+			
+			// aapt resource value: 0x7F0801BA
+			public const int hide_bg2_6 = 2131231162;
+			
+			// aapt resource value: 0x7F0801BB
+			public const int hide_bg2_7 = 2131231163;
+			
+			// aapt resource value: 0x7F0801BC
+			public const int hide_bg2_8 = 2131231164;
+			
+			// aapt resource value: 0x7F0801BD
+			public const int hide_bg2_9 = 2131231165;
+			
+			// aapt resource value: 0x7F0801BE
+			public const int history_video = 2131231166;
+			
+			// aapt resource value: 0x7F0801BF
+			public const int history_video_dis = 2131231167;
+			
+			// aapt resource value: 0x7F0801C0
+			public const int history_video_sel = 2131231168;
+			
+			// aapt resource value: 0x7F0801C1
+			public const int horizontal_fullscreen_button_selector = 2131231169;
 			
 			// aapt resource value: 0x7F0801C2
-			public const int ic_action_search = 2131231170;
+			public const int horizontal_shrink_screen_normal = 2131231170;
 			
 			// aapt resource value: 0x7F0801C3
-			public const int ic_gdmap_add = 2131231171;
+			public const int horizontal_shrink_screen_pressed = 2131231171;
 			
-			// aapt resource value: 0x7F0801C4
-			public const int ic_gdmap_back = 2131231172;
+			// aapt resource value: 0x7F0801B0
+			public const int h_bg = 2131231152;
 			
-			// aapt resource value: 0x7F0801C5
-			public const int ic_gdmap_delete = 2131231173;
+			// aapt resource value: 0x7F0801B1
+			public const int h_bg_sel = 2131231153;
 			
-			// aapt resource value: 0x7F0801C6
-			public const int ic_gdmap_home = 2131231174;
+			// aapt resource value: 0x7F0801B2
+			public const int h_talk = 2131231154;
 			
-			// aapt resource value: 0x7F0801C7
-			public const int ic_gdmap_mylocation = 2131231175;
-			
-			// aapt resource value: 0x7F0801C8
-			public const int ic_gdmap_now = 2131231176;
-			
-			// aapt resource value: 0x7F0801C9
-			public const int ic_gdmap_search = 2131231177;
-			
-			// aapt resource value: 0x7F0801CA
-			public const int ic_gdmap_zoom_out = 2131231178;
-			
-			// aapt resource value: 0x7F0801CB
-			public const int ic_gps_point = 2131231179;
-			
-			// aapt resource value: 0x7F0801CC
-			public const int ic_launcher_background = 2131231180;
-			
-			// aapt resource value: 0x7F0801CD
-			public const int ic_launcher_foreground = 2131231181;
-			
-			// aapt resource value: 0x7F0801CE
-			public const int ic_ss_arrow_back = 2131231182;
-			
-			// aapt resource value: 0x7F0801CF
-			public const int ic_wd_arc_scale_bg = 2131231183;
-			
-			// aapt resource value: 0x7F0801D0
-			public const int ic_wd_curtain_bg_top = 2131231184;
-			
-			// aapt resource value: 0x7F0801D1
-			public const int ic_wd_curtain_h_bg = 2131231185;
-			
-			// aapt resource value: 0x7F0801D2
-			public const int ic_wd_curtain_h_open = 2131231186;
-			
-			// aapt resource value: 0x7F0801D3
-			public const int ic_wd_curtain_h_progress = 2131231187;
-			
-			// aapt resource value: 0x7F0801D4
-			public const int ic_wd_curtain_h_top = 2131231188;
-			
-			// aapt resource value: 0x7F0801D5
-			public const int ic_wd_curtain_open = 2131231189;
-			
-			// aapt resource value: 0x7F0801D6
-			public const int ic_wd_curtain_roll_bg = 2131231190;
-			
-			// aapt resource value: 0x7F0801D7
-			public const int ic_wd_curtain_roll_progress = 2131231191;
-			
-			// aapt resource value: 0x7F0801D8
-			public const int ic_wd_on_curtain_blinds_progress = 2131231192;
-			
-			// aapt resource value: 0x7F0801D9
-			public const int ic_wd_on_curtain_blinds_progress2 = 2131231193;
-			
-			// aapt resource value: 0x7F0801DA
-			public const int ic_wd_on_curtain_blinds_progress_close = 2131231194;
-			
-			// aapt resource value: 0x7F0801DB
-			public const int ic_wd_on_curtain_blinds_progress_close2 = 2131231195;
-			
-			// aapt resource value: 0x7F0801DC
-			public const int ic_wd_on_curtain_h_bg = 2131231196;
-			
-			// aapt resource value: 0x7F0801DD
-			public const int ic_wd_on_curtain_h_open = 2131231197;
-			
-			// aapt resource value: 0x7F0801DE
-			public const int ic_wd_on_curtain_h_progress = 2131231198;
-			
-			// aapt resource value: 0x7F0801DF
-			public const int ic_wd_on_curtain_h_progress_close = 2131231199;
-			
-			// aapt resource value: 0x7F0801E0
-			public const int ic_wd_on_curtain_open = 2131231200;
-			
-			// aapt resource value: 0x7F0801E1
-			public const int ic_wd_on_curtain_roll_bg = 2131231201;
-			
-			// aapt resource value: 0x7F0801E2
-			public const int ic_wd_on_curtain_roll_progress = 2131231202;
-			
-			// aapt resource value: 0x7F0801E3
-			public const int ic_wd_on_curtain_roll_progress_close = 2131231203;
-			
-			// aapt resource value: 0x7F0801E7
-			public const int image_a1 = 2131231207;
-			
-			// aapt resource value: 0x7F0801E8
-			public const int image_crispr = 2131231208;
-			
-			// aapt resource value: 0x7F0801E9
-			public const int image_everyday_1080p = 2131231209;
-			
-			// aapt resource value: 0x7F0801EA
-			public const int image_everyday_3mp = 2131231210;
-			
-			// aapt resource value: 0x7F0801EB
-			public const int image_everyday_4mp_ip = 2131231211;
-			
-			// aapt resource value: 0x7F0801EC
-			public const int image_everyday_720p = 2131231212;
+			// aapt resource value: 0x7F0801B3
+			public const int h_talk_sel = 2131231155;
 			
 			// aapt resource value: 0x7F0801ED
-			public const int image_everyday_ip_1080p = 2131231213;
+			public const int icn_btn_bg_plus = 2131231213;
 			
 			// aapt resource value: 0x7F0801EE
-			public const int image_husky = 2131231214;
+			public const int Icon = 2131231214;
 			
 			// aapt resource value: 0x7F0801EF
-			public const int image_husky_c = 2131231215;
+			public const int icon_multi_screen_preview = 2131231215;
+			
+			// aapt resource value: 0x7F0801C4
+			public const int ic_action_search = 2131231172;
+			
+			// aapt resource value: 0x7F0801C5
+			public const int ic_esvideo_on_answer = 2131231173;
+			
+			// aapt resource value: 0x7F0801C6
+			public const int ic_esvideo_on_back = 2131231174;
+			
+			// aapt resource value: 0x7F0801C7
+			public const int ic_esvideo_on_hangup = 2131231175;
+			
+			// aapt resource value: 0x7F0801C8
+			public const int ic_esvideo_on_takephoto_select = 2131231176;
+			
+			// aapt resource value: 0x7F0801C9
+			public const int ic_esvideo_on_takephoto_unselect = 2131231177;
+			
+			// aapt resource value: 0x7F0801CA
+			public const int ic_esvideo_on_unlock_select = 2131231178;
+			
+			// aapt resource value: 0x7F0801CB
+			public const int ic_esvideo_on_unlock_unselect = 2131231179;
+			
+			// aapt resource value: 0x7F0801CC
+			public const int ic_gdmap_add = 2131231180;
+			
+			// aapt resource value: 0x7F0801CD
+			public const int ic_gdmap_back = 2131231181;
+			
+			// aapt resource value: 0x7F0801CE
+			public const int ic_gdmap_delete = 2131231182;
+			
+			// aapt resource value: 0x7F0801CF
+			public const int ic_gdmap_home = 2131231183;
+			
+			// aapt resource value: 0x7F0801D0
+			public const int ic_gdmap_mylocation = 2131231184;
+			
+			// aapt resource value: 0x7F0801D1
+			public const int ic_gdmap_now = 2131231185;
+			
+			// aapt resource value: 0x7F0801D2
+			public const int ic_gdmap_search = 2131231186;
+			
+			// aapt resource value: 0x7F0801D3
+			public const int ic_gdmap_zoom_out = 2131231187;
+			
+			// aapt resource value: 0x7F0801D4
+			public const int ic_gps_point = 2131231188;
+			
+			// aapt resource value: 0x7F0801D5
+			public const int ic_launcher_background = 2131231189;
+			
+			// aapt resource value: 0x7F0801D6
+			public const int ic_launcher_foreground = 2131231190;
+			
+			// aapt resource value: 0x7F0801D7
+			public const int ic_ss_arrow_back = 2131231191;
+			
+			// aapt resource value: 0x7F0801D8
+			public const int ic_wd_arc_scale_bg = 2131231192;
+			
+			// aapt resource value: 0x7F0801D9
+			public const int ic_wd_curtain_bg_top = 2131231193;
+			
+			// aapt resource value: 0x7F0801DA
+			public const int ic_wd_curtain_h_bg = 2131231194;
+			
+			// aapt resource value: 0x7F0801DB
+			public const int ic_wd_curtain_h_open = 2131231195;
+			
+			// aapt resource value: 0x7F0801DC
+			public const int ic_wd_curtain_h_progress = 2131231196;
+			
+			// aapt resource value: 0x7F0801DD
+			public const int ic_wd_curtain_h_top = 2131231197;
+			
+			// aapt resource value: 0x7F0801DE
+			public const int ic_wd_curtain_open = 2131231198;
+			
+			// aapt resource value: 0x7F0801DF
+			public const int ic_wd_curtain_roll_bg = 2131231199;
+			
+			// aapt resource value: 0x7F0801E0
+			public const int ic_wd_curtain_roll_progress = 2131231200;
+			
+			// aapt resource value: 0x7F0801E1
+			public const int ic_wd_on_curtain_blinds_progress = 2131231201;
+			
+			// aapt resource value: 0x7F0801E2
+			public const int ic_wd_on_curtain_blinds_progress2 = 2131231202;
+			
+			// aapt resource value: 0x7F0801E3
+			public const int ic_wd_on_curtain_blinds_progress_close = 2131231203;
+			
+			// aapt resource value: 0x7F0801E4
+			public const int ic_wd_on_curtain_blinds_progress_close2 = 2131231204;
+			
+			// aapt resource value: 0x7F0801E5
+			public const int ic_wd_on_curtain_h_bg = 2131231205;
+			
+			// aapt resource value: 0x7F0801E6
+			public const int ic_wd_on_curtain_h_open = 2131231206;
+			
+			// aapt resource value: 0x7F0801E7
+			public const int ic_wd_on_curtain_h_progress = 2131231207;
+			
+			// aapt resource value: 0x7F0801E8
+			public const int ic_wd_on_curtain_h_progress_close = 2131231208;
+			
+			// aapt resource value: 0x7F0801E9
+			public const int ic_wd_on_curtain_open = 2131231209;
+			
+			// aapt resource value: 0x7F0801EA
+			public const int ic_wd_on_curtain_roll_bg = 2131231210;
+			
+			// aapt resource value: 0x7F0801EB
+			public const int ic_wd_on_curtain_roll_progress = 2131231211;
+			
+			// aapt resource value: 0x7F0801EC
+			public const int ic_wd_on_curtain_roll_progress_close = 2131231212;
 			
 			// aapt resource value: 0x7F0801F0
-			public const int image_husky_dome = 2131231216;
+			public const int image_a1 = 2131231216;
 			
 			// aapt resource value: 0x7F0801F1
-			public const int image_mini = 2131231217;
-			
-			// aapt resource value: 0x7F0801F7
-			public const int image_minio = 2131231223;
+			public const int image_crispr = 2131231217;
 			
 			// aapt resource value: 0x7F0801F2
-			public const int image_mini_360 = 2131231218;
+			public const int image_everyday_1080p = 2131231218;
 			
 			// aapt resource value: 0x7F0801F3
-			public const int image_mini_360_plus = 2131231219;
+			public const int image_everyday_3mp = 2131231219;
 			
 			// aapt resource value: 0x7F0801F4
-			public const int image_mini_o = 2131231220;
+			public const int image_everyday_4mp_ip = 2131231220;
 			
 			// aapt resource value: 0x7F0801F5
-			public const int image_mini_plus = 2131231221;
+			public const int image_everyday_720p = 2131231221;
 			
 			// aapt resource value: 0x7F0801F6
-			public const int image_mini_trooper = 2131231222;
+			public const int image_everyday_ip_1080p = 2131231222;
+			
+			// aapt resource value: 0x7F0801F7
+			public const int image_husky = 2131231223;
 			
 			// aapt resource value: 0x7F0801F8
-			public const int img_slider_handle = 2131231224;
+			public const int image_husky_c = 2131231224;
 			
 			// aapt resource value: 0x7F0801F9
-			public const int indicator_autocrop = 2131231225;
-			
-			// aapt resource value: 0x7F0801FB
-			public const int inputlayout_bg = 2131231227;
+			public const int image_husky_dome = 2131231225;
 			
 			// aapt resource value: 0x7F0801FA
-			public const int input_shade = 2131231226;
-			
-			// aapt resource value: 0x7F0801FC
-			public const int interface_call_btn_selector = 2131231228;
-			
-			// aapt resource value: 0x7F0801FD
-			public const int join_qq_group = 2131231229;
-			
-			// aapt resource value: 0x7F0801FE
-			public const int label_bg_line = 2131231230;
-			
-			// aapt resource value: 0x7F0801FF
-			public const int label_bg_sel = 2131231231;
+			public const int image_mini = 2131231226;
 			
 			// aapt resource value: 0x7F080200
-			public const int launchImage = 2131231232;
+			public const int image_minio = 2131231232;
+			
+			// aapt resource value: 0x7F0801FB
+			public const int image_mini_360 = 2131231227;
+			
+			// aapt resource value: 0x7F0801FC
+			public const int image_mini_360_plus = 2131231228;
+			
+			// aapt resource value: 0x7F0801FD
+			public const int image_mini_o = 2131231229;
+			
+			// aapt resource value: 0x7F0801FE
+			public const int image_mini_plus = 2131231230;
+			
+			// aapt resource value: 0x7F0801FF
+			public const int image_mini_trooper = 2131231231;
 			
 			// aapt resource value: 0x7F080201
-			public const int leave_message_play = 2131231233;
+			public const int img_slider_handle = 2131231233;
 			
 			// aapt resource value: 0x7F080202
-			public const int leave_message_play_sel = 2131231234;
-			
-			// aapt resource value: 0x7F080203
-			public const int leave_message_play_selector = 2131231235;
+			public const int indicator_autocrop = 2131231234;
 			
 			// aapt resource value: 0x7F080204
-			public const int left_horizontal = 2131231236;
+			public const int inputlayout_bg = 2131231236;
+			
+			// aapt resource value: 0x7F080203
+			public const int input_shade = 2131231235;
 			
 			// aapt resource value: 0x7F080205
-			public const int left_twinkle = 2131231237;
+			public const int interface_call_btn_selector = 2131231237;
 			
 			// aapt resource value: 0x7F080206
-			public const int link_account1 = 2131231238;
+			public const int join_qq_group = 2131231238;
 			
 			// aapt resource value: 0x7F080207
-			public const int link_account2 = 2131231239;
+			public const int label_bg_line = 2131231239;
 			
 			// aapt resource value: 0x7F080208
-			public const int link_account3 = 2131231240;
+			public const int label_bg_sel = 2131231240;
 			
 			// aapt resource value: 0x7F080209
-			public const int link_account4 = 2131231241;
-			
-			// aapt resource value: 0x7F08020B
-			public const int Loading = 2131231243;
+			public const int launchImage = 2131231241;
 			
 			// aapt resource value: 0x7F08020A
-			public const int load_failed_bg = 2131231242;
+			public const int leave_message_play = 2131231242;
+			
+			// aapt resource value: 0x7F08020B
+			public const int leave_message_play_sel = 2131231243;
 			
 			// aapt resource value: 0x7F08020C
-			public const int lock_bg = 2131231244;
+			public const int leave_message_play_selector = 2131231244;
 			
 			// aapt resource value: 0x7F08020D
-			public const int login_btn_selector = 2131231245;
+			public const int left_horizontal = 2131231245;
 			
 			// aapt resource value: 0x7F08020E
-			public const int login_logo = 2131231246;
+			public const int left_twinkle = 2131231246;
 			
 			// aapt resource value: 0x7F08020F
-			public const int login_logo_button = 2131231247;
+			public const int link_account1 = 2131231247;
 			
 			// aapt resource value: 0x7F080210
-			public const int login_logo_button_sel = 2131231248;
+			public const int link_account2 = 2131231248;
 			
 			// aapt resource value: 0x7F080211
-			public const int logo_loading_1 = 2131231249;
+			public const int link_account3 = 2131231249;
 			
 			// aapt resource value: 0x7F080212
-			public const int logo_loading_2 = 2131231250;
-			
-			// aapt resource value: 0x7F080213
-			public const int logo_loading_3 = 2131231251;
+			public const int link_account4 = 2131231250;
 			
 			// aapt resource value: 0x7F080214
-			public const int logo_loading_4 = 2131231252;
+			public const int Loading = 2131231252;
+			
+			// aapt resource value: 0x7F080213
+			public const int load_failed_bg = 2131231251;
 			
 			// aapt resource value: 0x7F080215
-			public const int mesage_details_callhelp = 2131231253;
+			public const int lock_bg = 2131231253;
 			
 			// aapt resource value: 0x7F080216
-			public const int mesage_details_curtain = 2131231254;
+			public const int login_btn_selector = 2131231254;
 			
 			// aapt resource value: 0x7F080217
-			public const int mesage_details_data = 2131231255;
+			public const int login_logo = 2131231255;
 			
 			// aapt resource value: 0x7F080218
-			public const int mesage_details_door = 2131231256;
+			public const int login_logo_button = 2131231256;
 			
 			// aapt resource value: 0x7F080219
-			public const int mesage_details_gas = 2131231257;
+			public const int login_logo_button_sel = 2131231257;
 			
 			// aapt resource value: 0x7F08021A
-			public const int mesage_details_hdd = 2131231258;
+			public const int logo_loading_1 = 2131231258;
 			
 			// aapt resource value: 0x7F08021B
-			public const int mesage_details_infrared = 2131231259;
+			public const int logo_loading_2 = 2131231259;
 			
 			// aapt resource value: 0x7F08021C
-			public const int mesage_details_keyboard = 2131231260;
+			public const int logo_loading_3 = 2131231260;
 			
 			// aapt resource value: 0x7F08021D
-			public const int mesage_details_loss = 2131231261;
+			public const int logo_loading_4 = 2131231261;
 			
 			// aapt resource value: 0x7F08021E
-			public const int mesage_details_low_battery = 2131231262;
+			public const int lp_calltime_shape = 2131231262;
 			
 			// aapt resource value: 0x7F08021F
-			public const int mesage_details_offline = 2131231263;
+			public const int lp_calltime_shape_gray = 2131231263;
 			
 			// aapt resource value: 0x7F080220
-			public const int mesage_details_power = 2131231264;
+			public const int lp_line_shape = 2131231264;
 			
 			// aapt resource value: 0x7F080221
-			public const int mesage_details_smoke = 2131231265;
+			public const int mesage_details_callhelp = 2131231265;
 			
 			// aapt resource value: 0x7F080222
-			public const int mesage_details_tampering = 2131231266;
+			public const int mesage_details_curtain = 2131231266;
 			
 			// aapt resource value: 0x7F080223
-			public const int mesage_details_video_loss = 2131231267;
+			public const int mesage_details_data = 2131231267;
 			
 			// aapt resource value: 0x7F080224
-			public const int mesage_details_water = 2131231268;
+			public const int mesage_details_door = 2131231268;
 			
 			// aapt resource value: 0x7F080225
-			public const int message = 2131231269;
+			public const int mesage_details_gas = 2131231269;
 			
 			// aapt resource value: 0x7F080226
-			public const int message_a1_bg = 2131231270;
+			public const int mesage_details_hdd = 2131231270;
 			
 			// aapt resource value: 0x7F080227
-			public const int message_back = 2131231271;
+			public const int mesage_details_infrared = 2131231271;
 			
 			// aapt resource value: 0x7F080228
-			public const int message_back_sel = 2131231272;
+			public const int mesage_details_keyboard = 2131231272;
 			
 			// aapt resource value: 0x7F080229
-			public const int message_back_selector = 2131231273;
+			public const int mesage_details_loss = 2131231273;
 			
 			// aapt resource value: 0x7F08022A
-			public const int message_border_bg = 2131231274;
+			public const int mesage_details_low_battery = 2131231274;
 			
 			// aapt resource value: 0x7F08022B
-			public const int message_callhelp = 2131231275;
+			public const int mesage_details_offline = 2131231275;
 			
 			// aapt resource value: 0x7F08022C
-			public const int message_curtain = 2131231276;
+			public const int mesage_details_power = 2131231276;
 			
 			// aapt resource value: 0x7F08022D
-			public const int message_data = 2131231277;
+			public const int mesage_details_smoke = 2131231277;
 			
 			// aapt resource value: 0x7F08022E
-			public const int message_door = 2131231278;
+			public const int mesage_details_tampering = 2131231278;
 			
 			// aapt resource value: 0x7F08022F
-			public const int message_gas = 2131231279;
+			public const int mesage_details_video_loss = 2131231279;
 			
 			// aapt resource value: 0x7F080230
-			public const int message_hdd = 2131231280;
+			public const int mesage_details_water = 2131231280;
 			
 			// aapt resource value: 0x7F080231
-			public const int message_infrared = 2131231281;
+			public const int message = 2131231281;
 			
 			// aapt resource value: 0x7F080232
-			public const int message_item_bg_selector = 2131231282;
+			public const int message_a1_bg = 2131231282;
 			
 			// aapt resource value: 0x7F080233
-			public const int message_keyboard = 2131231283;
+			public const int message_back = 2131231283;
 			
 			// aapt resource value: 0x7F080234
-			public const int message_loss = 2131231284;
+			public const int message_back_sel = 2131231284;
 			
 			// aapt resource value: 0x7F080235
-			public const int message_low_battery = 2131231285;
+			public const int message_back_selector = 2131231285;
 			
 			// aapt resource value: 0x7F080236
-			public const int message_move_magnetometer = 2131231286;
+			public const int message_border_bg = 2131231286;
 			
 			// aapt resource value: 0x7F080237
-			public const int message_offline = 2131231287;
+			public const int message_callhelp = 2131231287;
 			
 			// aapt resource value: 0x7F080238
-			public const int message_play = 2131231288;
+			public const int message_curtain = 2131231288;
 			
 			// aapt resource value: 0x7F080239
-			public const int message_play_dis = 2131231289;
+			public const int message_data = 2131231289;
 			
 			// aapt resource value: 0x7F08023A
-			public const int message_play_sel = 2131231290;
+			public const int message_door = 2131231290;
 			
 			// aapt resource value: 0x7F08023B
-			public const int message_play_selector = 2131231291;
+			public const int message_gas = 2131231291;
 			
 			// aapt resource value: 0x7F08023C
-			public const int message_power = 2131231292;
+			public const int message_hdd = 2131231292;
 			
 			// aapt resource value: 0x7F08023D
-			public const int message_sel = 2131231293;
+			public const int message_infrared = 2131231293;
 			
 			// aapt resource value: 0x7F08023E
-			public const int message_smoke = 2131231294;
+			public const int message_item_bg_selector = 2131231294;
 			
 			// aapt resource value: 0x7F08023F
-			public const int message_tampering = 2131231295;
+			public const int message_keyboard = 2131231295;
 			
 			// aapt resource value: 0x7F080240
-			public const int message_video = 2131231296;
+			public const int message_loss = 2131231296;
 			
 			// aapt resource value: 0x7F080241
-			public const int message_video_dis = 2131231297;
+			public const int message_low_battery = 2131231297;
 			
 			// aapt resource value: 0x7F080242
-			public const int message_video_loss = 2131231298;
+			public const int message_move_magnetometer = 2131231298;
 			
 			// aapt resource value: 0x7F080243
-			public const int message_video_sel = 2131231299;
+			public const int message_offline = 2131231299;
 			
 			// aapt resource value: 0x7F080244
-			public const int message_video_selector = 2131231300;
+			public const int message_play = 2131231300;
 			
 			// aapt resource value: 0x7F080245
-			public const int message_water = 2131231301;
+			public const int message_play_dis = 2131231301;
 			
 			// aapt resource value: 0x7F080246
-			public const int mic = 2131231302;
+			public const int message_play_sel = 2131231302;
 			
 			// aapt resource value: 0x7F080247
-			public const int mm_trans = 2131231303;
+			public const int message_play_selector = 2131231303;
 			
 			// aapt resource value: 0x7F080248
-			public const int more = 2131231304;
+			public const int message_power = 2131231304;
 			
 			// aapt resource value: 0x7F080249
-			public const int my_5k_vr = 2131231305;
+			public const int message_sel = 2131231305;
 			
 			// aapt resource value: 0x7F08024A
-			public const int my_5k_vr116 = 2131231306;
+			public const int message_smoke = 2131231306;
 			
 			// aapt resource value: 0x7F08024B
-			public const int my_a1 = 2131231307;
+			public const int message_tampering = 2131231307;
 			
 			// aapt resource value: 0x7F08024C
-			public const int my_a1c = 2131231308;
+			public const int message_video = 2131231308;
 			
 			// aapt resource value: 0x7F08024D
-			public const int my_a1s = 2131231309;
+			public const int message_video_dis = 2131231309;
 			
 			// aapt resource value: 0x7F08024E
-			public const int my_add = 2131231310;
+			public const int message_video_loss = 2131231310;
 			
 			// aapt resource value: 0x7F08024F
-			public const int my_c6p = 2131231311;
+			public const int message_video_sel = 2131231311;
 			
 			// aapt resource value: 0x7F080250
-			public const int my_c6t = 2131231312;
+			public const int message_video_selector = 2131231312;
 			
 			// aapt resource value: 0x7F080251
-			public const int my_cover = 2131231313;
+			public const int message_water = 2131231313;
 			
 			// aapt resource value: 0x7F080252
-			public const int my_cover620 = 2131231314;
+			public const int mic = 2131231314;
 			
 			// aapt resource value: 0x7F080253
-			public const int my_db1 = 2131231315;
+			public const int mm_trans = 2131231315;
 			
 			// aapt resource value: 0x7F080254
-			public const int my_doorbell = 2131231316;
+			public const int more = 2131231316;
 			
 			// aapt resource value: 0x7F080255
-			public const int my_doorbell_hik = 2131231317;
+			public const int my_5k_vr = 2131231317;
 			
 			// aapt resource value: 0x7F080256
-			public const int my_n1 = 2131231318;
+			public const int my_5k_vr116 = 2131231318;
 			
 			// aapt resource value: 0x7F080257
-			public const int my_no_video = 2131231319;
+			public const int my_a1 = 2131231319;
 			
 			// aapt resource value: 0x7F080258
-			public const int my_progress_drawable = 2131231320;
+			public const int my_a1c = 2131231320;
 			
 			// aapt resource value: 0x7F080259
-			public const int my_r1 = 2131231321;
+			public const int my_a1s = 2131231321;
 			
 			// aapt resource value: 0x7F08025A
-			public const int my_r2 = 2131231322;
+			public const int my_add = 2131231322;
 			
 			// aapt resource value: 0x7F08025B
-			public const int my_shoping = 2131231323;
+			public const int my_c6p = 2131231323;
 			
 			// aapt resource value: 0x7F08025C
-			public const int my_switch_off = 2131231324;
+			public const int my_c6t = 2131231324;
 			
 			// aapt resource value: 0x7F08025D
-			public const int my_switch_on = 2131231325;
+			public const int my_cover = 2131231325;
 			
 			// aapt resource value: 0x7F08025E
-			public const int my_switch_selector = 2131231326;
+			public const int my_cover620 = 2131231326;
 			
 			// aapt resource value: 0x7F08025F
-			public const int my_vr104d = 2131231327;
+			public const int my_db1 = 2131231327;
 			
 			// aapt resource value: 0x7F080260
-			public const int my_w1 = 2131231328;
+			public const int my_doorbell = 2131231328;
 			
 			// aapt resource value: 0x7F080261
-			public const int my_w2d = 2131231329;
+			public const int my_doorbell_hik = 2131231329;
 			
 			// aapt resource value: 0x7F080262
-			public const int my_w2s = 2131231330;
+			public const int my_n1 = 2131231330;
 			
 			// aapt resource value: 0x7F080263
-			public const int my_w3 = 2131231331;
+			public const int my_no_video = 2131231331;
 			
 			// aapt resource value: 0x7F080264
-			public const int my_wlb = 2131231332;
+			public const int my_progress_drawable = 2131231332;
 			
 			// aapt resource value: 0x7F080265
-			public const int my_x1 = 2131231333;
+			public const int my_r1 = 2131231333;
 			
 			// aapt resource value: 0x7F080266
-			public const int my_x2 = 2131231334;
+			public const int my_r2 = 2131231334;
 			
 			// aapt resource value: 0x7F080267
-			public const int my_x3 = 2131231335;
+			public const int my_shoping = 2131231335;
 			
 			// aapt resource value: 0x7F080268
-			public const int my_x3c = 2131231336;
+			public const int my_switch_off = 2131231336;
 			
 			// aapt resource value: 0x7F080269
-			public const int my_x4 = 2131231337;
+			public const int my_switch_on = 2131231337;
 			
 			// aapt resource value: 0x7F08026A
-			public const int my_x5c = 2131231338;
+			public const int my_switch_selector = 2131231338;
 			
 			// aapt resource value: 0x7F08026B
-			public const int name_del = 2131231339;
+			public const int my_vr104d = 2131231339;
 			
 			// aapt resource value: 0x7F08026C
-			public const int name_del_sel = 2131231340;
+			public const int my_w1 = 2131231340;
 			
 			// aapt resource value: 0x7F08026D
-			public const int name_del_selector = 2131231341;
+			public const int my_w2d = 2131231341;
 			
 			// aapt resource value: 0x7F08026E
-			public const int navigation_empty_icon = 2131231342;
-			
-			// aapt resource value: 0x7F080271
-			public const int nomessage = 2131231345;
-			
-			// aapt resource value: 0x7F080272
-			public const int notification_action_background = 2131231346;
-			
-			// aapt resource value: 0x7F080273
-			public const int notification_bg = 2131231347;
-			
-			// aapt resource value: 0x7F080274
-			public const int notification_bg_low = 2131231348;
-			
-			// aapt resource value: 0x7F080275
-			public const int notification_bg_low_normal = 2131231349;
-			
-			// aapt resource value: 0x7F080276
-			public const int notification_bg_low_pressed = 2131231350;
-			
-			// aapt resource value: 0x7F080277
-			public const int notification_bg_normal = 2131231351;
-			
-			// aapt resource value: 0x7F080278
-			public const int notification_bg_normal_pressed = 2131231352;
-			
-			// aapt resource value: 0x7F080279
-			public const int notification_icon_background = 2131231353;
-			
-			// aapt resource value: 0x7F08027A
-			public const int notification_template_icon_bg = 2131231354;
-			
-			// aapt resource value: 0x7F08027B
-			public const int notification_template_icon_low_bg = 2131231355;
-			
-			// aapt resource value: 0x7F08027C
-			public const int notification_tile_bg = 2131231356;
-			
-			// aapt resource value: 0x7F08027D
-			public const int notify_bg = 2131231357;
-			
-			// aapt resource value: 0x7F08027E
-			public const int notify_panel_notification_icon_bg = 2131231358;
+			public const int my_w2s = 2131231342;
 			
 			// aapt resource value: 0x7F08026F
-			public const int no_message = 2131231343;
+			public const int my_w3 = 2131231343;
 			
 			// aapt resource value: 0x7F080270
-			public const int no_read = 2131231344;
+			public const int my_wlb = 2131231344;
+			
+			// aapt resource value: 0x7F080271
+			public const int my_x1 = 2131231345;
+			
+			// aapt resource value: 0x7F080272
+			public const int my_x2 = 2131231346;
+			
+			// aapt resource value: 0x7F080273
+			public const int my_x3 = 2131231347;
+			
+			// aapt resource value: 0x7F080274
+			public const int my_x3c = 2131231348;
+			
+			// aapt resource value: 0x7F080275
+			public const int my_x4 = 2131231349;
+			
+			// aapt resource value: 0x7F080276
+			public const int my_x5c = 2131231350;
+			
+			// aapt resource value: 0x7F080277
+			public const int name_del = 2131231351;
+			
+			// aapt resource value: 0x7F080278
+			public const int name_del_sel = 2131231352;
+			
+			// aapt resource value: 0x7F080279
+			public const int name_del_selector = 2131231353;
+			
+			// aapt resource value: 0x7F08027A
+			public const int navigation_empty_icon = 2131231354;
+			
+			// aapt resource value: 0x7F08027D
+			public const int nomessage = 2131231357;
+			
+			// aapt resource value: 0x7F08027E
+			public const int notification_action_background = 2131231358;
 			
 			// aapt resource value: 0x7F08027F
-			public const int number_bg = 2131231359;
+			public const int notification_bg = 2131231359;
 			
 			// aapt resource value: 0x7F080280
-			public const int offline = 2131231360;
+			public const int notification_bg_low = 2131231360;
 			
 			// aapt resource value: 0x7F080281
-			public const int open_cameralist_alarmlist_selector = 2131231361;
+			public const int notification_bg_low_normal = 2131231361;
 			
 			// aapt resource value: 0x7F080282
-			public const int open_cameralist_button_selector = 2131231362;
+			public const int notification_bg_low_pressed = 2131231362;
 			
 			// aapt resource value: 0x7F080283
-			public const int open_cameralist_remotepb_selector = 2131231363;
+			public const int notification_bg_normal = 2131231363;
 			
 			// aapt resource value: 0x7F080284
-			public const int open_cameralist_setup_selector = 2131231364;
+			public const int notification_bg_normal_pressed = 2131231364;
 			
 			// aapt resource value: 0x7F080285
-			public const int opinion = 2131231365;
+			public const int notification_icon_background = 2131231365;
 			
 			// aapt resource value: 0x7F080286
-			public const int palyback_alarm_icon2 = 2131231366;
+			public const int notification_template_icon_bg = 2131231366;
 			
 			// aapt resource value: 0x7F080287
-			public const int palyback_close = 2131231367;
+			public const int notification_template_icon_low_bg = 2131231367;
 			
 			// aapt resource value: 0x7F080288
-			public const int palyback_close_sel = 2131231368;
+			public const int notification_tile_bg = 2131231368;
 			
 			// aapt resource value: 0x7F080289
-			public const int palyback_close_selector = 2131231369;
+			public const int notify_bg = 2131231369;
 			
 			// aapt resource value: 0x7F08028A
-			public const int palyback_date_down = 2131231370;
+			public const int notify_panel_notification_icon_bg = 2131231370;
+			
+			// aapt resource value: 0x7F08027B
+			public const int no_message = 2131231355;
+			
+			// aapt resource value: 0x7F08027C
+			public const int no_read = 2131231356;
 			
 			// aapt resource value: 0x7F08028B
-			public const int palyback_date_down_sel = 2131231371;
+			public const int number_bg = 2131231371;
 			
 			// aapt resource value: 0x7F08028C
-			public const int palyback_full_down = 2131231372;
+			public const int offline = 2131231372;
 			
 			// aapt resource value: 0x7F08028D
-			public const int palyback_full_up = 2131231373;
+			public const int open_cameralist_alarmlist_selector = 2131231373;
 			
 			// aapt resource value: 0x7F08028E
-			public const int palyback_nest = 2131231374;
+			public const int open_cameralist_button_selector = 2131231374;
 			
 			// aapt resource value: 0x7F08028F
-			public const int palyback_pause = 2131231375;
+			public const int open_cameralist_remotepb_selector = 2131231375;
 			
 			// aapt resource value: 0x7F080290
-			public const int palyback_pause_sel = 2131231376;
+			public const int open_cameralist_setup_selector = 2131231376;
 			
 			// aapt resource value: 0x7F080291
-			public const int palyback_previously = 2131231377;
+			public const int opinion = 2131231377;
 			
 			// aapt resource value: 0x7F080292
-			public const int palyback_previously_sel = 2131231378;
+			public const int palyback_alarm_icon2 = 2131231378;
 			
 			// aapt resource value: 0x7F080293
-			public const int palyback_previously_selector = 2131231379;
+			public const int palyback_close = 2131231379;
 			
 			// aapt resource value: 0x7F080294
-			public const int palyback_replay = 2131231380;
+			public const int palyback_close_sel = 2131231380;
 			
 			// aapt resource value: 0x7F080295
-			public const int palyback_retry = 2131231381;
+			public const int palyback_close_selector = 2131231381;
 			
 			// aapt resource value: 0x7F080296
-			public const int palyback_time_bg = 2131231382;
+			public const int palyback_date_down = 2131231382;
 			
 			// aapt resource value: 0x7F080297
-			public const int palyback_video = 2131231383;
+			public const int palyback_date_down_sel = 2131231383;
 			
 			// aapt resource value: 0x7F080298
-			public const int palyback_video_now = 2131231384;
+			public const int palyback_full_down = 2131231384;
 			
 			// aapt resource value: 0x7F080299
-			public const int palyback_video_now_sel = 2131231385;
+			public const int palyback_full_up = 2131231385;
 			
 			// aapt resource value: 0x7F08029A
-			public const int palyback_video_now_selector = 2131231386;
+			public const int palyback_nest = 2131231386;
 			
 			// aapt resource value: 0x7F08029B
-			public const int palyback_video_sel = 2131231387;
+			public const int palyback_pause = 2131231387;
 			
 			// aapt resource value: 0x7F08029C
-			public const int palyback_video_selector = 2131231388;
+			public const int palyback_pause_sel = 2131231388;
 			
 			// aapt resource value: 0x7F08029D
-			public const int pause = 2131231389;
+			public const int palyback_previously = 2131231389;
 			
 			// aapt resource value: 0x7F08029E
-			public const int pause_sel = 2131231390;
+			public const int palyback_previously_sel = 2131231390;
 			
 			// aapt resource value: 0x7F08029F
-			public const int pic_bg = 2131231391;
+			public const int palyback_previously_selector = 2131231391;
 			
 			// aapt resource value: 0x7F0802A0
-			public const int play = 2131231392;
-			
-			// aapt resource value: 0x7F0802FF
-			public const int playback = 2131231487;
-			
-			// aapt resource value: 0x7F08030F
-			public const int playbackslider = 2131231503;
-			
-			// aapt resource value: 0x7F080310
-			public const int playbackslider_sel = 2131231504;
-			
-			// aapt resource value: 0x7F080300
-			public const int playback_button = 2131231488;
-			
-			// aapt resource value: 0x7F080301
-			public const int playback_cancel = 2131231489;
-			
-			// aapt resource value: 0x7F080302
-			public const int playback_check_selector = 2131231490;
-			
-			// aapt resource value: 0x7F080303
-			public const int playback_cover2 = 2131231491;
-			
-			// aapt resource value: 0x7F080304
-			public const int playback_cut = 2131231492;
-			
-			// aapt resource value: 0x7F080305
-			public const int playback_cut_btn_selector = 2131231493;
-			
-			// aapt resource value: 0x7F080306
-			public const int playback_cut_disable = 2131231494;
-			
-			// aapt resource value: 0x7F080307
-			public const int playback_cut_sel = 2131231495;
-			
-			// aapt resource value: 0x7F080308
-			public const int playback_matte = 2131231496;
-			
-			// aapt resource value: 0x7F080309
-			public const int playback_more_down = 2131231497;
-			
-			// aapt resource value: 0x7F08030A
-			public const int playback_more_down1 = 2131231498;
-			
-			// aapt resource value: 0x7F08030B
-			public const int playback_more_up1 = 2131231499;
-			
-			// aapt resource value: 0x7F08030C
-			public const int playback_play = 2131231500;
-			
-			// aapt resource value: 0x7F08030D
-			public const int playback_play_sel = 2131231501;
-			
-			// aapt resource value: 0x7F08030E
-			public const int playback_sel = 2131231502;
-			
-			// aapt resource value: 0x7F080311
-			public const int playbtn_selector = 2131231505;
+			public const int palyback_replay = 2131231392;
 			
 			// aapt resource value: 0x7F0802A1
-			public const int play_balanced = 2131231393;
+			public const int palyback_retry = 2131231393;
 			
 			// aapt resource value: 0x7F0802A2
-			public const int play_balanced_disabel = 2131231394;
+			public const int palyback_time_bg = 2131231394;
 			
 			// aapt resource value: 0x7F0802A3
-			public const int play_balanced_sel = 2131231395;
+			public const int palyback_video = 2131231395;
 			
 			// aapt resource value: 0x7F0802A4
-			public const int play_balanced_selector = 2131231396;
+			public const int palyback_video_now = 2131231396;
 			
 			// aapt resource value: 0x7F0802A5
-			public const int play_big = 2131231397;
-			
-			// aapt resource value: 0x7F0802A7
-			public const int play_bigbtn_selector = 2131231399;
+			public const int palyback_video_now_sel = 2131231397;
 			
 			// aapt resource value: 0x7F0802A6
-			public const int play_big_press = 2131231398;
+			public const int palyback_video_now_selector = 2131231398;
+			
+			// aapt resource value: 0x7F0802A7
+			public const int palyback_video_sel = 2131231399;
 			
 			// aapt resource value: 0x7F0802A8
-			public const int play_button_bg = 2131231400;
+			public const int palyback_video_selector = 2131231400;
 			
 			// aapt resource value: 0x7F0802A9
-			public const int play_button_sel = 2131231401;
+			public const int pause = 2131231401;
 			
 			// aapt resource value: 0x7F0802AA
-			public const int play_button_selector = 2131231402;
+			public const int pause_sel = 2131231402;
 			
 			// aapt resource value: 0x7F0802AB
-			public const int play_close = 2131231403;
+			public const int pic_bg = 2131231403;
 			
 			// aapt resource value: 0x7F0802AC
-			public const int play_close_sel = 2131231404;
+			public const int play = 2131231404;
 			
-			// aapt resource value: 0x7F0802AD
-			public const int play_close_selector = 2131231405;
-			
-			// aapt resource value: 0x7F0802AE
-			public const int play_disable = 2131231406;
-			
-			// aapt resource value: 0x7F0802AF
-			public const int play_flunet = 2131231407;
-			
-			// aapt resource value: 0x7F0802B0
-			public const int play_flunet_disabel = 2131231408;
-			
-			// aapt resource value: 0x7F0802B1
-			public const int play_flunet_sel = 2131231409;
-			
-			// aapt resource value: 0x7F0802B2
-			public const int play_flunet_selector = 2131231410;
-			
-			// aapt resource value: 0x7F0802B3
-			public const int play_full_loding_logo = 2131231411;
-			
-			// aapt resource value: 0x7F0802B4
-			public const int play_full_multiple = 2131231412;
-			
-			// aapt resource value: 0x7F0802B5
-			public const int play_full_multiple2 = 2131231413;
-			
-			// aapt resource value: 0x7F0802B6
-			public const int play_full_multiple3 = 2131231414;
-			
-			// aapt resource value: 0x7F0802B7
-			public const int play_full_multiple4 = 2131231415;
-			
-			// aapt resource value: 0x7F0802B8
-			public const int play_full_multiple5 = 2131231416;
-			
-			// aapt resource value: 0x7F0802B9
-			public const int play_full_pause = 2131231417;
-			
-			// aapt resource value: 0x7F0802BA
-			public const int play_full_pause_sel = 2131231418;
-			
-			// aapt resource value: 0x7F0802BB
-			public const int play_full_pause_selector = 2131231419;
-			
-			// aapt resource value: 0x7F0802BC
-			public const int play_full_play = 2131231420;
-			
-			// aapt resource value: 0x7F0802BD
-			public const int play_full_play_sel = 2131231421;
-			
-			// aapt resource value: 0x7F0802BE
-			public const int play_full_play_selector = 2131231422;
-			
-			// aapt resource value: 0x7F0802BF
-			public const int play_full_previously = 2131231423;
-			
-			// aapt resource value: 0x7F0802C0
-			public const int play_full_previously_sel = 2131231424;
-			
-			// aapt resource value: 0x7F0802C1
-			public const int play_full_previously_selector = 2131231425;
-			
-			// aapt resource value: 0x7F0802C2
-			public const int play_full_ptz_selector = 2131231426;
-			
-			// aapt resource value: 0x7F0802C3
-			public const int play_full_quality_color_selector = 2131231427;
-			
-			// aapt resource value: 0x7F0802C4
-			public const int play_full_quality_selector = 2131231428;
-			
-			// aapt resource value: 0x7F0802C5
-			public const int play_full_soundoff_btn_selector = 2131231429;
-			
-			// aapt resource value: 0x7F0802C6
-			public const int play_full_soundon_btn_selector = 2131231430;
-			
-			// aapt resource value: 0x7F0802C7
-			public const int play_full_stop = 2131231431;
-			
-			// aapt resource value: 0x7F0802C8
-			public const int play_full_stop_sel = 2131231432;
-			
-			// aapt resource value: 0x7F0802C9
-			public const int play_full_stop_selector = 2131231433;
-			
-			// aapt resource value: 0x7F0802CA
-			public const int play_full_talk_selector = 2131231434;
-			
-			// aapt resource value: 0x7F0802CB
-			public const int play_full_video = 2131231435;
-			
-			// aapt resource value: 0x7F0802CC
-			public const int play_full_video_now = 2131231436;
-			
-			// aapt resource value: 0x7F0802CD
-			public const int play_full_video_now_sel = 2131231437;
-			
-			// aapt resource value: 0x7F0802CE
-			public const int play_full_video_now_selector = 2131231438;
-			
-			// aapt resource value: 0x7F0802CF
-			public const int play_full_video_sel = 2131231439;
-			
-			// aapt resource value: 0x7F0802D0
-			public const int play_full_video_selector = 2131231440;
-			
-			// aapt resource value: 0x7F0802D1
-			public const int play_hd = 2131231441;
-			
-			// aapt resource value: 0x7F0802D2
-			public const int play_hd_disabel = 2131231442;
-			
-			// aapt resource value: 0x7F0802D3
-			public const int play_hd_sel = 2131231443;
-			
-			// aapt resource value: 0x7F0802D4
-			public const int play_hd_selector = 2131231444;
-			
-			// aapt resource value: 0x7F0802D5
-			public const int play_play = 2131231445;
-			
-			// aapt resource value: 0x7F0802D6
-			public const int play_play_dis = 2131231446;
-			
-			// aapt resource value: 0x7F0802D7
-			public const int play_play_sel = 2131231447;
-			
-			// aapt resource value: 0x7F0802D8
-			public const int play_play_selector = 2131231448;
-			
-			// aapt resource value: 0x7F0802D9
-			public const int play_press = 2131231449;
-			
-			// aapt resource value: 0x7F0802DA
-			public const int play_previously = 2131231450;
-			
-			// aapt resource value: 0x7F0802DB
-			public const int play_previously_dis = 2131231451;
-			
-			// aapt resource value: 0x7F0802DC
-			public const int play_previously_sel = 2131231452;
-			
-			// aapt resource value: 0x7F0802DD
-			public const int play_previously_selector = 2131231453;
-			
-			// aapt resource value: 0x7F0802DE
-			public const int play_privacy_selector = 2131231454;
-			
-			// aapt resource value: 0x7F0802DF
-			public const int play_ptz = 2131231455;
-			
-			// aapt resource value: 0x7F0802E0
-			public const int play_ptz_dis = 2131231456;
-			
-			// aapt resource value: 0x7F0802E1
-			public const int play_ptz_sel = 2131231457;
-			
-			// aapt resource value: 0x7F0802E2
-			public const int play_ptz_selector = 2131231458;
-			
-			// aapt resource value: 0x7F0802E3
-			public const int play_small = 2131231459;
-			
-			// aapt resource value: 0x7F0802E5
-			public const int play_smallbtn_selector = 2131231461;
-			
-			// aapt resource value: 0x7F0802E4
-			public const int play_small_press = 2131231460;
-			
-			// aapt resource value: 0x7F0802E6
-			public const int play_speech = 2131231462;
-			
-			// aapt resource value: 0x7F0802E7
-			public const int play_speech_dis = 2131231463;
-			
-			// aapt resource value: 0x7F0802E8
-			public const int play_speech_sel = 2131231464;
-			
-			// aapt resource value: 0x7F0802E9
-			public const int play_speech_selector = 2131231465;
-			
-			// aapt resource value: 0x7F0802EA
-			public const int play_stop = 2131231466;
-			
-			// aapt resource value: 0x7F0802EB
-			public const int play_stop_sel = 2131231467;
-			
-			// aapt resource value: 0x7F0802EC
-			public const int play_stop_selector = 2131231468;
-			
-			// aapt resource value: 0x7F0802ED
-			public const int play_talk = 2131231469;
-			
-			// aapt resource value: 0x7F0802F1
-			public const int play_talkback = 2131231473;
-			
-			// aapt resource value: 0x7F0802F2
-			public const int play_talkback_sel = 2131231474;
-			
-			// aapt resource value: 0x7F0802F3
-			public const int play_talkback_selector = 2131231475;
-			
-			// aapt resource value: 0x7F0802EE
-			public const int play_talk_dis = 2131231470;
-			
-			// aapt resource value: 0x7F0802EF
-			public const int play_talk_sel = 2131231471;
-			
-			// aapt resource value: 0x7F0802F0
-			public const int play_talk_selector = 2131231472;
-			
-			// aapt resource value: 0x7F0802F4
-			public const int play_video = 2131231476;
-			
-			// aapt resource value: 0x7F0802F5
-			public const int play_video_dis = 2131231477;
-			
-			// aapt resource value: 0x7F0802F6
-			public const int play_video_record = 2131231478;
-			
-			// aapt resource value: 0x7F0802F7
-			public const int play_video_sel = 2131231479;
-			
-			// aapt resource value: 0x7F0802F8
-			public const int play_video_selector = 2131231480;
-			
-			// aapt resource value: 0x7F0802F9
-			public const int play_video_start = 2131231481;
-			
-			// aapt resource value: 0x7F0802FA
-			public const int play_video_time_bg = 2131231482;
-			
-			// aapt resource value: 0x7F0802FB
-			public const int play_voice = 2131231483;
-			
-			// aapt resource value: 0x7F0802FC
-			public const int play_voice_dis = 2131231484;
-			
-			// aapt resource value: 0x7F0802FD
-			public const int play_voice_sel = 2131231485;
-			
-			// aapt resource value: 0x7F0802FE
-			public const int play_voice_selector = 2131231486;
-			
-			// aapt resource value: 0x7F080312
-			public const int popdialogbg = 2131231506;
-			
-			// aapt resource value: 0x7F080313
-			public const int prepare_device = 2131231507;
-			
-			// aapt resource value: 0x7F080314
-			public const int preview_close1_video_ico = 2131231508;
-			
-			// aapt resource value: 0x7F080315
-			public const int preview_close_video = 2131231509;
-			
-			// aapt resource value: 0x7F080316
-			public const int preview_close_video_dis = 2131231510;
-			
-			// aapt resource value: 0x7F080317
-			public const int preview_close_video_sel = 2131231511;
-			
-			// aapt resource value: 0x7F080318
-			public const int preview_down_bg_normal = 2131231512;
-			
-			// aapt resource value: 0x7F080319
-			public const int preview_down_bg_pressed = 2131231513;
-			
-			// aapt resource value: 0x7F08031A
-			public const int preview_down_ico = 2131231514;
+			// aapt resource value: 0x7F08030B
+			public const int playback = 2131231499;
 			
 			// aapt resource value: 0x7F08031B
-			public const int preview_down_selector = 2131231515;
+			public const int playbackslider = 2131231515;
 			
 			// aapt resource value: 0x7F08031C
-			public const int preview_enlarge = 2131231516;
+			public const int playbackslider_sel = 2131231516;
+			
+			// aapt resource value: 0x7F08030C
+			public const int playback_button = 2131231500;
+			
+			// aapt resource value: 0x7F08030D
+			public const int playback_cancel = 2131231501;
+			
+			// aapt resource value: 0x7F08030E
+			public const int playback_check_selector = 2131231502;
+			
+			// aapt resource value: 0x7F08030F
+			public const int playback_cover2 = 2131231503;
+			
+			// aapt resource value: 0x7F080310
+			public const int playback_cut = 2131231504;
+			
+			// aapt resource value: 0x7F080311
+			public const int playback_cut_btn_selector = 2131231505;
+			
+			// aapt resource value: 0x7F080312
+			public const int playback_cut_disable = 2131231506;
+			
+			// aapt resource value: 0x7F080313
+			public const int playback_cut_sel = 2131231507;
+			
+			// aapt resource value: 0x7F080314
+			public const int playback_matte = 2131231508;
+			
+			// aapt resource value: 0x7F080315
+			public const int playback_more_down = 2131231509;
+			
+			// aapt resource value: 0x7F080316
+			public const int playback_more_down1 = 2131231510;
+			
+			// aapt resource value: 0x7F080317
+			public const int playback_more_up1 = 2131231511;
+			
+			// aapt resource value: 0x7F080318
+			public const int playback_play = 2131231512;
+			
+			// aapt resource value: 0x7F080319
+			public const int playback_play_sel = 2131231513;
+			
+			// aapt resource value: 0x7F08031A
+			public const int playback_sel = 2131231514;
 			
 			// aapt resource value: 0x7F08031D
-			public const int preview_enlarge_btn_sel = 2131231517;
+			public const int playbtn_selector = 2131231517;
+			
+			// aapt resource value: 0x7F0802AD
+			public const int play_balanced = 2131231405;
+			
+			// aapt resource value: 0x7F0802AE
+			public const int play_balanced_disabel = 2131231406;
+			
+			// aapt resource value: 0x7F0802AF
+			public const int play_balanced_sel = 2131231407;
+			
+			// aapt resource value: 0x7F0802B0
+			public const int play_balanced_selector = 2131231408;
+			
+			// aapt resource value: 0x7F0802B1
+			public const int play_big = 2131231409;
+			
+			// aapt resource value: 0x7F0802B3
+			public const int play_bigbtn_selector = 2131231411;
+			
+			// aapt resource value: 0x7F0802B2
+			public const int play_big_press = 2131231410;
+			
+			// aapt resource value: 0x7F0802B4
+			public const int play_button_bg = 2131231412;
+			
+			// aapt resource value: 0x7F0802B5
+			public const int play_button_sel = 2131231413;
+			
+			// aapt resource value: 0x7F0802B6
+			public const int play_button_selector = 2131231414;
+			
+			// aapt resource value: 0x7F0802B7
+			public const int play_close = 2131231415;
+			
+			// aapt resource value: 0x7F0802B8
+			public const int play_close_sel = 2131231416;
+			
+			// aapt resource value: 0x7F0802B9
+			public const int play_close_selector = 2131231417;
+			
+			// aapt resource value: 0x7F0802BA
+			public const int play_disable = 2131231418;
+			
+			// aapt resource value: 0x7F0802BB
+			public const int play_flunet = 2131231419;
+			
+			// aapt resource value: 0x7F0802BC
+			public const int play_flunet_disabel = 2131231420;
+			
+			// aapt resource value: 0x7F0802BD
+			public const int play_flunet_sel = 2131231421;
+			
+			// aapt resource value: 0x7F0802BE
+			public const int play_flunet_selector = 2131231422;
+			
+			// aapt resource value: 0x7F0802BF
+			public const int play_full_loding_logo = 2131231423;
+			
+			// aapt resource value: 0x7F0802C0
+			public const int play_full_multiple = 2131231424;
+			
+			// aapt resource value: 0x7F0802C1
+			public const int play_full_multiple2 = 2131231425;
+			
+			// aapt resource value: 0x7F0802C2
+			public const int play_full_multiple3 = 2131231426;
+			
+			// aapt resource value: 0x7F0802C3
+			public const int play_full_multiple4 = 2131231427;
+			
+			// aapt resource value: 0x7F0802C4
+			public const int play_full_multiple5 = 2131231428;
+			
+			// aapt resource value: 0x7F0802C5
+			public const int play_full_pause = 2131231429;
+			
+			// aapt resource value: 0x7F0802C6
+			public const int play_full_pause_sel = 2131231430;
+			
+			// aapt resource value: 0x7F0802C7
+			public const int play_full_pause_selector = 2131231431;
+			
+			// aapt resource value: 0x7F0802C8
+			public const int play_full_play = 2131231432;
+			
+			// aapt resource value: 0x7F0802C9
+			public const int play_full_play_sel = 2131231433;
+			
+			// aapt resource value: 0x7F0802CA
+			public const int play_full_play_selector = 2131231434;
+			
+			// aapt resource value: 0x7F0802CB
+			public const int play_full_previously = 2131231435;
+			
+			// aapt resource value: 0x7F0802CC
+			public const int play_full_previously_sel = 2131231436;
+			
+			// aapt resource value: 0x7F0802CD
+			public const int play_full_previously_selector = 2131231437;
+			
+			// aapt resource value: 0x7F0802CE
+			public const int play_full_ptz_selector = 2131231438;
+			
+			// aapt resource value: 0x7F0802CF
+			public const int play_full_quality_color_selector = 2131231439;
+			
+			// aapt resource value: 0x7F0802D0
+			public const int play_full_quality_selector = 2131231440;
+			
+			// aapt resource value: 0x7F0802D1
+			public const int play_full_soundoff_btn_selector = 2131231441;
+			
+			// aapt resource value: 0x7F0802D2
+			public const int play_full_soundon_btn_selector = 2131231442;
+			
+			// aapt resource value: 0x7F0802D3
+			public const int play_full_stop = 2131231443;
+			
+			// aapt resource value: 0x7F0802D4
+			public const int play_full_stop_sel = 2131231444;
+			
+			// aapt resource value: 0x7F0802D5
+			public const int play_full_stop_selector = 2131231445;
+			
+			// aapt resource value: 0x7F0802D6
+			public const int play_full_talk_selector = 2131231446;
+			
+			// aapt resource value: 0x7F0802D7
+			public const int play_full_video = 2131231447;
+			
+			// aapt resource value: 0x7F0802D8
+			public const int play_full_video_now = 2131231448;
+			
+			// aapt resource value: 0x7F0802D9
+			public const int play_full_video_now_sel = 2131231449;
+			
+			// aapt resource value: 0x7F0802DA
+			public const int play_full_video_now_selector = 2131231450;
+			
+			// aapt resource value: 0x7F0802DB
+			public const int play_full_video_sel = 2131231451;
+			
+			// aapt resource value: 0x7F0802DC
+			public const int play_full_video_selector = 2131231452;
+			
+			// aapt resource value: 0x7F0802DD
+			public const int play_hd = 2131231453;
+			
+			// aapt resource value: 0x7F0802DE
+			public const int play_hd_disabel = 2131231454;
+			
+			// aapt resource value: 0x7F0802DF
+			public const int play_hd_sel = 2131231455;
+			
+			// aapt resource value: 0x7F0802E0
+			public const int play_hd_selector = 2131231456;
+			
+			// aapt resource value: 0x7F0802E1
+			public const int play_play = 2131231457;
+			
+			// aapt resource value: 0x7F0802E2
+			public const int play_play_dis = 2131231458;
+			
+			// aapt resource value: 0x7F0802E3
+			public const int play_play_sel = 2131231459;
+			
+			// aapt resource value: 0x7F0802E4
+			public const int play_play_selector = 2131231460;
+			
+			// aapt resource value: 0x7F0802E5
+			public const int play_press = 2131231461;
+			
+			// aapt resource value: 0x7F0802E6
+			public const int play_previously = 2131231462;
+			
+			// aapt resource value: 0x7F0802E7
+			public const int play_previously_dis = 2131231463;
+			
+			// aapt resource value: 0x7F0802E8
+			public const int play_previously_sel = 2131231464;
+			
+			// aapt resource value: 0x7F0802E9
+			public const int play_previously_selector = 2131231465;
+			
+			// aapt resource value: 0x7F0802EA
+			public const int play_privacy_selector = 2131231466;
+			
+			// aapt resource value: 0x7F0802EB
+			public const int play_ptz = 2131231467;
+			
+			// aapt resource value: 0x7F0802EC
+			public const int play_ptz_dis = 2131231468;
+			
+			// aapt resource value: 0x7F0802ED
+			public const int play_ptz_sel = 2131231469;
+			
+			// aapt resource value: 0x7F0802EE
+			public const int play_ptz_selector = 2131231470;
+			
+			// aapt resource value: 0x7F0802EF
+			public const int play_small = 2131231471;
+			
+			// aapt resource value: 0x7F0802F1
+			public const int play_smallbtn_selector = 2131231473;
+			
+			// aapt resource value: 0x7F0802F0
+			public const int play_small_press = 2131231472;
+			
+			// aapt resource value: 0x7F0802F2
+			public const int play_speech = 2131231474;
+			
+			// aapt resource value: 0x7F0802F3
+			public const int play_speech_dis = 2131231475;
+			
+			// aapt resource value: 0x7F0802F4
+			public const int play_speech_sel = 2131231476;
+			
+			// aapt resource value: 0x7F0802F5
+			public const int play_speech_selector = 2131231477;
+			
+			// aapt resource value: 0x7F0802F6
+			public const int play_stop = 2131231478;
+			
+			// aapt resource value: 0x7F0802F7
+			public const int play_stop_sel = 2131231479;
+			
+			// aapt resource value: 0x7F0802F8
+			public const int play_stop_selector = 2131231480;
+			
+			// aapt resource value: 0x7F0802F9
+			public const int play_talk = 2131231481;
+			
+			// aapt resource value: 0x7F0802FD
+			public const int play_talkback = 2131231485;
+			
+			// aapt resource value: 0x7F0802FE
+			public const int play_talkback_sel = 2131231486;
+			
+			// aapt resource value: 0x7F0802FF
+			public const int play_talkback_selector = 2131231487;
+			
+			// aapt resource value: 0x7F0802FA
+			public const int play_talk_dis = 2131231482;
+			
+			// aapt resource value: 0x7F0802FB
+			public const int play_talk_sel = 2131231483;
+			
+			// aapt resource value: 0x7F0802FC
+			public const int play_talk_selector = 2131231484;
+			
+			// aapt resource value: 0x7F080300
+			public const int play_video = 2131231488;
+			
+			// aapt resource value: 0x7F080301
+			public const int play_video_dis = 2131231489;
+			
+			// aapt resource value: 0x7F080302
+			public const int play_video_record = 2131231490;
+			
+			// aapt resource value: 0x7F080303
+			public const int play_video_sel = 2131231491;
+			
+			// aapt resource value: 0x7F080304
+			public const int play_video_selector = 2131231492;
+			
+			// aapt resource value: 0x7F080305
+			public const int play_video_start = 2131231493;
+			
+			// aapt resource value: 0x7F080306
+			public const int play_video_time_bg = 2131231494;
+			
+			// aapt resource value: 0x7F080307
+			public const int play_voice = 2131231495;
+			
+			// aapt resource value: 0x7F080308
+			public const int play_voice_dis = 2131231496;
+			
+			// aapt resource value: 0x7F080309
+			public const int play_voice_sel = 2131231497;
+			
+			// aapt resource value: 0x7F08030A
+			public const int play_voice_selector = 2131231498;
 			
 			// aapt resource value: 0x7F08031E
-			public const int preview_enlarge_dis = 2131231518;
+			public const int popdialogbg = 2131231518;
 			
 			// aapt resource value: 0x7F08031F
-			public const int preview_enlarge_selector = 2131231519;
+			public const int prepare_device = 2131231519;
 			
 			// aapt resource value: 0x7F080320
-			public const int preview_play_btn = 2131231520;
+			public const int preview_close1_video_ico = 2131231520;
 			
 			// aapt resource value: 0x7F080321
-			public const int preview_play_btn_dis = 2131231521;
+			public const int preview_close_video = 2131231521;
 			
 			// aapt resource value: 0x7F080322
-			public const int preview_play_btn_sel = 2131231522;
+			public const int preview_close_video_dis = 2131231522;
 			
 			// aapt resource value: 0x7F080323
-			public const int preview_recording = 2131231523;
+			public const int preview_close_video_sel = 2131231523;
 			
 			// aapt resource value: 0x7F080324
-			public const int preview_recording_dis = 2131231524;
+			public const int preview_down_bg_normal = 2131231524;
 			
 			// aapt resource value: 0x7F080325
-			public const int preview_recording_sel = 2131231525;
+			public const int preview_down_bg_pressed = 2131231525;
 			
 			// aapt resource value: 0x7F080326
-			public const int preview_selection_bg = 2131231526;
+			public const int preview_down_ico = 2131231526;
 			
 			// aapt resource value: 0x7F080327
-			public const int preview_stopplay_btn_dis = 2131231527;
+			public const int preview_down_selector = 2131231527;
 			
 			// aapt resource value: 0x7F080328
-			public const int preview_unvoice_btn = 2131231528;
+			public const int preview_enlarge = 2131231528;
 			
 			// aapt resource value: 0x7F080329
-			public const int preview_unvoice_btn_sel = 2131231529;
+			public const int preview_enlarge_btn_sel = 2131231529;
 			
 			// aapt resource value: 0x7F08032A
-			public const int preview_video_selection = 2131231530;
+			public const int preview_enlarge_dis = 2131231530;
 			
 			// aapt resource value: 0x7F08032B
-			public const int preview_video_selection_hover = 2131231531;
+			public const int preview_enlarge_selector = 2131231531;
 			
 			// aapt resource value: 0x7F08032C
-			public const int preview_voice_btn = 2131231532;
+			public const int preview_play_btn = 2131231532;
 			
 			// aapt resource value: 0x7F08032D
-			public const int preview_voice_btn_dis = 2131231533;
+			public const int preview_play_btn_dis = 2131231533;
 			
 			// aapt resource value: 0x7F08032E
-			public const int preview_voice_btn_sel = 2131231534;
+			public const int preview_play_btn_sel = 2131231534;
 			
 			// aapt resource value: 0x7F08032F
-			public const int previously = 2131231535;
+			public const int preview_recording = 2131231535;
 			
 			// aapt resource value: 0x7F080330
-			public const int previously_dis = 2131231536;
+			public const int preview_recording_dis = 2131231536;
 			
 			// aapt resource value: 0x7F080331
-			public const int previously_sel = 2131231537;
+			public const int preview_recording_sel = 2131231537;
 			
 			// aapt resource value: 0x7F080332
-			public const int ptz_bg = 2131231538;
+			public const int preview_selection_bg = 2131231538;
 			
 			// aapt resource value: 0x7F080333
-			public const int ptz_bottom_limit = 2131231539;
+			public const int preview_stopplay_btn_dis = 2131231539;
 			
 			// aapt resource value: 0x7F080334
-			public const int ptz_bottom_sel = 2131231540;
+			public const int preview_unvoice_btn = 2131231540;
 			
 			// aapt resource value: 0x7F080335
-			public const int ptz_left_limit = 2131231541;
+			public const int preview_unvoice_btn_sel = 2131231541;
 			
 			// aapt resource value: 0x7F080336
-			public const int ptz_left_sel = 2131231542;
+			public const int preview_video_selection = 2131231542;
 			
 			// aapt resource value: 0x7F080337
-			public const int ptz_prompt = 2131231543;
+			public const int preview_video_selection_hover = 2131231543;
 			
 			// aapt resource value: 0x7F080338
-			public const int ptz_right_limit = 2131231544;
+			public const int preview_voice_btn = 2131231544;
 			
 			// aapt resource value: 0x7F080339
-			public const int ptz_right_sel = 2131231545;
+			public const int preview_voice_btn_dis = 2131231545;
 			
 			// aapt resource value: 0x7F08033A
-			public const int ptz_top_limit = 2131231546;
+			public const int preview_voice_btn_sel = 2131231546;
 			
 			// aapt resource value: 0x7F08033B
-			public const int ptz_turn = 2131231547;
+			public const int previously = 2131231547;
 			
 			// aapt resource value: 0x7F08033C
-			public const int ptz_turn_sel = 2131231548;
+			public const int previously_dis = 2131231548;
 			
 			// aapt resource value: 0x7F08033D
-			public const int ptz_turn_selector = 2131231549;
+			public const int previously_sel = 2131231549;
 			
 			// aapt resource value: 0x7F08033E
-			public const int ptz_up_sel = 2131231550;
+			public const int ptz_bg = 2131231550;
 			
 			// aapt resource value: 0x7F08033F
-			public const int push_close = 2131231551;
+			public const int ptz_bottom_limit = 2131231551;
 			
 			// aapt resource value: 0x7F080340
-			public const int push_close_sel = 2131231552;
+			public const int ptz_bottom_sel = 2131231552;
 			
 			// aapt resource value: 0x7F080341
-			public const int push_close_selector = 2131231553;
+			public const int ptz_left_limit = 2131231553;
 			
 			// aapt resource value: 0x7F080342
-			public const int put_ico = 2131231554;
+			public const int ptz_left_sel = 2131231554;
 			
 			// aapt resource value: 0x7F080343
-			public const int query_loding1 = 2131231555;
+			public const int ptz_prompt = 2131231555;
 			
 			// aapt resource value: 0x7F080344
-			public const int query_loding2 = 2131231556;
+			public const int ptz_right_limit = 2131231556;
 			
 			// aapt resource value: 0x7F080345
-			public const int query_loding3 = 2131231557;
+			public const int ptz_right_sel = 2131231557;
 			
 			// aapt resource value: 0x7F080346
-			public const int query_loding4 = 2131231558;
+			public const int ptz_top_limit = 2131231558;
 			
 			// aapt resource value: 0x7F080347
-			public const int query_loding5 = 2131231559;
+			public const int ptz_turn = 2131231559;
 			
 			// aapt resource value: 0x7F080348
-			public const int radius_rect_bg_qq_group = 2131231560;
+			public const int ptz_turn_sel = 2131231560;
 			
 			// aapt resource value: 0x7F080349
-			public const int read_button = 2131231561;
+			public const int ptz_turn_selector = 2131231561;
 			
 			// aapt resource value: 0x7F08034A
-			public const int read_button_sel = 2131231562;
+			public const int ptz_up_sel = 2131231562;
 			
 			// aapt resource value: 0x7F08034B
-			public const int read_button_selector = 2131231563;
+			public const int push_close = 2131231563;
 			
 			// aapt resource value: 0x7F08034C
-			public const int refresh_selector = 2131231564;
+			public const int push_close_sel = 2131231564;
 			
 			// aapt resource value: 0x7F08034D
-			public const int register_server_bg = 2131231565;
+			public const int push_close_selector = 2131231565;
 			
 			// aapt resource value: 0x7F08034E
-			public const int remote_cal_selector = 2131231566;
+			public const int put_ico = 2131231566;
 			
 			// aapt resource value: 0x7F08034F
-			public const int remote_exit_btn_selector = 2131231567;
+			public const int query_loding1 = 2131231567;
 			
 			// aapt resource value: 0x7F080350
-			public const int remote_list_pause_btn_selector = 2131231568;
+			public const int query_loding2 = 2131231568;
 			
 			// aapt resource value: 0x7F080351
-			public const int remote_list_play_btn_selector = 2131231569;
+			public const int query_loding3 = 2131231569;
 			
 			// aapt resource value: 0x7F080352
-			public const int remote_list_soundoff_btn_selector = 2131231570;
+			public const int query_loding4 = 2131231570;
 			
 			// aapt resource value: 0x7F080353
-			public const int remote_list_soundon_btn_selector = 2131231571;
+			public const int query_loding5 = 2131231571;
 			
 			// aapt resource value: 0x7F080354
-			public const int remote_play = 2131231572;
+			public const int radius_rect_bg_qq_group = 2131231572;
 			
 			// aapt resource value: 0x7F080355
-			public const int remote_play_sel = 2131231573;
+			public const int read_button = 2131231573;
 			
 			// aapt resource value: 0x7F080356
-			public const int remote_seekbar_style = 2131231574;
+			public const int read_button_sel = 2131231574;
 			
 			// aapt resource value: 0x7F080357
-			public const int remote_seekbar_thumb = 2131231575;
+			public const int read_button_selector = 2131231575;
 			
 			// aapt resource value: 0x7F080358
-			public const int reset_deivce = 2131231576;
-			
-			// aapt resource value: 0x7F080365
-			public const int results_4_dvr = 2131231589;
-			
-			// aapt resource value: 0x7F080366
-			public const int results_8_16_nvr = 2131231590;
-			
-			// aapt resource value: 0x7F080367
-			public const int results_8_nvr = 2131231591;
-			
-			// aapt resource value: 0x7F080368
-			public const int results_c6p = 2131231592;
-			
-			// aapt resource value: 0x7F080369
-			public const int results_mini_360_plus = 2131231593;
-			
-			// aapt resource value: 0x7F08036A
-			public const int results_mini_trooper = 2131231594;
-			
-			// aapt resource value: 0x7F08036B
-			public const int results_pic_a1 = 2131231595;
-			
-			// aapt resource value: 0x7F08036C
-			public const int results_pic_a1c = 2131231596;
-			
-			// aapt resource value: 0x7F08036D
-			public const int results_pic_a1s = 2131231597;
-			
-			// aapt resource value: 0x7F08036E
-			public const int results_pic_baidu_c2s = 2131231598;
-			
-			// aapt resource value: 0x7F08036F
-			public const int results_pic_bg = 2131231599;
-			
-			// aapt resource value: 0x7F080370
-			public const int results_pic_c1 = 2131231600;
-			
-			// aapt resource value: 0x7F080371
-			public const int results_pic_c2 = 2131231601;
-			
-			// aapt resource value: 0x7F080374
-			public const int results_pic_c2c = 2131231604;
-			
-			// aapt resource value: 0x7F080375
-			public const int results_pic_c2mini = 2131231605;
-			
-			// aapt resource value: 0x7F080376
-			public const int results_pic_c2mini2 = 2131231606;
-			
-			// aapt resource value: 0x7F080377
-			public const int results_pic_c2plus = 2131231607;
-			
-			// aapt resource value: 0x7F080378
-			public const int results_pic_c2s = 2131231608;
-			
-			// aapt resource value: 0x7F080379
-			public const int results_pic_c2w = 2131231609;
-			
-			// aapt resource value: 0x7F080372
-			public const int results_pic_c2_2 = 2131231602;
-			
-			// aapt resource value: 0x7F080373
-			public const int results_pic_c2_usa = 2131231603;
-			
-			// aapt resource value: 0x7F08037A
-			public const int results_pic_c3 = 2131231610;
-			
-			// aapt resource value: 0x7F08037B
-			public const int results_pic_c3c = 2131231611;
-			
-			// aapt resource value: 0x7F08037C
-			public const int results_pic_c3e = 2131231612;
-			
-			// aapt resource value: 0x7F08037D
-			public const int results_pic_c3s = 2131231613;
-			
-			// aapt resource value: 0x7F08037E
-			public const int results_pic_c4 = 2131231614;
-			
-			// aapt resource value: 0x7F08037F
-			public const int results_pic_c4c = 2131231615;
-			
-			// aapt resource value: 0x7F080380
-			public const int results_pic_c4e = 2131231616;
-			
-			// aapt resource value: 0x7F080381
-			public const int results_pic_c4s = 2131231617;
-			
-			// aapt resource value: 0x7F080382
-			public const int results_pic_c6 = 2131231618;
-			
-			// aapt resource value: 0x7F080383
-			public const int results_pic_c6c = 2131231619;
-			
-			// aapt resource value: 0x7F080384
-			public const int results_pic_c6c_1 = 2131231620;
-			
-			// aapt resource value: 0x7F080385
-			public const int results_pic_c6c_2 = 2131231621;
-			
-			// aapt resource value: 0x7F080386
-			public const int results_pic_c6h = 2131231622;
-			
-			// aapt resource value: 0x7F080387
-			public const int results_pic_co2 = 2131231623;
-			
-			// aapt resource value: 0x7F080388
-			public const int results_pic_d1 = 2131231624;
-			
-			// aapt resource value: 0x7F080389
-			public const int results_pic_default = 2131231625;
-			
-			// aapt resource value: 0x7F08038A
-			public const int results_pic_f1 = 2131231626;
-			
-			// aapt resource value: 0x7F08038B
-			public const int results_pic_h2c = 2131231627;
-			
-			// aapt resource value: 0x7F08038C
-			public const int results_pic_h2s = 2131231628;
-			
-			// aapt resource value: 0x7F08038D
-			public const int results_pic_n1 = 2131231629;
-			
-			// aapt resource value: 0x7F08038E
-			public const int results_pic_n1w = 2131231630;
-			
-			// aapt resource value: 0x7F08038F
-			public const int results_pic_r1 = 2131231631;
-			
-			// aapt resource value: 0x7F080390
-			public const int results_pic_r2 = 2131231632;
-			
-			// aapt resource value: 0x7F080391
-			public const int results_pic_w1 = 2131231633;
-			
-			// aapt resource value: 0x7F080392
-			public const int results_pic_w3 = 2131231634;
-			
-			// aapt resource value: 0x7F080393
-			public const int results_pic_x1 = 2131231635;
-			
-			// aapt resource value: 0x7F080394
-			public const int results_pic_x2 = 2131231636;
-			
-			// aapt resource value: 0x7F080395
-			public const int results_pic_x3 = 2131231637;
-			
-			// aapt resource value: 0x7F080396
-			public const int results_pic_x3c = 2131231638;
-			
-			// aapt resource value: 0x7F080397
-			public const int results_pic_x4 = 2131231639;
-			
-			// aapt resource value: 0x7F080398
-			public const int results_pic_z1 = 2131231640;
-			
-			// aapt resource value: 0x7F080399
-			public const int results_w2d = 2131231641;
-			
-			// aapt resource value: 0x7F08039A
-			public const int results_w2s = 2131231642;
-			
-			// aapt resource value: 0x7F08039B
-			public const int results_wlb = 2131231643;
-			
-			// aapt resource value: 0x7F08039C
-			public const int results_x5_108tp = 2131231644;
+			public const int refresh_selector = 2131231576;
 			
 			// aapt resource value: 0x7F080359
-			public const int result_5k_vr104d = 2131231577;
+			public const int register_server_bg = 2131231577;
 			
 			// aapt resource value: 0x7F08035A
-			public const int result_5k_vr116d = 2131231578;
+			public const int remote_cal_selector = 2131231578;
 			
 			// aapt resource value: 0x7F08035B
-			public const int result_8_16dvr = 2131231579;
+			public const int remote_exit_btn_selector = 2131231579;
 			
 			// aapt resource value: 0x7F08035C
-			public const int result_cs_c3w = 2131231580;
+			public const int remote_list_pause_btn_selector = 2131231580;
 			
 			// aapt resource value: 0x7F08035D
-			public const int result_cs_vr104d = 2131231581;
+			public const int remote_list_play_btn_selector = 2131231581;
 			
 			// aapt resource value: 0x7F08035E
-			public const int result_cs_vr108d = 2131231582;
+			public const int remote_list_soundoff_btn_selector = 2131231582;
 			
 			// aapt resource value: 0x7F08035F
-			public const int result_cs_vr116d = 2131231583;
+			public const int remote_list_soundon_btn_selector = 2131231583;
 			
 			// aapt resource value: 0x7F080360
-			public const int result_pic_dh1 = 2131231584;
+			public const int remote_play = 2131231584;
 			
 			// aapt resource value: 0x7F080361
-			public const int result_pic_doorbell = 2131231585;
+			public const int remote_play_sel = 2131231585;
 			
 			// aapt resource value: 0x7F080362
-			public const int result_pic_doorbell_hik = 2131231586;
+			public const int remote_seekbar_style = 2131231586;
 			
 			// aapt resource value: 0x7F080363
-			public const int result_pic_light = 2131231587;
+			public const int remote_seekbar_thumb = 2131231587;
 			
 			// aapt resource value: 0x7F080364
-			public const int result_x5c = 2131231588;
+			public const int reset_deivce = 2131231588;
+			
+			// aapt resource value: 0x7F080371
+			public const int results_4_dvr = 2131231601;
+			
+			// aapt resource value: 0x7F080372
+			public const int results_8_16_nvr = 2131231602;
+			
+			// aapt resource value: 0x7F080373
+			public const int results_8_nvr = 2131231603;
+			
+			// aapt resource value: 0x7F080374
+			public const int results_c6p = 2131231604;
+			
+			// aapt resource value: 0x7F080375
+			public const int results_mini_360_plus = 2131231605;
+			
+			// aapt resource value: 0x7F080376
+			public const int results_mini_trooper = 2131231606;
+			
+			// aapt resource value: 0x7F080377
+			public const int results_pic_a1 = 2131231607;
+			
+			// aapt resource value: 0x7F080378
+			public const int results_pic_a1c = 2131231608;
+			
+			// aapt resource value: 0x7F080379
+			public const int results_pic_a1s = 2131231609;
+			
+			// aapt resource value: 0x7F08037A
+			public const int results_pic_baidu_c2s = 2131231610;
+			
+			// aapt resource value: 0x7F08037B
+			public const int results_pic_bg = 2131231611;
+			
+			// aapt resource value: 0x7F08037C
+			public const int results_pic_c1 = 2131231612;
+			
+			// aapt resource value: 0x7F08037D
+			public const int results_pic_c2 = 2131231613;
+			
+			// aapt resource value: 0x7F080380
+			public const int results_pic_c2c = 2131231616;
+			
+			// aapt resource value: 0x7F080381
+			public const int results_pic_c2mini = 2131231617;
+			
+			// aapt resource value: 0x7F080382
+			public const int results_pic_c2mini2 = 2131231618;
+			
+			// aapt resource value: 0x7F080383
+			public const int results_pic_c2plus = 2131231619;
+			
+			// aapt resource value: 0x7F080384
+			public const int results_pic_c2s = 2131231620;
+			
+			// aapt resource value: 0x7F080385
+			public const int results_pic_c2w = 2131231621;
+			
+			// aapt resource value: 0x7F08037E
+			public const int results_pic_c2_2 = 2131231614;
+			
+			// aapt resource value: 0x7F08037F
+			public const int results_pic_c2_usa = 2131231615;
+			
+			// aapt resource value: 0x7F080386
+			public const int results_pic_c3 = 2131231622;
+			
+			// aapt resource value: 0x7F080387
+			public const int results_pic_c3c = 2131231623;
+			
+			// aapt resource value: 0x7F080388
+			public const int results_pic_c3e = 2131231624;
+			
+			// aapt resource value: 0x7F080389
+			public const int results_pic_c3s = 2131231625;
+			
+			// aapt resource value: 0x7F08038A
+			public const int results_pic_c4 = 2131231626;
+			
+			// aapt resource value: 0x7F08038B
+			public const int results_pic_c4c = 2131231627;
+			
+			// aapt resource value: 0x7F08038C
+			public const int results_pic_c4e = 2131231628;
+			
+			// aapt resource value: 0x7F08038D
+			public const int results_pic_c4s = 2131231629;
+			
+			// aapt resource value: 0x7F08038E
+			public const int results_pic_c6 = 2131231630;
+			
+			// aapt resource value: 0x7F08038F
+			public const int results_pic_c6c = 2131231631;
+			
+			// aapt resource value: 0x7F080390
+			public const int results_pic_c6c_1 = 2131231632;
+			
+			// aapt resource value: 0x7F080391
+			public const int results_pic_c6c_2 = 2131231633;
+			
+			// aapt resource value: 0x7F080392
+			public const int results_pic_c6h = 2131231634;
+			
+			// aapt resource value: 0x7F080393
+			public const int results_pic_co2 = 2131231635;
+			
+			// aapt resource value: 0x7F080394
+			public const int results_pic_d1 = 2131231636;
+			
+			// aapt resource value: 0x7F080395
+			public const int results_pic_default = 2131231637;
+			
+			// aapt resource value: 0x7F080396
+			public const int results_pic_f1 = 2131231638;
+			
+			// aapt resource value: 0x7F080397
+			public const int results_pic_h2c = 2131231639;
+			
+			// aapt resource value: 0x7F080398
+			public const int results_pic_h2s = 2131231640;
+			
+			// aapt resource value: 0x7F080399
+			public const int results_pic_n1 = 2131231641;
+			
+			// aapt resource value: 0x7F08039A
+			public const int results_pic_n1w = 2131231642;
+			
+			// aapt resource value: 0x7F08039B
+			public const int results_pic_r1 = 2131231643;
+			
+			// aapt resource value: 0x7F08039C
+			public const int results_pic_r2 = 2131231644;
 			
 			// aapt resource value: 0x7F08039D
-			public const int right_horizontal = 2131231645;
+			public const int results_pic_w1 = 2131231645;
 			
 			// aapt resource value: 0x7F08039E
-			public const int right_twinkle = 2131231646;
+			public const int results_pic_w3 = 2131231646;
 			
 			// aapt resource value: 0x7F08039F
-			public const int ring_off = 2131231647;
+			public const int results_pic_x1 = 2131231647;
 			
 			// aapt resource value: 0x7F0803A0
-			public const int say_bg = 2131231648;
+			public const int results_pic_x2 = 2131231648;
 			
 			// aapt resource value: 0x7F0803A1
-			public const int screenshot = 2131231649;
+			public const int results_pic_x3 = 2131231649;
 			
 			// aapt resource value: 0x7F0803A2
-			public const int screenshot_def = 2131231650;
+			public const int results_pic_x3c = 2131231650;
 			
 			// aapt resource value: 0x7F0803A3
-			public const int screenshot_sel = 2131231651;
+			public const int results_pic_x4 = 2131231651;
 			
 			// aapt resource value: 0x7F0803A4
-			public const int search = 2131231652;
+			public const int results_pic_z1 = 2131231652;
 			
 			// aapt resource value: 0x7F0803A5
-			public const int search_bnt = 2131231653;
+			public const int results_w2d = 2131231653;
 			
 			// aapt resource value: 0x7F0803A6
-			public const int search_bnt_sel = 2131231654;
+			public const int results_w2s = 2131231654;
 			
 			// aapt resource value: 0x7F0803A7
-			public const int search_button_selector = 2131231655;
+			public const int results_wlb = 2131231655;
 			
 			// aapt resource value: 0x7F0803A8
-			public const int search_input = 2131231656;
+			public const int results_x5_108tp = 2131231656;
+			
+			// aapt resource value: 0x7F080365
+			public const int result_5k_vr104d = 2131231589;
+			
+			// aapt resource value: 0x7F080366
+			public const int result_5k_vr116d = 2131231590;
+			
+			// aapt resource value: 0x7F080367
+			public const int result_8_16dvr = 2131231591;
+			
+			// aapt resource value: 0x7F080368
+			public const int result_cs_c3w = 2131231592;
+			
+			// aapt resource value: 0x7F080369
+			public const int result_cs_vr104d = 2131231593;
+			
+			// aapt resource value: 0x7F08036A
+			public const int result_cs_vr108d = 2131231594;
+			
+			// aapt resource value: 0x7F08036B
+			public const int result_cs_vr116d = 2131231595;
+			
+			// aapt resource value: 0x7F08036C
+			public const int result_pic_dh1 = 2131231596;
+			
+			// aapt resource value: 0x7F08036D
+			public const int result_pic_doorbell = 2131231597;
+			
+			// aapt resource value: 0x7F08036E
+			public const int result_pic_doorbell_hik = 2131231598;
+			
+			// aapt resource value: 0x7F08036F
+			public const int result_pic_light = 2131231599;
+			
+			// aapt resource value: 0x7F080370
+			public const int result_x5c = 2131231600;
 			
 			// aapt resource value: 0x7F0803A9
-			public const int seekbar_thumb = 2131231657;
-			
-			// aapt resource value: 0x7F0803AB
-			public const int selected_icon = 2131231659;
-			
-			// aapt resource value: 0x7F0803AC
-			public const int selector_pickerview_btn = 2131231660;
+			public const int right_horizontal = 2131231657;
 			
 			// aapt resource value: 0x7F0803AA
-			public const int select_icon = 2131231658;
+			public const int right_twinkle = 2131231658;
+			
+			// aapt resource value: 0x7F0803AB
+			public const int ring_off = 2131231659;
+			
+			// aapt resource value: 0x7F0803AC
+			public const int say_bg = 2131231660;
 			
 			// aapt resource value: 0x7F0803AD
-			public const int server1 = 2131231661;
+			public const int screenshot = 2131231661;
 			
 			// aapt resource value: 0x7F0803AE
-			public const int server2 = 2131231662;
+			public const int screenshot_def = 2131231662;
 			
 			// aapt resource value: 0x7F0803AF
-			public const int server3 = 2131231663;
+			public const int screenshot_sel = 2131231663;
 			
 			// aapt resource value: 0x7F0803B0
-			public const int server4 = 2131231664;
+			public const int search = 2131231664;
 			
 			// aapt resource value: 0x7F0803B1
-			public const int setup = 2131231665;
+			public const int search_bnt = 2131231665;
 			
 			// aapt resource value: 0x7F0803B2
-			public const int setup_sel = 2131231666;
+			public const int search_bnt_sel = 2131231666;
 			
 			// aapt resource value: 0x7F0803B3
-			public const int setup_wechat = 2131231667;
+			public const int search_button_selector = 2131231667;
 			
 			// aapt resource value: 0x7F0803B4
-			public const int share_management_label_button = 2131231668;
+			public const int search_input = 2131231668;
 			
 			// aapt resource value: 0x7F0803B5
-			public const int share_management_label_button_sel = 2131231669;
-			
-			// aapt resource value: 0x7F0803B6
-			public const int shipin7_alarm_msg_new = 2131231670;
+			public const int seekbar_thumb = 2131231669;
 			
 			// aapt resource value: 0x7F0803B7
-			public const int shrink_screen_normal = 2131231671;
+			public const int selected_icon = 2131231671;
 			
 			// aapt resource value: 0x7F0803B8
-			public const int shrink_screen_pressed = 2131231672;
+			public const int selector_pickerview_btn = 2131231672;
+			
+			// aapt resource value: 0x7F0803B6
+			public const int select_icon = 2131231670;
 			
 			// aapt resource value: 0x7F0803B9
-			public const int small_button_cameralist = 2131231673;
+			public const int server1 = 2131231673;
 			
 			// aapt resource value: 0x7F0803BA
-			public const int sound_off = 2131231674;
+			public const int server2 = 2131231674;
 			
 			// aapt resource value: 0x7F0803BB
-			public const int sound_off_blue = 2131231675;
+			public const int server3 = 2131231675;
 			
 			// aapt resource value: 0x7F0803BC
-			public const int sound_off_sel = 2131231676;
+			public const int server4 = 2131231676;
 			
 			// aapt resource value: 0x7F0803BD
-			public const int sound_off_sel_blue = 2131231677;
+			public const int setup = 2131231677;
 			
 			// aapt resource value: 0x7F0803BE
-			public const int sound_on = 2131231678;
+			public const int setup_sel = 2131231678;
 			
 			// aapt resource value: 0x7F0803BF
-			public const int sound_on_blue = 2131231679;
+			public const int setup_wechat = 2131231679;
 			
 			// aapt resource value: 0x7F0803C0
-			public const int sound_on_sel = 2131231680;
+			public const int share_management_label_button = 2131231680;
 			
 			// aapt resource value: 0x7F0803C1
-			public const int sound_on_sel_blue = 2131231681;
+			public const int share_management_label_button_sel = 2131231681;
 			
 			// aapt resource value: 0x7F0803C2
-			public const int sound_source = 2131231682;
+			public const int shipin7_alarm_msg_new = 2131231682;
 			
 			// aapt resource value: 0x7F0803C3
-			public const int sound_source_sel = 2131231683;
+			public const int shrink_screen_normal = 2131231683;
 			
 			// aapt resource value: 0x7F0803C4
-			public const int speech = 2131231684;
+			public const int shrink_screen_pressed = 2131231684;
 			
 			// aapt resource value: 0x7F0803C5
-			public const int speech_0 = 2131231685;
+			public const int small_button_cameralist = 2131231685;
 			
 			// aapt resource value: 0x7F0803C6
-			public const int speech_1 = 2131231686;
+			public const int sound_off = 2131231686;
 			
 			// aapt resource value: 0x7F0803C7
-			public const int speech_2 = 2131231687;
+			public const int sound_off_blue = 2131231687;
 			
 			// aapt resource value: 0x7F0803C8
-			public const int speech_3 = 2131231688;
+			public const int sound_off_sel = 2131231688;
 			
 			// aapt resource value: 0x7F0803C9
-			public const int speech_4 = 2131231689;
+			public const int sound_off_sel_blue = 2131231689;
 			
 			// aapt resource value: 0x7F0803CA
-			public const int speech_5 = 2131231690;
+			public const int sound_on = 2131231690;
 			
 			// aapt resource value: 0x7F0803CB
-			public const int speech_full_selector = 2131231691;
+			public const int sound_on_blue = 2131231691;
 			
 			// aapt resource value: 0x7F0803CC
-			public const int stop = 2131231692;
-			
-			// aapt resource value: 0x7F0803CF
-			public const int stopbtn_selector = 2131231695;
-			
-			// aapt resource value: 0x7F0803D0
-			public const int stoplay_btn = 2131231696;
-			
-			// aapt resource value: 0x7F0803D1
-			public const int stoplay_btn_sel = 2131231697;
+			public const int sound_on_sel = 2131231692;
 			
 			// aapt resource value: 0x7F0803CD
-			public const int stop_disable = 2131231693;
+			public const int sound_on_sel_blue = 2131231693;
 			
 			// aapt resource value: 0x7F0803CE
-			public const int stop_press = 2131231694;
+			public const int sound_source = 2131231694;
+			
+			// aapt resource value: 0x7F0803CF
+			public const int sound_source_sel = 2131231695;
+			
+			// aapt resource value: 0x7F0803D0
+			public const int speech = 2131231696;
+			
+			// aapt resource value: 0x7F0803D1
+			public const int speech_0 = 2131231697;
 			
 			// aapt resource value: 0x7F0803D2
-			public const int success = 2131231698;
+			public const int speech_1 = 2131231698;
 			
 			// aapt resource value: 0x7F0803D3
-			public const int success_icon = 2131231699;
+			public const int speech_2 = 2131231699;
 			
 			// aapt resource value: 0x7F0803D4
-			public const int success_img = 2131231700;
+			public const int speech_3 = 2131231700;
 			
 			// aapt resource value: 0x7F0803D5
-			public const int sure_background_def = 2131231701;
+			public const int speech_4 = 2131231701;
 			
 			// aapt resource value: 0x7F0803D6
-			public const int sure_background_sel = 2131231702;
+			public const int speech_5 = 2131231702;
 			
 			// aapt resource value: 0x7F0803D7
-			public const int switch_camera = 2131231703;
+			public const int speech_full_selector = 2131231703;
 			
 			// aapt resource value: 0x7F0803D8
-			public const int tab_left = 2131231704;
-			
-			// aapt resource value: 0x7F0803D9
-			public const int tab_left_sel = 2131231705;
-			
-			// aapt resource value: 0x7F0803DA
-			public const int tab_right = 2131231706;
+			public const int stop = 2131231704;
 			
 			// aapt resource value: 0x7F0803DB
-			public const int tab_right_sel = 2131231707;
+			public const int stopbtn_selector = 2131231707;
 			
 			// aapt resource value: 0x7F0803DC
-			public const int tiltle_button_selector = 2131231708;
+			public const int stoplay_btn = 2131231708;
 			
 			// aapt resource value: 0x7F0803DD
-			public const int timeline = 2131231709;
+			public const int stoplay_btn_sel = 2131231709;
+			
+			// aapt resource value: 0x7F0803D9
+			public const int stop_disable = 2131231705;
+			
+			// aapt resource value: 0x7F0803DA
+			public const int stop_press = 2131231706;
 			
 			// aapt resource value: 0x7F0803DE
-			public const int timeline_sel = 2131231710;
+			public const int success = 2131231710;
 			
 			// aapt resource value: 0x7F0803DF
-			public const int tip_background = 2131231711;
+			public const int success_icon = 2131231711;
 			
 			// aapt resource value: 0x7F0803E0
-			public const int tip_textview_bg = 2131231712;
+			public const int success_img = 2131231712;
 			
 			// aapt resource value: 0x7F0803E1
-			public const int title_down_bg = 2131231713;
+			public const int sure_background_def = 2131231713;
 			
 			// aapt resource value: 0x7F0803E2
-			public const int title_down_play = 2131231714;
+			public const int sure_background_sel = 2131231714;
 			
 			// aapt resource value: 0x7F0803E3
-			public const int title_down_play_sel = 2131231715;
+			public const int switch_camera = 2131231715;
 			
 			// aapt resource value: 0x7F0803E4
-			public const int title_down_play_selector = 2131231716;
+			public const int tab_left = 2131231716;
 			
 			// aapt resource value: 0x7F0803E5
-			public const int title_menu_bg = 2131231717;
+			public const int tab_left_sel = 2131231717;
 			
 			// aapt resource value: 0x7F0803E6
-			public const int tittel_button_bg = 2131231718;
+			public const int tab_right = 2131231718;
 			
 			// aapt resource value: 0x7F0803E7
-			public const int tittel_button_press_bg = 2131231719;
+			public const int tab_right_sel = 2131231719;
 			
 			// aapt resource value: 0x7F0803E8
-			public const int tooltip_frame_dark = 2131231720;
+			public const int tiltle_button_selector = 2131231720;
 			
 			// aapt resource value: 0x7F0803E9
-			public const int tooltip_frame_light = 2131231721;
+			public const int timeline = 2131231721;
 			
 			// aapt resource value: 0x7F0803EA
-			public const int top_bar_bg = 2131231722;
+			public const int timeline_sel = 2131231722;
 			
 			// aapt resource value: 0x7F0803EB
-			public const int track_bar_bg = 2131231723;
+			public const int tip_background = 2131231723;
 			
 			// aapt resource value: 0x7F0803EC
-			public const int translucent = 2131231724;
+			public const int tip_textview_bg = 2131231724;
 			
 			// aapt resource value: 0x7F0803ED
-			public const int @unchecked = 2131231725;
+			public const int title_down_bg = 2131231725;
 			
 			// aapt resource value: 0x7F0803EE
-			public const int unlock = 2131231726;
+			public const int title_down_play = 2131231726;
 			
 			// aapt resource value: 0x7F0803EF
-			public const int unlock_def = 2131231727;
+			public const int title_down_play_sel = 2131231727;
 			
 			// aapt resource value: 0x7F0803F0
-			public const int unlock_sel = 2131231728;
-			
-			// aapt resource value: 0x7F0803F3
-			public const int upgrade = 2131231731;
+			public const int title_down_play_selector = 2131231728;
 			
 			// aapt resource value: 0x7F0803F1
-			public const int up_horizontal = 2131231729;
+			public const int title_menu_bg = 2131231729;
 			
 			// aapt resource value: 0x7F0803F2
-			public const int up_twinkle = 2131231730;
+			public const int tittel_button_bg = 2131231730;
+			
+			// aapt resource value: 0x7F0803F3
+			public const int tittel_button_press_bg = 2131231731;
 			
 			// aapt resource value: 0x7F0803F4
-			public const int user = 2131231732;
+			public const int tooltip_frame_dark = 2131231732;
 			
 			// aapt resource value: 0x7F0803F5
-			public const int vertical_preview_sound_selector = 2131231733;
+			public const int tooltip_frame_light = 2131231733;
 			
 			// aapt resource value: 0x7F0803F6
-			public const int vertical_preview_stop_selector = 2131231734;
-			
-			// aapt resource value: 0x7F080406
-			public const int videogo_icon = 2131231750;
+			public const int top_bar_bg = 2131231734;
 			
 			// aapt resource value: 0x7F0803F7
-			public const int video_background = 2131231735;
+			public const int track_bar_bg = 2131231735;
 			
 			// aapt resource value: 0x7F0803F8
-			public const int video_camera1_1 = 2131231736;
+			public const int translucent = 2131231736;
 			
 			// aapt resource value: 0x7F0803F9
-			public const int video_camera1_2 = 2131231737;
+			public const int @unchecked = 2131231737;
 			
 			// aapt resource value: 0x7F0803FA
-			public const int video_camera1_3 = 2131231738;
+			public const int unlock = 2131231738;
 			
 			// aapt resource value: 0x7F0803FB
-			public const int video_file_watermark = 2131231739;
+			public const int unlock_def = 2131231739;
 			
 			// aapt resource value: 0x7F0803FC
-			public const int video_quality_selector = 2131231740;
-			
-			// aapt resource value: 0x7F0803FD
-			public const int video_talk_sdk_icn_watch = 2131231741;
-			
-			// aapt resource value: 0x7F0803FE
-			public const int video_talk_sdk_placeholder_images_user = 2131231742;
+			public const int unlock_sel = 2131231740;
 			
 			// aapt resource value: 0x7F0803FF
-			public const int video_talk_sdk_video_answer = 2131231743;
+			public const int upgrade = 2131231743;
+			
+			// aapt resource value: 0x7F0803FD
+			public const int up_horizontal = 2131231741;
+			
+			// aapt resource value: 0x7F0803FE
+			public const int up_twinkle = 2131231742;
 			
 			// aapt resource value: 0x7F080400
-			public const int video_talk_sdk_video_hangup = 2131231744;
+			public const int user = 2131231744;
 			
 			// aapt resource value: 0x7F080401
-			public const int video_talk_sdk_video_record_off = 2131231745;
+			public const int vertical_preview_sound_selector = 2131231745;
 			
 			// aapt resource value: 0x7F080402
-			public const int video_talk_sdk_video_record_on = 2131231746;
-			
-			// aapt resource value: 0x7F080403
-			public const int video_talk_sdk_video_snap = 2131231747;
-			
-			// aapt resource value: 0x7F080404
-			public const int video_talk_sdk_video_stop = 2131231748;
-			
-			// aapt resource value: 0x7F080405
-			public const int video_talk_sdk_video_switch_camera = 2131231749;
-			
-			// aapt resource value: 0x7F080410
-			public const int waiting_bg = 2131231760;
-			
-			// aapt resource value: 0x7F080411
-			public const int waiting_progressbar_bg = 2131231761;
-			
-			// aapt resource value: 0x7F080407
-			public const int wait_1 = 2131231751;
-			
-			// aapt resource value: 0x7F080408
-			public const int wait_2 = 2131231752;
-			
-			// aapt resource value: 0x7F080409
-			public const int wait_3 = 2131231753;
-			
-			// aapt resource value: 0x7F08040A
-			public const int wait_4 = 2131231754;
-			
-			// aapt resource value: 0x7F08040B
-			public const int wait_5 = 2131231755;
-			
-			// aapt resource value: 0x7F08040C
-			public const int wait_6 = 2131231756;
-			
-			// aapt resource value: 0x7F08040D
-			public const int wait_7 = 2131231757;
-			
-			// aapt resource value: 0x7F08040E
-			public const int wait_8 = 2131231758;
-			
-			// aapt resource value: 0x7F08040F
-			public const int wait_upload_img = 2131231759;
+			public const int vertical_preview_stop_selector = 2131231746;
 			
 			// aapt resource value: 0x7F080412
-			public const int water_alarm = 2131231762;
+			public const int videogo_icon = 2131231762;
+			
+			// aapt resource value: 0x7F080403
+			public const int video_background = 2131231747;
+			
+			// aapt resource value: 0x7F080404
+			public const int video_camera1_1 = 2131231748;
+			
+			// aapt resource value: 0x7F080405
+			public const int video_camera1_2 = 2131231749;
+			
+			// aapt resource value: 0x7F080406
+			public const int video_camera1_3 = 2131231750;
+			
+			// aapt resource value: 0x7F080407
+			public const int video_file_watermark = 2131231751;
+			
+			// aapt resource value: 0x7F080408
+			public const int video_quality_selector = 2131231752;
+			
+			// aapt resource value: 0x7F080409
+			public const int video_talk_sdk_icn_watch = 2131231753;
+			
+			// aapt resource value: 0x7F08040A
+			public const int video_talk_sdk_placeholder_images_user = 2131231754;
+			
+			// aapt resource value: 0x7F08040B
+			public const int video_talk_sdk_video_answer = 2131231755;
+			
+			// aapt resource value: 0x7F08040C
+			public const int video_talk_sdk_video_hangup = 2131231756;
+			
+			// aapt resource value: 0x7F08040D
+			public const int video_talk_sdk_video_record_off = 2131231757;
+			
+			// aapt resource value: 0x7F08040E
+			public const int video_talk_sdk_video_record_on = 2131231758;
+			
+			// aapt resource value: 0x7F08040F
+			public const int video_talk_sdk_video_snap = 2131231759;
+			
+			// aapt resource value: 0x7F080410
+			public const int video_talk_sdk_video_stop = 2131231760;
+			
+			// aapt resource value: 0x7F080411
+			public const int video_talk_sdk_video_switch_camera = 2131231761;
+			
+			// aapt resource value: 0x7F08041C
+			public const int waiting_bg = 2131231772;
+			
+			// aapt resource value: 0x7F08041D
+			public const int waiting_progressbar_bg = 2131231773;
 			
 			// aapt resource value: 0x7F080413
-			public const int wifi_config_bg = 2131231763;
+			public const int wait_1 = 2131231763;
 			
 			// aapt resource value: 0x7F080414
-			public const int wifi_connect_tip = 2131231764;
+			public const int wait_2 = 2131231764;
 			
 			// aapt resource value: 0x7F080415
-			public const int yuntai_normal = 2131231765;
+			public const int wait_3 = 2131231765;
 			
 			// aapt resource value: 0x7F080416
-			public const int yuntai_pressed = 2131231766;
+			public const int wait_4 = 2131231766;
 			
 			// aapt resource value: 0x7F080417
-			public const int yxs_head = 2131231767;
+			public const int wait_5 = 2131231767;
 			
 			// aapt resource value: 0x7F080418
-			public const int z1_bg = 2131231768;
+			public const int wait_6 = 2131231768;
+			
+			// aapt resource value: 0x7F080419
+			public const int wait_7 = 2131231769;
+			
+			// aapt resource value: 0x7F08041A
+			public const int wait_8 = 2131231770;
+			
+			// aapt resource value: 0x7F08041B
+			public const int wait_upload_img = 2131231771;
+			
+			// aapt resource value: 0x7F08041E
+			public const int water_alarm = 2131231774;
+			
+			// aapt resource value: 0x7F08041F
+			public const int wifi_config_bg = 2131231775;
+			
+			// aapt resource value: 0x7F080420
+			public const int wifi_connect_tip = 2131231776;
+			
+			// aapt resource value: 0x7F080421
+			public const int yuntai_normal = 2131231777;
+			
+			// aapt resource value: 0x7F080422
+			public const int yuntai_pressed = 2131231778;
+			
+			// aapt resource value: 0x7F080423
+			public const int yxs_head = 2131231779;
+			
+			// aapt resource value: 0x7F080424
+			public const int z1_bg = 2131231780;
 			
 			static Drawable()
 			{
@@ -7618,11 +7663,11 @@
 			// aapt resource value: 0x7F090131
 			public const int file_size_text = 2131296561;
 			
-			// aapt resource value: 0x7F090003
-			public const int FILL = 2131296259;
-			
 			// aapt resource value: 0x7F090132
 			public const int fill = 2131296562;
+			
+			// aapt resource value: 0x7F090003
+			public const int FILL = 2131296259;
 			
 			// aapt resource value: 0x7F090133
 			public const int fill_horizontal = 2131296563;
@@ -7973,1471 +8018,1498 @@
 			public const int iv_child_watch_video_talk_player_head_image = 2131296674;
 			
 			// aapt resource value: 0x7F0901A3
-			public const int iv_more = 2131296675;
+			public const int iv_lp_answer = 2131296675;
 			
 			// aapt resource value: 0x7F0901A4
-			public const int join_room_btn = 2131296676;
-			
-			// aapt resource value: 0x7F0901A8
-			public const int labelbelongType = 2131296680;
+			public const int iv_lp_hangUp = 2131296676;
 			
 			// aapt resource value: 0x7F0901A5
-			public const int labelFilter = 2131296677;
+			public const int iv_lp_screenshot = 2131296677;
 			
 			// aapt resource value: 0x7F0901A6
-			public const int labelLocation = 2131296678;
+			public const int iv_lp_unlock = 2131296678;
 			
 			// aapt resource value: 0x7F0901A7
-			public const int labelSort = 2131296679;
+			public const int iv_more = 2131296679;
 			
-			// aapt resource value: 0x7F0901A9
-			public const int largeLabel = 2131296681;
-			
-			// aapt resource value: 0x7F0901AA
-			public const int latitude = 2131296682;
-			
-			// aapt resource value: 0x7F0901AB
-			public const int launch_product_query = 2131296683;
+			// aapt resource value: 0x7F0901A8
+			public const int join_room_btn = 2131296680;
 			
 			// aapt resource value: 0x7F0901AC
-			public const int layout = 2131296684;
+			public const int labelbelongType = 2131296684;
+			
+			// aapt resource value: 0x7F0901A9
+			public const int labelFilter = 2131296681;
+			
+			// aapt resource value: 0x7F0901AA
+			public const int labelLocation = 2131296682;
+			
+			// aapt resource value: 0x7F0901AB
+			public const int labelSort = 2131296683;
 			
 			// aapt resource value: 0x7F0901AD
-			public const int layout_more_ly = 2131296685;
+			public const int largeLabel = 2131296685;
 			
 			// aapt resource value: 0x7F0901AE
-			public const int left = 2131296686;
+			public const int latitude = 2131296686;
 			
 			// aapt resource value: 0x7F0901AF
-			public const int likedCount = 2131296687;
+			public const int launch_product_query = 2131296687;
 			
 			// aapt resource value: 0x7F0901B0
-			public const int line1 = 2131296688;
+			public const int layout = 2131296688;
 			
 			// aapt resource value: 0x7F0901B1
-			public const int line3 = 2131296689;
+			public const int layout_more_ly = 2131296689;
 			
 			// aapt resource value: 0x7F0901B2
-			public const int lineConnectContainer = 2131296690;
+			public const int left = 2131296690;
 			
 			// aapt resource value: 0x7F0901B3
-			public const int listMode = 2131296691;
+			public const int likedCount = 2131296691;
 			
 			// aapt resource value: 0x7F0901B4
-			public const int listView = 2131296692;
+			public const int line1 = 2131296692;
 			
 			// aapt resource value: 0x7F0901B5
-			public const int listView_device = 2131296693;
-			
-			// aapt resource value: 0x7F0901B9
-			public const int listview_line = 2131296697;
-			
-			// aapt resource value: 0x7F0901BA
-			public const int listview_line_device = 2131296698;
+			public const int line3 = 2131296693;
 			
 			// aapt resource value: 0x7F0901B6
-			public const int list_camera = 2131296694;
+			public const int lineConnectContainer = 2131296694;
 			
 			// aapt resource value: 0x7F0901B7
-			public const int list_device = 2131296695;
+			public const int listMode = 2131296695;
 			
 			// aapt resource value: 0x7F0901B8
-			public const int list_item = 2131296696;
+			public const int listView = 2131296696;
 			
-			// aapt resource value: 0x7F0901BB
-			public const int live_window = 2131296699;
-			
-			// aapt resource value: 0x7F0901BC
-			public const int llyCloundService = 2131296700;
+			// aapt resource value: 0x7F0901B9
+			public const int listView_device = 2131296697;
 			
 			// aapt resource value: 0x7F0901BD
-			public const int llyStatus1 = 2131296701;
+			public const int listview_line = 2131296701;
 			
 			// aapt resource value: 0x7F0901BE
-			public const int llyStatus2 = 2131296702;
+			public const int listview_line_device = 2131296702;
+			
+			// aapt resource value: 0x7F0901BA
+			public const int list_camera = 2131296698;
+			
+			// aapt resource value: 0x7F0901BB
+			public const int list_device = 2131296699;
+			
+			// aapt resource value: 0x7F0901BC
+			public const int list_item = 2131296700;
 			
 			// aapt resource value: 0x7F0901BF
-			public const int llyStatus3 = 2131296703;
-			
-			// aapt resource value: 0x7F0901C0
-			public const int loadingTextView = 2131296704;
-			
-			// aapt resource value: 0x7F0901C1
-			public const int loading_pb_ly = 2131296705;
+			public const int live_window = 2131296703;
 			
 			// aapt resource value: 0x7F0901C2
-			public const int loading_play_btn = 2131296706;
+			public const int llyCloundService = 2131296706;
 			
 			// aapt resource value: 0x7F0901C3
-			public const int loading_text = 2131296707;
+			public const int llyStatus1 = 2131296707;
 			
 			// aapt resource value: 0x7F0901C4
-			public const int loading_view = 2131296708;
-			
-			// aapt resource value: 0x7F0901C6
-			public const int localDoorUnlock = 2131296710;
-			
-			// aapt resource value: 0x7F0901C7
-			public const int localVideo = 2131296711;
-			
-			// aapt resource value: 0x7F0901C8
-			public const int local_alarm1 = 2131296712;
-			
-			// aapt resource value: 0x7F0901C9
-			public const int local_alarm2 = 2131296713;
-			
-			// aapt resource value: 0x7F0901CA
-			public const int local_alarm3 = 2131296714;
-			
-			// aapt resource value: 0x7F0901CB
-			public const int local_l1 = 2131296715;
-			
-			// aapt resource value: 0x7F0901CC
-			public const int local_l2 = 2131296716;
-			
-			// aapt resource value: 0x7F0901CD
-			public const int local_l3 = 2131296717;
-			
-			// aapt resource value: 0x7F0901CE
-			public const int local_realplay_btn = 2131296718;
-			
-			// aapt resource value: 0x7F0901CF
-			public const int local_time_part1 = 2131296719;
-			
-			// aapt resource value: 0x7F0901D0
-			public const int local_time_part2 = 2131296720;
-			
-			// aapt resource value: 0x7F0901D1
-			public const int local_time_part3 = 2131296721;
+			public const int llyStatus2 = 2131296708;
 			
 			// aapt resource value: 0x7F0901C5
-			public const int locaVideo = 2131296709;
+			public const int llyStatus3 = 2131296709;
+			
+			// aapt resource value: 0x7F0901C0
+			public const int ll_lp_btn_back = 2131296704;
+			
+			// aapt resource value: 0x7F0901C1
+			public const int ll_video_lp_rendering = 2131296705;
+			
+			// aapt resource value: 0x7F0901C6
+			public const int loadingTextView = 2131296710;
+			
+			// aapt resource value: 0x7F0901C7
+			public const int loading_pb_ly = 2131296711;
+			
+			// aapt resource value: 0x7F0901C8
+			public const int loading_play_btn = 2131296712;
+			
+			// aapt resource value: 0x7F0901C9
+			public const int loading_text = 2131296713;
+			
+			// aapt resource value: 0x7F0901CA
+			public const int loading_view = 2131296714;
+			
+			// aapt resource value: 0x7F0901CC
+			public const int localDoorUnlock = 2131296716;
+			
+			// aapt resource value: 0x7F0901CD
+			public const int localVideo = 2131296717;
+			
+			// aapt resource value: 0x7F0901CE
+			public const int local_alarm1 = 2131296718;
+			
+			// aapt resource value: 0x7F0901CF
+			public const int local_alarm2 = 2131296719;
+			
+			// aapt resource value: 0x7F0901D0
+			public const int local_alarm3 = 2131296720;
+			
+			// aapt resource value: 0x7F0901D1
+			public const int local_l1 = 2131296721;
 			
 			// aapt resource value: 0x7F0901D2
-			public const int login_name = 2131296722;
+			public const int local_l2 = 2131296722;
 			
 			// aapt resource value: 0x7F0901D3
-			public const int login_pwd = 2131296723;
+			public const int local_l3 = 2131296723;
 			
 			// aapt resource value: 0x7F0901D4
-			public const int longitude = 2131296724;
+			public const int local_realplay_btn = 2131296724;
 			
 			// aapt resource value: 0x7F0901D5
-			public const int main_layout = 2131296725;
+			public const int local_time_part1 = 2131296725;
 			
 			// aapt resource value: 0x7F0901D6
-			public const int masked = 2131296726;
+			public const int local_time_part2 = 2131296726;
+			
+			// aapt resource value: 0x7F0901D7
+			public const int local_time_part3 = 2131296727;
+			
+			// aapt resource value: 0x7F0901CB
+			public const int locaVideo = 2131296715;
+			
+			// aapt resource value: 0x7F0901D8
+			public const int login_name = 2131296728;
+			
+			// aapt resource value: 0x7F0901D9
+			public const int login_pwd = 2131296729;
+			
+			// aapt resource value: 0x7F0901DA
+			public const int longitude = 2131296730;
+			
+			// aapt resource value: 0x7F0901DB
+			public const int main_layout = 2131296731;
+			
+			// aapt resource value: 0x7F0901DC
+			public const int masked = 2131296732;
 			
 			// aapt resource value: 0x7F090009
 			public const int MatchLayout = 2131296265;
 			
-			// aapt resource value: 0x7F0901D7
-			public const int matte_image = 2131296727;
-			
-			// aapt resource value: 0x7F0901D8
-			public const int media_actions = 2131296728;
-			
-			// aapt resource value: 0x7F0901D9
-			public const int menu_layout = 2131296729;
-			
-			// aapt resource value: 0x7F0901DA
-			public const int menu_play = 2131296730;
-			
-			// aapt resource value: 0x7F0901DB
-			public const int message = 2131296731;
-			
-			// aapt resource value: 0x7F0901DC
-			public const int message1 = 2131296732;
-			
 			// aapt resource value: 0x7F0901DD
-			public const int message2 = 2131296733;
+			public const int matte_image = 2131296733;
 			
 			// aapt resource value: 0x7F0901DE
-			public const int message_check = 2131296734;
+			public const int media_actions = 2131296734;
 			
 			// aapt resource value: 0x7F0901DF
-			public const int message_content = 2131296735;
+			public const int menu_layout = 2131296735;
 			
 			// aapt resource value: 0x7F0901E0
-			public const int message_from = 2131296736;
+			public const int menu_play = 2131296736;
 			
 			// aapt resource value: 0x7F0901E1
-			public const int message_from_tip = 2131296737;
+			public const int message = 2131296737;
 			
 			// aapt resource value: 0x7F0901E2
-			public const int message_image = 2131296738;
+			public const int message1 = 2131296738;
 			
 			// aapt resource value: 0x7F0901E3
-			public const int message_image_layout = 2131296739;
+			public const int message2 = 2131296739;
 			
 			// aapt resource value: 0x7F0901E4
-			public const int message_image_progress = 2131296740;
+			public const int message_check = 2131296740;
 			
 			// aapt resource value: 0x7F0901E5
-			public const int message_layout = 2131296741;
+			public const int message_content = 2131296741;
 			
 			// aapt resource value: 0x7F0901E6
-			public const int message_list = 2131296742;
+			public const int message_from = 2131296742;
 			
 			// aapt resource value: 0x7F0901E7
-			public const int message_num_tv = 2131296743;
+			public const int message_from_tip = 2131296743;
 			
 			// aapt resource value: 0x7F0901E8
-			public const int message_play_layout = 2131296744;
+			public const int message_image = 2131296744;
 			
 			// aapt resource value: 0x7F0901E9
-			public const int message_time = 2131296745;
+			public const int message_image_layout = 2131296745;
 			
 			// aapt resource value: 0x7F0901EA
-			public const int message_type = 2131296746;
+			public const int message_image_progress = 2131296746;
 			
 			// aapt resource value: 0x7F0901EB
-			public const int message_unread = 2131296747;
+			public const int message_layout = 2131296747;
 			
 			// aapt resource value: 0x7F0901EC
-			public const int message_video_layout = 2131296748;
+			public const int message_list = 2131296748;
+			
+			// aapt resource value: 0x7F0901ED
+			public const int message_num_tv = 2131296749;
+			
+			// aapt resource value: 0x7F0901EE
+			public const int message_play_layout = 2131296750;
+			
+			// aapt resource value: 0x7F0901EF
+			public const int message_time = 2131296751;
+			
+			// aapt resource value: 0x7F0901F0
+			public const int message_type = 2131296752;
+			
+			// aapt resource value: 0x7F0901F1
+			public const int message_unread = 2131296753;
+			
+			// aapt resource value: 0x7F0901F2
+			public const int message_video_layout = 2131296754;
 			
 			// aapt resource value: 0x7F090008
 			public const int META = 2131296264;
 			
-			// aapt resource value: 0x7F0901EE
-			public const int middle = 2131296750;
-			
-			// aapt resource value: 0x7F0901ED
-			public const int mid_vertical_view = 2131296749;
-			
-			// aapt resource value: 0x7F0901EF
-			public const int min = 2131296751;
-			
-			// aapt resource value: 0x7F0901F0
-			public const int mini = 2131296752;
-			
-			// aapt resource value: 0x7F0901F1
-			public const int mirror_line = 2131296753;
-			
-			// aapt resource value: 0x7F0901F2
-			public const int modify_password_layout = 2131296754;
+			// aapt resource value: 0x7F0901F4
+			public const int middle = 2131296756;
 			
 			// aapt resource value: 0x7F0901F3
-			public const int monitor = 2131296755;
-			
-			// aapt resource value: 0x7F0901F4
-			public const int month = 2131296756;
+			public const int mid_vertical_view = 2131296755;
 			
 			// aapt resource value: 0x7F0901F5
-			public const int more_btn = 2131296757;
+			public const int min = 2131296757;
 			
 			// aapt resource value: 0x7F0901F6
-			public const int multiply = 2131296758;
+			public const int mini = 2131296758;
 			
 			// aapt resource value: 0x7F0901F7
-			public const int myRelativeLayout = 2131296759;
+			public const int mirror_line = 2131296759;
 			
 			// aapt resource value: 0x7F0901F8
-			public const int myRetry = 2131296760;
+			public const int modify_password_layout = 2131296760;
 			
 			// aapt resource value: 0x7F0901F9
-			public const int nameText = 2131296761;
+			public const int monitor = 2131296761;
 			
 			// aapt resource value: 0x7F0901FA
-			public const int name_del = 2131296762;
+			public const int month = 2131296762;
 			
 			// aapt resource value: 0x7F0901FB
-			public const int name_text = 2131296763;
+			public const int more_btn = 2131296763;
 			
 			// aapt resource value: 0x7F0901FC
-			public const int name_tv = 2131296764;
+			public const int multiply = 2131296764;
 			
 			// aapt resource value: 0x7F0901FD
-			public const int navigation_header_container = 2131296765;
+			public const int myRelativeLayout = 2131296765;
 			
 			// aapt resource value: 0x7F0901FE
-			public const int never = 2131296766;
+			public const int myRetry = 2131296766;
 			
 			// aapt resource value: 0x7F0901FF
-			public const int new_password = 2131296767;
+			public const int nameText = 2131296767;
 			
 			// aapt resource value: 0x7F090200
-			public const int next_play_btn = 2131296768;
-			
-			// aapt resource value: 0x7F090208
-			public const int none = 2131296776;
-			
-			// aapt resource value: 0x7F090209
-			public const int normal = 2131296777;
+			public const int name_del = 2131296768;
 			
 			// aapt resource value: 0x7F090201
-			public const int noText = 2131296769;
-			
-			// aapt resource value: 0x7F09020A
-			public const int notification_background = 2131296778;
-			
-			// aapt resource value: 0x7F09020B
-			public const int notification_main_column = 2131296779;
-			
-			// aapt resource value: 0x7F09020C
-			public const int notification_main_column_container = 2131296780;
-			
-			// aapt resource value: 0x7F09020D
-			public const int novideo_img = 2131296781;
-			
-			// aapt resource value: 0x7F09020E
-			public const int novideo_img_device = 2131296782;
+			public const int name_text = 2131296769;
 			
 			// aapt resource value: 0x7F090202
-			public const int no_camera_tip_ly = 2131296770;
+			public const int name_tv = 2131296770;
 			
 			// aapt resource value: 0x7F090203
-			public const int no_message_button = 2131296771;
+			public const int navigation_header_container = 2131296771;
 			
 			// aapt resource value: 0x7F090204
-			public const int no_message_layout = 2131296772;
+			public const int never = 2131296772;
 			
 			// aapt resource value: 0x7F090205
-			public const int no_message_text = 2131296773;
+			public const int new_password = 2131296773;
 			
 			// aapt resource value: 0x7F090206
-			public const int no_more_hint = 2131296774;
+			public const int next_play_btn = 2131296774;
 			
-			// aapt resource value: 0x7F090207
-			public const int no_more_text = 2131296775;
+			// aapt resource value: 0x7F09020E
+			public const int none = 2131296782;
 			
 			// aapt resource value: 0x7F09020F
-			public const int offline_bg = 2131296783;
+			public const int normal = 2131296783;
+			
+			// aapt resource value: 0x7F090207
+			public const int noText = 2131296775;
 			
 			// aapt resource value: 0x7F090210
-			public const int ok_tv = 2131296784;
+			public const int notification_background = 2131296784;
 			
 			// aapt resource value: 0x7F090211
-			public const int options1 = 2131296785;
+			public const int notification_main_column = 2131296785;
 			
 			// aapt resource value: 0x7F090212
-			public const int options2 = 2131296786;
+			public const int notification_main_column_container = 2131296786;
 			
 			// aapt resource value: 0x7F090213
-			public const int options3 = 2131296787;
+			public const int novideo_img = 2131296787;
 			
 			// aapt resource value: 0x7F090214
-			public const int optionspicker = 2131296788;
+			public const int novideo_img_device = 2131296788;
+			
+			// aapt resource value: 0x7F090208
+			public const int no_camera_tip_ly = 2131296776;
+			
+			// aapt resource value: 0x7F090209
+			public const int no_message_button = 2131296777;
+			
+			// aapt resource value: 0x7F09020A
+			public const int no_message_layout = 2131296778;
+			
+			// aapt resource value: 0x7F09020B
+			public const int no_message_text = 2131296779;
+			
+			// aapt resource value: 0x7F09020C
+			public const int no_more_hint = 2131296780;
+			
+			// aapt resource value: 0x7F09020D
+			public const int no_more_text = 2131296781;
 			
 			// aapt resource value: 0x7F090215
-			public const int outmost_container = 2131296789;
+			public const int offline_bg = 2131296789;
 			
 			// aapt resource value: 0x7F090216
-			public const int packed = 2131296790;
-			
-			// aapt resource value: 0x7F090218
-			public const int pager = 2131296792;
-			
-			// aapt resource value: 0x7F090219
-			public const int pager_tab_strip = 2131296793;
+			public const int ok_tv = 2131296790;
 			
 			// aapt resource value: 0x7F090217
-			public const int page_container = 2131296791;
+			public const int options1 = 2131296791;
+			
+			// aapt resource value: 0x7F090218
+			public const int options2 = 2131296792;
+			
+			// aapt resource value: 0x7F090219
+			public const int options3 = 2131296793;
 			
 			// aapt resource value: 0x7F09021A
-			public const int parallax = 2131296794;
+			public const int optionspicker = 2131296794;
 			
 			// aapt resource value: 0x7F09021B
-			public const int parent = 2131296795;
+			public const int outmost_container = 2131296795;
 			
 			// aapt resource value: 0x7F09021C
-			public const int parentPanel = 2131296796;
-			
-			// aapt resource value: 0x7F09021D
-			public const int parent_matrix = 2131296797;
+			public const int packed = 2131296796;
 			
 			// aapt resource value: 0x7F09021E
-			public const int passwordETV = 2131296798;
+			public const int pager = 2131296798;
 			
 			// aapt resource value: 0x7F09021F
-			public const int pb_notlist_title_bar_landscape = 2131296799;
+			public const int pager_tab_strip = 2131296799;
+			
+			// aapt resource value: 0x7F09021D
+			public const int page_container = 2131296797;
 			
 			// aapt resource value: 0x7F090220
-			public const int pb_play_loading = 2131296800;
+			public const int parallax = 2131296800;
 			
 			// aapt resource value: 0x7F090221
-			public const int pb_search_content_tab = 2131296801;
+			public const int parent = 2131296801;
 			
 			// aapt resource value: 0x7F090222
-			public const int pb_search_tab_btn_cloud = 2131296802;
+			public const int parentPanel = 2131296802;
 			
 			// aapt resource value: 0x7F090223
-			public const int pb_search_tab_btn_device = 2131296803;
+			public const int parent_matrix = 2131296803;
 			
 			// aapt resource value: 0x7F090224
-			public const int pb_title_bar_landscape = 2131296804;
+			public const int passwordETV = 2131296804;
 			
 			// aapt resource value: 0x7F090225
-			public const int peerAddress = 2131296805;
+			public const int pb_notlist_title_bar_landscape = 2131296805;
 			
 			// aapt resource value: 0x7F090226
-			public const int percent = 2131296806;
+			public const int pb_play_loading = 2131296806;
 			
 			// aapt resource value: 0x7F090227
-			public const int phone_et = 2131296807;
+			public const int pb_search_content_tab = 2131296807;
 			
 			// aapt resource value: 0x7F090228
-			public const int phone_ly = 2131296808;
+			public const int pb_search_tab_btn_cloud = 2131296808;
 			
 			// aapt resource value: 0x7F090229
-			public const int phone_lyt = 2131296809;
+			public const int pb_search_tab_btn_device = 2131296809;
 			
 			// aapt resource value: 0x7F09022A
-			public const int pin = 2131296810;
-			
-			// aapt resource value: 0x7F09022C
-			public const int platform_login_btn = 2131296812;
+			public const int pb_title_bar_landscape = 2131296810;
 			
 			// aapt resource value: 0x7F09022B
-			public const int plat_tv = 2131296811;
+			public const int peerAddress = 2131296811;
+			
+			// aapt resource value: 0x7F09022C
+			public const int percent = 2131296812;
 			
 			// aapt resource value: 0x7F09022D
-			public const int play_video_layout = 2131296813;
+			public const int phone_et = 2131296813;
 			
 			// aapt resource value: 0x7F09022E
-			public const int preview_view = 2131296814;
-			
-			// aapt resource value: 0x7F090233
-			public const int progressbar = 2131296819;
+			public const int phone_ly = 2131296814;
 			
 			// aapt resource value: 0x7F09022F
-			public const int progress_area = 2131296815;
+			public const int phone_lyt = 2131296815;
 			
 			// aapt resource value: 0x7F090230
-			public const int progress_circular = 2131296816;
-			
-			// aapt resource value: 0x7F090231
-			public const int progress_horizontal = 2131296817;
+			public const int pin = 2131296816;
 			
 			// aapt resource value: 0x7F090232
-			public const int progress_seekbar = 2131296818;
+			public const int platform_login_btn = 2131296818;
+			
+			// aapt resource value: 0x7F090231
+			public const int plat_tv = 2131296817;
+			
+			// aapt resource value: 0x7F090233
+			public const int play_video_layout = 2131296819;
 			
 			// aapt resource value: 0x7F090234
-			public const int ptz_bottom_btn = 2131296820;
-			
-			// aapt resource value: 0x7F090235
-			public const int ptz_close_btn = 2131296821;
-			
-			// aapt resource value: 0x7F090236
-			public const int ptz_control_ly = 2131296822;
-			
-			// aapt resource value: 0x7F090237
-			public const int ptz_flip_btn = 2131296823;
-			
-			// aapt resource value: 0x7F090238
-			public const int ptz_left_btn = 2131296824;
+			public const int preview_view = 2131296820;
 			
 			// aapt resource value: 0x7F090239
-			public const int ptz_right_btn = 2131296825;
+			public const int progressbar = 2131296825;
+			
+			// aapt resource value: 0x7F090235
+			public const int progress_area = 2131296821;
+			
+			// aapt resource value: 0x7F090236
+			public const int progress_circular = 2131296822;
+			
+			// aapt resource value: 0x7F090237
+			public const int progress_horizontal = 2131296823;
+			
+			// aapt resource value: 0x7F090238
+			public const int progress_seekbar = 2131296824;
 			
 			// aapt resource value: 0x7F09023A
-			public const int ptz_top_btn = 2131296826;
+			public const int ptz_bottom_btn = 2131296826;
 			
 			// aapt resource value: 0x7F09023B
-			public const int quality_balanced_btn = 2131296827;
+			public const int ptz_close_btn = 2131296827;
 			
 			// aapt resource value: 0x7F09023C
-			public const int quality_close_btn = 2131296828;
+			public const int ptz_control_ly = 2131296828;
 			
 			// aapt resource value: 0x7F09023D
-			public const int quality_flunet_btn = 2131296829;
+			public const int ptz_flip_btn = 2131296829;
 			
 			// aapt resource value: 0x7F09023E
-			public const int quality_hd_btn = 2131296830;
+			public const int ptz_left_btn = 2131296830;
 			
 			// aapt resource value: 0x7F09023F
-			public const int quality_line = 2131296831;
+			public const int ptz_right_btn = 2131296831;
 			
 			// aapt resource value: 0x7F090240
-			public const int quality_super_hd_btn = 2131296832;
-			
-			// aapt resource value: 0x7F090242
-			public const int queryingCameraRyt = 2131296834;
-			
-			// aapt resource value: 0x7F090243
-			public const int querying_camera_tv = 2131296835;
+			public const int ptz_top_btn = 2131296832;
 			
 			// aapt resource value: 0x7F090241
-			public const int query_exception_ly = 2131296833;
+			public const int quality_balanced_btn = 2131296833;
+			
+			// aapt resource value: 0x7F090242
+			public const int quality_close_btn = 2131296834;
+			
+			// aapt resource value: 0x7F090243
+			public const int quality_flunet_btn = 2131296835;
 			
 			// aapt resource value: 0x7F090244
-			public const int quit = 2131296836;
+			public const int quality_hd_btn = 2131296836;
 			
 			// aapt resource value: 0x7F090245
-			public const int radio = 2131296837;
+			public const int quality_line = 2131296837;
 			
 			// aapt resource value: 0x7F090246
-			public const int range = 2131296838;
-			
-			// aapt resource value: 0x7F090247
-			public const int rangeSort = 2131296839;
+			public const int quality_super_hd_btn = 2131296838;
 			
 			// aapt resource value: 0x7F090248
-			public const int rate_16x = 2131296840;
+			public const int queryingCameraRyt = 2131296840;
 			
 			// aapt resource value: 0x7F090249
-			public const int rate_1x = 2131296841;
+			public const int querying_camera_tv = 2131296841;
+			
+			// aapt resource value: 0x7F090247
+			public const int query_exception_ly = 2131296839;
 			
 			// aapt resource value: 0x7F09024A
-			public const int rate_4x = 2131296842;
+			public const int quit = 2131296842;
 			
 			// aapt resource value: 0x7F09024B
-			public const int rate_8x = 2131296843;
-			
-			// aapt resource value: 0x7F09024D
-			public const int read_button = 2131296845;
-			
-			// aapt resource value: 0x7F09024E
-			public const int realplay_area = 2131296846;
-			
-			// aapt resource value: 0x7F09024F
-			public const int realplay_back_btn = 2131296847;
-			
-			// aapt resource value: 0x7F090250
-			public const int realplay_capture_iv = 2131296848;
-			
-			// aapt resource value: 0x7F090251
-			public const int realplay_capture_rl = 2131296849;
-			
-			// aapt resource value: 0x7F090252
-			public const int realplay_capture_watermark_iv = 2131296850;
-			
-			// aapt resource value: 0x7F090253
-			public const int realplay_control_bar = 2131296851;
-			
-			// aapt resource value: 0x7F090254
-			public const int realplay_control_rl = 2131296852;
-			
-			// aapt resource value: 0x7F090255
-			public const int realplay_display_view = 2131296853;
-			
-			// aapt resource value: 0x7F090256
-			public const int realplay_flow_tv = 2131296854;
-			
-			// aapt resource value: 0x7F090257
-			public const int realplay_full_anim_btn = 2131296855;
-			
-			// aapt resource value: 0x7F090258
-			public const int realplay_full_flow_ly = 2131296856;
-			
-			// aapt resource value: 0x7F090259
-			public const int realplay_full_flow_tv = 2131296857;
-			
-			// aapt resource value: 0x7F09025A
-			public const int realplay_full_operate_bar = 2131296858;
-			
-			// aapt resource value: 0x7F09025B
-			public const int realplay_full_operate_layout = 2131296859;
-			
-			// aapt resource value: 0x7F09025C
-			public const int realplay_full_play_btn = 2131296860;
-			
-			// aapt resource value: 0x7F09025D
-			public const int realplay_full_previously_btn = 2131296861;
-			
-			// aapt resource value: 0x7F09025E
-			public const int realplay_full_ptz_anim_btn = 2131296862;
-			
-			// aapt resource value: 0x7F09025F
-			public const int realplay_full_ptz_btn = 2131296863;
-			
-			// aapt resource value: 0x7F090260
-			public const int realplay_full_ptz_prompt_iv = 2131296864;
-			
-			// aapt resource value: 0x7F090261
-			public const int realplay_full_rate_tv = 2131296865;
-			
-			// aapt resource value: 0x7F090262
-			public const int realplay_full_sound_btn = 2131296866;
-			
-			// aapt resource value: 0x7F090263
-			public const int realplay_full_talk_anim_btn = 2131296867;
-			
-			// aapt resource value: 0x7F090264
-			public const int realplay_full_talk_btn = 2131296868;
-			
-			// aapt resource value: 0x7F090265
-			public const int realplay_full_video_btn = 2131296869;
-			
-			// aapt resource value: 0x7F090266
-			public const int realplay_full_video_container = 2131296870;
-			
-			// aapt resource value: 0x7F090267
-			public const int realplay_full_video_start_btn = 2131296871;
-			
-			// aapt resource value: 0x7F090268
-			public const int realplay_loading = 2131296872;
-			
-			// aapt resource value: 0x7F090269
-			public const int realplay_loading_rl = 2131296873;
-			
-			// aapt resource value: 0x7F09026A
-			public const int realplay_operate_bar = 2131296874;
-			
-			// aapt resource value: 0x7F09026B
-			public const int realplay_operate_bar2 = 2131296875;
-			
-			// aapt resource value: 0x7F09026C
-			public const int realplay_operate_ly = 2131296876;
-			
-			// aapt resource value: 0x7F09026D
-			public const int realplay_operate_ly2 = 2131296877;
-			
-			// aapt resource value: 0x7F090270
-			public const int realplay_pages_gallery = 2131296880;
-			
-			// aapt resource value: 0x7F09026E
-			public const int realplay_page_anim_iv = 2131296878;
-			
-			// aapt resource value: 0x7F09026F
-			public const int realplay_page_ly = 2131296879;
-			
-			// aapt resource value: 0x7F090271
-			public const int realplay_play_btn = 2131296881;
-			
-			// aapt resource value: 0x7F090272
-			public const int realplay_play_iv = 2131296882;
-			
-			// aapt resource value: 0x7F090273
-			public const int realplay_play_rl = 2131296883;
-			
-			// aapt resource value: 0x7F090274
-			public const int realplay_previously_btn = 2131296884;
-			
-			// aapt resource value: 0x7F090275
-			public const int realplay_previously_btn2 = 2131296885;
-			
-			// aapt resource value: 0x7F090276
-			public const int realplay_previously_btn_ly = 2131296886;
-			
-			// aapt resource value: 0x7F090277
-			public const int realplay_previously_btn_ly2 = 2131296887;
-			
-			// aapt resource value: 0x7F090278
-			public const int realplay_privacy_btn = 2131296888;
-			
-			// aapt resource value: 0x7F090279
-			public const int realplay_privacy_btn2 = 2131296889;
-			
-			// aapt resource value: 0x7F09027A
-			public const int realplay_privacy_btn_ly = 2131296890;
-			
-			// aapt resource value: 0x7F09027B
-			public const int realplay_privacy_btn_ly2 = 2131296891;
-			
-			// aapt resource value: 0x7F09027C
-			public const int realplay_privacy_ly = 2131296892;
-			
-			// aapt resource value: 0x7F09027D
-			public const int realplay_privacy_tv = 2131296893;
-			
-			// aapt resource value: 0x7F09027E
-			public const int realplay_privacy_tv2 = 2131296894;
-			
-			// aapt resource value: 0x7F09027F
-			public const int realplay_prompt_rl = 2131296895;
-			
-			// aapt resource value: 0x7F090280
-			public const int realplay_ptz_btn = 2131296896;
-			
-			// aapt resource value: 0x7F090281
-			public const int realplay_ptz_btn2 = 2131296897;
-			
-			// aapt resource value: 0x7F090282
-			public const int realplay_ptz_btn_ly = 2131296898;
-			
-			// aapt resource value: 0x7F090283
-			public const int realplay_ptz_btn_ly2 = 2131296899;
-			
-			// aapt resource value: 0x7F090284
-			public const int realplay_ptz_direction_iv = 2131296900;
-			
-			// aapt resource value: 0x7F090285
-			public const int realplay_quality_btn = 2131296901;
-			
-			// aapt resource value: 0x7F090286
-			public const int realplay_ratio_tv = 2131296902;
-			
-			// aapt resource value: 0x7F090287
-			public const int realplay_record_iv = 2131296903;
-			
-			// aapt resource value: 0x7F090288
-			public const int realplay_record_ly = 2131296904;
-			
-			// aapt resource value: 0x7F090289
-			public const int realplay_record_tv = 2131296905;
-			
-			// aapt resource value: 0x7F09028A
-			public const int realplay_sound_btn = 2131296906;
-			
-			// aapt resource value: 0x7F09028B
-			public const int realplay_ssl_btn = 2131296907;
-			
-			// aapt resource value: 0x7F09028C
-			public const int realplay_ssl_btn2 = 2131296908;
-			
-			// aapt resource value: 0x7F09028D
-			public const int realplay_ssl_btn_ly = 2131296909;
-			
-			// aapt resource value: 0x7F09028E
-			public const int realplay_ssl_btn_ly2 = 2131296910;
-			
-			// aapt resource value: 0x7F09028F
-			public const int realplay_ssl_btn_rl = 2131296911;
-			
-			// aapt resource value: 0x7F090290
-			public const int realplay_ssl_btn_rl2 = 2131296912;
-			
-			// aapt resource value: 0x7F090291
-			public const int realplay_ssl_progress = 2131296913;
-			
-			// aapt resource value: 0x7F090292
-			public const int realplay_ssl_progress2 = 2131296914;
-			
-			// aapt resource value: 0x7F090293
-			public const int realplay_ssl_tv = 2131296915;
-			
-			// aapt resource value: 0x7F090294
-			public const int realplay_ssl_tv2 = 2131296916;
-			
-			// aapt resource value: 0x7F090295
-			public const int realplay_stop_btn = 2131296917;
-			
-			// aapt resource value: 0x7F090296
-			public const int realplay_sv = 2131296918;
-			
-			// aapt resource value: 0x7F090297
-			public const int realplay_talk_btn = 2131296919;
-			
-			// aapt resource value: 0x7F090298
-			public const int realplay_talk_btn2 = 2131296920;
-			
-			// aapt resource value: 0x7F090299
-			public const int realplay_talk_btn_ly = 2131296921;
-			
-			// aapt resource value: 0x7F09029A
-			public const int realplay_talk_btn_ly2 = 2131296922;
-			
-			// aapt resource value: 0x7F09029B
-			public const int realplay_tip_tv = 2131296923;
-			
-			// aapt resource value: 0x7F09029C
-			public const int realplay_title_tv = 2131296924;
-			
-			// aapt resource value: 0x7F09029D
-			public const int realplay_top_bar = 2131296925;
-			
-			// aapt resource value: 0x7F09029E
-			public const int realplay_video_btn = 2131296926;
-			
-			// aapt resource value: 0x7F09029F
-			public const int realplay_video_btn2 = 2131296927;
-			
-			// aapt resource value: 0x7F0902A0
-			public const int realplay_video_container = 2131296928;
-			
-			// aapt resource value: 0x7F0902A1
-			public const int realplay_video_container2 = 2131296929;
-			
-			// aapt resource value: 0x7F0902A2
-			public const int realplay_video_container_ly = 2131296930;
-			
-			// aapt resource value: 0x7F0902A3
-			public const int realplay_video_container_ly2 = 2131296931;
-			
-			// aapt resource value: 0x7F0902A4
-			public const int realplay_video_start_btn = 2131296932;
-			
-			// aapt resource value: 0x7F0902A5
-			public const int realplay_video_start_btn2 = 2131296933;
-			
-			// aapt resource value: 0x7F0902A6
-			public const int realplay_waiting_lr = 2131296934;
-			
-			// aapt resource value: 0x7F0902A7
-			public const int realplay_watting_pb = 2131296935;
-			
-			// aapt resource value: 0x7F0902A8
-			public const int realplay_watting_tv = 2131296936;
-			
-			// aapt resource value: 0x7F0902A9
-			public const int realplay_wnd_sv = 2131296937;
-			
-			// aapt resource value: 0x7F0902AA
-			public const int recycler_view = 2131296938;
-			
-			// aapt resource value: 0x7F0902AB
-			public const int refresh_button = 2131296939;
-			
-			// aapt resource value: 0x7F0902AC
-			public const int refresh_layout = 2131296940;
-			
-			// aapt resource value: 0x7F0902AD
-			public const int refresh_tip = 2131296941;
-			
-			// aapt resource value: 0x7F0902AE
-			public const int remoteFrame = 2131296942;
-			
-			// aapt resource value: 0x7F0902AF
-			public const int remoteFrameContainer = 2131296943;
-			
-			// aapt resource value: 0x7F0902BC
-			public const int remoteplayback_begin_time_tv = 2131296956;
-			
-			// aapt resource value: 0x7F0902BD
-			public const int remoteplayback_capture_iv = 2131296957;
-			
-			// aapt resource value: 0x7F0902BE
-			public const int remoteplayback_capture_rl = 2131296958;
-			
-			// aapt resource value: 0x7F0902BF
-			public const int remoteplayback_capture_watermark_iv = 2131296959;
-			
-			// aapt resource value: 0x7F0902C0
-			public const int remoteplayback_control_rl = 2131296960;
-			
-			// aapt resource value: 0x7F0902C1
-			public const int remoteplayback_end_time_tv = 2131296961;
-			
-			// aapt resource value: 0x7F0902C2
-			public const int remoteplayback_file_time_bar = 2131296962;
-			
-			// aapt resource value: 0x7F0902C3
-			public const int remoteplayback_flow_tv = 2131296963;
-			
-			// aapt resource value: 0x7F0902C4
-			public const int remoteplayback_full_down_btn = 2131296964;
-			
-			// aapt resource value: 0x7F0902C5
-			public const int remoteplayback_full_flow_ly = 2131296965;
-			
-			// aapt resource value: 0x7F0902C6
-			public const int remoteplayback_full_flow_tv = 2131296966;
-			
-			// aapt resource value: 0x7F0902C7
-			public const int remoteplayback_full_operate_bar = 2131296967;
-			
-			// aapt resource value: 0x7F0902C8
-			public const int remoteplayback_full_play_btn = 2131296968;
-			
-			// aapt resource value: 0x7F0902C9
-			public const int remoteplayback_full_previously_btn = 2131296969;
-			
-			// aapt resource value: 0x7F0902CA
-			public const int remoteplayback_full_rate_tv = 2131296970;
-			
-			// aapt resource value: 0x7F0902CB
-			public const int remoteplayback_full_sound_btn = 2131296971;
-			
-			// aapt resource value: 0x7F0902CC
-			public const int remoteplayback_full_video_btn = 2131296972;
-			
-			// aapt resource value: 0x7F0902CD
-			public const int remoteplayback_full_video_container = 2131296973;
-			
-			// aapt resource value: 0x7F0902CE
-			public const int remoteplayback_full_video_start_btn = 2131296974;
-			
-			// aapt resource value: 0x7F0902CF
-			public const int remoteplayback_loading_iv = 2131296975;
-			
-			// aapt resource value: 0x7F0902D0
-			public const int remoteplayback_loading_ly = 2131296976;
-			
-			// aapt resource value: 0x7F0902D1
-			public const int remoteplayback_loading_pb_ly = 2131296977;
-			
-			// aapt resource value: 0x7F0902D2
-			public const int remoteplayback_loading_play_btn = 2131296978;
-			
-			// aapt resource value: 0x7F0902D3
-			public const int remoteplayback_loading_tv = 2131296979;
-			
-			// aapt resource value: 0x7F0902D4
-			public const int remoteplayback_operate_bar = 2131296980;
-			
-			// aapt resource value: 0x7F0902D5
-			public const int remoteplayback_page_ly = 2131296981;
-			
-			// aapt resource value: 0x7F0902D6
-			public const int remoteplayback_play_btn = 2131296982;
-			
-			// aapt resource value: 0x7F0902D7
-			public const int remoteplayback_play_rl = 2131296983;
-			
-			// aapt resource value: 0x7F0902D8
-			public const int remoteplayback_previously_btn = 2131296984;
-			
-			// aapt resource value: 0x7F0902DB
-			public const int remoteplayback_progressbar = 2131296987;
-			
-			// aapt resource value: 0x7F0902D9
-			public const int remoteplayback_progress_ly = 2131296985;
-			
-			// aapt resource value: 0x7F0902DA
-			public const int remoteplayback_progress_seekbar = 2131296986;
-			
-			// aapt resource value: 0x7F0902DC
-			public const int remoteplayback_ratio_tv = 2131296988;
-			
-			// aapt resource value: 0x7F0902DD
-			public const int remoteplayback_record_iv = 2131296989;
-			
-			// aapt resource value: 0x7F0902DE
-			public const int remoteplayback_record_ly = 2131296990;
-			
-			// aapt resource value: 0x7F0902DF
-			public const int remoteplayback_record_tv = 2131296991;
-			
-			// aapt resource value: 0x7F0902E0
-			public const int remoteplayback_replay_btn = 2131296992;
-			
-			// aapt resource value: 0x7F0902E1
-			public const int remoteplayback_small_previously_btn = 2131296993;
-			
-			// aapt resource value: 0x7F0902E2
-			public const int remoteplayback_small_video_btn = 2131296994;
-			
-			// aapt resource value: 0x7F0902E3
-			public const int remoteplayback_small_video_container = 2131296995;
-			
-			// aapt resource value: 0x7F0902E4
-			public const int remoteplayback_small_video_start_btn = 2131296996;
-			
-			// aapt resource value: 0x7F0902E5
-			public const int remoteplayback_sound_btn = 2131296997;
-			
-			// aapt resource value: 0x7F0902E6
-			public const int remoteplayback_sv = 2131296998;
-			
-			// aapt resource value: 0x7F0902E8
-			public const int remoteplayback_timebar = 2131297000;
-			
-			// aapt resource value: 0x7F0902E9
-			public const int remoteplayback_timebar_rl = 2131297001;
-			
-			// aapt resource value: 0x7F0902E7
-			public const int remoteplayback_time_tv = 2131296999;
-			
-			// aapt resource value: 0x7F0902EA
-			public const int remoteplayback_tip_tv = 2131297002;
-			
-			// aapt resource value: 0x7F0902EB
-			public const int remoteplayback_video_btn = 2131297003;
-			
-			// aapt resource value: 0x7F0902EC
-			public const int remoteplayback_video_container = 2131297004;
-			
-			// aapt resource value: 0x7F0902ED
-			public const int remoteplayback_video_start_btn = 2131297005;
-			
-			// aapt resource value: 0x7F0902B0
-			public const int remoteVideo = 2131296944;
-			
-			// aapt resource value: 0x7F0902B1
-			public const int remote_list_page = 2131296945;
-			
-			// aapt resource value: 0x7F0902B2
-			public const int remote_loading_buffer_tv = 2131296946;
-			
-			// aapt resource value: 0x7F0902B3
-			public const int remote_loading_iv = 2131296947;
-			
-			// aapt resource value: 0x7F0902B4
-			public const int remote_playback_area = 2131296948;
-			
-			// aapt resource value: 0x7F0902B5
-			public const int remote_playback_capture_btn = 2131296949;
-			
-			// aapt resource value: 0x7F0902B6
-			public const int remote_playback_download_btn = 2131296950;
-			
-			// aapt resource value: 0x7F0902B7
-			public const int remote_playback_flow_tv = 2131296951;
-			
-			// aapt resource value: 0x7F0902B8
-			public const int remote_playback_pause_btn = 2131296952;
-			
-			// aapt resource value: 0x7F0902B9
-			public const int remote_playback_sound_btn = 2131296953;
-			
-			// aapt resource value: 0x7F0902BA
-			public const int remote_playback_video_recording_btn = 2131296954;
-			
-			// aapt resource value: 0x7F0902BB
-			public const int remote_playback_wnd_sv = 2131296955;
-			
-			// aapt resource value: 0x7F0902EE
-			public const int render_texture_view = 2131297006;
-			
-			// aapt resource value: 0x7F0902EF
-			public const int render_texture_view_soft = 2131297007;
-			
-			// aapt resource value: 0x7F0902F0
-			public const int replay_btn = 2131297008;
-			
-			// aapt resource value: 0x7F0902F1
-			public const int requestA = 2131297009;
-			
-			// aapt resource value: 0x7F0902F2
-			public const int requestMasterAudio = 2131297010;
-			
-			// aapt resource value: 0x7F0902F3
-			public const int requestMasterVideo = 2131297011;
-			
-			// aapt resource value: 0x7F0902F4
-			public const int requestV = 2131297012;
-			
-			// aapt resource value: 0x7F0902F5
-			public const int restart_preview = 2131297013;
-			
-			// aapt resource value: 0x7F0902F6
-			public const int retry_btn = 2131297014;
-			
-			// aapt resource value: 0x7F0902F7
-			public const int retry_button = 2131297015;
-			
-			// aapt resource value: 0x7F0902F8
-			public const int return_scan_result = 2131297016;
-			
-			// aapt resource value: 0x7F0902F9
-			public const int reverseCall = 2131297017;
-			
-			// aapt resource value: 0x7F0902FA
-			public const int reverseCallInfo = 2131297018;
+			public const int radio = 2131296843;
 			
 			// aapt resource value: 0x7F09024C
-			public const int re_next_area = 2131296844;
+			public const int range = 2131296844;
+			
+			// aapt resource value: 0x7F09024D
+			public const int rangeSort = 2131296845;
+			
+			// aapt resource value: 0x7F09024E
+			public const int rate_16x = 2131296846;
+			
+			// aapt resource value: 0x7F09024F
+			public const int rate_1x = 2131296847;
+			
+			// aapt resource value: 0x7F090250
+			public const int rate_4x = 2131296848;
+			
+			// aapt resource value: 0x7F090251
+			public const int rate_8x = 2131296849;
+			
+			// aapt resource value: 0x7F090253
+			public const int read_button = 2131296851;
+			
+			// aapt resource value: 0x7F090254
+			public const int realplay_area = 2131296852;
+			
+			// aapt resource value: 0x7F090255
+			public const int realplay_back_btn = 2131296853;
+			
+			// aapt resource value: 0x7F090256
+			public const int realplay_capture_iv = 2131296854;
+			
+			// aapt resource value: 0x7F090257
+			public const int realplay_capture_rl = 2131296855;
+			
+			// aapt resource value: 0x7F090258
+			public const int realplay_capture_watermark_iv = 2131296856;
+			
+			// aapt resource value: 0x7F090259
+			public const int realplay_control_bar = 2131296857;
+			
+			// aapt resource value: 0x7F09025A
+			public const int realplay_control_rl = 2131296858;
+			
+			// aapt resource value: 0x7F09025B
+			public const int realplay_display_view = 2131296859;
+			
+			// aapt resource value: 0x7F09025C
+			public const int realplay_flow_tv = 2131296860;
+			
+			// aapt resource value: 0x7F09025D
+			public const int realplay_full_anim_btn = 2131296861;
+			
+			// aapt resource value: 0x7F09025E
+			public const int realplay_full_flow_ly = 2131296862;
+			
+			// aapt resource value: 0x7F09025F
+			public const int realplay_full_flow_tv = 2131296863;
+			
+			// aapt resource value: 0x7F090260
+			public const int realplay_full_operate_bar = 2131296864;
+			
+			// aapt resource value: 0x7F090261
+			public const int realplay_full_operate_layout = 2131296865;
+			
+			// aapt resource value: 0x7F090262
+			public const int realplay_full_play_btn = 2131296866;
+			
+			// aapt resource value: 0x7F090263
+			public const int realplay_full_previously_btn = 2131296867;
+			
+			// aapt resource value: 0x7F090264
+			public const int realplay_full_ptz_anim_btn = 2131296868;
+			
+			// aapt resource value: 0x7F090265
+			public const int realplay_full_ptz_btn = 2131296869;
+			
+			// aapt resource value: 0x7F090266
+			public const int realplay_full_ptz_prompt_iv = 2131296870;
+			
+			// aapt resource value: 0x7F090267
+			public const int realplay_full_rate_tv = 2131296871;
+			
+			// aapt resource value: 0x7F090268
+			public const int realplay_full_sound_btn = 2131296872;
+			
+			// aapt resource value: 0x7F090269
+			public const int realplay_full_talk_anim_btn = 2131296873;
+			
+			// aapt resource value: 0x7F09026A
+			public const int realplay_full_talk_btn = 2131296874;
+			
+			// aapt resource value: 0x7F09026B
+			public const int realplay_full_video_btn = 2131296875;
+			
+			// aapt resource value: 0x7F09026C
+			public const int realplay_full_video_container = 2131296876;
+			
+			// aapt resource value: 0x7F09026D
+			public const int realplay_full_video_start_btn = 2131296877;
+			
+			// aapt resource value: 0x7F09026E
+			public const int realplay_loading = 2131296878;
+			
+			// aapt resource value: 0x7F09026F
+			public const int realplay_loading_rl = 2131296879;
+			
+			// aapt resource value: 0x7F090270
+			public const int realplay_operate_bar = 2131296880;
+			
+			// aapt resource value: 0x7F090271
+			public const int realplay_operate_bar2 = 2131296881;
+			
+			// aapt resource value: 0x7F090272
+			public const int realplay_operate_ly = 2131296882;
+			
+			// aapt resource value: 0x7F090273
+			public const int realplay_operate_ly2 = 2131296883;
+			
+			// aapt resource value: 0x7F090276
+			public const int realplay_pages_gallery = 2131296886;
+			
+			// aapt resource value: 0x7F090274
+			public const int realplay_page_anim_iv = 2131296884;
+			
+			// aapt resource value: 0x7F090275
+			public const int realplay_page_ly = 2131296885;
+			
+			// aapt resource value: 0x7F090277
+			public const int realplay_play_btn = 2131296887;
+			
+			// aapt resource value: 0x7F090278
+			public const int realplay_play_iv = 2131296888;
+			
+			// aapt resource value: 0x7F090279
+			public const int realplay_play_rl = 2131296889;
+			
+			// aapt resource value: 0x7F09027A
+			public const int realplay_previously_btn = 2131296890;
+			
+			// aapt resource value: 0x7F09027B
+			public const int realplay_previously_btn2 = 2131296891;
+			
+			// aapt resource value: 0x7F09027C
+			public const int realplay_previously_btn_ly = 2131296892;
+			
+			// aapt resource value: 0x7F09027D
+			public const int realplay_previously_btn_ly2 = 2131296893;
+			
+			// aapt resource value: 0x7F09027E
+			public const int realplay_privacy_btn = 2131296894;
+			
+			// aapt resource value: 0x7F09027F
+			public const int realplay_privacy_btn2 = 2131296895;
+			
+			// aapt resource value: 0x7F090280
+			public const int realplay_privacy_btn_ly = 2131296896;
+			
+			// aapt resource value: 0x7F090281
+			public const int realplay_privacy_btn_ly2 = 2131296897;
+			
+			// aapt resource value: 0x7F090282
+			public const int realplay_privacy_ly = 2131296898;
+			
+			// aapt resource value: 0x7F090283
+			public const int realplay_privacy_tv = 2131296899;
+			
+			// aapt resource value: 0x7F090284
+			public const int realplay_privacy_tv2 = 2131296900;
+			
+			// aapt resource value: 0x7F090285
+			public const int realplay_prompt_rl = 2131296901;
+			
+			// aapt resource value: 0x7F090286
+			public const int realplay_ptz_btn = 2131296902;
+			
+			// aapt resource value: 0x7F090287
+			public const int realplay_ptz_btn2 = 2131296903;
+			
+			// aapt resource value: 0x7F090288
+			public const int realplay_ptz_btn_ly = 2131296904;
+			
+			// aapt resource value: 0x7F090289
+			public const int realplay_ptz_btn_ly2 = 2131296905;
+			
+			// aapt resource value: 0x7F09028A
+			public const int realplay_ptz_direction_iv = 2131296906;
+			
+			// aapt resource value: 0x7F09028B
+			public const int realplay_quality_btn = 2131296907;
+			
+			// aapt resource value: 0x7F09028C
+			public const int realplay_ratio_tv = 2131296908;
+			
+			// aapt resource value: 0x7F09028D
+			public const int realplay_record_iv = 2131296909;
+			
+			// aapt resource value: 0x7F09028E
+			public const int realplay_record_ly = 2131296910;
+			
+			// aapt resource value: 0x7F09028F
+			public const int realplay_record_tv = 2131296911;
+			
+			// aapt resource value: 0x7F090290
+			public const int realplay_sound_btn = 2131296912;
+			
+			// aapt resource value: 0x7F090291
+			public const int realplay_ssl_btn = 2131296913;
+			
+			// aapt resource value: 0x7F090292
+			public const int realplay_ssl_btn2 = 2131296914;
+			
+			// aapt resource value: 0x7F090293
+			public const int realplay_ssl_btn_ly = 2131296915;
+			
+			// aapt resource value: 0x7F090294
+			public const int realplay_ssl_btn_ly2 = 2131296916;
+			
+			// aapt resource value: 0x7F090295
+			public const int realplay_ssl_btn_rl = 2131296917;
+			
+			// aapt resource value: 0x7F090296
+			public const int realplay_ssl_btn_rl2 = 2131296918;
+			
+			// aapt resource value: 0x7F090297
+			public const int realplay_ssl_progress = 2131296919;
+			
+			// aapt resource value: 0x7F090298
+			public const int realplay_ssl_progress2 = 2131296920;
+			
+			// aapt resource value: 0x7F090299
+			public const int realplay_ssl_tv = 2131296921;
+			
+			// aapt resource value: 0x7F09029A
+			public const int realplay_ssl_tv2 = 2131296922;
+			
+			// aapt resource value: 0x7F09029B
+			public const int realplay_stop_btn = 2131296923;
+			
+			// aapt resource value: 0x7F09029C
+			public const int realplay_sv = 2131296924;
+			
+			// aapt resource value: 0x7F09029D
+			public const int realplay_talk_btn = 2131296925;
+			
+			// aapt resource value: 0x7F09029E
+			public const int realplay_talk_btn2 = 2131296926;
+			
+			// aapt resource value: 0x7F09029F
+			public const int realplay_talk_btn_ly = 2131296927;
+			
+			// aapt resource value: 0x7F0902A0
+			public const int realplay_talk_btn_ly2 = 2131296928;
+			
+			// aapt resource value: 0x7F0902A1
+			public const int realplay_tip_tv = 2131296929;
+			
+			// aapt resource value: 0x7F0902A2
+			public const int realplay_title_tv = 2131296930;
+			
+			// aapt resource value: 0x7F0902A3
+			public const int realplay_top_bar = 2131296931;
+			
+			// aapt resource value: 0x7F0902A4
+			public const int realplay_video_btn = 2131296932;
+			
+			// aapt resource value: 0x7F0902A5
+			public const int realplay_video_btn2 = 2131296933;
+			
+			// aapt resource value: 0x7F0902A6
+			public const int realplay_video_container = 2131296934;
+			
+			// aapt resource value: 0x7F0902A7
+			public const int realplay_video_container2 = 2131296935;
+			
+			// aapt resource value: 0x7F0902A8
+			public const int realplay_video_container_ly = 2131296936;
+			
+			// aapt resource value: 0x7F0902A9
+			public const int realplay_video_container_ly2 = 2131296937;
+			
+			// aapt resource value: 0x7F0902AA
+			public const int realplay_video_start_btn = 2131296938;
+			
+			// aapt resource value: 0x7F0902AB
+			public const int realplay_video_start_btn2 = 2131296939;
+			
+			// aapt resource value: 0x7F0902AC
+			public const int realplay_waiting_lr = 2131296940;
+			
+			// aapt resource value: 0x7F0902AD
+			public const int realplay_watting_pb = 2131296941;
+			
+			// aapt resource value: 0x7F0902AE
+			public const int realplay_watting_tv = 2131296942;
+			
+			// aapt resource value: 0x7F0902AF
+			public const int realplay_wnd_sv = 2131296943;
+			
+			// aapt resource value: 0x7F0902B0
+			public const int recycler_view = 2131296944;
+			
+			// aapt resource value: 0x7F0902B1
+			public const int refresh_button = 2131296945;
+			
+			// aapt resource value: 0x7F0902B2
+			public const int refresh_layout = 2131296946;
+			
+			// aapt resource value: 0x7F0902B3
+			public const int refresh_tip = 2131296947;
+			
+			// aapt resource value: 0x7F0902B4
+			public const int remoteFrame = 2131296948;
+			
+			// aapt resource value: 0x7F0902B5
+			public const int remoteFrameContainer = 2131296949;
+			
+			// aapt resource value: 0x7F0902C2
+			public const int remoteplayback_begin_time_tv = 2131296962;
+			
+			// aapt resource value: 0x7F0902C3
+			public const int remoteplayback_capture_iv = 2131296963;
+			
+			// aapt resource value: 0x7F0902C4
+			public const int remoteplayback_capture_rl = 2131296964;
+			
+			// aapt resource value: 0x7F0902C5
+			public const int remoteplayback_capture_watermark_iv = 2131296965;
+			
+			// aapt resource value: 0x7F0902C6
+			public const int remoteplayback_control_rl = 2131296966;
+			
+			// aapt resource value: 0x7F0902C7
+			public const int remoteplayback_end_time_tv = 2131296967;
+			
+			// aapt resource value: 0x7F0902C8
+			public const int remoteplayback_file_time_bar = 2131296968;
+			
+			// aapt resource value: 0x7F0902C9
+			public const int remoteplayback_flow_tv = 2131296969;
+			
+			// aapt resource value: 0x7F0902CA
+			public const int remoteplayback_full_down_btn = 2131296970;
+			
+			// aapt resource value: 0x7F0902CB
+			public const int remoteplayback_full_flow_ly = 2131296971;
+			
+			// aapt resource value: 0x7F0902CC
+			public const int remoteplayback_full_flow_tv = 2131296972;
+			
+			// aapt resource value: 0x7F0902CD
+			public const int remoteplayback_full_operate_bar = 2131296973;
+			
+			// aapt resource value: 0x7F0902CE
+			public const int remoteplayback_full_play_btn = 2131296974;
+			
+			// aapt resource value: 0x7F0902CF
+			public const int remoteplayback_full_previously_btn = 2131296975;
+			
+			// aapt resource value: 0x7F0902D0
+			public const int remoteplayback_full_rate_tv = 2131296976;
+			
+			// aapt resource value: 0x7F0902D1
+			public const int remoteplayback_full_sound_btn = 2131296977;
+			
+			// aapt resource value: 0x7F0902D2
+			public const int remoteplayback_full_video_btn = 2131296978;
+			
+			// aapt resource value: 0x7F0902D3
+			public const int remoteplayback_full_video_container = 2131296979;
+			
+			// aapt resource value: 0x7F0902D4
+			public const int remoteplayback_full_video_start_btn = 2131296980;
+			
+			// aapt resource value: 0x7F0902D5
+			public const int remoteplayback_loading_iv = 2131296981;
+			
+			// aapt resource value: 0x7F0902D6
+			public const int remoteplayback_loading_ly = 2131296982;
+			
+			// aapt resource value: 0x7F0902D7
+			public const int remoteplayback_loading_pb_ly = 2131296983;
+			
+			// aapt resource value: 0x7F0902D8
+			public const int remoteplayback_loading_play_btn = 2131296984;
+			
+			// aapt resource value: 0x7F0902D9
+			public const int remoteplayback_loading_tv = 2131296985;
+			
+			// aapt resource value: 0x7F0902DA
+			public const int remoteplayback_operate_bar = 2131296986;
+			
+			// aapt resource value: 0x7F0902DB
+			public const int remoteplayback_page_ly = 2131296987;
+			
+			// aapt resource value: 0x7F0902DC
+			public const int remoteplayback_play_btn = 2131296988;
+			
+			// aapt resource value: 0x7F0902DD
+			public const int remoteplayback_play_rl = 2131296989;
+			
+			// aapt resource value: 0x7F0902DE
+			public const int remoteplayback_previously_btn = 2131296990;
+			
+			// aapt resource value: 0x7F0902E1
+			public const int remoteplayback_progressbar = 2131296993;
+			
+			// aapt resource value: 0x7F0902DF
+			public const int remoteplayback_progress_ly = 2131296991;
+			
+			// aapt resource value: 0x7F0902E0
+			public const int remoteplayback_progress_seekbar = 2131296992;
+			
+			// aapt resource value: 0x7F0902E2
+			public const int remoteplayback_ratio_tv = 2131296994;
+			
+			// aapt resource value: 0x7F0902E3
+			public const int remoteplayback_record_iv = 2131296995;
+			
+			// aapt resource value: 0x7F0902E4
+			public const int remoteplayback_record_ly = 2131296996;
+			
+			// aapt resource value: 0x7F0902E5
+			public const int remoteplayback_record_tv = 2131296997;
+			
+			// aapt resource value: 0x7F0902E6
+			public const int remoteplayback_replay_btn = 2131296998;
+			
+			// aapt resource value: 0x7F0902E7
+			public const int remoteplayback_small_previously_btn = 2131296999;
+			
+			// aapt resource value: 0x7F0902E8
+			public const int remoteplayback_small_video_btn = 2131297000;
+			
+			// aapt resource value: 0x7F0902E9
+			public const int remoteplayback_small_video_container = 2131297001;
+			
+			// aapt resource value: 0x7F0902EA
+			public const int remoteplayback_small_video_start_btn = 2131297002;
+			
+			// aapt resource value: 0x7F0902EB
+			public const int remoteplayback_sound_btn = 2131297003;
+			
+			// aapt resource value: 0x7F0902EC
+			public const int remoteplayback_sv = 2131297004;
+			
+			// aapt resource value: 0x7F0902EE
+			public const int remoteplayback_timebar = 2131297006;
+			
+			// aapt resource value: 0x7F0902EF
+			public const int remoteplayback_timebar_rl = 2131297007;
+			
+			// aapt resource value: 0x7F0902ED
+			public const int remoteplayback_time_tv = 2131297005;
+			
+			// aapt resource value: 0x7F0902F0
+			public const int remoteplayback_tip_tv = 2131297008;
+			
+			// aapt resource value: 0x7F0902F1
+			public const int remoteplayback_video_btn = 2131297009;
+			
+			// aapt resource value: 0x7F0902F2
+			public const int remoteplayback_video_container = 2131297010;
+			
+			// aapt resource value: 0x7F0902F3
+			public const int remoteplayback_video_start_btn = 2131297011;
+			
+			// aapt resource value: 0x7F0902B6
+			public const int remoteVideo = 2131296950;
+			
+			// aapt resource value: 0x7F0902B7
+			public const int remote_list_page = 2131296951;
+			
+			// aapt resource value: 0x7F0902B8
+			public const int remote_loading_buffer_tv = 2131296952;
+			
+			// aapt resource value: 0x7F0902B9
+			public const int remote_loading_iv = 2131296953;
+			
+			// aapt resource value: 0x7F0902BA
+			public const int remote_playback_area = 2131296954;
+			
+			// aapt resource value: 0x7F0902BB
+			public const int remote_playback_capture_btn = 2131296955;
+			
+			// aapt resource value: 0x7F0902BC
+			public const int remote_playback_download_btn = 2131296956;
+			
+			// aapt resource value: 0x7F0902BD
+			public const int remote_playback_flow_tv = 2131296957;
+			
+			// aapt resource value: 0x7F0902BE
+			public const int remote_playback_pause_btn = 2131296958;
+			
+			// aapt resource value: 0x7F0902BF
+			public const int remote_playback_sound_btn = 2131296959;
+			
+			// aapt resource value: 0x7F0902C0
+			public const int remote_playback_video_recording_btn = 2131296960;
+			
+			// aapt resource value: 0x7F0902C1
+			public const int remote_playback_wnd_sv = 2131296961;
+			
+			// aapt resource value: 0x7F0902F4
+			public const int render_texture_view = 2131297012;
+			
+			// aapt resource value: 0x7F0902F5
+			public const int render_texture_view_soft = 2131297013;
+			
+			// aapt resource value: 0x7F0902F6
+			public const int replay_btn = 2131297014;
+			
+			// aapt resource value: 0x7F0902F7
+			public const int requestA = 2131297015;
+			
+			// aapt resource value: 0x7F0902F8
+			public const int requestMasterAudio = 2131297016;
+			
+			// aapt resource value: 0x7F0902F9
+			public const int requestMasterVideo = 2131297017;
+			
+			// aapt resource value: 0x7F0902FA
+			public const int requestV = 2131297018;
 			
 			// aapt resource value: 0x7F0902FB
-			public const int right = 2131297019;
+			public const int restart_preview = 2131297019;
 			
 			// aapt resource value: 0x7F0902FC
-			public const int right_icon = 2131297020;
+			public const int retry_btn = 2131297020;
 			
 			// aapt resource value: 0x7F0902FD
-			public const int right_side = 2131297021;
+			public const int retry_button = 2131297021;
 			
 			// aapt resource value: 0x7F0902FE
-			public const int room_id = 2131297022;
+			public const int return_scan_result = 2131297022;
 			
 			// aapt resource value: 0x7F0902FF
-			public const int room_id_text = 2131297023;
+			public const int reverseCall = 2131297023;
 			
 			// aapt resource value: 0x7F090300
-			public const int rv_multi_screen = 2131297024;
+			public const int reverseCallInfo = 2131297024;
+			
+			// aapt resource value: 0x7F090252
+			public const int re_next_area = 2131296850;
 			
 			// aapt resource value: 0x7F090301
-			public const int rv_topbar = 2131297025;
+			public const int right = 2131297025;
 			
 			// aapt resource value: 0x7F090302
-			public const int safe_box_tip = 2131297026;
+			public const int right_icon = 2131297026;
 			
 			// aapt resource value: 0x7F090303
-			public const int sample_text = 2131297027;
+			public const int right_side = 2131297027;
 			
 			// aapt resource value: 0x7F090304
-			public const int save_image_matrix = 2131297028;
+			public const int rl_lp_answerView = 2131297028;
 			
 			// aapt resource value: 0x7F090305
-			public const int save_non_transition_alpha = 2131297029;
+			public const int rl_lp_topView = 2131297029;
 			
 			// aapt resource value: 0x7F090306
-			public const int save_scale_type = 2131297030;
+			public const int rl_lp_unlock = 2131297030;
+			
+			// aapt resource value: 0x7F090307
+			public const int room_id = 2131297031;
+			
+			// aapt resource value: 0x7F090308
+			public const int room_id_text = 2131297032;
+			
+			// aapt resource value: 0x7F090309
+			public const int rv_multi_screen = 2131297033;
+			
+			// aapt resource value: 0x7F09030A
+			public const int rv_topbar = 2131297034;
+			
+			// aapt resource value: 0x7F09030B
+			public const int safe_box_tip = 2131297035;
+			
+			// aapt resource value: 0x7F09030C
+			public const int sample_text = 2131297036;
+			
+			// aapt resource value: 0x7F09030D
+			public const int save_image_matrix = 2131297037;
+			
+			// aapt resource value: 0x7F09030E
+			public const int save_non_transition_alpha = 2131297038;
+			
+			// aapt resource value: 0x7F09030F
+			public const int save_scale_type = 2131297039;
 			
 			// aapt resource value: 0x7F09000D
 			public const int Scale = 2131296269;
 			
-			// aapt resource value: 0x7F090307
-			public const int screen = 2131297031;
-			
-			// aapt resource value: 0x7F090308
-			public const int scroll = 2131297032;
-			
-			// aapt resource value: 0x7F09030C
-			public const int scrollable = 2131297036;
-			
-			// aapt resource value: 0x7F090309
-			public const int scrollIndicatorDown = 2131297033;
-			
-			// aapt resource value: 0x7F09030A
-			public const int scrollIndicatorUp = 2131297034;
-			
-			// aapt resource value: 0x7F09030B
-			public const int scrollView = 2131297035;
-			
-			// aapt resource value: 0x7F09030D
-			public const int searchAnim = 2131297037;
-			
-			// aapt resource value: 0x7F09030E
-			public const int searchBtn = 2131297038;
-			
-			// aapt resource value: 0x7F09030F
-			public const int searchEditTextContainer = 2131297039;
-			
 			// aapt resource value: 0x7F090310
-			public const int searchFragment = 2131297040;
+			public const int screen = 2131297040;
 			
 			// aapt resource value: 0x7F090311
-			public const int search_badge = 2131297041;
-			
-			// aapt resource value: 0x7F090312
-			public const int search_bar = 2131297042;
-			
-			// aapt resource value: 0x7F090313
-			public const int search_button = 2131297043;
-			
-			// aapt resource value: 0x7F090314
-			public const int search_close_btn = 2131297044;
+			public const int scroll = 2131297041;
 			
 			// aapt resource value: 0x7F090315
-			public const int search_edit_frame = 2131297045;
+			public const int scrollable = 2131297045;
+			
+			// aapt resource value: 0x7F090312
+			public const int scrollIndicatorDown = 2131297042;
+			
+			// aapt resource value: 0x7F090313
+			public const int scrollIndicatorUp = 2131297043;
+			
+			// aapt resource value: 0x7F090314
+			public const int scrollView = 2131297044;
 			
 			// aapt resource value: 0x7F090316
-			public const int search_go_btn = 2131297046;
+			public const int searchAnim = 2131297046;
 			
 			// aapt resource value: 0x7F090317
-			public const int search_mag_icon = 2131297047;
+			public const int searchBtn = 2131297047;
 			
 			// aapt resource value: 0x7F090318
-			public const int search_plate = 2131297048;
+			public const int searchEditTextContainer = 2131297048;
 			
 			// aapt resource value: 0x7F090319
-			public const int search_src_text = 2131297049;
+			public const int searchFragment = 2131297049;
 			
 			// aapt resource value: 0x7F09031A
-			public const int search_voice_btn = 2131297050;
+			public const int search_badge = 2131297050;
 			
 			// aapt resource value: 0x7F09031B
-			public const int second = 2131297051;
+			public const int search_bar = 2131297051;
 			
 			// aapt resource value: 0x7F09031C
-			public const int select_dialog_listview = 2131297052;
+			public const int search_button = 2131297052;
 			
 			// aapt resource value: 0x7F09031D
-			public const int select_ipc_talkback = 2131297053;
+			public const int search_close_btn = 2131297053;
 			
 			// aapt resource value: 0x7F09031E
-			public const int select_nvr_talkback = 2131297054;
+			public const int search_edit_frame = 2131297054;
 			
 			// aapt resource value: 0x7F09031F
-			public const int sendA = 2131297055;
+			public const int search_go_btn = 2131297055;
 			
 			// aapt resource value: 0x7F090320
-			public const int sendCustomData = 2131297056;
+			public const int search_mag_icon = 2131297056;
 			
 			// aapt resource value: 0x7F090321
-			public const int sendV = 2131297057;
+			public const int search_plate = 2131297057;
 			
 			// aapt resource value: 0x7F090322
-			public const int separate_line = 2131297058;
+			public const int search_src_text = 2131297058;
 			
 			// aapt resource value: 0x7F090323
-			public const int serial_tv = 2131297059;
+			public const int search_voice_btn = 2131297059;
 			
 			// aapt resource value: 0x7F090324
-			public const int seriesNumberEt = 2131297060;
+			public const int second = 2131297060;
+			
+			// aapt resource value: 0x7F090325
+			public const int select_dialog_listview = 2131297061;
+			
+			// aapt resource value: 0x7F090326
+			public const int select_ipc_talkback = 2131297062;
+			
+			// aapt resource value: 0x7F090327
+			public const int select_nvr_talkback = 2131297063;
+			
+			// aapt resource value: 0x7F090328
+			public const int sendA = 2131297064;
+			
+			// aapt resource value: 0x7F090329
+			public const int sendCustomData = 2131297065;
+			
+			// aapt resource value: 0x7F09032A
+			public const int sendV = 2131297066;
+			
+			// aapt resource value: 0x7F09032B
+			public const int separate_line = 2131297067;
+			
+			// aapt resource value: 0x7F09032C
+			public const int serial_tv = 2131297068;
+			
+			// aapt resource value: 0x7F09032D
+			public const int seriesNumberEt = 2131297069;
 			
 			// aapt resource value: 0x7F09000A
 			public const int SHIFT = 2131296266;
 			
-			// aapt resource value: 0x7F090325
-			public const int shipin7_logo_lyt = 2131297061;
-			
-			// aapt resource value: 0x7F090326
-			public const int shortcut = 2131297062;
-			
-			// aapt resource value: 0x7F090327
-			public const int show = 2131297063;
-			
-			// aapt resource value: 0x7F090328
-			public const int showCustom = 2131297064;
-			
-			// aapt resource value: 0x7F090329
-			public const int showHome = 2131297065;
-			
-			// aapt resource value: 0x7F09032A
-			public const int showTitle = 2131297066;
-			
-			// aapt resource value: 0x7F09032B
-			public const int sign_et = 2131297067;
-			
-			// aapt resource value: 0x7F09032C
-			public const int smallLabel = 2131297068;
-			
-			// aapt resource value: 0x7F09032D
-			public const int sms_code_et = 2131297069;
-			
 			// aapt resource value: 0x7F09032E
-			public const int sms_code_lyt = 2131297070;
+			public const int shipin7_logo_lyt = 2131297070;
 			
 			// aapt resource value: 0x7F09032F
-			public const int sms_verify_dailog_ly = 2131297071;
+			public const int shortcut = 2131297071;
 			
 			// aapt resource value: 0x7F090330
-			public const int snackbar_action = 2131297072;
+			public const int show = 2131297072;
 			
 			// aapt resource value: 0x7F090331
-			public const int snackbar_text = 2131297073;
+			public const int showCustom = 2131297073;
 			
 			// aapt resource value: 0x7F090332
-			public const int snap = 2131297074;
+			public const int showHome = 2131297074;
 			
 			// aapt resource value: 0x7F090333
-			public const int snapshot = 2131297075;
+			public const int showTitle = 2131297075;
 			
 			// aapt resource value: 0x7F090334
-			public const int sound_line = 2131297076;
-			
-			// aapt resource value: 0x7F090336
-			public const int spacer = 2131297078;
-			
-			// aapt resource value: 0x7F090337
-			public const int split_action_bar = 2131297079;
-			
-			// aapt resource value: 0x7F090338
-			public const int spread = 2131297080;
-			
-			// aapt resource value: 0x7F090339
-			public const int spread_inside = 2131297081;
+			public const int sign_et = 2131297076;
 			
 			// aapt resource value: 0x7F090335
-			public const int sp_server_area = 2131297077;
+			public const int smallLabel = 2131297077;
+			
+			// aapt resource value: 0x7F090336
+			public const int sms_code_et = 2131297078;
+			
+			// aapt resource value: 0x7F090337
+			public const int sms_code_lyt = 2131297079;
+			
+			// aapt resource value: 0x7F090338
+			public const int sms_verify_dailog_ly = 2131297080;
+			
+			// aapt resource value: 0x7F090339
+			public const int snackbar_action = 2131297081;
 			
 			// aapt resource value: 0x7F09033A
-			public const int squareColumnItem = 2131297082;
+			public const int snackbar_text = 2131297082;
 			
 			// aapt resource value: 0x7F09033B
-			public const int squareVideo = 2131297083;
+			public const int snap = 2131297083;
 			
 			// aapt resource value: 0x7F09033C
-			public const int squareVideoList = 2131297084;
+			public const int snapshot = 2131297084;
 			
 			// aapt resource value: 0x7F09033D
-			public const int square_channel = 2131297085;
-			
-			// aapt resource value: 0x7F09033E
-			public const int src_atop = 2131297086;
+			public const int sound_line = 2131297085;
 			
 			// aapt resource value: 0x7F09033F
-			public const int src_in = 2131297087;
+			public const int spacer = 2131297087;
 			
 			// aapt resource value: 0x7F090340
-			public const int src_over = 2131297088;
+			public const int split_action_bar = 2131297088;
 			
 			// aapt resource value: 0x7F090341
-			public const int srl_classics_arrow = 2131297089;
+			public const int spread = 2131297089;
 			
 			// aapt resource value: 0x7F090342
-			public const int srl_classics_center = 2131297090;
+			public const int spread_inside = 2131297090;
+			
+			// aapt resource value: 0x7F09033E
+			public const int sp_server_area = 2131297086;
 			
 			// aapt resource value: 0x7F090343
-			public const int srl_classics_progress = 2131297091;
+			public const int squareColumnItem = 2131297091;
 			
 			// aapt resource value: 0x7F090344
-			public const int srl_classics_title = 2131297092;
+			public const int squareVideo = 2131297092;
 			
 			// aapt resource value: 0x7F090345
-			public const int srl_classics_update = 2131297093;
+			public const int squareVideoList = 2131297093;
 			
 			// aapt resource value: 0x7F090346
-			public const int standard = 2131297094;
+			public const int square_channel = 2131297094;
 			
 			// aapt resource value: 0x7F090347
-			public const int start = 2131297095;
+			public const int src_atop = 2131297095;
 			
 			// aapt resource value: 0x7F090348
-			public const int startAVMsg = 2131297096;
+			public const int src_in = 2131297096;
 			
 			// aapt resource value: 0x7F090349
-			public const int startDoorKey = 2131297097;
+			public const int src_over = 2131297097;
 			
 			// aapt resource value: 0x7F09034A
-			public const int startLocalRecord = 2131297098;
+			public const int srl_classics_arrow = 2131297098;
 			
 			// aapt resource value: 0x7F09034B
-			public const int startReadCard = 2131297099;
+			public const int srl_classics_center = 2131297099;
 			
 			// aapt resource value: 0x7F09034C
-			public const int startRecord = 2131297100;
+			public const int srl_classics_progress = 2131297100;
 			
 			// aapt resource value: 0x7F09034D
-			public const int startRecordLocalAudio = 2131297101;
+			public const int srl_classics_title = 2131297101;
 			
 			// aapt resource value: 0x7F09034E
-			public const int startRecordPeerAudio = 2131297102;
+			public const int srl_classics_update = 2131297102;
 			
 			// aapt resource value: 0x7F09034F
-			public const int startStream = 2131297103;
+			public const int standard = 2131297103;
 			
 			// aapt resource value: 0x7F090350
-			public const int startWatchDog = 2131297104;
+			public const int start = 2131297104;
 			
 			// aapt resource value: 0x7F090351
-			public const int start_stop = 2131297105;
+			public const int startAVMsg = 2131297105;
 			
 			// aapt resource value: 0x7F090352
-			public const int start_stop_stream = 2131297106;
+			public const int startDoorKey = 2131297106;
 			
 			// aapt resource value: 0x7F090353
-			public const int status = 2131297107;
+			public const int startLocalRecord = 2131297107;
 			
 			// aapt resource value: 0x7F090354
-			public const int status_bar_latest_event_content = 2131297108;
+			public const int startReadCard = 2131297108;
 			
 			// aapt resource value: 0x7F090355
-			public const int stopAVMsg = 2131297109;
+			public const int startRecord = 2131297109;
 			
 			// aapt resource value: 0x7F090356
-			public const int stopDoorKey = 2131297110;
+			public const int startRecordLocalAudio = 2131297110;
 			
 			// aapt resource value: 0x7F090357
-			public const int stopLocalRecord = 2131297111;
+			public const int startRecordPeerAudio = 2131297111;
 			
 			// aapt resource value: 0x7F090358
-			public const int stopReadCard = 2131297112;
+			public const int startStream = 2131297112;
 			
 			// aapt resource value: 0x7F090359
-			public const int stopRecord = 2131297113;
+			public const int startWatchDog = 2131297113;
 			
 			// aapt resource value: 0x7F09035A
-			public const int stopRecordLocalAudio = 2131297114;
+			public const int start_stop = 2131297114;
 			
 			// aapt resource value: 0x7F09035B
-			public const int stopRecordPeerAudio = 2131297115;
+			public const int start_stop_stream = 2131297115;
 			
 			// aapt resource value: 0x7F09035C
-			public const int stopStream = 2131297116;
+			public const int status = 2131297116;
 			
 			// aapt resource value: 0x7F09035D
-			public const int stopWatchDog = 2131297117;
+			public const int status_bar_latest_event_content = 2131297117;
 			
 			// aapt resource value: 0x7F09035E
-			public const int storage_layout = 2131297118;
+			public const int stopAVMsg = 2131297118;
 			
 			// aapt resource value: 0x7F09035F
-			public const int storage_notice = 2131297119;
+			public const int stopDoorKey = 2131297119;
+			
+			// aapt resource value: 0x7F090360
+			public const int stopLocalRecord = 2131297120;
+			
+			// aapt resource value: 0x7F090361
+			public const int stopReadCard = 2131297121;
+			
+			// aapt resource value: 0x7F090362
+			public const int stopRecord = 2131297122;
+			
+			// aapt resource value: 0x7F090363
+			public const int stopRecordLocalAudio = 2131297123;
+			
+			// aapt resource value: 0x7F090364
+			public const int stopRecordPeerAudio = 2131297124;
+			
+			// aapt resource value: 0x7F090365
+			public const int stopStream = 2131297125;
+			
+			// aapt resource value: 0x7F090366
+			public const int stopWatchDog = 2131297126;
+			
+			// aapt resource value: 0x7F090367
+			public const int storage_layout = 2131297127;
+			
+			// aapt resource value: 0x7F090368
+			public const int storage_notice = 2131297128;
 			
 			// aapt resource value: 0x7F09000B
 			public const int STROKE = 2131296267;
 			
-			// aapt resource value: 0x7F090361
-			public const int submenuarrow = 2131297121;
+			// aapt resource value: 0x7F09036A
+			public const int submenuarrow = 2131297130;
 			
-			// aapt resource value: 0x7F090362
-			public const int submit = 2131297122;
+			// aapt resource value: 0x7F09036B
+			public const int submit = 2131297131;
 			
-			// aapt resource value: 0x7F090363
-			public const int submit_area = 2131297123;
+			// aapt resource value: 0x7F09036C
+			public const int submit_area = 2131297132;
 			
-			// aapt resource value: 0x7F090364
-			public const int subtitle = 2131297124;
+			// aapt resource value: 0x7F09036D
+			public const int subtitle = 2131297133;
 			
-			// aapt resource value: 0x7F090360
-			public const int sub_title_text = 2131297120;
+			// aapt resource value: 0x7F090369
+			public const int sub_title_text = 2131297129;
 			
-			// aapt resource value: 0x7F090365
-			public const int successIcon = 2131297125;
+			// aapt resource value: 0x7F09036E
+			public const int successIcon = 2131297134;
 			
-			// aapt resource value: 0x7F090366
-			public const int surfaceview = 2131297126;
+			// aapt resource value: 0x7F09036F
+			public const int surfaceview = 2131297135;
 			
 			// aapt resource value: 0x7F09000C
 			public const int SYM = 2131296268;
 			
-			// aapt resource value: 0x7F090367
-			public const int tabMode = 2131297127;
-			
-			// aapt resource value: 0x7F090368
-			public const int tab_alarmlist_btn = 2131297128;
-			
-			// aapt resource value: 0x7F090369
-			public const int tab_alarmlist_rl = 2131297129;
-			
-			// aapt resource value: 0x7F09036A
-			public const int tab_devicedefence_btn = 2131297130;
-			
-			// aapt resource value: 0x7F09036B
-			public const int tab_devicedefence_rl = 2131297131;
-			
-			// aapt resource value: 0x7F09036C
-			public const int tab_devicepicture_btn = 2131297132;
-			
-			// aapt resource value: 0x7F09036D
-			public const int tab_devicepicture_rl = 2131297133;
-			
-			// aapt resource value: 0x7F09036E
-			public const int tab_devicevideo_btn = 2131297134;
-			
-			// aapt resource value: 0x7F09036F
-			public const int tab_devicevideo_rl = 2131297135;
-			
 			// aapt resource value: 0x7F090370
-			public const int tab_remoteplayback_btn = 2131297136;
+			public const int tabMode = 2131297136;
 			
 			// aapt resource value: 0x7F090371
-			public const int tab_remoteplayback_rl = 2131297137;
+			public const int tab_alarmlist_btn = 2131297137;
 			
 			// aapt resource value: 0x7F090372
-			public const int tab_setdevice_btn = 2131297138;
+			public const int tab_alarmlist_rl = 2131297138;
 			
 			// aapt resource value: 0x7F090373
-			public const int tab_setdevice_rl = 2131297139;
+			public const int tab_devicedefence_btn = 2131297139;
 			
 			// aapt resource value: 0x7F090374
-			public const int tab_video_talk_btn = 2131297140;
+			public const int tab_devicedefence_rl = 2131297140;
 			
 			// aapt resource value: 0x7F090375
-			public const int tab_video_talk_rl = 2131297141;
+			public const int tab_devicepicture_btn = 2131297141;
 			
 			// aapt resource value: 0x7F090376
-			public const int tag_key_position = 2131297142;
+			public const int tab_devicepicture_rl = 2131297142;
 			
 			// aapt resource value: 0x7F090377
-			public const int talkback_close_btn = 2131297143;
+			public const int tab_devicevideo_btn = 2131297143;
 			
 			// aapt resource value: 0x7F090378
-			public const int talkback_control_btn = 2131297144;
+			public const int tab_devicevideo_rl = 2131297144;
 			
 			// aapt resource value: 0x7F090379
-			public const int talkback_rv = 2131297145;
+			public const int tab_remoteplayback_btn = 2131297145;
 			
 			// aapt resource value: 0x7F09037A
-			public const int test = 2131297146;
+			public const int tab_remoteplayback_rl = 2131297146;
 			
 			// aapt resource value: 0x7F09037B
-			public const int testWatchDogReboot = 2131297147;
+			public const int tab_setdevice_btn = 2131297147;
 			
 			// aapt resource value: 0x7F09037C
-			public const int text = 2131297148;
+			public const int tab_setdevice_rl = 2131297148;
 			
 			// aapt resource value: 0x7F09037D
-			public const int text1 = 2131297149;
+			public const int tab_video_talk_btn = 2131297149;
 			
 			// aapt resource value: 0x7F09037E
-			public const int text2 = 2131297150;
+			public const int tab_video_talk_rl = 2131297150;
 			
 			// aapt resource value: 0x7F09037F
-			public const int text3 = 2131297151;
-			
-			// aapt resource value: 0x7F09038C
-			public const int textinput_counter = 2131297164;
-			
-			// aapt resource value: 0x7F09038D
-			public const int textinput_error = 2131297165;
+			public const int tag_key_position = 2131297151;
 			
 			// aapt resource value: 0x7F090380
-			public const int textSpacerNoButtons = 2131297152;
+			public const int talkback_close_btn = 2131297152;
 			
 			// aapt resource value: 0x7F090381
-			public const int textSpacerNoTitle = 2131297153;
+			public const int talkback_control_btn = 2131297153;
 			
-			// aapt resource value: 0x7F09038E
-			public const int textureView_play = 2131297166;
+			// aapt resource value: 0x7F090382
+			public const int talkback_rv = 2131297154;
 			
-			// aapt resource value: 0x7F09038F
-			public const int texture_view_play_window = 2131297167;
+			// aapt resource value: 0x7F090383
+			public const int test = 2131297155;
+			
+			// aapt resource value: 0x7F090384
+			public const int testWatchDogReboot = 2131297156;
+			
+			// aapt resource value: 0x7F090385
+			public const int text = 2131297157;
+			
+			// aapt resource value: 0x7F090386
+			public const int text1 = 2131297158;
+			
+			// aapt resource value: 0x7F090387
+			public const int text2 = 2131297159;
+			
+			// aapt resource value: 0x7F090388
+			public const int text3 = 2131297160;
+			
+			// aapt resource value: 0x7F090395
+			public const int textinput_counter = 2131297173;
+			
+			// aapt resource value: 0x7F090396
+			public const int textinput_error = 2131297174;
+			
+			// aapt resource value: 0x7F090389
+			public const int textSpacerNoButtons = 2131297161;
+			
+			// aapt resource value: 0x7F09038A
+			public const int textSpacerNoTitle = 2131297162;
+			
+			// aapt resource value: 0x7F090397
+			public const int textureView_play = 2131297175;
+			
+			// aapt resource value: 0x7F090398
+			public const int texture_view_play_window = 2131297176;
 			
 			// aapt resource value: 0x7F09000E
 			public const int TextView01 = 2131296270;
@@ -9445,383 +9517,410 @@
 			// aapt resource value: 0x7F09000F
 			public const int TextView03 = 2131296271;
 			
-			// aapt resource value: 0x7F090383
-			public const int text_camerano = 2131297155;
-			
-			// aapt resource value: 0x7F090382
-			public const int text_camera_name = 2131297154;
-			
-			// aapt resource value: 0x7F090384
-			public const int text_device_ip = 2131297156;
-			
-			// aapt resource value: 0x7F090385
-			public const int text_input_password_toggle = 2131297157;
-			
-			// aapt resource value: 0x7F090386
-			public const int text_left = 2131297158;
-			
-			// aapt resource value: 0x7F090387
-			public const int text_my = 2131297159;
-			
-			// aapt resource value: 0x7F090388
-			public const int text_right = 2131297160;
-			
-			// aapt resource value: 0x7F090389
-			public const int text_serial = 2131297161;
-			
-			// aapt resource value: 0x7F09038A
-			public const int text_share = 2131297162;
+			// aapt resource value: 0x7F09038C
+			public const int text_camerano = 2131297164;
 			
 			// aapt resource value: 0x7F09038B
-			public const int text_title = 2131297163;
+			public const int text_camera_name = 2131297163;
+			
+			// aapt resource value: 0x7F09038D
+			public const int text_device_ip = 2131297165;
+			
+			// aapt resource value: 0x7F09038E
+			public const int text_input_password_toggle = 2131297166;
+			
+			// aapt resource value: 0x7F09038F
+			public const int text_left = 2131297167;
 			
 			// aapt resource value: 0x7F090390
-			public const int time = 2131297168;
-			
-			// aapt resource value: 0x7F090393
-			public const int timeline_image = 2131297171;
-			
-			// aapt resource value: 0x7F090394
-			public const int timepicker = 2131297172;
-			
-			// aapt resource value: 0x7F090395
-			public const int timer = 2131297173;
+			public const int text_my = 2131297168;
 			
 			// aapt resource value: 0x7F090391
-			public const int time_text = 2131297169;
+			public const int text_right = 2131297169;
 			
 			// aapt resource value: 0x7F090392
-			public const int time_tv = 2131297170;
+			public const int text_serial = 2131297170;
 			
-			// aapt resource value: 0x7F090396
-			public const int tip = 2131297174;
+			// aapt resource value: 0x7F090393
+			public const int text_share = 2131297171;
 			
-			// aapt resource value: 0x7F090397
-			public const int title = 2131297175;
-			
-			// aapt resource value: 0x7F090398
-			public const int titleBar = 2131297176;
+			// aapt resource value: 0x7F090394
+			public const int text_title = 2131297172;
 			
 			// aapt resource value: 0x7F090399
-			public const int titleDividerNoCustom = 2131297177;
-			
-			// aapt resource value: 0x7F09039A
-			public const int title_bar = 2131297178;
-			
-			// aapt resource value: 0x7F09039B
-			public const int title_bar_landscape = 2131297179;
+			public const int time = 2131297177;
 			
 			// aapt resource value: 0x7F09039C
-			public const int title_bar_portrait = 2131297180;
+			public const int timeline_image = 2131297180;
 			
 			// aapt resource value: 0x7F09039D
-			public const int title_layout = 2131297181;
+			public const int timepicker = 2131297181;
 			
 			// aapt resource value: 0x7F09039E
-			public const int title_left = 2131297182;
+			public const int timer = 2131297182;
 			
 			// aapt resource value: 0x7F09039F
-			public const int title_right = 2131297183;
+			public const int timer_lp_calltime = 2131297183;
+			
+			// aapt resource value: 0x7F09039A
+			public const int time_text = 2131297178;
+			
+			// aapt resource value: 0x7F09039B
+			public const int time_tv = 2131297179;
 			
 			// aapt resource value: 0x7F0903A0
-			public const int title_template = 2131297184;
+			public const int tip = 2131297184;
 			
 			// aapt resource value: 0x7F0903A1
-			public const int title_text = 2131297185;
+			public const int title = 2131297185;
 			
 			// aapt resource value: 0x7F0903A2
-			public const int title_text_layout = 2131297186;
+			public const int titleBar = 2131297186;
 			
 			// aapt resource value: 0x7F0903A3
-			public const int title_top = 2131297187;
+			public const int titleDividerNoCustom = 2131297187;
 			
 			// aapt resource value: 0x7F0903A4
-			public const int top = 2131297188;
-			
-			// aapt resource value: 0x7F0903A7
-			public const int topbar = 2131297191;
-			
-			// aapt resource value: 0x7F0903A8
-			public const int topbar_right_img = 2131297192;
+			public const int title_bar = 2131297188;
 			
 			// aapt resource value: 0x7F0903A5
-			public const int topPanel = 2131297189;
+			public const int title_bar_landscape = 2131297189;
 			
 			// aapt resource value: 0x7F0903A6
-			public const int topTip = 2131297190;
+			public const int title_bar_portrait = 2131297190;
+			
+			// aapt resource value: 0x7F0903A7
+			public const int title_layout = 2131297191;
+			
+			// aapt resource value: 0x7F0903A8
+			public const int title_left = 2131297192;
 			
 			// aapt resource value: 0x7F0903A9
-			public const int touch_loading_buffer_tv = 2131297193;
+			public const int title_right = 2131297193;
 			
 			// aapt resource value: 0x7F0903AA
-			public const int touch_outside = 2131297194;
+			public const int title_template = 2131297194;
 			
 			// aapt resource value: 0x7F0903AB
-			public const int touch_progress_layout = 2131297195;
+			public const int title_text = 2131297195;
 			
 			// aapt resource value: 0x7F0903AC
-			public const int transition_current_scene = 2131297196;
+			public const int title_text_layout = 2131297196;
 			
 			// aapt resource value: 0x7F0903AD
-			public const int transition_layout_save = 2131297197;
+			public const int title_top = 2131297197;
 			
 			// aapt resource value: 0x7F0903AE
-			public const int transition_position = 2131297198;
+			public const int top = 2131297198;
+			
+			// aapt resource value: 0x7F0903B1
+			public const int topbar = 2131297201;
+			
+			// aapt resource value: 0x7F0903B2
+			public const int topbar_right_img = 2131297202;
 			
 			// aapt resource value: 0x7F0903AF
-			public const int transition_scene_layoutid_cache = 2131297199;
+			public const int topPanel = 2131297199;
 			
 			// aapt resource value: 0x7F0903B0
-			public const int transition_transform = 2131297200;
+			public const int topTip = 2131297200;
+			
+			// aapt resource value: 0x7F0903B3
+			public const int touch_loading_buffer_tv = 2131297203;
+			
+			// aapt resource value: 0x7F0903B4
+			public const int touch_outside = 2131297204;
+			
+			// aapt resource value: 0x7F0903B5
+			public const int touch_progress_layout = 2131297205;
+			
+			// aapt resource value: 0x7F0903B6
+			public const int transition_current_scene = 2131297206;
+			
+			// aapt resource value: 0x7F0903B7
+			public const int transition_layout_save = 2131297207;
+			
+			// aapt resource value: 0x7F0903B8
+			public const int transition_position = 2131297208;
+			
+			// aapt resource value: 0x7F0903B9
+			public const int transition_scene_layoutid_cache = 2131297209;
+			
+			// aapt resource value: 0x7F0903BA
+			public const int transition_transform = 2131297210;
 			
 			// aapt resource value: 0x7F090010
 			public const int Translate = 2131296272;
 			
-			// aapt resource value: 0x7F0903B1
-			public const int tvDeviceWifiConfigTip = 2131297201;
-			
-			// aapt resource value: 0x7F0903B2
-			public const int tvIntroduce1 = 2131297202;
-			
-			// aapt resource value: 0x7F0903B3
-			public const int tvIntroduce2 = 2131297203;
-			
-			// aapt resource value: 0x7F0903B4
-			public const int tvMore = 2131297204;
-			
-			// aapt resource value: 0x7F0903B5
-			public const int tvSSID = 2131297205;
-			
-			// aapt resource value: 0x7F0903B6
-			public const int tvStatus = 2131297206;
-			
-			// aapt resource value: 0x7F0903B7
-			public const int tvSuccess = 2131297207;
-			
-			// aapt resource value: 0x7F0903B8
-			public const int tvTip = 2131297208;
-			
-			// aapt resource value: 0x7F0903B9
-			public const int tvTitle = 2131297209;
-			
-			// aapt resource value: 0x7F0903BA
-			public const int tv_adding_to_account = 2131297210;
-			
 			// aapt resource value: 0x7F0903BB
-			public const int tv_camera_name = 2131297211;
+			public const int tvDeviceWifiConfigTip = 2131297211;
 			
 			// aapt resource value: 0x7F0903BC
-			public const int tv_child_watch_video_talk_notification = 2131297212;
+			public const int tvIntroduce1 = 2131297212;
 			
 			// aapt resource value: 0x7F0903BD
-			public const int tv_connecting_to_device = 2131297213;
+			public const int tvIntroduce2 = 2131297213;
 			
 			// aapt resource value: 0x7F0903BE
-			public const int tv_content = 2131297214;
+			public const int tvMore = 2131297214;
 			
 			// aapt resource value: 0x7F0903BF
-			public const int tv_decode_type = 2131297215;
+			public const int tvSSID = 2131297215;
 			
 			// aapt resource value: 0x7F0903C0
-			public const int tv_ezviz_account_login = 2131297216;
+			public const int tvStatus = 2131297216;
 			
 			// aapt resource value: 0x7F0903C1
-			public const int tv_file_path = 2131297217;
+			public const int tvSuccess = 2131297217;
 			
 			// aapt resource value: 0x7F0903C2
-			public const int tv_ok = 2131297218;
+			public const int tvTip = 2131297218;
 			
 			// aapt resource value: 0x7F0903C3
-			public const int tv_play_error = 2131297219;
+			public const int tvTitle = 2131297219;
 			
 			// aapt resource value: 0x7F0903C4
-			public const int tv_pwd = 2131297220;
+			public const int tv_adding_to_account = 2131297220;
 			
 			// aapt resource value: 0x7F0903C5
-			public const int tv_registering_to_platform = 2131297221;
+			public const int tv_camera_name = 2131297221;
 			
 			// aapt resource value: 0x7F0903C6
-			public const int tv_sdk_ver = 2131297222;
+			public const int tv_child_watch_video_talk_notification = 2131297222;
 			
 			// aapt resource value: 0x7F0903C7
-			public const int tv_ssid = 2131297223;
+			public const int tv_connecting_to_device = 2131297223;
 			
 			// aapt resource value: 0x7F0903C8
-			public const int tv_stream_type = 2131297224;
+			public const int tv_content = 2131297224;
 			
 			// aapt resource value: 0x7F0903C9
-			public const int tv_tip = 2131297225;
+			public const int tv_decode_type = 2131297225;
 			
 			// aapt resource value: 0x7F0903CA
-			public const int tv_title = 2131297226;
+			public const int tv_ezviz_account_login = 2131297226;
 			
 			// aapt resource value: 0x7F0903CB
-			public const int tv_zxing_back = 2131297227;
+			public const int tv_file_path = 2131297227;
 			
 			// aapt resource value: 0x7F0903CC
-			public const int tv_zxing_flash = 2131297228;
+			public const int tv_lp_answer = 2131297228;
 			
 			// aapt resource value: 0x7F0903CD
-			public const int tv_zxing_scan = 2131297229;
+			public const int tv_lp_calltime = 2131297229;
 			
 			// aapt resource value: 0x7F0903CE
-			public const int txtResult = 2131297230;
+			public const int tv_lp_hangUp = 2131297230;
 			
 			// aapt resource value: 0x7F0903CF
-			public const int unbind_button = 2131297231;
+			public const int tv_lp_screenshot = 2131297231;
 			
 			// aapt resource value: 0x7F0903D0
-			public const int uniform = 2131297232;
+			public const int tv_lp_title = 2131297232;
 			
 			// aapt resource value: 0x7F0903D1
-			public const int up = 2131297233;
+			public const int tv_lp_unlock = 2131297233;
 			
 			// aapt resource value: 0x7F0903D2
-			public const int useLogo = 2131297234;
-			
-			// aapt resource value: 0x7F0903D4
-			public const int userid_et = 2131297236;
-			
-			// aapt resource value: 0x7F0903D5
-			public const int userid_lyt = 2131297237;
-			
-			// aapt resource value: 0x7F0903D6
-			public const int username_et = 2131297238;
-			
-			// aapt resource value: 0x7F0903D7
-			public const int username_text = 2131297239;
-			
-			// aapt resource value: 0x7F0903D8
-			public const int username_tv = 2131297240;
+			public const int tv_ok = 2131297234;
 			
 			// aapt resource value: 0x7F0903D3
-			public const int use_custom_pwd_cb = 2131297235;
+			public const int tv_play_error = 2131297235;
+			
+			// aapt resource value: 0x7F0903D4
+			public const int tv_pwd = 2131297236;
+			
+			// aapt resource value: 0x7F0903D5
+			public const int tv_registering_to_platform = 2131297237;
+			
+			// aapt resource value: 0x7F0903D6
+			public const int tv_sdk_ver = 2131297238;
+			
+			// aapt resource value: 0x7F0903D7
+			public const int tv_ssid = 2131297239;
+			
+			// aapt resource value: 0x7F0903D8
+			public const int tv_stream_type = 2131297240;
 			
 			// aapt resource value: 0x7F0903D9
-			public const int uvc = 2131297241;
+			public const int tv_tip = 2131297241;
 			
 			// aapt resource value: 0x7F0903DA
-			public const int verifycodeEditTextContainer = 2131297242;
+			public const int tv_title = 2131297242;
 			
 			// aapt resource value: 0x7F0903DB
-			public const int verifycodeEt = 2131297243;
+			public const int tv_zxing_back = 2131297243;
 			
 			// aapt resource value: 0x7F0903DC
-			public const int version = 2131297244;
+			public const int tv_zxing_flash = 2131297244;
 			
 			// aapt resource value: 0x7F0903DD
-			public const int version_arrow = 2131297245;
+			public const int tv_zxing_scan = 2131297245;
 			
 			// aapt resource value: 0x7F0903DE
-			public const int version_layout = 2131297246;
+			public const int txtResult = 2131297246;
 			
 			// aapt resource value: 0x7F0903DF
-			public const int version_newest = 2131297247;
+			public const int unbind_button = 2131297247;
 			
 			// aapt resource value: 0x7F0903E0
-			public const int version_notice = 2131297248;
+			public const int uniform = 2131297248;
 			
 			// aapt resource value: 0x7F0903E1
-			public const int vertical = 2131297249;
+			public const int up = 2131297249;
 			
 			// aapt resource value: 0x7F0903E2
-			public const int vg_child_watch_video_talk_camera = 2131297250;
-			
-			// aapt resource value: 0x7F0903E3
-			public const int vg_child_watch_video_talk_notification_container = 2131297251;
+			public const int useLogo = 2131297250;
 			
 			// aapt resource value: 0x7F0903E4
-			public const int vg_child_watch_video_talk_operation_container = 2131297252;
+			public const int userid_et = 2131297252;
 			
 			// aapt resource value: 0x7F0903E5
-			public const int vg_child_watch_video_talk_player = 2131297253;
+			public const int userid_lyt = 2131297253;
 			
 			// aapt resource value: 0x7F0903E6
-			public const int vg_child_watch_video_talk_tool_container = 2131297254;
+			public const int username_et = 2131297254;
 			
 			// aapt resource value: 0x7F0903E7
-			public const int vg_child_watch_video_talk_video_container = 2131297255;
+			public const int username_text = 2131297255;
 			
 			// aapt resource value: 0x7F0903E8
-			public const int vg_error_tips = 2131297256;
+			public const int username_tv = 2131297256;
+			
+			// aapt resource value: 0x7F0903E3
+			public const int use_custom_pwd_cb = 2131297251;
 			
 			// aapt resource value: 0x7F0903E9
-			public const int vg_login_anim = 2131297257;
+			public const int uvc = 2131297257;
 			
 			// aapt resource value: 0x7F0903EA
-			public const int vg_notification_operation_tool_container = 2131297258;
+			public const int verifycodeEditTextContainer = 2131297258;
 			
 			// aapt resource value: 0x7F0903EB
-			public const int vg_play_info = 2131297259;
+			public const int verifycodeEt = 2131297259;
 			
 			// aapt resource value: 0x7F0903EC
-			public const int vg_play_window = 2131297260;
+			public const int version = 2131297260;
 			
 			// aapt resource value: 0x7F0903ED
-			public const int videoBackImg = 2131297261;
+			public const int version_arrow = 2131297261;
 			
 			// aapt resource value: 0x7F0903EE
-			public const int videoParent = 2131297262;
+			public const int version_layout = 2131297262;
 			
 			// aapt resource value: 0x7F0903EF
-			public const int videoTitle = 2131297263;
+			public const int version_newest = 2131297263;
 			
 			// aapt resource value: 0x7F0903F0
-			public const int video_button = 2131297264;
+			public const int version_notice = 2131297264;
 			
 			// aapt resource value: 0x7F0903F1
-			public const int video_talk_et_room_id = 2131297265;
-			
-			// aapt resource value: 0x7F0903F6
-			public const int viewedCount = 2131297270;
-			
-			// aapt resource value: 0x7F0903F7
-			public const int viewfinder_view = 2131297271;
+			public const int vertical = 2131297265;
 			
 			// aapt resource value: 0x7F0903F2
-			public const int viewSort = 2131297266;
+			public const int vg_child_watch_video_talk_camera = 2131297266;
 			
 			// aapt resource value: 0x7F0903F3
-			public const int view_child_watch_video_talk_camera = 2131297267;
+			public const int vg_child_watch_video_talk_notification_container = 2131297267;
 			
 			// aapt resource value: 0x7F0903F4
-			public const int view_child_watch_video_talk_player = 2131297268;
+			public const int vg_child_watch_video_talk_operation_container = 2131297268;
 			
 			// aapt resource value: 0x7F0903F5
-			public const int view_offset_helper = 2131297269;
+			public const int vg_child_watch_video_talk_player = 2131297269;
+			
+			// aapt resource value: 0x7F0903F6
+			public const int vg_child_watch_video_talk_tool_container = 2131297270;
+			
+			// aapt resource value: 0x7F0903F7
+			public const int vg_child_watch_video_talk_video_container = 2131297271;
 			
 			// aapt resource value: 0x7F0903F8
-			public const int visible = 2131297272;
+			public const int vg_error_tips = 2131297272;
 			
 			// aapt resource value: 0x7F0903F9
-			public const int wait_bar = 2131297273;
+			public const int vg_login_anim = 2131297273;
 			
 			// aapt resource value: 0x7F0903FA
-			public const int wait_tv = 2131297274;
+			public const int vg_notification_operation_tool_container = 2131297274;
 			
 			// aapt resource value: 0x7F0903FB
-			public const int watting_pb = 2131297275;
-			
-			// aapt resource value: 0x7F0903FD
-			public const int webview = 2131297277;
+			public const int vg_play_info = 2131297275;
 			
 			// aapt resource value: 0x7F0903FC
-			public const int web_login_btn = 2131297276;
+			public const int vg_play_window = 2131297276;
+			
+			// aapt resource value: 0x7F0903FD
+			public const int videoBackImg = 2131297277;
 			
 			// aapt resource value: 0x7F0903FE
-			public const int wifi_tv = 2131297278;
+			public const int videoParent = 2131297278;
 			
 			// aapt resource value: 0x7F0903FF
-			public const int withText = 2131297279;
+			public const int videoTitle = 2131297279;
 			
 			// aapt resource value: 0x7F090400
-			public const int wrap = 2131297280;
+			public const int video_button = 2131297280;
 			
 			// aapt resource value: 0x7F090401
-			public const int wrap_content = 2131297281;
+			public const int video_lp_rendering = 2131297281;
 			
 			// aapt resource value: 0x7F090402
-			public const int year = 2131297282;
+			public const int video_lp_rendering2 = 2131297282;
+			
+			// aapt resource value: 0x7F090403
+			public const int video_talk_et_room_id = 2131297283;
+			
+			// aapt resource value: 0x7F090408
+			public const int viewedCount = 2131297288;
+			
+			// aapt resource value: 0x7F090409
+			public const int viewfinder_view = 2131297289;
+			
+			// aapt resource value: 0x7F090404
+			public const int viewSort = 2131297284;
+			
+			// aapt resource value: 0x7F090405
+			public const int view_child_watch_video_talk_camera = 2131297285;
+			
+			// aapt resource value: 0x7F090406
+			public const int view_child_watch_video_talk_player = 2131297286;
+			
+			// aapt resource value: 0x7F090407
+			public const int view_offset_helper = 2131297287;
+			
+			// aapt resource value: 0x7F09040A
+			public const int visible = 2131297290;
+			
+			// aapt resource value: 0x7F09040B
+			public const int wait_bar = 2131297291;
+			
+			// aapt resource value: 0x7F09040C
+			public const int wait_tv = 2131297292;
+			
+			// aapt resource value: 0x7F09040D
+			public const int watting_pb = 2131297293;
+			
+			// aapt resource value: 0x7F09040F
+			public const int webview = 2131297295;
+			
+			// aapt resource value: 0x7F09040E
+			public const int web_login_btn = 2131297294;
+			
+			// aapt resource value: 0x7F090410
+			public const int wifi_tv = 2131297296;
+			
+			// aapt resource value: 0x7F090411
+			public const int withText = 2131297297;
+			
+			// aapt resource value: 0x7F090412
+			public const int wrap = 2131297298;
+			
+			// aapt resource value: 0x7F090413
+			public const int wrap_content = 2131297299;
+			
+			// aapt resource value: 0x7F090414
+			public const int year = 2131297300;
 			
 			static Id()
 			{
@@ -9988,559 +10087,565 @@
 			public const int activity_hcplay = 2131427362;
 			
 			// aapt resource value: 0x7F0B0023
-			public const int activity_interface_self_test = 2131427363;
+			public const int activity_hdllinphone_intercom = 2131427363;
 			
 			// aapt resource value: 0x7F0B0024
-			public const int activity_interface_test = 2131427364;
+			public const int activity_hdllinphone_monitor = 2131427364;
 			
 			// aapt resource value: 0x7F0B0025
-			public const int activity_lan_multi_device = 2131427365;
+			public const int activity_interface_self_test = 2131427365;
 			
 			// aapt resource value: 0x7F0B0026
-			public const int activity_list = 2131427366;
+			public const int activity_interface_test = 2131427366;
 			
 			// aapt resource value: 0x7F0B0027
-			public const int activity_main = 2131427367;
+			public const int activity_lan_multi_device = 2131427367;
 			
 			// aapt resource value: 0x7F0B0028
-			public const int activity_main_ez = 2131427368;
+			public const int activity_list = 2131427368;
 			
 			// aapt resource value: 0x7F0B0029
-			public const int activity_manual_choose_config_wifi_way = 2131427369;
+			public const int activity_main = 2131427369;
 			
 			// aapt resource value: 0x7F0B002A
-			public const int activity_manual_connect_device_hotspot = 2131427370;
+			public const int activity_main_ez = 2131427370;
 			
 			// aapt resource value: 0x7F0B002B
-			public const int activity_manual_input_device_hotspot_info = 2131427371;
+			public const int activity_manual_choose_config_wifi_way = 2131427371;
 			
 			// aapt resource value: 0x7F0B002C
-			public const int activity_more_features_entrance = 2131427372;
+			public const int activity_manual_connect_device_hotspot = 2131427372;
 			
 			// aapt resource value: 0x7F0B002D
-			public const int activity_multi_screen_preview = 2131427373;
+			public const int activity_manual_input_device_hotspot_info = 2131427373;
 			
 			// aapt resource value: 0x7F0B002E
-			public const int activity_multi_video_talk = 2131427374;
+			public const int activity_more_features_entrance = 2131427374;
 			
 			// aapt resource value: 0x7F0B002F
-			public const int activity_multi_video_talk_test = 2131427375;
+			public const int activity_multi_screen_preview = 2131427375;
 			
 			// aapt resource value: 0x7F0B0030
-			public const int activity_my_collect = 2131427376;
+			public const int activity_multi_video_talk = 2131427376;
 			
 			// aapt resource value: 0x7F0B0031
-			public const int activity_option = 2131427377;
+			public const int activity_multi_video_talk_test = 2131427377;
 			
 			// aapt resource value: 0x7F0B0032
-			public const int activity_origin_stream_control = 2131427378;
+			public const int activity_my_collect = 2131427378;
 			
 			// aapt resource value: 0x7F0B0033
-			public const int activity_rtp_stream_play = 2131427379;
+			public const int activity_option = 2131427379;
 			
 			// aapt resource value: 0x7F0B0034
-			public const int activity_safety_hat_talk = 2131427380;
+			public const int activity_origin_stream_control = 2131427380;
 			
 			// aapt resource value: 0x7F0B0035
-			public const int activity_square = 2131427381;
+			public const int activity_rtp_stream_play = 2131427381;
 			
 			// aapt resource value: 0x7F0B0036
-			public const int activity_square_video_list = 2131427382;
+			public const int activity_safety_hat_talk = 2131427382;
 			
 			// aapt resource value: 0x7F0B0037
-			public const int activity_square_video_list2 = 2131427383;
+			public const int activity_square = 2131427383;
 			
 			// aapt resource value: 0x7F0B0038
-			public const int activity_square_video_search = 2131427384;
+			public const int activity_square_video_list = 2131427384;
 			
 			// aapt resource value: 0x7F0B0039
-			public const int activity_support = 2131427385;
+			public const int activity_square_video_list2 = 2131427385;
 			
 			// aapt resource value: 0x7F0B003A
-			public const int activity_test_config_wifi = 2131427386;
+			public const int activity_square_video_search = 2131427386;
 			
 			// aapt resource value: 0x7F0B003B
-			public const int activity_test_for_sdk = 2131427387;
+			public const int activity_support = 2131427387;
 			
 			// aapt resource value: 0x7F0B003C
-			public const int activity_test_page = 2131427388;
+			public const int activity_test_config_wifi = 2131427388;
 			
 			// aapt resource value: 0x7F0B003D
-			public const int activity_video_phone = 2131427389;
+			public const int activity_test_for_sdk = 2131427389;
 			
 			// aapt resource value: 0x7F0B003E
-			public const int activity_video_talk = 2131427390;
+			public const int activity_test_page = 2131427390;
 			
 			// aapt resource value: 0x7F0B003F
-			public const int add_camera_by_series_number_page = 2131427391;
+			public const int activity_video_phone = 2131427391;
 			
 			// aapt resource value: 0x7F0B0040
-			public const int auto_wifi_connecting = 2131427392;
+			public const int activity_video_talk = 2131427392;
 			
 			// aapt resource value: 0x7F0B0041
-			public const int auto_wifi_connecting_status_item = 2131427393;
+			public const int add_camera_by_series_number_page = 2131427393;
 			
 			// aapt resource value: 0x7F0B0042
-			public const int auto_wifi_connecting_status_item_ez = 2131427394;
+			public const int auto_wifi_connecting = 2131427394;
 			
 			// aapt resource value: 0x7F0B0043
-			public const int auto_wifi_net_config = 2131427395;
+			public const int auto_wifi_connecting_status_item = 2131427395;
 			
 			// aapt resource value: 0x7F0B0044
-			public const int auto_wifi_prepare_step_on = 2131427396;
+			public const int auto_wifi_connecting_status_item_ez = 2131427396;
 			
 			// aapt resource value: 0x7F0B0045
-			public const int auto_wifi_reset = 2131427397;
+			public const int auto_wifi_net_config = 2131427397;
 			
 			// aapt resource value: 0x7F0B0046
-			public const int auto_wifi_reset_introduce = 2131427398;
+			public const int auto_wifi_prepare_step_on = 2131427398;
 			
 			// aapt resource value: 0x7F0B0047
-			public const int biometric_prompt_dialog_content = 2131427399;
+			public const int auto_wifi_reset = 2131427399;
 			
 			// aapt resource value: 0x7F0B0048
-			public const int cameralist_page = 2131427400;
+			public const int auto_wifi_reset_introduce = 2131427400;
 			
 			// aapt resource value: 0x7F0B0049
-			public const int cameralist_page_common = 2131427401;
+			public const int biometric_prompt_dialog_content = 2131427401;
 			
 			// aapt resource value: 0x7F0B004A
-			public const int cameralist_small_item = 2131427402;
+			public const int cameralist_page = 2131427402;
 			
 			// aapt resource value: 0x7F0B004B
-			public const int cameralist_small_item_common = 2131427403;
+			public const int cameralist_page_common = 2131427403;
 			
 			// aapt resource value: 0x7F0B004C
-			public const int capture_activity = 2131427404;
+			public const int cameralist_small_item = 2131427404;
 			
 			// aapt resource value: 0x7F0B004D
-			public const int cc_activity_widget_countrycode = 2131427405;
+			public const int cameralist_small_item_common = 2131427405;
 			
 			// aapt resource value: 0x7F0B004E
-			public const int cc_activity_widget_sortselection = 2131427406;
+			public const int capture_activity = 2131427406;
 			
 			// aapt resource value: 0x7F0B004F
-			public const int cc_country_list_item = 2131427407;
+			public const int cc_activity_widget_countrycode = 2131427407;
 			
 			// aapt resource value: 0x7F0B0050
-			public const int city_config_item = 2131427408;
+			public const int cc_activity_widget_sortselection = 2131427408;
 			
 			// aapt resource value: 0x7F0B0051
-			public const int ddns_device_ist_page = 2131427409;
+			public const int cc_country_list_item = 2131427409;
 			
 			// aapt resource value: 0x7F0B0052
-			public const int ddns_device_list_item = 2131427410;
+			public const int city_config_item = 2131427410;
 			
 			// aapt resource value: 0x7F0B0053
-			public const int design_bottom_navigation_item = 2131427411;
+			public const int ddns_device_ist_page = 2131427411;
 			
 			// aapt resource value: 0x7F0B0054
-			public const int design_bottom_sheet_dialog = 2131427412;
+			public const int ddns_device_list_item = 2131427412;
 			
 			// aapt resource value: 0x7F0B0055
-			public const int design_layout_snackbar = 2131427413;
+			public const int design_bottom_navigation_item = 2131427413;
 			
 			// aapt resource value: 0x7F0B0056
-			public const int design_layout_snackbar_include = 2131427414;
+			public const int design_bottom_sheet_dialog = 2131427414;
 			
 			// aapt resource value: 0x7F0B0057
-			public const int design_layout_tab_icon = 2131427415;
+			public const int design_layout_snackbar = 2131427415;
 			
 			// aapt resource value: 0x7F0B0058
-			public const int design_layout_tab_text = 2131427416;
+			public const int design_layout_snackbar_include = 2131427416;
 			
 			// aapt resource value: 0x7F0B0059
-			public const int design_menu_item_action_area = 2131427417;
+			public const int design_layout_tab_icon = 2131427417;
 			
 			// aapt resource value: 0x7F0B005A
-			public const int design_navigation_item = 2131427418;
+			public const int design_layout_tab_text = 2131427418;
 			
 			// aapt resource value: 0x7F0B005B
-			public const int design_navigation_item_header = 2131427419;
+			public const int design_menu_item_action_area = 2131427419;
 			
 			// aapt resource value: 0x7F0B005C
-			public const int design_navigation_item_separator = 2131427420;
+			public const int design_navigation_item = 2131427420;
 			
 			// aapt resource value: 0x7F0B005D
-			public const int design_navigation_item_subheader = 2131427421;
+			public const int design_navigation_item_header = 2131427421;
 			
 			// aapt resource value: 0x7F0B005E
-			public const int design_navigation_menu = 2131427422;
+			public const int design_navigation_item_separator = 2131427422;
 			
 			// aapt resource value: 0x7F0B005F
-			public const int design_navigation_menu_item = 2131427423;
+			public const int design_navigation_item_subheader = 2131427423;
 			
 			// aapt resource value: 0x7F0B0060
-			public const int design_text_input_password_icon = 2131427424;
+			public const int design_navigation_menu = 2131427424;
 			
 			// aapt resource value: 0x7F0B0061
-			public const int device_discover_item = 2131427425;
+			public const int design_navigation_menu_item = 2131427425;
 			
 			// aapt resource value: 0x7F0B0062
-			public const int device_discover_page = 2131427426;
+			public const int design_text_input_password_icon = 2131427426;
 			
 			// aapt resource value: 0x7F0B0063
-			public const int device_setting_page = 2131427427;
+			public const int device_discover_item = 2131427427;
 			
 			// aapt resource value: 0x7F0B0064
-			public const int device_video_encrypt_dialog = 2131427428;
+			public const int device_discover_page = 2131427428;
 			
 			// aapt resource value: 0x7F0B0065
-			public const int dialog_tip = 2131427429;
-			
-			// aapt resource value: 0x7F0B007B
-			public const int ezopen_realplay_operate_bar = 2131427451;
-			
-			// aapt resource value: 0x7F0B007C
-			public const int ezopen_realplay_operate_bar2 = 2131427452;
+			public const int device_setting_page = 2131427429;
 			
 			// aapt resource value: 0x7F0B0066
-			public const int ez_demo_interface_activity = 2131427430;
+			public const int device_video_encrypt_dialog = 2131427430;
 			
 			// aapt resource value: 0x7F0B0067
-			public const int ez_message_image_page = 2131427431;
-			
-			// aapt resource value: 0x7F0B0068
-			public const int ez_message_image_page_new = 2131427432;
-			
-			// aapt resource value: 0x7F0B0069
-			public const int ez_message_list_item = 2131427433;
-			
-			// aapt resource value: 0x7F0B006A
-			public const int ez_message_list_item_new = 2131427434;
-			
-			// aapt resource value: 0x7F0B006B
-			public const int ez_message_list_section = 2131427435;
-			
-			// aapt resource value: 0x7F0B006C
-			public const int ez_message_list_section_new = 2131427436;
-			
-			// aapt resource value: 0x7F0B006D
-			public const int ez_message_page = 2131427437;
-			
-			// aapt resource value: 0x7F0B006E
-			public const int ez_message_page_new = 2131427438;
-			
-			// aapt resource value: 0x7F0B0071
-			public const int ez_playback_list_page_common = 2131427441;
-			
-			// aapt resource value: 0x7F0B0072
-			public const int ez_playback_list_page_new = 2131427442;
-			
-			// aapt resource value: 0x7F0B006F
-			public const int ez_play_control = 2131427439;
-			
-			// aapt resource value: 0x7F0B0070
-			public const int ez_play_control_new = 2131427440;
-			
-			// aapt resource value: 0x7F0B0073
-			public const int ez_realplay_page = 2131427443;
-			
-			// aapt resource value: 0x7F0B0074
-			public const int ez_realplay_page_new = 2131427444;
-			
-			// aapt resource value: 0x7F0B0075
-			public const int ez_realplay_prompt_layout = 2131427445;
-			
-			// aapt resource value: 0x7F0B0076
-			public const int ez_realplay_prompt_layout_new = 2131427446;
-			
-			// aapt resource value: 0x7F0B0077
-			public const int ez_realplay_quality_items = 2131427447;
-			
-			// aapt resource value: 0x7F0B0078
-			public const int ez_realplay_quality_items_new = 2131427448;
-			
-			// aapt resource value: 0x7F0B0079
-			public const int ez_remote_playback_page = 2131427449;
-			
-			// aapt resource value: 0x7F0B007A
-			public const int ez_remote_playback_page_new = 2131427450;
+			public const int dialog_tip = 2131427431;
 			
 			// aapt resource value: 0x7F0B007D
-			public const int fragment_call = 2131427453;
+			public const int ezopen_realplay_operate_bar = 2131427453;
 			
 			// aapt resource value: 0x7F0B007E
-			public const int fragment_city_config = 2131427454;
+			public const int ezopen_realplay_operate_bar2 = 2131427454;
+			
+			// aapt resource value: 0x7F0B0068
+			public const int ez_demo_interface_activity = 2131427432;
+			
+			// aapt resource value: 0x7F0B0069
+			public const int ez_message_image_page = 2131427433;
+			
+			// aapt resource value: 0x7F0B006A
+			public const int ez_message_image_page_new = 2131427434;
+			
+			// aapt resource value: 0x7F0B006B
+			public const int ez_message_list_item = 2131427435;
+			
+			// aapt resource value: 0x7F0B006C
+			public const int ez_message_list_item_new = 2131427436;
+			
+			// aapt resource value: 0x7F0B006D
+			public const int ez_message_list_section = 2131427437;
+			
+			// aapt resource value: 0x7F0B006E
+			public const int ez_message_list_section_new = 2131427438;
+			
+			// aapt resource value: 0x7F0B006F
+			public const int ez_message_page = 2131427439;
+			
+			// aapt resource value: 0x7F0B0070
+			public const int ez_message_page_new = 2131427440;
+			
+			// aapt resource value: 0x7F0B0073
+			public const int ez_playback_list_page_common = 2131427443;
+			
+			// aapt resource value: 0x7F0B0074
+			public const int ez_playback_list_page_new = 2131427444;
+			
+			// aapt resource value: 0x7F0B0071
+			public const int ez_play_control = 2131427441;
+			
+			// aapt resource value: 0x7F0B0072
+			public const int ez_play_control_new = 2131427442;
+			
+			// aapt resource value: 0x7F0B0075
+			public const int ez_realplay_page = 2131427445;
+			
+			// aapt resource value: 0x7F0B0076
+			public const int ez_realplay_page_new = 2131427446;
+			
+			// aapt resource value: 0x7F0B0077
+			public const int ez_realplay_prompt_layout = 2131427447;
+			
+			// aapt resource value: 0x7F0B0078
+			public const int ez_realplay_prompt_layout_new = 2131427448;
+			
+			// aapt resource value: 0x7F0B0079
+			public const int ez_realplay_quality_items = 2131427449;
+			
+			// aapt resource value: 0x7F0B007A
+			public const int ez_realplay_quality_items_new = 2131427450;
+			
+			// aapt resource value: 0x7F0B007B
+			public const int ez_remote_playback_page = 2131427451;
+			
+			// aapt resource value: 0x7F0B007C
+			public const int ez_remote_playback_page_new = 2131427452;
 			
 			// aapt resource value: 0x7F0B007F
-			public const int fragment_monitor = 2131427455;
+			public const int fragment_call = 2131427455;
 			
 			// aapt resource value: 0x7F0B0080
-			public const int fragment_search_video = 2131427456;
+			public const int fragment_city_config = 2131427456;
 			
 			// aapt resource value: 0x7F0B0081
-			public const int fragment_square_video_list = 2131427457;
+			public const int fragment_monitor = 2131427457;
 			
 			// aapt resource value: 0x7F0B0082
-			public const int hdl_gallery_banner_view_layout = 2131427458;
+			public const int fragment_search_video = 2131427458;
 			
 			// aapt resource value: 0x7F0B0083
-			public const int hdl_widget_activity_crop_image = 2131427459;
+			public const int fragment_square_video_list = 2131427459;
 			
 			// aapt resource value: 0x7F0B0084
-			public const int hdl_widget_activity_geofence_round = 2131427460;
+			public const int hdl_gallery_banner_view_layout = 2131427460;
 			
 			// aapt resource value: 0x7F0B0085
-			public const int hdl_widget_air_button = 2131427461;
+			public const int hdl_widget_activity_crop_image = 2131427461;
 			
 			// aapt resource value: 0x7F0B0086
-			public const int hdl_widget_include_pickerview_topbar = 2131427462;
+			public const int hdl_widget_activity_geofence_round = 2131427462;
 			
 			// aapt resource value: 0x7F0B0087
-			public const int hdl_widget_layout_basepickerview = 2131427463;
+			public const int hdl_widget_air_button = 2131427463;
 			
 			// aapt resource value: 0x7F0B0088
-			public const int hdl_widget_pickerview = 2131427464;
+			public const int hdl_widget_include_pickerview_topbar = 2131427464;
 			
 			// aapt resource value: 0x7F0B0089
-			public const int hdl_widget_pickerview_options = 2131427465;
+			public const int hdl_widget_layout_basepickerview = 2131427465;
 			
 			// aapt resource value: 0x7F0B008A
-			public const int hdl_widget_pickerview_time = 2131427466;
+			public const int hdl_widget_pickerview = 2131427466;
 			
 			// aapt resource value: 0x7F0B008B
-			public const int item_multi_screen_preview = 2131427467;
+			public const int hdl_widget_pickerview_options = 2131427467;
 			
 			// aapt resource value: 0x7F0B008C
-			public const int lan_device_adapter_item = 2131427468;
+			public const int hdl_widget_pickerview_time = 2131427468;
 			
 			// aapt resource value: 0x7F0B008D
-			public const int lan_device_login_dialog = 2131427469;
+			public const int item_multi_screen_preview = 2131427469;
 			
 			// aapt resource value: 0x7F0B008E
-			public const int layout_camera_view = 2131427470;
+			public const int lan_device_adapter_item = 2131427470;
 			
 			// aapt resource value: 0x7F0B008F
-			public const int layout_camera_view_soft = 2131427471;
+			public const int lan_device_login_dialog = 2131427471;
 			
 			// aapt resource value: 0x7F0B0090
-			public const int layout_change_playback_rate = 2131427472;
+			public const int layout_camera_view = 2131427472;
 			
 			// aapt resource value: 0x7F0B0091
-			public const int layout_child_watch_video_talk_operation = 2131427473;
+			public const int layout_camera_view_soft = 2131427473;
 			
 			// aapt resource value: 0x7F0B0092
-			public const int layout_dialog_tip = 2131427474;
+			public const int layout_change_playback_rate = 2131427474;
 			
 			// aapt resource value: 0x7F0B0093
-			public const int layout_login_anim = 2131427475;
+			public const int layout_child_watch_video_talk_operation = 2131427475;
 			
 			// aapt resource value: 0x7F0B0094
-			public const int line_connecting_introduce_activity = 2131427476;
+			public const int layout_dialog_tip = 2131427476;
 			
 			// aapt resource value: 0x7F0B0095
-			public const int list_section = 2131427477;
+			public const int layout_login_anim = 2131427477;
 			
 			// aapt resource value: 0x7F0B0096
-			public const int loading_text_view = 2131427478;
+			public const int line_connecting_introduce_activity = 2131427478;
 			
 			// aapt resource value: 0x7F0B0097
-			public const int login_page = 2131427479;
+			public const int list_section = 2131427479;
 			
 			// aapt resource value: 0x7F0B0098
-			public const int message_list_item = 2131427480;
+			public const int loading_text_view = 2131427480;
 			
 			// aapt resource value: 0x7F0B0099
-			public const int message_page = 2131427481;
+			public const int login_page = 2131427481;
 			
 			// aapt resource value: 0x7F0B009A
-			public const int modify_device_name_page = 2131427482;
+			public const int message_list_item = 2131427482;
 			
 			// aapt resource value: 0x7F0B009B
-			public const int multi_video_talk_item = 2131427483;
+			public const int message_page = 2131427483;
 			
 			// aapt resource value: 0x7F0B009C
-			public const int network_error_retry_page = 2131427484;
-			
-			// aapt resource value: 0x7F0B00A0
-			public const int notification_action = 2131427488;
-			
-			// aapt resource value: 0x7F0B00A1
-			public const int notification_action_tombstone = 2131427489;
-			
-			// aapt resource value: 0x7F0B00A2
-			public const int notification_media_action = 2131427490;
-			
-			// aapt resource value: 0x7F0B00A3
-			public const int notification_media_cancel_action = 2131427491;
-			
-			// aapt resource value: 0x7F0B00A4
-			public const int notification_template_big_media = 2131427492;
-			
-			// aapt resource value: 0x7F0B00A5
-			public const int notification_template_big_media_custom = 2131427493;
-			
-			// aapt resource value: 0x7F0B00A6
-			public const int notification_template_big_media_narrow = 2131427494;
-			
-			// aapt resource value: 0x7F0B00A7
-			public const int notification_template_big_media_narrow_custom = 2131427495;
-			
-			// aapt resource value: 0x7F0B00A8
-			public const int notification_template_custom_big = 2131427496;
-			
-			// aapt resource value: 0x7F0B00A9
-			public const int notification_template_icon_group = 2131427497;
-			
-			// aapt resource value: 0x7F0B00AA
-			public const int notification_template_lines_media = 2131427498;
-			
-			// aapt resource value: 0x7F0B00AB
-			public const int notification_template_media = 2131427499;
-			
-			// aapt resource value: 0x7F0B00AC
-			public const int notification_template_media_custom = 2131427500;
-			
-			// aapt resource value: 0x7F0B00AD
-			public const int notification_template_part_chronometer = 2131427501;
-			
-			// aapt resource value: 0x7F0B00AE
-			public const int notification_template_part_time = 2131427502;
-			
-			// aapt resource value: 0x7F0B00AF
-			public const int notifier_alarmloginfo_list_item = 2131427503;
-			
-			// aapt resource value: 0x7F0B00B0
-			public const int notifier_page = 2131427504;
+			public const int modify_device_name_page = 2131427484;
 			
 			// aapt resource value: 0x7F0B009D
-			public const int no_device_more_footer = 2131427485;
+			public const int multi_video_talk_item = 2131427485;
 			
 			// aapt resource value: 0x7F0B009E
-			public const int no_more_footer = 2131427486;
+			public const int network_error_retry_page = 2131427486;
 			
-			// aapt resource value: 0x7F0B009F
-			public const int no_msg_more_footer = 2131427487;
+			// aapt resource value: 0x7F0B00A2
+			public const int notification_action = 2131427490;
+			
+			// aapt resource value: 0x7F0B00A3
+			public const int notification_action_tombstone = 2131427491;
+			
+			// aapt resource value: 0x7F0B00A4
+			public const int notification_media_action = 2131427492;
+			
+			// aapt resource value: 0x7F0B00A5
+			public const int notification_media_cancel_action = 2131427493;
+			
+			// aapt resource value: 0x7F0B00A6
+			public const int notification_template_big_media = 2131427494;
+			
+			// aapt resource value: 0x7F0B00A7
+			public const int notification_template_big_media_custom = 2131427495;
+			
+			// aapt resource value: 0x7F0B00A8
+			public const int notification_template_big_media_narrow = 2131427496;
+			
+			// aapt resource value: 0x7F0B00A9
+			public const int notification_template_big_media_narrow_custom = 2131427497;
+			
+			// aapt resource value: 0x7F0B00AA
+			public const int notification_template_custom_big = 2131427498;
+			
+			// aapt resource value: 0x7F0B00AB
+			public const int notification_template_icon_group = 2131427499;
+			
+			// aapt resource value: 0x7F0B00AC
+			public const int notification_template_lines_media = 2131427500;
+			
+			// aapt resource value: 0x7F0B00AD
+			public const int notification_template_media = 2131427501;
+			
+			// aapt resource value: 0x7F0B00AE
+			public const int notification_template_media_custom = 2131427502;
+			
+			// aapt resource value: 0x7F0B00AF
+			public const int notification_template_part_chronometer = 2131427503;
+			
+			// aapt resource value: 0x7F0B00B0
+			public const int notification_template_part_time = 2131427504;
 			
 			// aapt resource value: 0x7F0B00B1
-			public const int open_ysservice_dialog = 2131427505;
+			public const int notifier_alarmloginfo_list_item = 2131427505;
 			
 			// aapt resource value: 0x7F0B00B2
-			public const int password_error_layout = 2131427506;
+			public const int notifier_page = 2131427506;
+			
+			// aapt resource value: 0x7F0B009F
+			public const int no_device_more_footer = 2131427487;
+			
+			// aapt resource value: 0x7F0B00A0
+			public const int no_more_footer = 2131427488;
+			
+			// aapt resource value: 0x7F0B00A1
+			public const int no_msg_more_footer = 2131427489;
 			
 			// aapt resource value: 0x7F0B00B3
-			public const int playback_list_page = 2131427507;
+			public const int open_ysservice_dialog = 2131427507;
 			
 			// aapt resource value: 0x7F0B00B4
-			public const int pull_to_refresh_footer = 2131427508;
+			public const int password_error_layout = 2131427508;
 			
 			// aapt resource value: 0x7F0B00B5
-			public const int pull_to_refresh_header = 2131427509;
-			
-			// aapt resource value: 0x7F0B00C1
-			public const int realplayer_item = 2131427521;
-			
-			// aapt resource value: 0x7F0B00C2
-			public const int realplayer_page = 2131427522;
+			public const int playback_list_page = 2131427509;
 			
 			// aapt resource value: 0x7F0B00B6
-			public const int realplay_control_layout = 2131427510;
+			public const int pull_to_refresh_footer = 2131427510;
 			
 			// aapt resource value: 0x7F0B00B7
-			public const int realplay_full_operate_layout = 2131427511;
-			
-			// aapt resource value: 0x7F0B00B8
-			public const int realplay_loading_layout = 2131427512;
-			
-			// aapt resource value: 0x7F0B00B9
-			public const int realplay_operate_bar = 2131427513;
-			
-			// aapt resource value: 0x7F0B00BA
-			public const int realplay_operate_bar2 = 2131427514;
-			
-			// aapt resource value: 0x7F0B00BB
-			public const int realplay_page = 2131427515;
-			
-			// aapt resource value: 0x7F0B00BC
-			public const int realplay_prompt_layout = 2131427516;
-			
-			// aapt resource value: 0x7F0B00BD
-			public const int realplay_ptz_wnd = 2131427517;
-			
-			// aapt resource value: 0x7F0B00BE
-			public const int realplay_quality_items = 2131427518;
-			
-			// aapt resource value: 0x7F0B00BF
-			public const int realplay_quality_wnd = 2131427519;
-			
-			// aapt resource value: 0x7F0B00C0
-			public const int realplay_talkback_wnd = 2131427520;
+			public const int pull_to_refresh_header = 2131427511;
 			
 			// aapt resource value: 0x7F0B00C3
-			public const int remote_playback_page = 2131427523;
+			public const int realplayer_item = 2131427523;
 			
 			// aapt resource value: 0x7F0B00C4
-			public const int section_list_item = 2131427524;
+			public const int realplayer_page = 2131427524;
+			
+			// aapt resource value: 0x7F0B00B8
+			public const int realplay_control_layout = 2131427512;
+			
+			// aapt resource value: 0x7F0B00B9
+			public const int realplay_full_operate_layout = 2131427513;
+			
+			// aapt resource value: 0x7F0B00BA
+			public const int realplay_loading_layout = 2131427514;
+			
+			// aapt resource value: 0x7F0B00BB
+			public const int realplay_operate_bar = 2131427515;
+			
+			// aapt resource value: 0x7F0B00BC
+			public const int realplay_operate_bar2 = 2131427516;
+			
+			// aapt resource value: 0x7F0B00BD
+			public const int realplay_page = 2131427517;
+			
+			// aapt resource value: 0x7F0B00BE
+			public const int realplay_prompt_layout = 2131427518;
+			
+			// aapt resource value: 0x7F0B00BF
+			public const int realplay_ptz_wnd = 2131427519;
+			
+			// aapt resource value: 0x7F0B00C0
+			public const int realplay_quality_items = 2131427520;
+			
+			// aapt resource value: 0x7F0B00C1
+			public const int realplay_quality_wnd = 2131427521;
+			
+			// aapt resource value: 0x7F0B00C2
+			public const int realplay_talkback_wnd = 2131427522;
 			
 			// aapt resource value: 0x7F0B00C5
-			public const int select_camera_no_dialog = 2131427525;
+			public const int remote_playback_page = 2131427525;
 			
 			// aapt resource value: 0x7F0B00C6
-			public const int select_camera_no_dialog_item = 2131427526;
+			public const int section_list_item = 2131427526;
 			
 			// aapt resource value: 0x7F0B00C7
-			public const int select_dialog_item_material = 2131427527;
+			public const int select_camera_no_dialog = 2131427527;
 			
 			// aapt resource value: 0x7F0B00C8
-			public const int select_dialog_multichoice_material = 2131427528;
+			public const int select_camera_no_dialog_item = 2131427528;
 			
 			// aapt resource value: 0x7F0B00C9
-			public const int select_dialog_singlechoice_material = 2131427529;
+			public const int select_dialog_item_material = 2131427529;
 			
 			// aapt resource value: 0x7F0B00CA
-			public const int select_talkback_items = 2131427530;
+			public const int select_dialog_multichoice_material = 2131427530;
 			
 			// aapt resource value: 0x7F0B00CB
-			public const int simple_demo = 2131427531;
+			public const int select_dialog_singlechoice_material = 2131427531;
 			
 			// aapt resource value: 0x7F0B00CC
-			public const int sms_verify_dialog = 2131427532;
+			public const int select_talkback_items = 2131427532;
 			
 			// aapt resource value: 0x7F0B00CD
-			public const int square_column_item = 2131427533;
+			public const int simple_demo = 2131427533;
 			
 			// aapt resource value: 0x7F0B00CE
-			public const int square_video_item = 2131427534;
+			public const int sms_verify_dialog = 2131427534;
 			
 			// aapt resource value: 0x7F0B00CF
-			public const int srl_classics_footer = 2131427535;
+			public const int square_column_item = 2131427535;
 			
 			// aapt resource value: 0x7F0B00D0
-			public const int srl_classics_header = 2131427536;
+			public const int square_video_item = 2131427536;
 			
 			// aapt resource value: 0x7F0B00D1
-			public const int support_simple_spinner_dropdown_item = 2131427537;
+			public const int srl_classics_footer = 2131427537;
 			
 			// aapt resource value: 0x7F0B00D2
-			public const int test_surfaceview = 2131427538;
+			public const int srl_classics_header = 2131427538;
 			
 			// aapt resource value: 0x7F0B00D3
-			public const int tooltip = 2131427539;
+			public const int support_simple_spinner_dropdown_item = 2131427539;
 			
 			// aapt resource value: 0x7F0B00D4
-			public const int topbar = 2131427540;
+			public const int test_surfaceview = 2131427540;
 			
 			// aapt resource value: 0x7F0B00D5
-			public const int verifycode_layout = 2131427541;
+			public const int tooltip = 2131427541;
 			
 			// aapt resource value: 0x7F0B00D6
-			public const int video_device = 2131427542;
+			public const int topbar = 2131427542;
 			
 			// aapt resource value: 0x7F0B00D7
-			public const int wait_dialog = 2131427543;
+			public const int verifycode_layout = 2131427543;
 			
 			// aapt resource value: 0x7F0B00D8
-			public const int web_page = 2131427544;
-			
-			// aapt resource value: 0x7F0B00DA
-			public const int zxingscanneractivitylayout = 2131427546;
-			
-			// aapt resource value: 0x7F0B00DB
-			public const int zxingscannerfragmentlayout = 2131427547;
+			public const int video_device = 2131427544;
 			
 			// aapt resource value: 0x7F0B00D9
-			public const int zxing_layout = 2131427545;
+			public const int wait_dialog = 2131427545;
+			
+			// aapt resource value: 0x7F0B00DA
+			public const int web_page = 2131427546;
+			
+			// aapt resource value: 0x7F0B00DC
+			public const int zxingscanneractivitylayout = 2131427548;
+			
+			// aapt resource value: 0x7F0B00DD
+			public const int zxingscannerfragmentlayout = 2131427549;
+			
+			// aapt resource value: 0x7F0B00DB
+			public const int zxing_layout = 2131427547;
 			
 			static Layout()
 			{
@@ -10603,16 +10708,40 @@
 			public const int beep = 2131623936;
 			
 			// aapt resource value: 0x7F0E0001
-			public const int paizhao = 2131623937;
+			public const int incoming_chat = 2131623937;
 			
 			// aapt resource value: 0x7F0E0002
-			public const int record = 2131623938;
+			public const int linphonerc_default = 2131623938;
 			
 			// aapt resource value: 0x7F0E0003
-			public const int video_talk_answer_ring = 2131623939;
+			public const int linphonerc_factory = 2131623939;
 			
 			// aapt resource value: 0x7F0E0004
-			public const int video_talk_caller_ring = 2131623940;
+			public const int lpconfig = 2131623940;
+			
+			// aapt resource value: 0x7F0E0005
+			public const int oldphone_mono = 2131623941;
+			
+			// aapt resource value: 0x7F0E0006
+			public const int paizhao = 2131623942;
+			
+			// aapt resource value: 0x7F0E0007
+			public const int record = 2131623943;
+			
+			// aapt resource value: 0x7F0E0008
+			public const int ringback = 2131623944;
+			
+			// aapt resource value: 0x7F0E0009
+			public const int rootca = 2131623945;
+			
+			// aapt resource value: 0x7F0E000A
+			public const int toy_mono = 2131623946;
+			
+			// aapt resource value: 0x7F0E000B
+			public const int video_talk_answer_ring = 2131623947;
+			
+			// aapt resource value: 0x7F0E000C
+			public const int video_talk_caller_ring = 2131623948;
 			
 			static Raw()
 			{
@@ -11642,1024 +11771,1075 @@
 			public const int later_alarm = 2131689809;
 			
 			// aapt resource value: 0x7F0F0152
-			public const int loading = 2131689810;
+			public const int linphone_sdk_branch = 2131689810;
 			
 			// aapt resource value: 0x7F0F0153
-			public const int loading_text_default = 2131689811;
-			
-			// aapt resource value: 0x7F0F0158
-			public const int localmgt_video_square_txt = 2131689816;
+			public const int linphone_sdk_version = 2131689811;
 			
 			// aapt resource value: 0x7F0F0154
-			public const int local_network_exception = 2131689812;
+			public const int loading = 2131689812;
 			
 			// aapt resource value: 0x7F0F0155
-			public const int local_play_hour = 2131689813;
-			
-			// aapt resource value: 0x7F0F0156
-			public const int local_realplay = 2131689814;
-			
-			// aapt resource value: 0x7F0F0157
-			public const int local_video_not_delete = 2131689815;
-			
-			// aapt resource value: 0x7F0F0159
-			public const int login_by_ezviz_account = 2131689817;
+			public const int loading_text_default = 2131689813;
 			
 			// aapt resource value: 0x7F0F015A
-			public const int login_expire = 2131689818;
+			public const int localmgt_video_square_txt = 2131689818;
+			
+			// aapt resource value: 0x7F0F0156
+			public const int local_network_exception = 2131689814;
+			
+			// aapt resource value: 0x7F0F0157
+			public const int local_play_hour = 2131689815;
+			
+			// aapt resource value: 0x7F0F0158
+			public const int local_realplay = 2131689816;
+			
+			// aapt resource value: 0x7F0F0159
+			public const int local_video_not_delete = 2131689817;
 			
 			// aapt resource value: 0x7F0F015B
-			public const int login_password_tv_txt = 2131689819;
+			public const int login_by_ezviz_account = 2131689819;
 			
 			// aapt resource value: 0x7F0F015C
-			public const int main_tab_second_tab = 2131689820;
+			public const int login_expire = 2131689820;
 			
 			// aapt resource value: 0x7F0F015D
-			public const int message_come_from_tip = 2131689821;
+			public const int login_password_tv_txt = 2131689821;
 			
 			// aapt resource value: 0x7F0F015E
-			public const int message_encrypt_inputpsw_tip_title = 2131689822;
+			public const int lp_answerStr = 2131689822;
 			
 			// aapt resource value: 0x7F0F015F
-			public const int message_live = 2131689823;
+			public const int lp_callingStr = 2131689823;
 			
 			// aapt resource value: 0x7F0F0160
-			public const int message_no_data_text = 2131689824;
+			public const int lp_endMonitoringStr = 2131689824;
 			
 			// aapt resource value: 0x7F0F0161
-			public const int message_refresh_fail_network_exception = 2131689825;
+			public const int lp_endOfCallStr = 2131689825;
 			
 			// aapt resource value: 0x7F0F0162
-			public const int message_refresh_fail_server_exception = 2131689826;
+			public const int lp_hangupStr = 2131689826;
 			
 			// aapt resource value: 0x7F0F0163
-			public const int message_video = 2131689827;
+			public const int lp_okStr = 2131689827;
 			
 			// aapt resource value: 0x7F0F0164
-			public const int modify_online_schedule = 2131689828;
+			public const int lp_operationFailedStr = 2131689828;
 			
 			// aapt resource value: 0x7F0F0165
-			public const int month = 2131689829;
+			public const int lp_outdoorUnitStr = 2131689829;
 			
 			// aapt resource value: 0x7F0F0166
-			public const int more = 2131689830;
+			public const int lp_refuseStr = 2131689830;
 			
 			// aapt resource value: 0x7F0F0167
-			public const int more_local_image = 2131689831;
+			public const int lp_saveToTheAlbumsStr = 2131689831;
 			
 			// aapt resource value: 0x7F0F0168
-			public const int more_setting = 2131689832;
+			public const int lp_screenshotStr = 2131689832;
 			
 			// aapt resource value: 0x7F0F0169
-			public const int my_collect = 2131689833;
-			
-			// aapt resource value: 0x7F0F016A
-			public const int my_devices = 2131689834;
-			
-			// aapt resource value: 0x7F0F016B
-			public const int network_error_retry_prompt = 2131689835;
+			public const int lp_tipStr = 2131689833;
 			
 			// aapt resource value: 0x7F0F016C
-			public const int network_exception = 2131689836;
+			public const int lp_unlockfailureStr = 2131689836;
+			
+			// aapt resource value: 0x7F0F016A
+			public const int lp_unlockStr = 2131689834;
+			
+			// aapt resource value: 0x7F0F016B
+			public const int lp_unlockSuccessfullyStr = 2131689835;
 			
 			// aapt resource value: 0x7F0F016D
-			public const int network_video_recorder = 2131689837;
+			public const int main_tab_second_tab = 2131689837;
 			
 			// aapt resource value: 0x7F0F016E
-			public const int newest_version = 2131689838;
+			public const int message_come_from_tip = 2131689838;
 			
 			// aapt resource value: 0x7F0F016F
-			public const int next_button_txt = 2131689839;
-			
-			// aapt resource value: 0x7F0F0176
-			public const int not_find_any_devices = 2131689846;
-			
-			// aapt resource value: 0x7F0F0177
-			public const int not_now = 2131689847;
-			
-			// aapt resource value: 0x7F0F0178
-			public const int not_recognized_fingerprint_hint = 2131689848;
+			public const int message_encrypt_inputpsw_tip_title = 2131689839;
 			
 			// aapt resource value: 0x7F0F0170
-			public const int no_event_device_prompt = 2131689840;
+			public const int message_live = 2131689840;
 			
 			// aapt resource value: 0x7F0F0171
-			public const int no_leave_device_prompt = 2131689841;
+			public const int message_no_data_text = 2131689841;
 			
 			// aapt resource value: 0x7F0F0172
-			public const int no_more_alarm_tip = 2131689842;
+			public const int message_refresh_fail_network_exception = 2131689842;
 			
 			// aapt resource value: 0x7F0F0173
-			public const int no_more_leave_tip = 2131689843;
+			public const int message_refresh_fail_server_exception = 2131689843;
 			
 			// aapt resource value: 0x7F0F0174
-			public const int no_remote_data = 2131689844;
+			public const int message_video = 2131689844;
 			
 			// aapt resource value: 0x7F0F0175
-			public const int no_result_text = 2131689845;
+			public const int modify_online_schedule = 2131689845;
+			
+			// aapt resource value: 0x7F0F0176
+			public const int month = 2131689846;
+			
+			// aapt resource value: 0x7F0F0177
+			public const int more = 2131689847;
+			
+			// aapt resource value: 0x7F0F0178
+			public const int more_local_image = 2131689848;
 			
 			// aapt resource value: 0x7F0F0179
-			public const int offline_warn_text = 2131689849;
-			
-			// aapt resource value: 0x7F0F017B
-			public const int online_time = 2131689851;
+			public const int more_setting = 2131689849;
 			
 			// aapt resource value: 0x7F0F017A
-			public const int on_the_phone = 2131689850;
+			public const int my_collect = 2131689850;
+			
+			// aapt resource value: 0x7F0F017B
+			public const int my_devices = 2131689851;
 			
 			// aapt resource value: 0x7F0F017C
-			public const int open_camera_fail = 2131689852;
+			public const int network_error_retry_prompt = 2131689852;
 			
 			// aapt resource value: 0x7F0F017D
-			public const int open_camera_lens = 2131689853;
+			public const int network_exception = 2131689853;
 			
 			// aapt resource value: 0x7F0F017E
-			public const int open_source_localization = 2131689854;
+			public const int network_video_recorder = 2131689854;
 			
 			// aapt resource value: 0x7F0F017F
-			public const int open_ys_service = 2131689855;
+			public const int newest_version = 2131689855;
 			
 			// aapt resource value: 0x7F0F0180
-			public const int open_ys_service_fail = 2131689856;
-			
-			// aapt resource value: 0x7F0F0181
-			public const int open_ys_service_success = 2131689857;
-			
-			// aapt resource value: 0x7F0F0182
-			public const int operational_fail = 2131689858;
-			
-			// aapt resource value: 0x7F0F0183
-			public const int option_support_web = 2131689859;
-			
-			// aapt resource value: 0x7F0F0184
-			public const int password_et_hint = 2131689860;
-			
-			// aapt resource value: 0x7F0F0185
-			public const int password_security_txt = 2131689861;
-			
-			// aapt resource value: 0x7F0F0186
-			public const int password_toggle_content_description = 2131689862;
+			public const int next_button_txt = 2131689856;
 			
 			// aapt resource value: 0x7F0F0187
-			public const int path_password_eye = 2131689863;
+			public const int not_find_any_devices = 2131689863;
 			
 			// aapt resource value: 0x7F0F0188
-			public const int path_password_eye_mask_strike_through = 2131689864;
+			public const int not_now = 2131689864;
 			
 			// aapt resource value: 0x7F0F0189
-			public const int path_password_eye_mask_visible = 2131689865;
+			public const int not_recognized_fingerprint_hint = 2131689865;
+			
+			// aapt resource value: 0x7F0F0181
+			public const int no_event_device_prompt = 2131689857;
+			
+			// aapt resource value: 0x7F0F0182
+			public const int no_leave_device_prompt = 2131689858;
+			
+			// aapt resource value: 0x7F0F0183
+			public const int no_more_alarm_tip = 2131689859;
+			
+			// aapt resource value: 0x7F0F0184
+			public const int no_more_leave_tip = 2131689860;
+			
+			// aapt resource value: 0x7F0F0185
+			public const int no_remote_data = 2131689861;
+			
+			// aapt resource value: 0x7F0F0186
+			public const int no_result_text = 2131689862;
 			
 			// aapt resource value: 0x7F0F018A
-			public const int path_password_strike_through = 2131689866;
-			
-			// aapt resource value: 0x7F0F018B
-			public const int pickerview_cancel = 2131689867;
+			public const int offline_warn_text = 2131689866;
 			
 			// aapt resource value: 0x7F0F018C
-			public const int pickerview_day = 2131689868;
+			public const int online_time = 2131689868;
+			
+			// aapt resource value: 0x7F0F018B
+			public const int on_the_phone = 2131689867;
 			
 			// aapt resource value: 0x7F0F018D
-			public const int pickerview_hours = 2131689869;
+			public const int open_camera_fail = 2131689869;
 			
 			// aapt resource value: 0x7F0F018E
-			public const int pickerview_minutes = 2131689870;
+			public const int open_camera_lens = 2131689870;
 			
 			// aapt resource value: 0x7F0F018F
-			public const int pickerview_month = 2131689871;
+			public const int open_source_localization = 2131689871;
 			
 			// aapt resource value: 0x7F0F0190
-			public const int pickerview_seconds = 2131689872;
+			public const int open_ys_service = 2131689872;
 			
 			// aapt resource value: 0x7F0F0191
-			public const int pickerview_submit = 2131689873;
+			public const int open_ys_service_fail = 2131689873;
 			
 			// aapt resource value: 0x7F0F0192
-			public const int pickerview_year = 2131689874;
-			
-			// aapt resource value: 0x7F0F0194
-			public const int platform_login_button_txt = 2131689876;
+			public const int open_ys_service_success = 2131689874;
 			
 			// aapt resource value: 0x7F0F0193
-			public const int plat_connected = 2131689875;
+			public const int operational_fail = 2131689875;
+			
+			// aapt resource value: 0x7F0F0194
+			public const int option_support_web = 2131689876;
 			
 			// aapt resource value: 0x7F0F0195
-			public const int play_hour = 2131689877;
+			public const int password_et_hint = 2131689877;
 			
 			// aapt resource value: 0x7F0F0196
-			public const int please_connect_the_power = 2131689878;
-			
-			// aapt resource value: 0x7F0F0198
-			public const int please_input_phonenumber_txt = 2131689880;
+			public const int password_security_txt = 2131689878;
 			
 			// aapt resource value: 0x7F0F0197
-			public const int please_input_phone_txt = 2131689879;
+			public const int password_toggle_content_description = 2131689879;
+			
+			// aapt resource value: 0x7F0F0198
+			public const int path_password_eye = 2131689880;
 			
 			// aapt resource value: 0x7F0F0199
-			public const int please_input_platform_accesstoken_txt = 2131689881;
+			public const int path_password_eye_mask_strike_through = 2131689881;
 			
 			// aapt resource value: 0x7F0F019A
-			public const int please_input_sign_get_sms_txt = 2131689882;
+			public const int path_password_eye_mask_visible = 2131689882;
 			
 			// aapt resource value: 0x7F0F019B
-			public const int please_input_sign_txt = 2131689883;
+			public const int path_password_strike_through = 2131689883;
 			
 			// aapt resource value: 0x7F0F019C
-			public const int please_input_userid_txt = 2131689884;
+			public const int pickerview_cancel = 2131689884;
 			
 			// aapt resource value: 0x7F0F019D
-			public const int please_open_wifi_network = 2131689885;
+			public const int pickerview_day = 2131689885;
 			
 			// aapt resource value: 0x7F0F019E
-			public const int please_open_wifi_network_sadp = 2131689886;
+			public const int pickerview_hours = 2131689886;
 			
 			// aapt resource value: 0x7F0F019F
-			public const int please_operate_after_select_any_record = 2131689887;
+			public const int pickerview_minutes = 2131689887;
 			
 			// aapt resource value: 0x7F0F01A0
-			public const int please_try_connect_device_hotspot_manually = 2131689888;
+			public const int pickerview_month = 2131689888;
 			
 			// aapt resource value: 0x7F0F01A1
-			public const int plug = 2131689889;
+			public const int pickerview_seconds = 2131689889;
 			
 			// aapt resource value: 0x7F0F01A2
-			public const int pm = 2131689890;
+			public const int pickerview_submit = 2131689890;
 			
 			// aapt resource value: 0x7F0F01A3
-			public const int press_again_to_exit = 2131689891;
-			
-			// aapt resource value: 0x7F0F01A4
-			public const int press_to_talk_release_to_listen = 2131689892;
+			public const int pickerview_year = 2131689891;
 			
 			// aapt resource value: 0x7F0F01A5
-			public const int probe_not_support_tip = 2131689893;
+			public const int platform_login_button_txt = 2131689893;
+			
+			// aapt resource value: 0x7F0F01A4
+			public const int plat_connected = 2131689892;
 			
 			// aapt resource value: 0x7F0F01A6
-			public const int promptUserToActivate = 2131689894;
+			public const int play_hour = 2131689894;
 			
 			// aapt resource value: 0x7F0F01A7
-			public const int ptz = 2131689895;
-			
-			// aapt resource value: 0x7F0F01A8
-			public const int ptz_control_timeout_cruise_track_failed = 2131689896;
+			public const int please_connect_the_power = 2131689895;
 			
 			// aapt resource value: 0x7F0F01A9
-			public const int ptz_control_timeout_sound_lacalization_failed = 2131689897;
+			public const int please_input_phonenumber_txt = 2131689897;
+			
+			// aapt resource value: 0x7F0F01A8
+			public const int please_input_phone_txt = 2131689896;
 			
 			// aapt resource value: 0x7F0F01AA
-			public const int ptz_is_preseting = 2131689898;
+			public const int please_input_platform_accesstoken_txt = 2131689898;
 			
 			// aapt resource value: 0x7F0F01AB
-			public const int ptz_mirroring_failed = 2131689899;
+			public const int please_input_sign_get_sms_txt = 2131689899;
 			
 			// aapt resource value: 0x7F0F01AC
-			public const int ptz_operation_failed = 2131689900;
+			public const int please_input_sign_txt = 2131689900;
 			
 			// aapt resource value: 0x7F0F01AD
-			public const int ptz_operation_too_frequently = 2131689901;
+			public const int please_input_userid_txt = 2131689901;
 			
 			// aapt resource value: 0x7F0F01AE
-			public const int ptz_preset_current_position_failed = 2131689902;
+			public const int please_open_wifi_network = 2131689902;
 			
 			// aapt resource value: 0x7F0F01AF
-			public const int ptz_preset_exceed_maxnum_failed = 2131689903;
+			public const int please_open_wifi_network_sadp = 2131689903;
 			
 			// aapt resource value: 0x7F0F01B0
-			public const int ptz_preset_invalid_position_failed = 2131689904;
+			public const int please_operate_after_select_any_record = 2131689904;
 			
 			// aapt resource value: 0x7F0F01B1
-			public const int ptz_preset_sound_localization_failed = 2131689905;
+			public const int please_try_connect_device_hotspot_manually = 2131689905;
 			
 			// aapt resource value: 0x7F0F01B2
-			public const int ptz_privacying_failed = 2131689906;
+			public const int plug = 2131689906;
 			
 			// aapt resource value: 0x7F0F01B3
-			public const int push_event_alarm_title = 2131689907;
+			public const int pm = 2131689907;
 			
 			// aapt resource value: 0x7F0F01B4
-			public const int push_event_from = 2131689908;
+			public const int press_again_to_exit = 2131689908;
 			
 			// aapt resource value: 0x7F0F01B5
-			public const int push_event_get = 2131689909;
+			public const int press_to_talk_release_to_listen = 2131689909;
 			
 			// aapt resource value: 0x7F0F01B6
-			public const int push_event_get_count = 2131689910;
+			public const int probe_not_support_tip = 2131689910;
 			
 			// aapt resource value: 0x7F0F01B7
-			public const int push_out_event_alarm_title = 2131689911;
+			public const int promptUserToActivate = 2131689911;
 			
 			// aapt resource value: 0x7F0F01B8
-			public const int pwd_not_contain_chinese = 2131689912;
+			public const int ptz = 2131689912;
 			
 			// aapt resource value: 0x7F0F01B9
-			public const int qrcode_card = 2131689913;
+			public const int ptz_control_timeout_cruise_track_failed = 2131689913;
 			
 			// aapt resource value: 0x7F0F01BA
-			public const int quality_balanced = 2131689914;
+			public const int ptz_control_timeout_sound_lacalization_failed = 2131689914;
 			
 			// aapt resource value: 0x7F0F01BB
-			public const int quality_flunet = 2131689915;
+			public const int ptz_is_preseting = 2131689915;
 			
 			// aapt resource value: 0x7F0F01BC
-			public const int quality_hd = 2131689916;
+			public const int ptz_mirroring_failed = 2131689916;
 			
 			// aapt resource value: 0x7F0F01BD
-			public const int quality_super_hd = 2131689917;
-			
-			// aapt resource value: 0x7F0F01C4
-			public const int querying_camera_text = 2131689924;
+			public const int ptz_operation_failed = 2131689917;
 			
 			// aapt resource value: 0x7F0F01BE
-			public const int query_camera_fail = 2131689918;
+			public const int ptz_operation_too_frequently = 2131689918;
 			
 			// aapt resource value: 0x7F0F01BF
-			public const int query_camera_fail_network_exception = 2131689919;
+			public const int ptz_preset_current_position_failed = 2131689919;
 			
 			// aapt resource value: 0x7F0F01C0
-			public const int query_camera_fail_network_exception_or_server_exception = 2131689920;
+			public const int ptz_preset_exceed_maxnum_failed = 2131689920;
 			
 			// aapt resource value: 0x7F0F01C1
-			public const int query_camera_fail_not_exit = 2131689921;
+			public const int ptz_preset_invalid_position_failed = 2131689921;
 			
 			// aapt resource value: 0x7F0F01C2
-			public const int query_camera_fail_repeat_error = 2131689922;
+			public const int ptz_preset_sound_localization_failed = 2131689922;
 			
 			// aapt resource value: 0x7F0F01C3
-			public const int query_camera_fail_server_exception = 2131689923;
+			public const int ptz_privacying_failed = 2131689923;
+			
+			// aapt resource value: 0x7F0F01C4
+			public const int push_event_alarm_title = 2131689924;
 			
 			// aapt resource value: 0x7F0F01C5
-			public const int readed = 2131689925;
+			public const int push_event_from = 2131689925;
 			
 			// aapt resource value: 0x7F0F01C6
-			public const int realplay = 2131689926;
+			public const int push_event_get = 2131689926;
 			
 			// aapt resource value: 0x7F0F01C7
-			public const int realplay_close_sound_localization_fail = 2131689927;
+			public const int push_event_get_count = 2131689927;
 			
 			// aapt resource value: 0x7F0F01C8
-			public const int realplay_encrypt_password_error_message = 2131689928;
+			public const int push_out_event_alarm_title = 2131689928;
 			
 			// aapt resource value: 0x7F0F01C9
-			public const int realplay_encrypt_password_error_title = 2131689929;
+			public const int pwd_not_contain_chinese = 2131689929;
 			
 			// aapt resource value: 0x7F0F01CA
-			public const int realplay_fail_connect_device = 2131689930;
+			public const int qrcode_card = 2131689930;
 			
 			// aapt resource value: 0x7F0F01CB
-			public const int realplay_fail_device_not_exist = 2131689931;
+			public const int quality_balanced = 2131689931;
 			
 			// aapt resource value: 0x7F0F01CC
-			public const int realplay_full_talk_start_tip = 2131689932;
+			public const int quality_flunet = 2131689932;
 			
 			// aapt resource value: 0x7F0F01CD
-			public const int realplay_loading = 2131689933;
+			public const int quality_hd = 2131689933;
 			
 			// aapt resource value: 0x7F0F01CE
-			public const int realplay_login_password_error = 2131689934;
-			
-			// aapt resource value: 0x7F0F01CF
-			public const int realplay_login_password_msg = 2131689935;
-			
-			// aapt resource value: 0x7F0F01D0
-			public const int realplay_no_encrypt_password_error = 2131689936;
-			
-			// aapt resource value: 0x7F0F01D1
-			public const int realplay_no_permission = 2131689937;
-			
-			// aapt resource value: 0x7F0F01D2
-			public const int realplay_open_sound_localization_fail = 2131689938;
-			
-			// aapt resource value: 0x7F0F01D3
-			public const int realplay_password_error_message1 = 2131689939;
-			
-			// aapt resource value: 0x7F0F01D4
-			public const int realplay_password_error_message3 = 2131689940;
+			public const int quality_super_hd = 2131689934;
 			
 			// aapt resource value: 0x7F0F01D5
-			public const int realplay_password_error_message4 = 2131689941;
+			public const int querying_camera_text = 2131689941;
+			
+			// aapt resource value: 0x7F0F01CF
+			public const int query_camera_fail = 2131689935;
+			
+			// aapt resource value: 0x7F0F01D0
+			public const int query_camera_fail_network_exception = 2131689936;
+			
+			// aapt resource value: 0x7F0F01D1
+			public const int query_camera_fail_network_exception_or_server_exception = 2131689937;
+			
+			// aapt resource value: 0x7F0F01D2
+			public const int query_camera_fail_not_exit = 2131689938;
+			
+			// aapt resource value: 0x7F0F01D3
+			public const int query_camera_fail_repeat_error = 2131689939;
+			
+			// aapt resource value: 0x7F0F01D4
+			public const int query_camera_fail_server_exception = 2131689940;
 			
 			// aapt resource value: 0x7F0F01D6
-			public const int realplay_password_error_title = 2131689942;
+			public const int readed = 2131689942;
 			
 			// aapt resource value: 0x7F0F01D7
-			public const int realplay_play_fail = 2131689943;
+			public const int realplay = 2131689943;
 			
 			// aapt resource value: 0x7F0F01D8
-			public const int realplay_play_fail_becauseof_network = 2131689944;
+			public const int realplay_close_sound_localization_fail = 2131689944;
 			
 			// aapt resource value: 0x7F0F01D9
-			public const int realplay_play_no_video_source = 2131689945;
+			public const int realplay_encrypt_password_error_message = 2131689945;
 			
 			// aapt resource value: 0x7F0F01DA
-			public const int realplay_play_talkback_fail = 2131689946;
+			public const int realplay_encrypt_password_error_title = 2131689946;
 			
 			// aapt resource value: 0x7F0F01DB
-			public const int realplay_play_talkback_fail_ison = 2131689947;
+			public const int realplay_fail_connect_device = 2131689947;
 			
 			// aapt resource value: 0x7F0F01DC
-			public const int realplay_play_talkback_fail_privacy = 2131689948;
+			public const int realplay_fail_device_not_exist = 2131689948;
 			
 			// aapt resource value: 0x7F0F01DD
-			public const int realplay_play_talkback_network_exception = 2131689949;
+			public const int realplay_full_talk_start_tip = 2131689949;
 			
 			// aapt resource value: 0x7F0F01DE
-			public const int realplay_play_talkback_request_timeout = 2131689950;
+			public const int realplay_loading = 2131689950;
 			
 			// aapt resource value: 0x7F0F01DF
-			public const int realplay_set_fail_network = 2131689951;
+			public const int realplay_login_password_error = 2131689951;
 			
 			// aapt resource value: 0x7F0F01E0
-			public const int realplay_set_fail_status = 2131689952;
+			public const int realplay_login_password_msg = 2131689952;
 			
 			// aapt resource value: 0x7F0F01E1
-			public const int realplay_set_vediomode_fail = 2131689953;
+			public const int realplay_no_encrypt_password_error = 2131689953;
 			
 			// aapt resource value: 0x7F0F01E2
-			public const int realplay_share_no_permission = 2131689954;
+			public const int realplay_no_permission = 2131689954;
 			
 			// aapt resource value: 0x7F0F01E3
-			public const int realplay_share_time_over = 2131689955;
+			public const int realplay_open_sound_localization_fail = 2131689955;
 			
 			// aapt resource value: 0x7F0F01E4
-			public const int realplay_verifycode_error_message0 = 2131689956;
+			public const int realplay_password_error_message1 = 2131689956;
 			
 			// aapt resource value: 0x7F0F01E5
-			public const int realplay_verifycode_error_placehold = 2131689957;
+			public const int realplay_password_error_message3 = 2131689957;
 			
 			// aapt resource value: 0x7F0F01E6
-			public const int receice_leave_msg_audio = 2131689958;
+			public const int realplay_password_error_message4 = 2131689958;
 			
 			// aapt resource value: 0x7F0F01E7
-			public const int receice_leave_msg_video = 2131689959;
+			public const int realplay_password_error_title = 2131689959;
 			
 			// aapt resource value: 0x7F0F01E8
-			public const int record = 2131689960;
+			public const int realplay_play_fail = 2131689960;
 			
 			// aapt resource value: 0x7F0F01E9
-			public const int refresh = 2131689961;
+			public const int realplay_play_fail_becauseof_network = 2131689961;
 			
 			// aapt resource value: 0x7F0F01EA
-			public const int refresh_empty_hint = 2131689962;
+			public const int realplay_play_no_video_source = 2131689962;
 			
 			// aapt resource value: 0x7F0F01EB
-			public const int refresh_fail_hint = 2131689963;
-			
-			// aapt resource value: 0x7F0F01ED
-			public const int remoteplayback_capture_fail = 2131689965;
-			
-			// aapt resource value: 0x7F0F01EE
-			public const int remoteplayback_capture_fail_for_memory = 2131689966;
-			
-			// aapt resource value: 0x7F0F01EF
-			public const int remoteplayback_connect_device_error = 2131689967;
-			
-			// aapt resource value: 0x7F0F01F0
-			public const int remoteplayback_connect_server_error = 2131689968;
-			
-			// aapt resource value: 0x7F0F01F1
-			public const int remoteplayback_fail = 2131689969;
-			
-			// aapt resource value: 0x7F0F01F2
-			public const int remoteplayback_norecordfile = 2131689970;
-			
-			// aapt resource value: 0x7F0F01F3
-			public const int remoteplayback_norecordfile_alarm = 2131689971;
-			
-			// aapt resource value: 0x7F0F01F4
-			public const int remoteplayback_over_link = 2131689972;
-			
-			// aapt resource value: 0x7F0F01F5
-			public const int remoteplayback_record_fail = 2131689973;
-			
-			// aapt resource value: 0x7F0F01F6
-			public const int remoteplayback_record_fail_for_memory = 2131689974;
+			public const int realplay_play_talkback_fail = 2131689963;
 			
 			// aapt resource value: 0x7F0F01EC
-			public const int remoteplayback_SDCard_disable_use = 2131689964;
+			public const int realplay_play_talkback_fail_ison = 2131689964;
+			
+			// aapt resource value: 0x7F0F01ED
+			public const int realplay_play_talkback_fail_privacy = 2131689965;
+			
+			// aapt resource value: 0x7F0F01EE
+			public const int realplay_play_talkback_network_exception = 2131689966;
+			
+			// aapt resource value: 0x7F0F01EF
+			public const int realplay_play_talkback_request_timeout = 2131689967;
+			
+			// aapt resource value: 0x7F0F01F0
+			public const int realplay_set_fail_network = 2131689968;
+			
+			// aapt resource value: 0x7F0F01F1
+			public const int realplay_set_fail_status = 2131689969;
+			
+			// aapt resource value: 0x7F0F01F2
+			public const int realplay_set_vediomode_fail = 2131689970;
+			
+			// aapt resource value: 0x7F0F01F3
+			public const int realplay_share_no_permission = 2131689971;
+			
+			// aapt resource value: 0x7F0F01F4
+			public const int realplay_share_time_over = 2131689972;
+			
+			// aapt resource value: 0x7F0F01F5
+			public const int realplay_verifycode_error_message0 = 2131689973;
+			
+			// aapt resource value: 0x7F0F01F6
+			public const int realplay_verifycode_error_placehold = 2131689974;
 			
 			// aapt resource value: 0x7F0F01F7
-			public const int remoteplayback_searchfile_fail_for_device = 2131689975;
+			public const int receice_leave_msg_audio = 2131689975;
 			
 			// aapt resource value: 0x7F0F01F8
-			public const int remoteplayback_searchfile_fail_for_network = 2131689976;
+			public const int receice_leave_msg_video = 2131689976;
 			
 			// aapt resource value: 0x7F0F01F9
-			public const int reset_10_sec_to_release = 2131689977;
+			public const int record = 2131689977;
 			
 			// aapt resource value: 0x7F0F01FA
-			public const int reset_device = 2131689978;
+			public const int refresh = 2131689978;
 			
 			// aapt resource value: 0x7F0F01FB
-			public const int result_txt = 2131689979;
+			public const int refresh_empty_hint = 2131689979;
 			
 			// aapt resource value: 0x7F0F01FC
-			public const int retry = 2131689980;
+			public const int refresh_fail_hint = 2131689980;
 			
 			// aapt resource value: 0x7F0F01FE
-			public const int router = 2131689982;
-			
-			// aapt resource value: 0x7F0F01FD
-			public const int route_status_light = 2131689981;
+			public const int remoteplayback_capture_fail = 2131689982;
 			
 			// aapt resource value: 0x7F0F01FF
-			public const int sadp_activate_state1 = 2131689983;
+			public const int remoteplayback_capture_fail_for_memory = 2131689983;
 			
 			// aapt resource value: 0x7F0F0200
-			public const int sadp_activate_state2 = 2131689984;
+			public const int remoteplayback_connect_device_error = 2131689984;
 			
 			// aapt resource value: 0x7F0F0201
-			public const int sadp_password_input_hint = 2131689985;
+			public const int remoteplayback_connect_server_error = 2131689985;
 			
 			// aapt resource value: 0x7F0F0202
-			public const int sadp_password_toast = 2131689986;
+			public const int remoteplayback_fail = 2131689986;
 			
 			// aapt resource value: 0x7F0F0203
-			public const int sadp_password_too_weak = 2131689987;
+			public const int remoteplayback_norecordfile = 2131689987;
 			
 			// aapt resource value: 0x7F0F0204
-			public const int sadp_quit_activate = 2131689988;
+			public const int remoteplayback_norecordfile_alarm = 2131689988;
 			
 			// aapt resource value: 0x7F0F0205
-			public const int save_encrypt_password_fail_network_exception = 2131689989;
+			public const int remoteplayback_over_link = 2131689989;
 			
 			// aapt resource value: 0x7F0F0206
-			public const int scan_add = 2131689990;
+			public const int remoteplayback_record_fail = 2131689990;
 			
 			// aapt resource value: 0x7F0F0207
-			public const int scan_connet_network = 2131689991;
+			public const int remoteplayback_record_fail_for_memory = 2131689991;
+			
+			// aapt resource value: 0x7F0F01FD
+			public const int remoteplayback_SDCard_disable_use = 2131689981;
 			
 			// aapt resource value: 0x7F0F0208
-			public const int scan_cue_txt = 2131689992;
+			public const int remoteplayback_searchfile_fail_for_device = 2131689992;
 			
 			// aapt resource value: 0x7F0F0209
-			public const int scan_device_add_by_others = 2131689993;
+			public const int remoteplayback_searchfile_fail_for_network = 2131689993;
 			
 			// aapt resource value: 0x7F0F020A
-			public const int scan_device_search = 2131689994;
+			public const int reset_10_sec_to_release = 2131689994;
 			
 			// aapt resource value: 0x7F0F020B
-			public const int scan_device_serial_no = 2131689995;
+			public const int reset_device = 2131689995;
 			
 			// aapt resource value: 0x7F0F020C
-			public const int scan_network_unavailible = 2131689996;
+			public const int result_txt = 2131689996;
 			
 			// aapt resource value: 0x7F0F020D
-			public const int scan_probe_qrcode_error = 2131689997;
-			
-			// aapt resource value: 0x7F0F020E
-			public const int scan_search_probe_qrcode = 2131689998;
+			public const int retry = 2131689997;
 			
 			// aapt resource value: 0x7F0F020F
-			public const int scan_title_txt = 2131689999;
+			public const int router = 2131689999;
+			
+			// aapt resource value: 0x7F0F020E
+			public const int route_status_light = 2131689998;
 			
 			// aapt resource value: 0x7F0F0210
-			public const int screenshot_fail = 2131690000;
+			public const int sadp_activate_state1 = 2131690000;
 			
 			// aapt resource value: 0x7F0F0211
-			public const int screenshot_success = 2131690001;
+			public const int sadp_activate_state2 = 2131690001;
 			
 			// aapt resource value: 0x7F0F0212
-			public const int sdk_is_init = 2131690002;
+			public const int sadp_password_input_hint = 2131690002;
 			
 			// aapt resource value: 0x7F0F0213
-			public const int search = 2131690003;
+			public const int sadp_password_toast = 2131690003;
 			
 			// aapt resource value: 0x7F0F0214
-			public const int search_menu_title = 2131690004;
+			public const int sadp_password_too_weak = 2131690004;
 			
 			// aapt resource value: 0x7F0F0215
-			public const int secure_validate = 2131690005;
-			
-			// aapt resource value: 0x7F0F0217
-			public const int secure_validatee_fail = 2131690007;
+			public const int sadp_quit_activate = 2131690005;
 			
 			// aapt resource value: 0x7F0F0216
-			public const int secure_validate_success = 2131690006;
+			public const int save_encrypt_password_fail_network_exception = 2131690006;
+			
+			// aapt resource value: 0x7F0F0217
+			public const int scan_add = 2131690007;
 			
 			// aapt resource value: 0x7F0F0218
-			public const int seek_camera_fail_device_not_support_shipin7 = 2131690008;
+			public const int scan_connet_network = 2131690008;
 			
 			// aapt resource value: 0x7F0F0219
-			public const int select_all = 2131690009;
+			public const int scan_cue_txt = 2131690009;
 			
 			// aapt resource value: 0x7F0F021A
-			public const int select_date = 2131690010;
+			public const int scan_device_add_by_others = 2131690010;
 			
 			// aapt resource value: 0x7F0F021B
-			public const int serial_add_hint = 2131690011;
+			public const int scan_device_search = 2131690011;
 			
 			// aapt resource value: 0x7F0F021C
-			public const int serial_add_password_error_title = 2131690012;
+			public const int scan_device_serial_no = 2131690012;
 			
 			// aapt resource value: 0x7F0F021D
-			public const int serial_input_text = 2131690013;
+			public const int scan_network_unavailible = 2131690013;
 			
 			// aapt resource value: 0x7F0F021E
-			public const int serial_number_error = 2131690014;
+			public const int scan_probe_qrcode_error = 2131690014;
 			
 			// aapt resource value: 0x7F0F021F
-			public const int serial_number_is_null = 2131690015;
+			public const int scan_search_probe_qrcode = 2131690015;
 			
 			// aapt resource value: 0x7F0F0220
-			public const int serial_number_put_the_right_no = 2131690016;
+			public const int scan_title_txt = 2131690016;
 			
 			// aapt resource value: 0x7F0F0221
-			public const int server_area = 2131690017;
-			
-			// aapt resource value: 0x7F0F0226
-			public const int setting = 2131690022;
-			
-			// aapt resource value: 0x7F0F0227
-			public const int setting_video_level = 2131690023;
+			public const int screenshot_fail = 2131690017;
 			
 			// aapt resource value: 0x7F0F0222
-			public const int set_defence_plan = 2131690018;
+			public const int screenshot_success = 2131690018;
 			
 			// aapt resource value: 0x7F0F0223
-			public const int set_device_wifi_network_need_reset_the_device = 2131690019;
+			public const int sdk_is_init = 2131690019;
 			
 			// aapt resource value: 0x7F0F0224
-			public const int set_ptz_flip_fail = 2131690020;
+			public const int search = 2131690020;
 			
 			// aapt resource value: 0x7F0F0225
-			public const int set_ptz_flip_success = 2131690021;
+			public const int search_menu_title = 2131690021;
+			
+			// aapt resource value: 0x7F0F0226
+			public const int secure_validate = 2131690022;
 			
 			// aapt resource value: 0x7F0F0228
-			public const int share_devices = 2131690024;
+			public const int secure_validatee_fail = 2131690024;
+			
+			// aapt resource value: 0x7F0F0227
+			public const int secure_validate_success = 2131690023;
 			
 			// aapt resource value: 0x7F0F0229
-			public const int sms_verify_bind_error = 2131690025;
+			public const int seek_camera_fail_device_not_support_shipin7 = 2131690025;
 			
 			// aapt resource value: 0x7F0F022A
-			public const int sms_verify_code_received = 2131690026;
+			public const int select_all = 2131690026;
 			
 			// aapt resource value: 0x7F0F022B
-			public const int source_detection_off = 2131690027;
+			public const int select_date = 2131690027;
 			
 			// aapt resource value: 0x7F0F022C
-			public const int source_detection_on = 2131690028;
+			public const int serial_add_hint = 2131690028;
 			
 			// aapt resource value: 0x7F0F022D
-			public const int specified_device = 2131690029;
+			public const int serial_add_password_error_title = 2131690029;
 			
 			// aapt resource value: 0x7F0F022E
-			public const int srl_component_falsify = 2131690030;
+			public const int serial_input_text = 2131690030;
 			
 			// aapt resource value: 0x7F0F022F
-			public const int srl_content_empty = 2131690031;
+			public const int serial_number_error = 2131690031;
 			
 			// aapt resource value: 0x7F0F0230
-			public const int srl_footer_failed = 2131690032;
+			public const int serial_number_is_null = 2131690032;
 			
 			// aapt resource value: 0x7F0F0231
-			public const int srl_footer_finish = 2131690033;
+			public const int serial_number_put_the_right_no = 2131690033;
 			
 			// aapt resource value: 0x7F0F0232
-			public const int srl_footer_loading = 2131690034;
-			
-			// aapt resource value: 0x7F0F0233
-			public const int srl_footer_nothing = 2131690035;
-			
-			// aapt resource value: 0x7F0F0234
-			public const int srl_footer_pulling = 2131690036;
-			
-			// aapt resource value: 0x7F0F0235
-			public const int srl_footer_refreshing = 2131690037;
-			
-			// aapt resource value: 0x7F0F0236
-			public const int srl_footer_release = 2131690038;
+			public const int server_area = 2131690034;
 			
 			// aapt resource value: 0x7F0F0237
-			public const int srl_header_failed = 2131690039;
+			public const int setting = 2131690039;
 			
 			// aapt resource value: 0x7F0F0238
-			public const int srl_header_finish = 2131690040;
+			public const int setting_video_level = 2131690040;
+			
+			// aapt resource value: 0x7F0F0233
+			public const int set_defence_plan = 2131690035;
+			
+			// aapt resource value: 0x7F0F0234
+			public const int set_device_wifi_network_need_reset_the_device = 2131690036;
+			
+			// aapt resource value: 0x7F0F0235
+			public const int set_ptz_flip_fail = 2131690037;
+			
+			// aapt resource value: 0x7F0F0236
+			public const int set_ptz_flip_success = 2131690038;
 			
 			// aapt resource value: 0x7F0F0239
-			public const int srl_header_loading = 2131690041;
+			public const int share_devices = 2131690041;
 			
 			// aapt resource value: 0x7F0F023A
-			public const int srl_header_pulling = 2131690042;
+			public const int sms_verify_bind_error = 2131690042;
 			
 			// aapt resource value: 0x7F0F023B
-			public const int srl_header_refreshing = 2131690043;
+			public const int sms_verify_code_received = 2131690043;
 			
 			// aapt resource value: 0x7F0F023C
-			public const int srl_header_release = 2131690044;
+			public const int source_detection_off = 2131690044;
 			
 			// aapt resource value: 0x7F0F023D
-			public const int srl_header_secondary = 2131690045;
+			public const int source_detection_on = 2131690045;
 			
 			// aapt resource value: 0x7F0F023E
-			public const int srl_header_update = 2131690046;
+			public const int specified_device = 2131690046;
 			
 			// aapt resource value: 0x7F0F023F
-			public const int start_cloud = 2131690047;
+			public const int srl_component_falsify = 2131690047;
 			
 			// aapt resource value: 0x7F0F0240
-			public const int start_to_experience = 2131690048;
+			public const int srl_content_empty = 2131690048;
 			
 			// aapt resource value: 0x7F0F0241
-			public const int start_voice_talk = 2131690049;
+			public const int srl_footer_failed = 2131690049;
 			
 			// aapt resource value: 0x7F0F0242
-			public const int status_bar_notification_info_overflow = 2131690050;
+			public const int srl_footer_finish = 2131690050;
 			
 			// aapt resource value: 0x7F0F0243
-			public const int step3_adding_device_to_account = 2131690051;
+			public const int srl_footer_loading = 2131690051;
 			
 			// aapt resource value: 0x7F0F0244
-			public const int storage_status = 2131690052;
+			public const int srl_footer_nothing = 2131690052;
 			
 			// aapt resource value: 0x7F0F0245
-			public const int stream_type = 2131690053;
-			
-			// aapt resource value: 0x7F0F0248
-			public const int string_apiurl = 2131690056;
+			public const int srl_footer_pulling = 2131690053;
 			
 			// aapt resource value: 0x7F0F0246
-			public const int string_ap_connection = 2131690054;
+			public const int srl_footer_refreshing = 2131690054;
 			
 			// aapt resource value: 0x7F0F0247
-			public const int string_ap_connection_normal = 2131690055;
+			public const int srl_footer_release = 2131690055;
+			
+			// aapt resource value: 0x7F0F0248
+			public const int srl_header_failed = 2131690056;
 			
 			// aapt resource value: 0x7F0F0249
-			public const int string_authurl = 2131690057;
-			
-			// aapt resource value: 0x7F0F024B
-			public const int string_deviceserial = 2131690059;
+			public const int srl_header_finish = 2131690057;
 			
 			// aapt resource value: 0x7F0F024A
-			public const int string_device_network_mode = 2131690058;
+			public const int srl_header_loading = 2131690058;
+			
+			// aapt resource value: 0x7F0F024B
+			public const int srl_header_pulling = 2131690059;
 			
 			// aapt resource value: 0x7F0F024C
-			public const int string_ezopenurl = 2131690060;
+			public const int srl_header_refreshing = 2131690060;
 			
 			// aapt resource value: 0x7F0F024D
-			public const int string_get_device_version_fail = 2131690061;
+			public const int srl_header_release = 2131690061;
 			
 			// aapt resource value: 0x7F0F024E
-			public const int string_smart_and_sound_wave_connection = 2131690062;
+			public const int srl_header_secondary = 2131690062;
 			
 			// aapt resource value: 0x7F0F024F
-			public const int string_smart_connection = 2131690063;
+			public const int srl_header_update = 2131690063;
 			
 			// aapt resource value: 0x7F0F0250
-			public const int string_smart_connection_normal = 2131690064;
+			public const int start_cloud = 2131690064;
 			
 			// aapt resource value: 0x7F0F0251
-			public const int string_sound_wave_connection = 2131690065;
+			public const int start_to_experience = 2131690065;
 			
 			// aapt resource value: 0x7F0F0252
-			public const int string_wired_connection = 2131690066;
+			public const int start_voice_talk = 2131690066;
 			
 			// aapt resource value: 0x7F0F0253
-			public const int submit_secure_validate = 2131690067;
+			public const int status_bar_notification_info_overflow = 2131690067;
 			
 			// aapt resource value: 0x7F0F0254
-			public const int submit_sms_code = 2131690068;
+			public const int step3_adding_device_to_account = 2131690068;
 			
 			// aapt resource value: 0x7F0F0255
-			public const int switch_to_handset = 2131690069;
+			public const int storage_status = 2131690069;
 			
 			// aapt resource value: 0x7F0F0256
-			public const int switch_to_speaker = 2131690070;
-			
-			// aapt resource value: 0x7F0F0257
-			public const int tab_more = 2131690071;
-			
-			// aapt resource value: 0x7F0F0258
-			public const int talk = 2131690072;
-			
-			// aapt resource value: 0x7F0F025B
-			public const int talking = 2131690075;
+			public const int stream_type = 2131690070;
 			
 			// aapt resource value: 0x7F0F0259
-			public const int talk_open_failed = 2131690073;
+			public const int string_apiurl = 2131690073;
+			
+			// aapt resource value: 0x7F0F0257
+			public const int string_ap_connection = 2131690071;
+			
+			// aapt resource value: 0x7F0F0258
+			public const int string_ap_connection_normal = 2131690072;
 			
 			// aapt resource value: 0x7F0F025A
-			public const int talk_open_success = 2131690074;
+			public const int string_authurl = 2131690074;
 			
 			// aapt resource value: 0x7F0F025C
-			public const int tip_heard_voice = 2131690076;
+			public const int string_deviceserial = 2131690076;
+			
+			// aapt resource value: 0x7F0F025B
+			public const int string_device_network_mode = 2131690075;
 			
 			// aapt resource value: 0x7F0F025D
-			public const int tip_login_out = 2131690077;
+			public const int string_ezopenurl = 2131690077;
 			
 			// aapt resource value: 0x7F0F025E
-			public const int tip_of_added_by_yourself_and_online = 2131690078;
+			public const int string_get_device_version_fail = 2131690078;
 			
 			// aapt resource value: 0x7F0F025F
-			public const int tip_of_bad_net = 2131690079;
+			public const int string_smart_and_sound_wave_connection = 2131690079;
 			
 			// aapt resource value: 0x7F0F0260
-			public const int tip_playback_again = 2131690080;
+			public const int string_smart_connection = 2131690080;
 			
 			// aapt resource value: 0x7F0F0261
-			public const int tip_specified_device = 2131690081;
+			public const int string_smart_connection_normal = 2131690081;
 			
 			// aapt resource value: 0x7F0F0262
-			public const int title_activate_device = 2131690082;
+			public const int string_sound_wave_connection = 2131690082;
 			
 			// aapt resource value: 0x7F0F0263
-			public const int title_activate_device_fail = 2131690083;
+			public const int string_wired_connection = 2131690083;
 			
 			// aapt resource value: 0x7F0F0264
-			public const int title_activity_connect_device_wifi = 2131690084;
+			public const int submit_secure_validate = 2131690084;
 			
 			// aapt resource value: 0x7F0F0265
-			public const int title_activity_ezupgrade_device = 2131690085;
+			public const int submit_sms_code = 2131690085;
 			
 			// aapt resource value: 0x7F0F0266
-			public const int today = 2131690086;
+			public const int switch_to_handset = 2131690086;
 			
 			// aapt resource value: 0x7F0F0267
-			public const int touch_fingerprint_sensor_hint = 2131690087;
+			public const int switch_to_speaker = 2131690087;
 			
 			// aapt resource value: 0x7F0F0268
-			public const int touch_to_load = 2131690088;
+			public const int tab_more = 2131690088;
 			
 			// aapt resource value: 0x7F0F0269
-			public const int try_again = 2131690089;
-			
-			// aapt resource value: 0x7F0F026A
-			public const int ui_call_demo_txt = 2131690090;
-			
-			// aapt resource value: 0x7F0F026B
-			public const int unable_identify_two_dimensional_code_tip = 2131690091;
+			public const int talk = 2131690089;
 			
 			// aapt resource value: 0x7F0F026C
-			public const int unbind_to_bind = 2131690092;
+			public const int talking = 2131690092;
+			
+			// aapt resource value: 0x7F0F026A
+			public const int talk_open_failed = 2131690090;
+			
+			// aapt resource value: 0x7F0F026B
+			public const int talk_open_success = 2131690091;
 			
 			// aapt resource value: 0x7F0F026D
-			public const int unknow_ssid = 2131690093;
+			public const int tip_heard_voice = 2131690093;
 			
 			// aapt resource value: 0x7F0F026E
-			public const int unlock_fail = 2131690094;
+			public const int tip_login_out = 2131690094;
 			
 			// aapt resource value: 0x7F0F026F
-			public const int unlock_success = 2131690095;
+			public const int tip_of_added_by_yourself_and_online = 2131690095;
 			
 			// aapt resource value: 0x7F0F0270
-			public const int unnamed = 2131690096;
+			public const int tip_of_bad_net = 2131690096;
 			
 			// aapt resource value: 0x7F0F0271
-			public const int update_exit = 2131690097;
+			public const int tip_playback_again = 2131690097;
 			
 			// aapt resource value: 0x7F0F0272
-			public const int upgrade = 2131690098;
+			public const int tip_specified_device = 2131690098;
 			
 			// aapt resource value: 0x7F0F0273
-			public const int upgrade_fail = 2131690099;
+			public const int title_activate_device = 2131690099;
 			
 			// aapt resource value: 0x7F0F0274
-			public const int upgrade_progress = 2131690100;
+			public const int title_activate_device_fail = 2131690100;
 			
 			// aapt resource value: 0x7F0F0275
-			public const int upgrade_success = 2131690101;
+			public const int title_activity_connect_device_wifi = 2131690101;
 			
 			// aapt resource value: 0x7F0F0276
-			public const int upgrade_success_progress = 2131690102;
+			public const int title_activity_ezupgrade_device = 2131690102;
 			
 			// aapt resource value: 0x7F0F0277
-			public const int user_name_txt = 2131690103;
+			public const int today = 2131690103;
 			
 			// aapt resource value: 0x7F0F0278
-			public const int verify_code_error = 2131690104;
+			public const int touch_fingerprint_sensor_hint = 2131690104;
 			
 			// aapt resource value: 0x7F0F0279
-			public const int verify_sms_code_fail = 2131690105;
+			public const int touch_to_load = 2131690105;
 			
 			// aapt resource value: 0x7F0F027A
-			public const int verify_sms_code_success = 2131690106;
+			public const int try_again = 2131690106;
 			
 			// aapt resource value: 0x7F0F027B
-			public const int version_newest = 2131690107;
+			public const int ui_call_demo_txt = 2131690107;
 			
 			// aapt resource value: 0x7F0F027C
-			public const int video_answer = 2131690108;
+			public const int unable_identify_two_dimensional_code_tip = 2131690108;
 			
 			// aapt resource value: 0x7F0F027D
-			public const int video_box = 2131690109;
+			public const int unbind_to_bind = 2131690109;
 			
 			// aapt resource value: 0x7F0F027E
-			public const int video_confirm = 2131690110;
+			public const int unknow_ssid = 2131690110;
 			
 			// aapt resource value: 0x7F0F027F
-			public const int video_device = 2131690111;
+			public const int unlock_fail = 2131690111;
 			
 			// aapt resource value: 0x7F0F0280
-			public const int video_fail = 2131690112;
+			public const int unlock_success = 2131690112;
 			
 			// aapt resource value: 0x7F0F0281
-			public const int video_hang_up = 2131690113;
+			public const int unnamed = 2131690113;
 			
 			// aapt resource value: 0x7F0F0282
-			public const int video_icon = 2131690114;
+			public const int update_exit = 2131690114;
 			
 			// aapt resource value: 0x7F0F0283
-			public const int video_not_answer = 2131690115;
+			public const int upgrade = 2131690115;
 			
 			// aapt resource value: 0x7F0F0284
-			public const int video_screenshot = 2131690116;
+			public const int upgrade_fail = 2131690116;
 			
 			// aapt resource value: 0x7F0F0285
-			public const int video_square = 2131690117;
+			public const int upgrade_progress = 2131690117;
 			
 			// aapt resource value: 0x7F0F0286
-			public const int video_success = 2131690118;
+			public const int upgrade_success = 2131690118;
 			
 			// aapt resource value: 0x7F0F0287
-			public const int video_talk_call_cancel = 2131690119;
+			public const int upgrade_success_progress = 2131690119;
 			
 			// aapt resource value: 0x7F0F0288
-			public const int video_talk_call_is_accepted = 2131690120;
+			public const int user_name_txt = 2131690120;
 			
 			// aapt resource value: 0x7F0F0289
-			public const int video_talk_is_playing = 2131690121;
+			public const int verify_code_error = 2131690121;
 			
 			// aapt resource value: 0x7F0F028A
-			public const int video_talk_sdk_toast_hang_up = 2131690122;
+			public const int verify_sms_code_fail = 2131690122;
 			
 			// aapt resource value: 0x7F0F028B
-			public const int video_talk_sdk_toast_nobody = 2131690123;
+			public const int verify_sms_code_success = 2131690123;
 			
 			// aapt resource value: 0x7F0F028C
-			public const int video_talk_signal_weak = 2131690124;
+			public const int version_newest = 2131690124;
 			
 			// aapt resource value: 0x7F0F028D
-			public const int video_talk_watch_is_busy = 2131690125;
+			public const int video_answer = 2131690125;
 			
 			// aapt resource value: 0x7F0F028E
-			public const int video_talk_watch_temperature_high_hang = 2131690126;
+			public const int video_box = 2131690126;
 			
 			// aapt resource value: 0x7F0F028F
-			public const int video_talk_watch_temperature_high_hint = 2131690127;
+			public const int video_confirm = 2131690127;
 			
 			// aapt resource value: 0x7F0F0290
-			public const int video_talk_watch_temperature_high_reject = 2131690128;
+			public const int video_device = 2131690128;
 			
 			// aapt resource value: 0x7F0F0291
-			public const int video_talk_watch_temperature_high_warn = 2131690129;
+			public const int video_fail = 2131690129;
 			
 			// aapt resource value: 0x7F0F0292
-			public const int video_tip = 2131690130;
+			public const int video_hang_up = 2131690130;
 			
 			// aapt resource value: 0x7F0F0293
-			public const int video_unlock = 2131690131;
+			public const int video_icon = 2131690131;
 			
 			// aapt resource value: 0x7F0F0294
-			public const int wait = 2131690132;
+			public const int video_not_answer = 2131690132;
 			
 			// aapt resource value: 0x7F0F0295
-			public const int web_login_button_txt = 2131690133;
+			public const int video_screenshot = 2131690133;
 			
 			// aapt resource value: 0x7F0F0296
-			public const int wechat_interconnect = 2131690134;
+			public const int video_square = 2131690134;
 			
 			// aapt resource value: 0x7F0F0297
-			public const int wifi_connected = 2131690135;
+			public const int video_success = 2131690135;
 			
 			// aapt resource value: 0x7F0F0298
-			public const int wifi_connection_finish_need_refresh = 2131690136;
+			public const int video_talk_call_cancel = 2131690136;
 			
 			// aapt resource value: 0x7F0F0299
-			public const int wifi_set = 2131690137;
+			public const int video_talk_call_is_accepted = 2131690137;
 			
 			// aapt resource value: 0x7F0F029A
-			public const int wifi_setting = 2131690138;
+			public const int video_talk_is_playing = 2131690138;
 			
 			// aapt resource value: 0x7F0F029B
-			public const int wired_connection = 2131690139;
-			
-			// aapt resource value: 0x7F0F029D
-			public const int xlistview_footer_hint_normal = 2131690141;
+			public const int video_talk_sdk_toast_hang_up = 2131690139;
 			
 			// aapt resource value: 0x7F0F029C
-			public const int xlistview_footer_hint_no_more_device = 2131690140;
+			public const int video_talk_sdk_toast_nobody = 2131690140;
+			
+			// aapt resource value: 0x7F0F029D
+			public const int video_talk_signal_weak = 2131690141;
 			
 			// aapt resource value: 0x7F0F029E
-			public const int xlistview_footer_hint_ready = 2131690142;
+			public const int video_talk_watch_is_busy = 2131690142;
 			
 			// aapt resource value: 0x7F0F029F
-			public const int xlistview_footer_no_more = 2131690143;
+			public const int video_talk_watch_temperature_high_hang = 2131690143;
 			
 			// aapt resource value: 0x7F0F02A0
-			public const int xlistview_footer_no_more_msg = 2131690144;
+			public const int video_talk_watch_temperature_high_hint = 2131690144;
 			
 			// aapt resource value: 0x7F0F02A1
-			public const int xlistview_header_hint_loading = 2131690145;
+			public const int video_talk_watch_temperature_high_reject = 2131690145;
 			
 			// aapt resource value: 0x7F0F02A2
-			public const int xlistview_header_hint_more = 2131690146;
+			public const int video_talk_watch_temperature_high_warn = 2131690146;
 			
 			// aapt resource value: 0x7F0F02A3
-			public const int xlistview_header_hint_normal = 2131690147;
+			public const int video_tip = 2131690147;
 			
 			// aapt resource value: 0x7F0F02A4
-			public const int xlistview_header_hint_ready = 2131690148;
+			public const int video_unlock = 2131690148;
 			
 			// aapt resource value: 0x7F0F02A5
-			public const int xlistview_header_last_time = 2131690149;
+			public const int wait = 2131690149;
+			
+			// aapt resource value: 0x7F0F02A6
+			public const int web_login_button_txt = 2131690150;
+			
+			// aapt resource value: 0x7F0F02A7
+			public const int wechat_interconnect = 2131690151;
+			
+			// aapt resource value: 0x7F0F02A8
+			public const int wifi_connected = 2131690152;
+			
+			// aapt resource value: 0x7F0F02A9
+			public const int wifi_connection_finish_need_refresh = 2131690153;
+			
+			// aapt resource value: 0x7F0F02AA
+			public const int wifi_set = 2131690154;
+			
+			// aapt resource value: 0x7F0F02AB
+			public const int wifi_setting = 2131690155;
+			
+			// aapt resource value: 0x7F0F02AC
+			public const int wired_connection = 2131690156;
+			
+			// aapt resource value: 0x7F0F02AE
+			public const int xlistview_footer_hint_normal = 2131690158;
+			
+			// aapt resource value: 0x7F0F02AD
+			public const int xlistview_footer_hint_no_more_device = 2131690157;
+			
+			// aapt resource value: 0x7F0F02AF
+			public const int xlistview_footer_hint_ready = 2131690159;
+			
+			// aapt resource value: 0x7F0F02B0
+			public const int xlistview_footer_no_more = 2131690160;
+			
+			// aapt resource value: 0x7F0F02B1
+			public const int xlistview_footer_no_more_msg = 2131690161;
+			
+			// aapt resource value: 0x7F0F02B2
+			public const int xlistview_header_hint_loading = 2131690162;
+			
+			// aapt resource value: 0x7F0F02B3
+			public const int xlistview_header_hint_more = 2131690163;
+			
+			// aapt resource value: 0x7F0F02B4
+			public const int xlistview_header_hint_normal = 2131690164;
+			
+			// aapt resource value: 0x7F0F02B5
+			public const int xlistview_header_hint_ready = 2131690165;
+			
+			// aapt resource value: 0x7F0F02B6
+			public const int xlistview_header_last_time = 2131690166;
 			
 			static String()
 			{
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 584102e..0fc2a6b 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -101,6 +101,9 @@
         <Reference Include="Shared.IOS.LCVideoOnSDK">
           <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath>
         </Reference>
+        <Reference Include="Shared.IOS.HDLLinphoneSDK">
+          <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath>
+        </Reference>
     </ItemGroup>
     <ItemGroup>
       <PackageReference Include="Newtonsoft.Json">
@@ -126,6 +129,9 @@
       </PackageReference>
       <PackageReference Include="Xamarin.Essentials">
         <Version>1.7.0</Version>
+      </PackageReference>
+      <PackageReference Include="Xamarin.Swift">
+        <Version>1.0.8</Version>
       </PackageReference>
     </ItemGroup>
     <ItemGroup>
@@ -459,6 +465,7 @@
         <Folder Include="Assets.xcassets\device_bg.imageset\" />
         <Folder Include="Resources\Phone\FunctionIcon\Light\LightScene\" />
         <Folder Include="Resources\Phone\PersonalCenter\FacePassage\" />
+        <Folder Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\" />
     </ItemGroup>
     <ItemGroup>
         <InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1331,6 +1338,20 @@
       <BundleResource Include="Resources\Phone\Collection\DefenseStatusIcon.png" />
       <BundleResource Include="Resources\Phone\Collection\DisarmStatusIcon.png" />
       <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceDefenseIcon.png" />
+      <BundleResource Include="Resources\Phone\Collection\DefenseAlarmIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\InAlarmBigIcon.png" />
+      <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceInAlarmIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\AirSwitchBgIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\AirSwitchBgOnIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\EnergyIcon.png" />
+      <BundleResource Include="Resources\Phone\PersonalCenter\FacePassage\FailIcon.png" />
+      <BundleResource Include="Resources\Phone\PersonalCenter\FacePassage\TrueIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\HchoBg.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\HchoIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorhcho.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalbreaker.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalbreaker_blue.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalbreaker_white.png" />
       <BundleResource Include="Resources\Phone\LogicIcon\security.png" />
     </ItemGroup>
     <ItemGroup>
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 43ba8de..e8e71f9 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -42,7 +42,7 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>
-	<string>9.0</string>
+	<string>11.0</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>1</integer>
@@ -100,9 +100,9 @@
 	<key>UIStatusBarStyle</key>
 	<string>UIStatusBarStyleLightContent</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.202108211</string>
+	<string>1.2.202108282</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.08211</string>
+	<string>1.2.08282</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Use geographic location to provide services such as weather</string>
 	<key>NSAppleMusicUsageDescription</key>
@@ -119,6 +119,8 @@
 	</array>
 	<key>UIBackgroundModes</key>
 	<array>
+		<string>audio</string>
+		<string>voip</string>
 		<string>remote-notification</string>
 	</array>
 	<key>NSFaceIDUsageDescription</key>
@@ -129,5 +131,7 @@
 	<string>This application uses Bluetooth to communicate with the device, this application does not collect, store or record any data that communicates via Bluetooth.</string>
 	<key>NSBluetoothAlwaysUsageDescription</key>
 	<string>This application uses Bluetooth to communicate with the device, this application does not collect, store or record any data that communicates via Bluetooth.</string>
+	<key>NSVoIPUsageDescription</key>
+	<string>Make audio/video calls</string>
 </dict>
 </plist>
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 5650c30..7cbdacb 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -487,7 +487,13 @@
 499=Add defense function
 500=Add alarm target
 501=Security alarm: {0} is triggered.
-
+502=Clear the security alarm?
+503=Exceeding standard
+504=Secondary standard
+505=Class I standard
+506=Face input succeeded
+507=Face input failed
+508=Formaldehyde
  
 1000=Room Humidity
 1001=V-chip
@@ -1592,6 +1598,13 @@
 499=娣诲姞甯冮槻鍔熻兘
 500=娣诲姞鍛婅鐩爣
 501=瀹夐槻鎶ヨ锛歿0}琚Е鍙戙��
+502=鏄惁瑙i櫎瀹夐槻璀︽姤锛�
+503=瓒呮爣
+504=浜岀骇
+505=涓�绾�
+506=浜鸿劯褰曞叆鎴愬姛
+507=浜鸿劯褰曞叆澶辫触
+508=鐢查啗
  
 1000=瀹ゅ唴婀垮害
 1001=绔ラ攣
diff --git a/HDL-ON_iOS/Resources/Phone/Collection/DefenseAlarmIcon.png b/HDL-ON_iOS/Resources/Phone/Collection/DefenseAlarmIcon.png
new file mode 100644
index 0000000..c3e0948
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/Collection/DefenseAlarmIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/ArmCenter/InAlarmBigIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/ArmCenter/InAlarmBigIcon.png
new file mode 100644
index 0000000..248a434
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/ArmCenter/InAlarmBigIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/ArmCenter/NoDefenseBigIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/ArmCenter/NoDefenseBigIcon.png
index 0555432..f40f82e 100644
--- a/HDL-ON_iOS/Resources/Phone/FunctionIcon/ArmCenter/NoDefenseBigIcon.png
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/ArmCenter/NoDefenseBigIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/AirSwitch/AirSwitchBgIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/AirSwitch/AirSwitchBgIcon.png
new file mode 100644
index 0000000..1abcc1e
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/AirSwitch/AirSwitchBgIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/AirSwitch/AirSwitchBgOnIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/AirSwitch/AirSwitchBgOnIcon.png
new file mode 100644
index 0000000..61a12ec
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/AirSwitch/AirSwitchBgOnIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/AirSwitch/EnergyIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/AirSwitch/EnergyIcon.png
new file mode 100644
index 0000000..a2ad64d
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/AirSwitch/EnergyIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvirSensor/HchoBg.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvirSensor/HchoBg.png
new file mode 100644
index 0000000..77e184b
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvirSensor/HchoBg.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvirSensor/HchoIcon.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvirSensor/HchoIcon.png
new file mode 100644
index 0000000..df9281d
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvirSensor/HchoIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/electricalbreaker_blue.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/electricalbreaker_blue.png
new file mode 100644
index 0000000..784f410
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/electricalbreaker_blue.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/electricalbreaker_white.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/electricalbreaker_white.png
new file mode 100644
index 0000000..300521d
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/electricalbreaker_white.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/electricalbreaker.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/electricalbreaker.png
new file mode 100644
index 0000000..3abfd8b
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/electricalbreaker.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/sensorhcho.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/sensorhcho.png
new file mode 100644
index 0000000..108f4e4
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/sensorhcho.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PersonalCenter/FacePassage/FailIcon.png b/HDL-ON_iOS/Resources/Phone/PersonalCenter/FacePassage/FailIcon.png
new file mode 100644
index 0000000..b169eb0
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/PersonalCenter/FacePassage/FailIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PersonalCenter/FacePassage/TrueIcon.png b/HDL-ON_iOS/Resources/Phone/PersonalCenter/FacePassage/TrueIcon.png
new file mode 100644
index 0000000..9606411
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/PersonalCenter/FacePassage/TrueIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PersonalCenter/ResidenceInAlarmIcon.png b/HDL-ON_iOS/Resources/Phone/PersonalCenter/ResidenceInAlarmIcon.png
new file mode 100644
index 0000000..ea9f614
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/PersonalCenter/ResidenceInAlarmIcon.png
Binary files differ
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 2c4449a..9786858 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -204,7 +204,7 @@
                     {
                         endTime = DateTime.Now.AddSeconds(100);
                         MainPage.Log($"璇诲彇鍦烘櫙鏁版嵁鎴愬姛");
-                        var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
+                        var sceneList = JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
                         if (sceneList == null)
                         {
                             sceneList = new List<Scene>();
@@ -263,6 +263,7 @@
                     //}
 
                     //======================鑾峰彇鍙瀵硅璁惧鍒楄〃====================
+                    bool isInterphoneType_HDL = false;//鏄惁涓篐DLLinphone鍙瀵硅
                     var videoInfo= VideoSend.GetVideoInfoList();
                     if (videoInfo.Code == StateCode.SUCCESS)
                     {
@@ -274,10 +275,30 @@
                             if (video.interphoneType == InterphoneType.IMOUVISIAL.ToString())
                             {
                                 UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken;
+                            } else if (video.interphoneType == InterphoneType.HDL.ToString()) {
+                                isInterphoneType_HDL = true;
+                                DB_ResidenceData.Instance.SupportFacePass = true;
+                                DB_ResidenceData.Instance.SaveResidenceData();
                             }
                         }
                     }
 
+                    //======================鑾峰彇Sip璐﹀彿骞朵笖鍒濆鍖朣DK鍙瀵硅璁惧鍒楄〃====================
+                    //濡傛灉妫�娴嬬嚎绋嬫病鍚姩锛屾墠缁х画涓嬮潰鎿嶄綔 鍥犱负App鏈夊彲鑳藉垰鍚姩椹笂鏀跺埌鎺ㄩ�佷簡锛岀劧鍚庢墠鎵ц鍒拌繖閲�
+                    if (HDLLinphone.Current.CheckIncomingCallThreadIsNull()) {
+                        //褰撳墠浣忓畢鏄疕DL鍙瀵硅绫诲瀷鐨勮澶�
+                        if (isInterphoneType_HDL)
+                        {
+                            //HDLLinphone鍙瀵硅,鑾峰彇Sip璐﹀彿骞跺垵濮嬪寲SDK
+                            HDLLinphone.Current.GetHDLSipInfoAndInitSDK(DB_ResidenceData.Instance.CurrentRegion.id);
+                        }
+                        else
+                        {
+                            Utlis.WriteLine("褰撳墠浣忓畢涓嶆敮鎸丠DL鍙瀵硅,閫�鍑虹櫥褰曟墍鏈夎处鍙�");
+                            //褰撳墠浣忓畢涓嶆敮鎸丠DL鍙瀵硅
+                            HDLLinphone.Current.LogoutAllAccount();
+                        }
+                    }
 
                     //======================瀹夐槻====================
                     GetSecurityList();
@@ -294,8 +315,11 @@
                         MainPage.Log($"缁撴潫璇诲彇浜戠鏁版嵁绾跨▼");
                         endTime = DateTime.MinValue;
                         DownloadDataComplete = true;
-                        waitPage.Hide();
-                        waitPage.RemoveFromParent();
+                        if (waitPage != null)
+                        {
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
                     });
                     //涓嶈�冭檻缃戝叧鎯呭喌锛岀洿鎺ヨ闃�
                     DAL.Mqtt.MqttClient.InitState();
@@ -327,8 +351,11 @@
                     DownloadDataComplete = true;
                     Application.RunOnMainThread(() =>
                     {
-                        waitPage.Hide();
-                        waitPage.RemoveFromParent();
+                        if (waitPage != null)
+                        {
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
                     });
                     //鍒濆鍖栨暟鎹�
                     //SpatialInfo.CurrentSpatial.Clear();
@@ -388,17 +415,38 @@
                 }
                 var infoListPack = Ins.httpRequest.GetSecurityInfo(sidList, new List<string>());
                 var infoList = JsonConvert.DeserializeObject<List<SecurityAlarm>>(infoListPack.Data.ToString());
-                foreach (var function in infoList)
+                if (infoList != null)
                 {
-                    function.SaveFile();
-                    FunctionList.List.IniFunctionList(function.savePath, true);
+                    var filePathList = FileUtlis.Files.ReadFiles().FindAll((obj) => obj.StartsWith("SecurityData_"));
+                    if (filePathList != null)
+                    {
+                        foreach (var file in filePathList)
+                        {
+                            FileUtlis.Files.DeleteFile(file);
+                        }
+                    }
+                    foreach (var function in infoList)
+                    {
+                        function.SaveFile();
+                        FunctionList.List.IniFunctionList(function.savePath, true);
+                    }
                 }
-            }
+            } 
             else
             {
                 MainPage.Log($"璇诲彇瀹夐槻鍒楄〃澶辫触:Code:{pack.Code}; Msg:{pack.message}");
             }
 
         }
+
+        /// <summary>
+        /// 鑾峰彇SIP璐﹀彿淇℃伅
+        /// </summary>
+        public void GetSipInfo()
+        {
+            var pack = Ins.HttpRequest.GetSecurityList();
+        }
+
+
     }
 }
\ No newline at end of file
diff --git a/HDL_ON/Common/Constant.cs b/HDL_ON/Common/Constant.cs
index a5c0598..06fb199 100644
--- a/HDL_ON/Common/Constant.cs
+++ b/HDL_ON/Common/Constant.cs
@@ -233,6 +233,18 @@
         /// 绯荤粺淇℃伅
         /// </summary>
         Prompt,
+        /// <summary>
+        /// 鏂伴椈
+        /// </summary>
+        News,
+        /// <summary>
+        /// 鎺ㄨ崘
+        /// </summary>
+        Recommend,
+        /// <summary>
+        /// 鐗╀笟閫氱煡锛屽緟纭淇敼
+        /// </summary>
+        Property,
     }
 
     /// <summary>
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 955fb51..d986e84 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -307,7 +307,6 @@
                         //1.瑙嗗璁插巶瀹剁被鍨�
                         string interphoneTypeEnum = json["interphoneTypeEnum"].ToString();
                         if (string.IsNullOrEmpty(interphoneTypeEnum)) return;
-                        //
                         ESVideoInfo eSVideoInfo = new ESVideoInfo();// GetESOnVideoJson(jpushMessageInfo.expantContent);
                         //2.鏍规嵁鍙瀵硅鍘傚绫诲瀷锛屽鐞嗕笉鍚岀殑鏁版嵁
                         if (interphoneTypeEnum == InterphoneType.IMOUVISIAL.ToString())
@@ -327,6 +326,19 @@
                             eSVideoInfo.Lc_AccessToken = json["subToken"].ToString();//"瀛愯处鍙穞oken
                             eSVideoInfo.DeviceSerial = json["devSerial"].ToString();//璁惧搴忓垪鍙�
                             eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
+                        }
+                        else if (interphoneTypeEnum == InterphoneType.HDL.ToString())
+                        {
+                            //HDL Linphone 鐙勮�愬厠
+                            eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
+                            eSVideoInfo.callId = json["callId"].ToString();
+                            eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
+                            eSVideoInfo.DeviceName = json["deviceName"].ToString();
+                            eSVideoInfo.deviceSipAccount = json["deviceSipAccount"].ToString();
+                            //ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�");
+                            //鎵撳紑鍛煎彨椤甸潰
+                            HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo);
+                            return;
                         }
 
                         //3.鎵撳紑鍛煎彨椤甸潰
@@ -424,6 +436,8 @@
                     UserInfo.Current.LastTime = DateTime.MinValue;
                     UserInfo.Current.SaveUserInfo();
                     DB_ResidenceData.Instance.EixtAccount();
+                    //4.娉ㄩ攢HDLSIP璐﹀彿鐧诲綍 2021-08-20
+                    HDLLinphone.Current.LogoutAllAccount();
                 }
                 catch (Exception ex)
                 {
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 89f39e2..3924bf6 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,7 +4,34 @@
 {
     public static class StringId
     {
-
+        /// <summary>
+        /// 鐢查啗
+        /// </summary>
+        public const int Formaldehyde = 508;
+        /// <summary>
+        /// 浜鸿劯褰曞叆澶辫触
+        /// </summary>
+        public const int FaceInputFailed = 507;
+        /// <summary>
+        /// 浜鸿劯褰曞叆鎴愬姛
+        /// </summary>
+        public const int FaceInputSucceeded = 506;
+        /// <summary>
+        /// 涓�绾у缓绛戞爣鍑�
+        /// </summary>
+        public const int Class_I_BuildingStandard = 505;
+        /// <summary>
+        /// 浜岀骇寤虹瓚鏍囧噯
+        /// </summary>
+        public const int SecondaryBuildingStandard = 504;
+        /// <summary>
+        /// 瓒呮爣
+        /// </summary>
+        public const int ExceedingTheStandard = 503;
+        /// <summary>
+        /// 鏄惁瑙i櫎瀹夐槻璀︽姤锛�
+        /// </summary>
+        public const int ClearTheSecurityAlarmTip = 502;
         /// <summary>
         /// 瀹夐槻鎶ヨ
         /// </summary>
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index e3d0166..85ebba3 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -467,6 +467,7 @@
                     var actionObjs = new List<ApiAlinkControlActionObj>();
                     actionObjs.Add(apiControlData);
                     var pack = httpServer.ControlDevice(actionObjs);
+                    MainPage.Log($"杩滅▼鎺у埗鍙嶉:{pack.message}");
                 }
 
             }
@@ -633,6 +634,7 @@
                  gatewayId = DB_ResidenceData.Instance.HomeGateway.gatewayId,
                   sid = securityAlarm.sid, status = state, userSecurityId = securityAlarm.userSecurityId
                 } });
+                MainPage.Log($"瀹夐槻鎺у埗缁撴灉:{result.Code}");
             }
             else
             {
@@ -784,21 +786,31 @@
                     || receiveObj.Topic == CommunicationTopic.ct.ReadSecurityStatus + "_reply"
                     || receiveObj.Topic == CommunicationTopic.ct.SecurityStatusUp)
                 {
-                    var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityStatusObj>(receiveObj.BodyDataString);
-                    if (temp != null)
+                    try
                     {
-                        Control_Udp.ReceiveRepeatManager(temp.id, null);
-                        foreach (var updataSecurity in temp.objects)
-                        {
-                            var updataLocalSecurity = FunctionList.List.securities.Find((obj) => obj.sid == updataSecurity.sid);
-                            if (updataLocalSecurity != null)
+                        MainPage.Log($"灞�鍩熺綉瀹夐槻淇℃伅: {receiveObj.Topic}  : 鍐呭: {res[1]}");
+                        var tt = "";
+                        lock (tt) {
+                            var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityStatusObj>(receiveObj.BodyDataString);
+                            if (temp != null)
                             {
-                                updataLocalSecurity.status = updataSecurity.status;
-                                updataLocalSecurity.alarm = updataSecurity.alarm;
+                                Control_Udp.ReceiveRepeatManager(temp.id, null);
+                                foreach (var updataSecurity in temp.objects)
+                                {
+                                    var updataLocalSecurity = FunctionList.List.securities.Find((obj) => obj.sid == updataSecurity.sid);
+                                    if (updataLocalSecurity != null)
+                                    {
+                                        updataLocalSecurity.status = updataSecurity.status;
+                                        updataLocalSecurity.alarm = updataSecurity.alarm;
+                                        ArmCenterPage.LoadEvent_RefreshSecurityStatus(updataLocalSecurity);
+                                    }
+                                }
+                                HomePage.LoadEvent_RefreshSecurityStatus();
                             }
                         }
-                        HomePage.LoadEvent_RefreshSecurityStatus();
-                        ArmCenterPage.LoadEvent_RefreshSecurityStatus();
+                    }
+                    catch (Exception ex){
+                        MainPage.Log($"瀹夐槻灞�鍩熺綉寮傚父锛歿ex.Message}");
                     }
                 }
                 else
@@ -855,7 +867,7 @@
                                 return;
                             }
                         }
-                        MainPage.Log($"A鍗忚鏇存柊鐘舵��:{revString}");
+                        //MainPage.Log($"A鍗忚鏇存柊鐘舵��:{revString}");
                         foreach (var attr in updateTemp.status)
                         {
                             localFunction.time_stamp = temp.time_stamp;
@@ -866,6 +878,9 @@
                         Function localObj = null;
                         switch (localFunction.spk)
                         {
+                            case SPK.AirSwitch:
+                                AirSwitchPage.UpdataState(localFunction);
+                                break;
                             case SPK.ElectricEnergy:
                                 EnergyMainPage.UpdataStatus(localFunction);
                                 break;
@@ -949,6 +964,7 @@
                                 }
                                 break;
                             case SPK.FloorHeatStandard:
+                                localFunction.lastState = "";
                                 switch (localFunction.GetAttrState(FunctionAttributeKey.Mode))
                                 {
                                     case "normal":
@@ -1014,6 +1030,7 @@
                             case SPK.ClothesHanger:
                             case SPK.AcIr:
                             case SPK.SenesorMegahealth:
+                            case SPK.AirFreshStandard:
                                 //璁惧鐘舵�佹帹閫�
                                 //鐘舵�佹洿鏂�
                                 Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 559725c..8757db9 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -448,25 +448,31 @@
                                 {
                                     if (!string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.aesKey))
                                     {
-                                        var securityBytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, DB_ResidenceData.Instance.HomeGateway.aesKey);
-                                        var securityString = Encoding.UTF8.GetString(securityBytes);
-                                        var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityStatusObj>(securityString);
-                                        MainPage.Log($"瀹夐槻鐘舵�佸彉鍖栵細{securityString}");
-
-                                        if (temp != null)
+                                        try
                                         {
-                                            Control_Udp.ReceiveRepeatManager(temp.id, null);
-                                            foreach (var updataSecurity in temp.objects)
+                                            var securityBytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, DB_ResidenceData.Instance.HomeGateway.aesKey);
+                                            var securityString = Encoding.UTF8.GetString(securityBytes);
+                                            var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityStatusObj>(securityString);
+                                            MainPage.Log($"瀹夐槻鐘舵�佸彉鍖栵細{securityString}");
+
+                                            if (temp != null)
                                             {
-                                                var updataLocalSecurity = FunctionList.List.securities.Find((obj) => obj.sid == updataSecurity.sid);
-                                                if (updataLocalSecurity != null)
+                                                Control_Udp.ReceiveRepeatManager(temp.id, null);
+                                                foreach (var updataSecurity in temp.objects)
                                                 {
-                                                    updataLocalSecurity.status = updataSecurity.status;
-                                                    updataLocalSecurity.alarm = updataSecurity.alarm;
+                                                    var updataLocalSecurity = FunctionList.List.securities.Find((obj) => obj.sid == updataSecurity.sid);
+                                                    if (updataLocalSecurity != null)
+                                                    {
+                                                        updataLocalSecurity.status = updataSecurity.status;
+                                                        updataLocalSecurity.alarm = updataSecurity.alarm;
+                                                        ArmCenterPage.LoadEvent_RefreshSecurityStatus(updataLocalSecurity);
+                                                    }
                                                 }
+                                                HomePage.LoadEvent_RefreshSecurityStatus();
                                             }
-                                            HomePage.LoadEvent_RefreshSecurityStatus();
-                                            ArmCenterPage.LoadEvent_RefreshSecurityStatus();
+                                        }catch(Exception ex)
+                                        {
+                                            MainPage.Log($"瀹夐槻杩滅▼淇℃伅寮傚父:{ex.Message}");
                                         }
                                     }
                                 }
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index ceee580..32868bd 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -1041,7 +1041,7 @@
         /// <summary>
         /// 鏌ヨ鎺ㄩ�佷俊鎭垪琛�
         /// </summary>
-        /// <param name="queryType">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅</param>
+        /// <param name="queryType">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅 4鐗╀笟閫氱煡</param>
         /// <returns></returns>
         public ResponsePackNew PushSerivceGetPushmessagelist(int queryType = 0)
         {
@@ -1059,14 +1059,18 @@
             {
                 pushType = PushType.Prompt.ToString();
             }
-
+            else if (queryType == 4)
+            {
+                pushType = PushType.Property.ToString();
+            }
             var requestJson = HttpUtil.GetSignRequestJson(new GetMessageListObj()
             {
                 pushId = OnAppConfig.Instance.PushId,
                 pushType = pushType,
                 homeId = DB_ResidenceData.Instance.CurrentRegion.id,
             });
-            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist, requestJson);
+            //2021-08-28 鏀逛负鍒嗛〉鏌ヨ
+            return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist_Paging, requestJson);
         }
 
         /// <summary>
@@ -2375,6 +2379,7 @@
             d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
             d.Add("securitys", securityStates);
             var requestJson = HttpUtil.GetSignRequestJson(d);
+            MainPage.Log($"api瀹夐槻鎺у埗锛歿requestJson}");
             var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Security_StatusSet, requestJson);
             return pack;
         }
@@ -2633,5 +2638,52 @@
         }
         #endregion
 
+
+        /// <summary>
+        /// 浜鸿劯褰曞叆
+        /// </summary>
+        /// <param name="imageBytes"></param>
+        /// <returns></returns>
+        public ResponsePackNew FaceSetting(string imageBytes)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("userFace", @"data:image/jpg;base64,"+imageBytes);
+            d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id);
+
+            //MainPage.Log(imageBytes);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_InputUserFace, requestJson);
+        }
+
+
+        /// <summary>
+        /// 淇敼浣忔埛浜鸿劯鍏抽棴鐘舵��
+        /// 1锛氬紑鍚姸鎬� 2锛氬叧闂姸鎬�
+        /// 3:娓呴櫎浜鸿劯鏁版嵁
+        /// </summary>
+        public ResponsePackNew EditFaceFunction(int status)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("faceClose", status);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_SwitchFaceFunction, requestJson);
+        }
+
+
+        /// <summary>
+        /// 鑾峰彇浣忔埛璇︽儏
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew GetCustomerInfo()
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetCustomerInfo, requestJson);
+        }
     }
 }
\ No newline at end of file
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 0dec30c..48d5724 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -16,7 +16,6 @@
         /// <summary>
         /// 鍥哄畾鍩熷悕,姝e紡鐜
         /// 鍏叡鍩熷悕灏辫繎瑙f瀽
-        /// 
         /// </summary>
         //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
         public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
@@ -651,7 +650,7 @@
         /// <summary>
         /// 鍝嶅簲閿欒淇℃伅
         /// </summary>
-        public string message;
+        public string message = "";
 
         /// <summary>
         /// 杩欎釜鏄姹傞敊璇椂鐨勬墿灞曟暟鎹�,浠ュ悗鎵�鏈夌殑闄勫甫鎵╁睍鏁版嵁閮戒細鏀惧湪杩欓噷闈㈠姩鎬佺淮鎶�
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index 21fadf4..e43aa25 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -284,10 +284,14 @@
         /// 鍒犻櫎鎺ㄩ�乀oken
         /// </summary>
         public const string API_POST_PushSerivce_DeleteToken = "/smart-footstone/app/push-information/delete";
+        ///// <summary>
+        /////// 鑾峰彇鎺ㄩ�佹秷鎭褰�
+        /////// </summary>
+        //public const string API_POST_PushSerivce_Getpushmessagelist = "/smart-footstone/app/message/list";
         /// <summary>
-        /// 鑾峰彇鎺ㄩ�佹秷鎭褰�
+        /// 鑾峰彇鎺ㄩ�佹秷鎭褰� 鍒嗛〉
         /// </summary>
-        public const string API_POST_PushSerivce_Getpushmessagelist = "/smart-footstone/app/message/list";
+        public const string API_POST_PushSerivce_Getpushmessagelist_Paging = "/smart-footstone/app/message/page";
         /// <summary>
         /// 娓呯┖鎺ㄩ�佺殑娑堟伅璁板綍
         /// </summary>
@@ -661,6 +665,22 @@
         /// 鑾峰彇閫氳瘽璁板綍
         /// </summary>
         public const string API_POST_FL_GetCallList = "/home-wisdom/platform/imou/listCallRecords";
+
+        /// <summary>
+        /// 浜鸿劯褰曞叆
+        /// </summary>
+        public const string Api_Post_InputUserFace = "/community-wisdom/app/doorDevice/inputUserFaceHouse";
+        /// <summary>
+        /// 寮�鍏充汉鑴稿姛鑳�
+        /// </summary>
+        public const string Api_Post_SwitchFaceFunction = "/community-wisdom/app/doorDevice/updateCustomerFaceClose";
+        /// <summary>
+        /// 鑾峰彇浣忔埛璇︽儏
+        /// </summary>
+        public const string Api_Post_GetCustomerInfo = "/basis-footstone/app/customer/detail";
+        /// 浣忓畢sip璐﹀彿鑾峰彇
+        /// </summary>
+        public const string API_POST_VideoDevice_GetSipAccount = "/home-wisdom/app/home/getSipAccount";
         #endregion
 
 
@@ -688,6 +708,11 @@
         public const string API_POST_DoorHistory = "/home-wisdom/app/device/door/logs";
 
         #endregion
+
+        #region  鈻�  -- SIP鐩稿叧鎺ュ彛_______________________________
+        #endregion
+
+
     }
 
     ///// <summary>
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 4d5cf58..a5a3fc7 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -49,6 +49,17 @@
         public string regionUrl;
     }
 
+    /// <summary>
+    /// 鍒嗛〉
+    /// </summary>
+    public class BasePagingObj
+    {
+        public int totalCount = 0;
+        public int totalPage = 0;
+        public int pageNo = 0;
+        public int pageSize = 0;
+    }
+
     #endregion
 
     #region  鈻� 鐧诲綍 ____________________________
@@ -1085,6 +1096,14 @@
         /// ""锛氬叏閮紱Default锛氬垎浜笌鍔熻兘锛汚larm锛氭姤璀︾被锛汸rompt锛氱郴缁熸秷鎭�
         /// </summary>
         public string pushType;
+        /// <summary>
+        ///  椤甸潰澶у皬
+        /// </summary>
+        public int pageSize = 100;
+        /// <summary>
+        ///  椤甸潰搴忓彿
+        /// </summary>
+        public int pageNo = 1;
     }
 
     /// <summary>
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index 9a25874..df8612f 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -71,6 +71,7 @@
             {
                 //涔愭鍙瀵硅
                 //1.鍒濆鍖朙COpenSDK_Api
+                LCApiKit.SharedInstance().IsChinaMainland = OnAppConfig.Instance.RequestHttpsHost.Contains("china");//濡傛灉鍩熷悕鍖呭惈china锛屽垯SDK 浣跨敤涔愭鐨勪腑鍥藉ぇ闄�(姝e紡)鍩熷悕
                 LCApiKit.SharedInstance().InitSDKOpenApi(mESVideoInfo.Lc_AccessToken);
                 LCApiKit.SharedInstance().CurrentDevicePlayToken = mESVideoInfo.Lc_PlayToken;
                 LCApiKit.SharedInstance().CurrentDeviceId = mESVideoInfo.Lc_DeviceId;
@@ -83,7 +84,7 @@
                 //vc.MLCCallDelegate = new OnLCCallDelegate(this);
                 Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
             }
-            else
+            else if(interphoneType == InterphoneType.FLVI.ToString())
             {
 
                 ESOnMonitorViewController vc = new ESOnMonitorViewController();
@@ -93,36 +94,73 @@
                 //vc.RoomName = mESVideoInfo.RoomName;
                 //vc.MESCallDelegate = new OnESCallDelegate(this);
                 Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
+            }else if (interphoneType == InterphoneType.HDL.ToString())
+            {
+                //HDLLinphone 鐙勮�愬厠
+                HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo);
+            }
+            else
+            {
+                HDLUtils.WriteLine("鏈鎺ワ紝涓嶆敮鎸佺洃瑙�");
             }
 #else
             Intent intent = null;
             if (interphoneType == InterphoneType.IMOUVISIAL.ToString())
             {
                 intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.LeChengVideoActivity));
+                intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);
+                intent.PutExtra("uuid", mESVideoInfo.uuid);
+                intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);
+                intent.PutExtra("cmtID", mESVideoInfo.cmtID);
+                intent.PutExtra("roomno", mESVideoInfo.roomno);
+                intent.PutExtra("unitno", mESVideoInfo.unitno);
+                intent.PutExtra("HomeID", PirSend.HomeId);
+                intent.PutExtra("callId", mESVideoInfo.callId);
+                intent.PutExtra("Type", 0);
+
+                //=========涔愭==========
+                intent.PutExtra("AccessToken", mESVideoInfo.Lc_AccessToken);
+                intent.PutExtra("DeviceId", mESVideoInfo.Lc_DeviceId);
+                intent.PutExtra("Location", OnAppConfig.Instance.RequestHttpsHost.Contains("china") ? 0 : 1);//濡傛灉鍩熷悕鍖呭惈china锛屽垯鏄浗鍐呰处鍙�);
+                intent.PutExtra("PlayToken", mESVideoInfo.Lc_PlayToken);
+                intent.PutExtra("Psk", mESVideoInfo.Lc_Psk);
+
+                Shared.Application.Activity.StartActivity(intent);
+            }
+            else if (interphoneType == InterphoneType.FLVI.ToString())
+            {
+
+                intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.VideoActivity));
+                intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);
+                intent.PutExtra("uuid", mESVideoInfo.uuid);
+                intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);
+                intent.PutExtra("cmtID", mESVideoInfo.cmtID);
+                intent.PutExtra("roomno", mESVideoInfo.roomno);
+                intent.PutExtra("unitno", mESVideoInfo.unitno);
+                intent.PutExtra("HomeID", PirSend.HomeId);
+                intent.PutExtra("callId", mESVideoInfo.callId);
+                intent.PutExtra("Type", 0);
+
+                //=========涔愭==========
+                intent.PutExtra("AccessToken", mESVideoInfo.Lc_AccessToken);
+                intent.PutExtra("DeviceId", mESVideoInfo.Lc_DeviceId);
+                intent.PutExtra("Location", OnAppConfig.Instance.RequestHttpsHost.Contains("china") ? 0 : 1);//濡傛灉鍩熷悕鍖呭惈china锛屽垯鏄浗鍐呰处鍙�);
+                intent.PutExtra("PlayToken", mESVideoInfo.Lc_PlayToken);
+                intent.PutExtra("Psk", mESVideoInfo.Lc_Psk);
+
+                Shared.Application.Activity.StartActivity(intent);
+            }
+            else if (interphoneType == InterphoneType.HDL.ToString())
+            {
+                //HDLLinphone 鐙勮�愬厠
+                HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo);
             }
             else
             {
-                intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.VideoActivity));
+                HDLUtils.WriteLine("鏈鎺ワ紝涓嶆敮鎸佺洃瑙�");
             }
 
-            intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);
-            intent.PutExtra("uuid", mESVideoInfo.uuid);
-            intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);
-            intent.PutExtra("cmtID", mESVideoInfo.cmtID);
-            intent.PutExtra("roomno", mESVideoInfo.roomno);
-            intent.PutExtra("unitno", mESVideoInfo.unitno);
-            intent.PutExtra("HomeID", PirSend.HomeId);
-            intent.PutExtra("callId", mESVideoInfo.callId);
-            intent.PutExtra("Type", 0);
-
-            //=========涔愭==========
-            intent.PutExtra("AccessToken", mESVideoInfo.Lc_AccessToken);
-            intent.PutExtra("DeviceId", mESVideoInfo.Lc_DeviceId);
-            intent.PutExtra("Location", OnAppConfig.Instance.RequestHttpsHost.Contains("China") ? 0 : 1);//濡傛灉鍩熷悕鍖呭惈china锛屽垯鏄浗鍐呰处鍙�);
-            intent.PutExtra("PlayToken", mESVideoInfo.Lc_PlayToken);
-            intent.PutExtra("Psk", mESVideoInfo.Lc_Psk);
-
-            Shared.Application.Activity.StartActivity(intent);
+          
 
 #endif
         }
@@ -141,6 +179,7 @@
             {
                 //涔愭鍙瀵硅
                 //1.鍒濆鍖朙COpenSDK_Api
+                LCApiKit.SharedInstance().IsChinaMainland = OnAppConfig.Instance.RequestHttpsHost.Contains("china");//濡傛灉鍩熷悕鍖呭惈china锛屽垯SDK 浣跨敤涔愭鐨勪腑鍥藉ぇ闄�(姝e紡)鍩熷悕
                 LCApiKit.SharedInstance().InitSDKOpenApi(mESVideoInfo.Lc_AccessToken);
                 //2021-05-18 鐩墠鎺ㄩ�佺殑PlayToken;鏈夐棶棰樹細瀵艰嚧SDK宕╂簝锛屾殏鏃朵笉浼�
                 //LCApiKit.SharedInstance().CurrentDevicePlayToken = mESVideoInfo.Lc_PlayToken;
@@ -169,7 +208,13 @@
                 EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(mESVideoInfo.DeviceSerial);
 
             }
-            else
+            else if (interphoneType == InterphoneType.HDL.ToString())
+            {
+                //HDL Linphone 鐙勮�愬厠
+     
+
+            }
+            else if (interphoneType == InterphoneType.FLVI.ToString())
             {
 
                 ESOnIntercomViewController vc = new ESOnIntercomViewController();
@@ -181,14 +226,37 @@
                 mOnESCallDelegate = new OnESCallDelegate(this);
                 vc.MESCallDelegate = mOnESCallDelegate;
                 Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
+            }else{
+                HDLUtils.WriteLine("鏈敮鎸佺殑鍙瀵硅绫诲瀷");
+
             }
 #else
-            #region
+            #region Android 澶勭悊
 
             Intent intent = null;
             if (interphoneType == InterphoneType.IMOUVISIAL.ToString())
             {
+                //寰呭垹鍑忎笉蹇呰鍙傛暟
                 intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.LeChengVideoActivity));
+                intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);
+                intent.PutExtra("uuid", mESVideoInfo.uuid);
+                intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);
+                intent.PutExtra("cmtID", mESVideoInfo.cmtID);
+                intent.PutExtra("roomno", mESVideoInfo.roomno);
+                intent.PutExtra("unitno", mESVideoInfo.unitno);
+                intent.PutExtra("HomeID", PirSend.HomeId);
+                intent.PutExtra("callId", mESVideoInfo.callId);
+                intent.PutExtra("Type", 1);
+
+                //=========涔愭==========
+                intent.PutExtra("AccessToken", mESVideoInfo.Lc_AccessToken);
+                intent.PutExtra("DeviceId", mESVideoInfo.Lc_DeviceId);
+                intent.PutExtra("Location", OnAppConfig.Instance.RequestHttpsHost.Contains("china") ? 0 : 1);//濡傛灉鍩熷悕鍖呭惈china锛屽垯鏄浗鍐呰处鍙�);
+                intent.PutExtra("PlayToken", mESVideoInfo.Lc_PlayToken);
+                intent.PutExtra("Psk", mESVideoInfo.Lc_Psk);
+
+                Shared.Application.Activity.StartActivity(intent);
+
             }
             else if (interphoneType == InterphoneType.EZVIZ.ToString())
             {
@@ -213,29 +281,45 @@
                 });
                 return;
             }
+            else if (interphoneType == InterphoneType.HDL.ToString())
+            {
+                //HDL Linphone 鐙勮�愬厠
+           
+
+            }
+            else if (interphoneType == InterphoneType.FLVI.ToString())
+            {
+                //寰呭垹鍑忎笉蹇呰鍙傛暟
+                intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.VideoActivity));
+                intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);
+                intent.PutExtra("uuid", mESVideoInfo.uuid);
+                intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);
+                intent.PutExtra("cmtID", mESVideoInfo.cmtID);
+                intent.PutExtra("roomno", mESVideoInfo.roomno);
+                intent.PutExtra("unitno", mESVideoInfo.unitno);
+                intent.PutExtra("HomeID", PirSend.HomeId);
+                intent.PutExtra("callId", mESVideoInfo.callId);
+                intent.PutExtra("Type", 1);
+
+                //=========涔愭==========
+                intent.PutExtra("AccessToken", mESVideoInfo.Lc_AccessToken);
+                intent.PutExtra("DeviceId", mESVideoInfo.Lc_DeviceId);
+                intent.PutExtra("Location", OnAppConfig.Instance.RequestHttpsHost.Contains("china") ? 0 : 1);//濡傛灉鍩熷悕鍖呭惈china锛屽垯鏄浗鍐呰处鍙�);
+                intent.PutExtra("PlayToken", mESVideoInfo.Lc_PlayToken);
+                intent.PutExtra("Psk", mESVideoInfo.Lc_Psk);
+
+
+                Shared.Application.Activity.StartActivity(intent);
+            }
             else
             {
-                intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.VideoActivity));
+                HDLUtils.WriteLine("鏈敮鎸佺殑鍙瀵硅绫诲瀷");
+
             }
 
-            intent.PutExtra("ESVideoUUID", mESVideoInfo.ESVideoUUID);
-            intent.PutExtra("uuid", mESVideoInfo.uuid);
-            intent.PutExtra("DeviceName", mESVideoInfo.DeviceName);
-            intent.PutExtra("cmtID", mESVideoInfo.cmtID);
-            intent.PutExtra("roomno", mESVideoInfo.roomno);
-            intent.PutExtra("unitno", mESVideoInfo.unitno);
-            intent.PutExtra("HomeID", PirSend.HomeId);
-            intent.PutExtra("callId", mESVideoInfo.callId);
-            intent.PutExtra("Type", 1);
+         
 
-            //=========涔愭==========
-            intent.PutExtra("AccessToken", mESVideoInfo.Lc_AccessToken);
-            intent.PutExtra("DeviceId", mESVideoInfo.Lc_DeviceId);
-            intent.PutExtra("Location", OnAppConfig.Instance.RequestHttpsHost.Contains("China") ? 0 : 1);//濡傛灉鍩熷悕鍖呭惈china锛屽垯鏄浗鍐呰处鍙�);
-            intent.PutExtra("PlayToken", mESVideoInfo.Lc_PlayToken);
-            intent.PutExtra("Psk", mESVideoInfo.Lc_Psk);
-
-            Shared.Application.Activity.StartActivity(intent);
+         
 
             #endregion
 #endif
@@ -743,8 +827,11 @@
         /// 璁惧搴忓垪鍙�
         /// </summary>
         public string DeviceSerial = string.Empty;
-
-
+        //========================HDL SIP==========================
+        /// <summary>
+        /// 璁惧sip璐﹀彿 interphoneType鏄疕DL鏃舵墠浼氭湁鍊�
+        /// </summary>
+        public string deviceSipAccount;
     }
 
 
@@ -784,6 +871,10 @@
         /// 钀ょ煶鐚溂鍛煎彨
         /// </summary>
         EZVIZ,
+        /// <summary>
+        /// 鐙勮�愬厠 HDL Linphone
+        /// </summary>
+        HDL,
 
 
     }
diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
new file mode 100644
index 0000000..68cec3c
--- /dev/null
+++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -0,0 +1,847 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Threading;
+
+using HDL_ON;
+using HDL_ON.DAL.Server;
+using HDL_ON.Entity;
+
+#if __Android__
+using Android.App;
+using Android.Content;
+using Android.Graphics;
+using Android.Widget;
+using Com.Hdl.Hdllinphonesdk;
+#else
+using Foundation;
+using UIKit;
+using Shared.IOS.HDLLinphoneSDK;
+#endif
+
+namespace Shared
+{
+    /// <summary>
+    /// 鐩墠鏄瘡涓綇瀹呭搴斾竴涓猄IP璐﹀彿锛屽垏鎹綇瀹呴渶瑕侀噸鏂拌幏鍙朣IP璐﹀彿
+    /// </summary>
+    public class HDLLinphone
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public HDLLinphone()
+        {
+           
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        private static HDLLinphone m_Current = null;
+        /// <summary>
+        /// 
+        /// </summary>
+        public static HDLLinphone Current
+        {
+            get
+            {
+                if (m_Current == null)
+                {
+                    m_Current = new HDLLinphone();
+                }
+                return m_Current;
+            }
+        }
+
+     
+        /// <summary>
+        /// 褰撳墠浣忓畢鏄惁鏀寔鍙瀵硅
+        /// </summary>
+        public bool IsEnable = false;
+        /// <summary>
+        /// 鏄惁鑷姩璺宠浆鍛煎彨椤甸潰,
+        /// false锛氭敹鍒版帹閫佸苟涓斿凡缁忔敹鍒皊ip鍛煎彨鎵嶈烦杞懠鍙〉闈�
+        /// true锛氬師鐢熸敹鍒板懠鍙┈涓婅烦杞懠鍙〉闈紝涓嶇瓑寰呮帹閫佽繃鏉�
+        /// </summary>
+        bool IsAutoJumpCallView = false;
+        /// <summary>
+        /// 鏄惁鍒濆鍖栦簡SDK
+        /// </summary>
+        bool IsInitSdk;
+        /// <summary>
+        /// 褰撳墠鐧诲綍鐨凷ip璐﹀彿
+        /// </summary>
+        HDLSipInfo currentHDLSipInfo;
+        /// <summary>
+        /// 鍙瀵硅璁惧鍙傛暟
+        /// </summary>
+        HDLCallVideoInfo mHDLCallVideoInfo;
+
+        #region 鈻�  --  鍒濆鍖朣DK_______________________________
+        /// <summary>
+        /// 鍒濆鍖朣DK
+        /// </summary>
+        void InitLinphone()
+        {
+            //闃叉閲嶅鍒濆鍖�
+            if (IsInitSdk) return;
+
+            IsInitSdk = true;
+
+#if __IOS__
+
+            Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().InitalLinPhone();
+            //璁剧疆鏀跺埌鏉ョ數鍚庛�佹槸鍚﹂渶鑷姩璺宠浆鍛煎彨椤甸潰鏂规
+            Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().IsAutoJumpCallView = IsAutoJumpCallView;
+            //璁剧疆Listener鐩戝惉
+            mOnHDLLinphoneCallDelegate = new OnHDLLinphoneCallDelegate(this);
+            Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().HdlLinphoneCallDelegate = mOnHDLLinphoneCallDelegate;
+#else
+            HDLLinphoneKit.Instance.InitLinphone(Application.Activity);
+            //璁剧疆鏀跺埌鏉ョ數鍚庛�佹槸鍚﹂渶鑷姩璺宠浆鍛煎彨椤甸潰鏂规
+            HDLLinphoneKit.Instance.AutoJumpCallView = IsAutoJumpCallView;
+            //璁剧疆Listener鐩戝惉
+            setOnHDLLinphoneCallListener();
+#endif
+        }
+
+       
+        /// <summary>
+        /// 璁剧疆sip鐧诲綍璐﹀彿
+        /// </summary>
+        /// <param name="mHDLSipInfo"></param>
+        public void SetAccountAndLogin(HDLSipInfo mHDLSipInfo)
+        {
+
+            this.currentHDLSipInfo = mHDLSipInfo;
+
+            if (mHDLSipInfo == null) return;
+
+#if __IOS__
+            //Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().Login("6666", "85521566", "116.62.26.215:5060");
+            Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().Login(mHDLSipInfo.sipAccount, mHDLSipInfo.sipPasswd, mHDLSipInfo.realm);
+#else
+            HDLLinphoneKit.Instance.SetAccountAndLogin(mHDLSipInfo.sipAccount, mHDLSipInfo.sipPasswd, mHDLSipInfo.realm);
+#endif
+
+        }
+
+        /// <summary>
+        /// 娉ㄩ攢鎵�鏈夎处鍙�
+        /// </summary>
+        public void LogoutAllAccount() {
+            //娌″垵濮嬪寲杩囧垯杩斿洖
+            if (!IsInitSdk) return;
+
+            this.currentHDLSipInfo = null;
+            this.mHDLCallVideoInfo = null;
+#if __IOS__
+
+            HDLLinPhoneSDK.Instance().LogoutAllLinphoneUser();
+#else
+            HDLLinphoneKit.Instance.Logout();
+#endif
+        }
+
+        /// <summary>
+        /// 娓呴櫎閰嶇疆琛�
+        /// </summary>
+        public void ClearProxyConfig()
+        {
+#if __IOS__
+
+            HDLLinPhoneSDK.Instance().ClearAllConfigs();
+#else
+            HDLLinphoneKit.Instance.ClearProxyConfig();
+#endif
+        }
+
+        #endregion
+
+        #region 鈻�  --  鑾峰彇sip璐﹀彿_______________________________
+        /// <summary>
+        /// 鑾峰彇褰撳墠浣忓畢鐨凷IP璐﹀彿
+        /// </summary>
+        public HDLSipInfo GetHDLSipInfo(string homeId)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", homeId);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var resultObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_VideoDevice_GetSipAccount, requestJson);
+
+            if (resultObj.Code == StateCode.SUCCESS)
+            {
+                if (string.IsNullOrEmpty(resultObj.Data.ToString()))
+                {
+                    //鎺х殑璇濅唬琛ㄥ綋鍓嶄綇瀹呬笉鏀寔
+                    return null;
+                }
+                else
+                {
+                    var info = Newtonsoft.Json.JsonConvert.DeserializeObject<HDLSipInfo>(resultObj.Data.ToString());
+                    return info;
+                }
+            }
+            else
+            {
+                return null;
+            }
+
+        }
+
+        /// <summary>
+        /// 璇锋眰鏈嶅姟鍣ㄨ幏鍙栧綋鍓嶄綇瀹匰ip璐﹀彿淇℃伅骞跺垵濮嬪寲LinphoneSDK鍜岀櫥褰�
+        /// </summary>
+        /// <param name="homeId"></param>
+        public void GetHDLSipInfoAndInitSDK(string homeId, bool clearCallInfo = true)
+        {
+            try
+            {
+
+
+                //鍏堟竻绌哄懠鍙拰鐩戣璁惧淇℃伅
+                if (clearCallInfo)
+                {
+                    InitCallInfo(null);
+                }
+
+                HDLSipInfo mHDLSipInfo = GetHDLSipInfo(homeId);
+                if (mHDLSipInfo != null)
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        InitLinphone();
+                        mHDLSipInfo.homeId = homeId;
+                        SetAccountAndLogin(mHDLSipInfo);
+                        Utlis.WriteLine("CALL 鑾峰彇SIP璐﹀彿鎴愬姛锛�" + mHDLSipInfo.sipAccount);
+                    });
+                }
+            }
+            catch { }
+
+        }
+        #endregion
+
+
+        #region 鈻�  -- 鍔ㄤ綔鍥炶皟鍜屽師鐢熶氦浜掞紝鎻愪氦璁板綍鍒颁簯绔痏______________________________
+       
+        /// <summary>
+        /// 鍒濆鍖栧懠鍙弬鏁�
+        /// </summary>
+        /// <param name="mHDLCallVideoInfo"></param>
+        /// <param name="mInterphoneType"></param>
+        void InitCallInfo(HDLCallVideoInfo mHDLCallVideoInfo)
+        {
+            this.mHDLCallVideoInfo = mHDLCallVideoInfo;
+        }
+
+        /// <summary>
+        /// 鍒ゆ柇callId鏄惁涓虹┖
+        /// </summary>
+        /// <returns></returns>
+        bool CheckmHDLCallVideoInfoIsNullOrEmpty()
+        {
+            return (mHDLCallVideoInfo == null || string.IsNullOrEmpty(mHDLCallVideoInfo.CallId));
+        }
+
+        /// <summary>
+        /// 鎴浘鎴愬姛 鏆傛椂搴熷純
+        /// </summary>
+        public void ScreenshotSuccessfulAction(byte[] dataBytes)
+        {
+            //Utlis.WriteLine("ScreenshotSuccessfulAction");
+
+            if (CheckmHDLCallVideoInfoIsNullOrEmpty()) return;
+
+            new Thread(() =>
+            {
+                //var imageName = Guid.NewGuid().ToString();
+                Dictionary<string, object> dic = new Dictionary<string, object>();
+                dic.Add("callId", mHDLCallVideoInfo.CallId);
+                dic.Add("images", dataBytes);
+#if __IOS__
+                dic.Add("imagesName", "_IOS.jpg");
+#else
+                dic.Add("imagesName", "_Android.jpg");
+#endif
+
+                var requestJson = HttpUtil.GetSignRequestJson(dic);
+                var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_FL_Screenshot, requestJson);
+                if (revertObj.Code == StateCode.SUCCESS)
+                {
+                    //Utlis.WriteLine("POST 鎴浘涓婁紶鎴愬姛");
+                }
+                else
+                {
+                    Utlis.WriteLine("POST 鎴浘涓婁紶澶辫触 code: " + revertObj.Code);
+                }
+
+            })
+            { IsBackground = false }.Start();
+
+        }
+
+        //DateTime UnlockDateTime = DateTime.MinValue;
+        #endregion
+
+        #region 鈻�  --  鏂版帴鍚拰寮�閿佹帴鍙______________________________
+        /// <summary>
+        /// 寮�閿�
+        /// </summary>
+        public void HDLUnlockAction()
+        {
+            //Utlis.WriteLine("UnlockAction");
+
+            if (mHDLCallVideoInfo == null) return;
+
+            new Thread(() =>
+            {
+                Dictionary<string, object> dic = new Dictionary<string, object>();
+                dic.Add("deviceId", mHDLCallVideoInfo.DeviceId);//璁惧id
+                dic.Add("callId", mHDLCallVideoInfo.CallId);//褰撳墠鍛煎彨id
+                dic.Add("interphoneType", mHDLCallVideoInfo.InterphoneType);//鍙瀵硅鍘傚绫诲瀷
+                dic.Add("homeId", mHDLCallVideoInfo.HomeId);//浣忓畢ID
+                var requestJson = HttpUtil.GetSignRequestJson(dic);
+                var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_VideoDevice_OpenDoorbell, requestJson);
+
+                Application.RunOnMainThread(() =>
+                {
+
+#if __IOS__
+                    if (revertObj.Code == StateCode.SUCCESS)
+                    {
+                        //鍜屽師鐢熺洃鎺х晫闈氦浜掋�佸彂閫佸紑閿佹垚鍔熼�氱煡
+                        NSNotificationCenter.DefaultCenter.PostNotificationName("lcCallDelegateOpenDoorSuccess", null);
+                    }
+                    else
+                    {
+                        Utlis.WriteLine("POST 寮�閿佸け璐� code: " + revertObj.Code);
+                    }
+#else
+                    if (revertObj.Code == StateCode.SUCCESS)
+                    {
+                        HDLLinphoneKit.Instance.OnOpenSuccess();
+                    }
+                    else
+                    {
+                        Utlis.WriteLine("POST 寮�閿佸け璐� code: " + revertObj.Code);
+                        HDLLinphoneKit.Instance.OnOpenError(revertObj.message);
+                    }
+#endif
+
+                });
+
+
+            })
+            { IsBackground = false }.Start();
+        }
+
+        /// <summary>
+        /// 鏇存敼閫氳瘽鐘舵��
+        /// </summary>
+        public void HDLUpdateCallStatus(CallStatusType callStatusType, InterphoneType interphoneType, int callDuration = 0)
+        {
+
+            if (CheckmHDLCallVideoInfoIsNullOrEmpty()) return;
+
+            new Thread(() =>
+            {
+                Dictionary<string, object> dic = new Dictionary<string, object>();
+                dic.Add("callId", mHDLCallVideoInfo.CallId);//鍛煎彨id
+                dic.Add("callStatus", callStatusType.ToString());//鍙敤鍊�:MISSED,RECEIVED,REJECT
+                dic.Add("interphoneTypeEnum", interphoneType.ToString());
+                if (callStatusType == CallStatusType.RECEIVED && callDuration > 0)
+                {
+                    dic.Add("callDuration", callDuration);//閫氳瘽鏃堕暱锛堢锛�
+                }
+
+                var requestJson = HttpUtil.GetSignRequestJson(dic);
+                var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_VideoDevice_UpdateCallStatus, requestJson);
+                if (revertObj.Code == StateCode.SUCCESS)
+                {
+
+                }
+                else
+                {
+                    Utlis.WriteLine("POST 鏇存柊鐘舵�佸け璐� code: " + revertObj.Code);
+                }
+
+            })
+            { IsBackground = false }.Start();
+
+        }
+        #endregion
+
+     
+        #region 鈻�  --  璺宠浆鐩戞帶椤甸潰_______________________________
+        /// <summary>
+        /// 璺宠浆鐩戞帶椤甸潰
+        /// </summary>
+        /// <param name="mESVideoInfo"></param>
+        public void ShowESVideoMonitor(ESVideoInfo mESVideoInfo)
+        {
+            InitLinphone();
+            //sip璐﹀彿涓虹┖
+            if (string.IsNullOrEmpty(mESVideoInfo.deviceSipAccount))
+            {
+
+                HDLCommon.Current.ShowAlert(Language.StringByID(StringId.shebeibucunzai));
+                return;
+            }
+            HDLCallVideoInfo mHDLCallVideoInfo = new HDLCallVideoInfo();
+            mHDLCallVideoInfo.HomeId = mESVideoInfo.HomeId;
+            mHDLCallVideoInfo.DeviceId = mESVideoInfo.Lc_DeviceId;
+            mHDLCallVideoInfo.DeviceName = mESVideoInfo.DeviceName;
+            mHDLCallVideoInfo.InterphoneType = InterphoneType.HDL.ToString();
+            mHDLCallVideoInfo.DeviceSipAccount = mESVideoInfo.deviceSipAccount;//鐩戣涓诲姩鍛煎彨闂ㄥ彛鏈烘椂鐢ㄥ埌
+            InitCallInfo(mHDLCallVideoInfo);
+
+#if __IOS__
+
+            HDLLinPhoneSDK.Instance().CallWithUserName(mHDLCallVideoInfo.DeviceSipAccount, mHDLCallVideoInfo.DeviceName);
+
+#else
+            //1.鍏堝懠鍙澶�
+            Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.CallTo(mHDLCallVideoInfo.DeviceSipAccount, true);
+            //2.璺宠浆鎵撳紑鐩戞帶椤甸潰
+            var intent = new Intent(Shared.Application.Activity, typeof(Com.Hdl.Hdllinphonesdk.Activity.HDLLinphoneMonitorActivity)); ;
+            intent.PutExtra(HDLLinphoneKit.KeyTitleName, mHDLCallVideoInfo.DeviceName);//浼犲叆璁惧鍚嶇О涓烘樉绀烘爣棰�
+            Shared.Application.Activity.StartActivity(intent);
+#endif
+
+        }
+        #endregion
+
+
+        #region 鈻�  --  璺宠浆鍛煎彨椤甸潰_______________________________
+        /// <summary>
+        /// 鏀跺埌鎺ㄩ�侊紝鍚庡垽鏂懠鍙綇瀹呮槸鍚︿负褰撳墠浣忓畢锛屼笉鏄殑璇濋噸鏂拌幏鍙朣IP璐﹀彿骞剁櫥褰�
+        /// </summary>
+        /// <param name="mESVideoInfo"></param>
+        public void ShowESVideoIntercom(ESVideoInfo mESVideoInfo)
+        {
+            InitLinphone();
+
+            HDLCallVideoInfo mHDLCallVideoInfo = new HDLCallVideoInfo();
+            mHDLCallVideoInfo.CallId = mESVideoInfo.callId;
+            mHDLCallVideoInfo.HomeId = mESVideoInfo.HomeId;
+            mHDLCallVideoInfo.DeviceId = mESVideoInfo.Lc_DeviceId;
+            mHDLCallVideoInfo.DeviceName = mESVideoInfo.DeviceName;
+            mHDLCallVideoInfo.InterphoneType = InterphoneType.HDL.ToString();
+            mHDLCallVideoInfo.DeviceSipAccount = mESVideoInfo.deviceSipAccount;
+            InitCallInfo(mHDLCallVideoInfo);
+
+            //褰撳墠鍛煎彨鏉ョ數鐨勪綇瀹呭拰涔嬪墠娉ㄥ唽鐧诲綍鐨勪綇瀹呬竴鑷寸殑鎯呭喌涓�
+            if (currentHDLSipInfo != null && currentHDLSipInfo.homeId == mESVideoInfo.HomeId)
+            {
+                Utlis.WriteLine("CALL 鏀跺埌鎺ㄩ�� 鎺ㄩ�佷綇瀹呭拰涔嬪墠娉ㄥ唽鐧诲綍鐨勪綇瀹呬竴鑷�");
+                CheckCallStateAndGotoPage();
+            }
+            else
+            {
+                //娉ㄦ剰锛氫箣鍓嶆病鐧诲綍SIP璐﹀彿鎴栬�呬綇瀹呬笉涓�鑷寸殑鎯呭喌涓嬮渶瑕侀噸鏂拌幏鍙朣IP璐﹀彿
+                //鑾峰彇鍛煎彨浣忓畢鐨凷IP璐﹀彿骞剁櫥褰�
+                Utlis.WriteLine("CALL 鏀跺埌鎺ㄩ�� 鍏朵粬浣忓畢锛岄噸鏂拌幏鍙栧懠鍙綇瀹呯殑SIP璐﹀彿骞剁櫥褰�");
+                new Thread(() =>
+                {
+                    GetHDLSipInfoAndInitSDK(mESVideoInfo.HomeId, false);
+                })
+                { IsBackground = false }.Start();
+
+                //
+                CheckCallStateAndGotoPage();
+
+            }
+
+        }
+
+        /// <summary>
+        /// 妫�娴嬫潵鐢电姸鎬侊紝鍒ゆ柇鏄惁椹笂鎵撳紑鍛煎彨椤甸潰锛屽鏋滆繕娌℃潵鐢靛垯寮�鍚嚎绋嬫娴嬬瓑寰�
+        /// </summary>
+        /// <param name="mESVideoInfo"></param>
+        public void CheckCallStateAndGotoPage()
+        {
+            //濡傛灉寮�鍚簡鑷姩璺宠浆鏂规锛屽垯鏃犻渶缁х画涓嬮潰澶勭悊銆佹棤闇�鎵嬪姩璺宠浆
+            if (IsAutoJumpCallView) return;
+            //鍏堢粨鏉熸帀涔嬪墠鐨勭嚎绋�
+            EndCheckIncomingCallThread();
+            //妫�娴嬫槸鍚︽潵鐢典簡濡傛灉鏄洿鎺ヨ皟鏁村懠鍙〉闈㈠鏋滀笉鏄垯寮�鍚嚎绋嬬瓑寰呭垽鏂�
+            if (IsIncomingReceivedCallState()) {
+                Utlis.WriteLine("CALL 宸茬粡鏉ョ數浜嗐�傘�傘�傛墦寮�鍛煎彨椤甸潰");
+                GoToHDLLinphoneIntercomActivity();
+            }
+            else
+            {
+                //濡傛灉杩樻病鏉ョ數 寮�鍚嚎绋嬫娴�
+                StartCheckIncomingCallThread();
+            }
+
+        }
+
+        /// <summary>
+        /// 鏄惁鏉ョ數鐘舵��
+        /// </summary>
+        /// <returns></returns>
+        bool IsIncomingReceivedCallState() {
+#if __IOS__
+             return HDLLinPhoneSDK.Instance().IsIncomingReceivedCallState;
+#else
+            return HDLLinphoneKit.Instance.IsIncomingReceivedCallState;
+#endif
+        }
+
+        /// <summary>
+        /// 璺宠浆鎵撳紑鍘熺敓鐨勫懠鍙〉闈�
+        /// </summary>
+        void GoToHDLLinphoneIntercomActivity() {
+
+#if __IOS__
+
+            HDLLinPhoneSDK.Instance().GotoHDLLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName);
+
+#else
+            var intent = new Intent(Shared.Application.Activity, typeof(Com.Hdl.Hdllinphonesdk.Activity.HDLLinphoneIntercomActivity));
+            if (mHDLCallVideoInfo != null)
+            {
+                intent.PutExtra(HDLLinphoneKit.KeyTitleName, mHDLCallVideoInfo.DeviceName);
+            }
+            Shared.Application.Activity.StartActivity(intent);
+#endif
+
+        }
+
+
+        /// <summary>
+        /// 妫�娴嬫潵鐢电嚎绋�
+        /// </summary>
+        Thread checkIncomingCallThread = null;
+        /// <summary>
+        /// 妫�娴嬬嚎绋嬫寔缁椂闂�
+        /// </summary>
+        const int MAX_THREAD_TIME = 30;
+        /// <summary>
+        /// 绾跨▼缁撴潫
+        /// </summary>
+        int threadTime = MAX_THREAD_TIME;
+        /// <summary>
+        /// 寮�鍚娴嬫潵鐢电嚎绋�
+        /// </summary>
+        void StartCheckIncomingCallThread()
+        {
+            try
+            {
+                Utlis.WriteLine("CALL 杩樻病鏉ョ數锛屽紑鍚嚎绋�");
+                threadTime = MAX_THREAD_TIME;
+                //缁撴潫涔嬪墠鐨勭嚎绋�
+                EndCheckIncomingCallThread();
+                //鏂板缓绾跨▼
+                checkIncomingCallThread = new Thread(() =>
+                    {
+                        try
+                        {
+                            //15S鍚庤嚜鍔ㄧ粨鏉熺嚎绋�
+                            while (threadTime > 0)
+                            {
+                                threadTime--;
+                                Utlis.WriteLine("CALL 妫�娴嬩腑...." + threadTime);
+                                Thread.Sleep(1000);
+                                //鏉ョ數浜嗭紝璺宠浆鍛煎彨椤甸潰
+                                if (IsIncomingReceivedCallState())
+                                {
+                                    Utlis.WriteLine("CALL 鏉ョ數浜嗐�傘�傘�傛墦寮�鍛煎彨椤甸潰");
+                                    threadTime = 0;//璺冲嚭寰幆锛屽叧闂嚎绋�
+                                    Application.RunOnMainThread(() =>
+                                    {
+                                        GoToHDLLinphoneIntercomActivity();
+                                    });
+
+                                }
+                            }
+                          
+                          
+                        }
+                        catch { }
+                    });
+                //寮�鍚嚎绋�
+                checkIncomingCallThread.Start();
+            }
+            catch { }
+        }
+
+        /// <summary>
+        /// 缁撴潫绾跨▼
+        /// </summary>
+        void EndCheckIncomingCallThread()
+        {
+            if (checkIncomingCallThread != null)
+            {
+                try
+                {
+                    checkIncomingCallThread.Interrupt();
+                }
+                catch {
+
+                }
+
+                checkIncomingCallThread = null;
+                Utlis.WriteLine("CALL 鍏堢粨鏉熺嚎绋�");
+            }
+        }
+
+        /// <summary>
+        /// 鍒ゆ柇绾跨▼鏄惁鍚姩浜�
+        /// </summary>
+        /// <returns></returns>
+        public bool CheckIncomingCallThreadIsNull()
+        {
+            return checkIncomingCallThread == null || checkIncomingCallThread.ThreadState != ThreadState.Running;
+        }
+
+        #endregion
+
+
+        #region 鈻�  --  Android鐩稿叧鎿嶄綔_______________________________
+
+#if __Android__
+
+        /// <summary>
+        /// 鎺ュ惉銆佹寕鏂�佸紑閿佺瓑鍔ㄤ綔鐩戝惉澶勭悊
+        /// </summary>
+        private class HDLLinphoneCallListener : Java.Lang.Object, Com.Hdl.Hdllinphonesdk.Callback.IOnHDLLinphoneCallListener
+        {
+            [Weak] HDLLinphone hdlLinphone;
+
+            public HDLLinphoneCallListener(HDLLinphone mHDLLinphone)
+            {
+                hdlLinphone = mHDLLinphone;
+            }
+
+
+            //showToast
+            void showToast(string text)
+            {
+                Toast.MakeText(Application.Activity, text, ToastLength.Short).Show();
+            }
+            /// <summary>
+            /// 鎺ュ惉浜嬩欢
+            /// </summary>
+            public void OnAnswerAction()
+            {
+                //showToast("鎺ュ惉");
+                hdlLinphone.HDLUpdateCallStatus(CallStatusType.RECEIVED, InterphoneType.HDL);
+            }
+            /// <summary>
+            /// 鎸傛柇浜嬩欢
+            /// </summary>
+            /// <param name="callDuration"></param>
+            public void OnHangUpAction(int callDuration)
+            {
+
+                //showToast("鎸傛柇 閫氳瘽鏃堕暱锛�" + callDuration);
+                hdlLinphone.HDLUpdateCallStatus(CallStatusType.RECEIVED, InterphoneType.HDL, callDuration);
+            }
+
+            /// <summary>
+            /// 鎷掓帴浜嬩欢
+            /// </summary>
+            public void OnRejectCallAction()
+            {
+                //showToast("鎷掓帴");
+                hdlLinphone.HDLUpdateCallStatus(CallStatusType.REJECT, InterphoneType.HDL);
+            }
+
+            /// <summary>
+            /// 鎴浘鎴愬姛浜嬩欢
+            /// </summary>
+            /// <param name="p0"></param>
+            public void OnScreenshotSuccessfulAction(Bitmap imgBitmap)
+            {
+                //showToast("鎴浘鎴愬姛");
+            }
+
+            /// <summary>
+            /// 寮�閿佷簨浠�
+            /// </summary>
+            public void OnUnlockAction()
+            {
+                hdlLinphone.HDLUnlockAction();
+            }
+
+            /// <summary>
+            /// 鏉ョ數浜嬩欢
+            /// </summary>
+            /// <param name="userName"></param>
+            public void OnIncomingCall(string userName)
+            {
+                Utlis.WriteLine("OnIncomingCall :" + userName);
+            }
+        }
+
+        /// <summary>
+        /// 璁剧疆鍘熺敓鐨凩istener鐩戝惉
+        /// </summary>
+        void setOnHDLLinphoneCallListener()
+        {
+            HDLLinphoneKit.Instance.OnHDLLinphoneCallListener = new HDLLinphoneCallListener(this);
+        }
+
+        /// <summary>
+        /// 娓呮閫氱煡鏍忔墍鏈夐�氱煡
+        /// </summary>
+        void CancelAllNotification()
+        {
+            NotificationManager nMgr = (NotificationManager)Application.Activity.GetSystemService(Context.NotificationService);
+            nMgr.CancelAll();
+        }
+
+#endif
+        #endregion
+
+        #region 鈻�  --  iOS鐩稿叧鎿嶄綔_______________________________
+
+#if __IOS__
+
+        #region OnHDLLinphoneCallDelegate
+        /// <summary>
+        /// 
+        /// </summary>
+        OnHDLLinphoneCallDelegate mOnHDLLinphoneCallDelegate;
+     
+        /// <summary>
+        /// 
+        /// </summary>
+        public class OnHDLLinphoneCallDelegate : HDLLinphoneCallDelegate
+        { 
+            [Weak] HDLLinphone hdlLinphone;
+
+            public OnHDLLinphoneCallDelegate(HDLLinphone mHDLLinphone)
+            {
+                this.hdlLinphone = mHDLLinphone;
+            }
+
+            /// <summary>
+            /// 鎺ュ惉
+            /// </summary>
+            public override void OnAnswerAction()
+            {
+                hdlLinphone.HDLUpdateCallStatus(CallStatusType.RECEIVED, InterphoneType.HDL);
+            }
+
+            /// <summary>
+            /// 鎸傛柇
+            /// </summary>
+            /// <param name="callDuration"></param>
+            public override void OnHangUpAction(int callDuration)
+            {
+                hdlLinphone.HDLUpdateCallStatus(CallStatusType.RECEIVED, InterphoneType.HDL, callDuration);
+            }
+
+            /// <summary>
+            /// 鎷掓帴
+            /// </summary>
+            public override void OnRejectCallAction()
+            {
+                hdlLinphone.HDLUpdateCallStatus(CallStatusType.REJECT, InterphoneType.HDL);
+            }
+
+            /// <summary>
+            /// 鎴浘鎴愬姛
+            /// </summary>
+            /// <param name="image"></param>
+            public override void OnScreenshotSuccessfulAction(UIImage image)
+            {
+                ////NSData imageData = UIImagePNGRepresentation(image); UIImage
+                //NSData imageData = image.AsPNG();
+                //byte[] dataBytes = new byte[imageData.Length];
+                //System.Runtime.InteropServices.Marshal.Copy(imageData.Bytes, dataBytes, 0, Convert.ToInt32(imageData.Length));
+                ////image.g
+                ////hdlLinphone.ScreenshotSuccessfulAction(dataBytes);
+            }
+
+            /// <summary>
+            /// 寮�閿佹垚鍔�
+            /// </summary>
+            public override void OnUnlockAction()
+            {
+                hdlLinphone.HDLUnlockAction();
+            }
+
+            /// <summary>
+            /// 鏉ョ數涓�...
+            /// </summary>
+            public override void OnIncomingCall(string userName)
+            {
+                Utlis.WriteLine("OnIncomingCall :" + userName);
+            }
+            
+
+
+        }
+
+        #endregion
+#endif
+
+        #endregion
+
+    }
+
+    /// <summary>
+    /// SIP鍙瀵硅鍙傛暟
+    /// </summary>
+    public class HDLCallVideoInfo
+    {
+        /// <summary>
+        /// 璁惧搴忓垪鍙凤紝閫氳蹇呰瀛楁
+        /// </summary>
+        public string DeviceId = string.Empty;
+        /// <summary>
+        /// 璁惧鍚嶇О
+        /// </summary>
+        public string DeviceName = string.Empty;
+        /// <summary>
+        /// 璁惧Sip璐﹀彿
+        /// </summary>
+        public string DeviceSipAccount = string.Empty;
+        /// <summary>
+        /// 鍛煎彨璁板綍Id
+        /// </summary>
+        public string CallId = string.Empty;
+        /// <summary>
+        /// 浣忓畢Id
+        /// </summary>
+        public string HomeId = string.Empty;
+        /// <summary>
+        /// 绫诲瀷
+        /// </summary>
+        public string InterphoneType;
+
+    }
+
+    /// <summary>
+    /// SIP璐﹀彿鐩稿叧淇℃伅
+    /// </summary>
+    public class HDLSipInfo
+    {
+        /// <summary>
+        /// Sip鏈嶅姟鍣�
+        /// </summary>
+        public string proxy { get; set; }
+        /// <summary>
+        /// 璁惧鍩�
+        /// </summary>
+        public string realm { get; set; }
+        /// <summary>
+        /// sip璐﹀彿
+        /// </summary>
+        public string sipAccount { get; set; }
+        /// <summary>
+        /// sipPasswd	sip瀵嗙爜
+        /// </summary>
+        public string sipPasswd { get; set; }
+        /// <summary>
+        /// 浣忓畢ID
+        /// </summary>
+        public string homeId;
+    }
+
+
+}
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 0f6ca28..712bbb5 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -155,6 +155,10 @@
             HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
             DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
         }
+        /// <summary>
+        /// 鏄惁鏀寔浜鸿劯閫氳
+        /// </summary>
+        public bool SupportFacePass = false;
 
         /// <summary>
         /// 缃戝叧璇︾粏淇℃伅
diff --git a/HDL_ON/Entity/Function/AirSwitch.cs b/HDL_ON/Entity/Function/AirSwitch.cs
new file mode 100644
index 0000000..2276f82
--- /dev/null
+++ b/HDL_ON/Entity/Function/AirSwitch.cs
@@ -0,0 +1,10 @@
+锘縰sing System;
+namespace HDL_ON.Entity
+{
+    public class AirSwitch
+    {
+        public AirSwitch()
+        {
+        }
+    }
+}
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 9205440..1d2e85d 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1274,6 +1274,10 @@
         /// 闈掕悕鐜浼犳劅鍣�
         /// </summary>
         public const string SensorEnvironment3 = "sensor.environment3";
+        /// <summary>
+        /// 鐢查啗
+        /// </summary>
+        public const string SensorHcho = "sensor.hcho";
 
         /// <summary>
         /// 鐜浼犳劅鍣╯pk鍒楄〃
@@ -1290,6 +1294,7 @@
             spkList.Add(SensorEnvironment);
             spkList.Add(SensorEnvironment2);
             spkList.Add(SensorEnvironment3);
+            spkList.Add(SensorHcho);
             return spkList;
         }
 
@@ -1362,6 +1367,10 @@
         /// 绾㈠椋庢墖
         /// </summary>
         public const string FanIr = "ir.fan";
+        /// <summary>
+        /// 鏅鸿兘绌哄紑
+        /// </summary>
+        public const string AirSwitch = "electrical.breaker";
 
         #region 娑傞甫
         /// <summary>
@@ -1404,6 +1413,7 @@
             spkList.Add(ElectricTuyaFan);
             spkList.Add(ElectricTuyaWeepRobot);
             spkList.Add(ElectricTuyaWaterValve);
+            spkList.Add(AirSwitch);
             return spkList;
         }
 
diff --git a/HDL_ON/Entity/Function/SecurityAlarm.cs b/HDL_ON/Entity/Function/SecurityAlarm.cs
index 1ebe9f8..902b12c 100644
--- a/HDL_ON/Entity/Function/SecurityAlarm.cs
+++ b/HDL_ON/Entity/Function/SecurityAlarm.cs
@@ -7,17 +7,17 @@
 namespace HDL_ON.Entity
 {
 
-    public class SecurityCenter
+    public class SecurityCenter111111
     {
-        static SecurityCenter _securityCenter;
+        static SecurityCenter111111 _securityCenter;
 
-        public static SecurityCenter Ins
+        public static SecurityCenter111111 Ins
         {
             get
             {
                 if (_securityCenter == null)
                 {
-                    _securityCenter = new SecurityCenter();
+                    _securityCenter = new SecurityCenter111111();
                 }
                 return _securityCenter;
             }
@@ -30,14 +30,11 @@
         {
             get
             {
-                foreach (var temp in FunctionList.List.securities)
+                lock (FunctionList.List.securities)
                 {
-                    if (temp.status == "enable")
-                    {
-                        return true;
-                    }
+                    var temp = FunctionList.List.securities.Find((obj) => obj.status == "enable");
+                    return temp == null ? false : true;
                 }
-                return false;
             }
         }
 
@@ -48,14 +45,11 @@
         {
             get
             {
-                foreach (var temp in FunctionList.List.securities)
+                lock (FunctionList.List.securities)
                 {
-                    if (temp.alarm)
-                    {
-                        return true;
-                    }
+                    var temp = FunctionList.List.securities.Find((obj) => obj.alarm == true);
+                    return temp == null ? false : true;
                 }
-                return false;
             }
         }
 
@@ -69,13 +63,10 @@
             {
                 if (_inDefenseMode == null)
                 {
-                    foreach (var temp in FunctionList.List.securities)
+                    lock (FunctionList.List.securities)
                     {
-                        if (temp.status == "enable")
-                        {
-                            _inDefenseMode = temp;
-                            return _inDefenseMode;
-                        }
+                        var temp = FunctionList.List.securities.Find((obj) => obj.status == "enable");
+                        return temp;  
                     }
                 }
                 return _inDefenseMode;
diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs
index 585a617..341392a 100644
--- a/HDL_ON/Entity/Function/Sensor.cs
+++ b/HDL_ON/Entity/Function/Sensor.cs
@@ -81,16 +81,22 @@
                     _intervalValue.Add("33掳C ~");
                     break;
                 case SPK.SensorTVOC:
-                    _intervalValue.Add("0 ~ 0.6");
-                    _intervalValue.Add("0.61 ~ 2");
-                    _intervalValue.Add("2.01 ~ 5");
-                    _intervalValue.Add("5 ~");
+                    _intervalValue.Add("0 ~ 600");
+                    _intervalValue.Add("601 ~ 2000");
+                    _intervalValue.Add("2001 ~ 5000");
+                    _intervalValue.Add("5001 ~");
                     break;
                 case SPK.SensorHumidity:
                     _intervalValue.Add("70 ~");
                     _intervalValue.Add("71 ~ 40");
                     _intervalValue.Add("0 ~ 39");
                     break;
+                case SPK.SensorHcho:
+                    _intervalValue.Add("~ 0.08");
+                    _intervalValue.Add("0.08 ~ 0.1");
+                    _intervalValue.Add("0.1 ~ ");
+                    break;
+
             }
             return _intervalValue;
         }
@@ -135,6 +141,16 @@
                     _levelColorList.Add(0xFF2172FF);
                     _levelColorList.Add(0xFFADE764);
                     _levelColorList.Add(0xFFFF3D3D);
+                    break;
+                case SPK.SensorHcho:
+                    _levelColorList.Add(0xFF2172FF);
+                    _levelColorList.Add(0xFFADE764);
+                    _levelColorList.Add(0xFFFF3D3D);
+                    break;
+                default:
+                    _levelColorList.Add(0x00000000);
+                    _levelColorList.Add(0x00000000);
+                    _levelColorList.Add(0x00000000);
                     break;
             }
             return _levelColorList;
@@ -181,6 +197,16 @@
                     _levelTextList.Add(StringId.SensorReferenceHumidityTipLevel2);
                     _levelTextList.Add(StringId.SensorReferenceHumidityTipLevel3);
                     break;
+                case SPK.SensorHcho:
+                    _levelTextList.Add(StringId.Class_I_BuildingStandard);
+                    _levelTextList.Add(StringId.SecondaryBuildingStandard);
+                    _levelTextList.Add(StringId.ExceedingTheStandard);
+                    break;
+                default:
+                    _levelTextList.Add(99999999);
+                    _levelTextList.Add(99999999);
+                    _levelTextList.Add(99999999);
+                    break;
             }
             return _levelTextList;
         }
@@ -211,7 +237,7 @@
                         level = 2;
                     else if (values < 5000)
                         level = 3;
-                    else if (values > 5000)
+                    else if (values >= 5000)
                         level = 4;
                     break;
                 case SPK.SensorTemperature:
@@ -231,13 +257,13 @@
                         level = 7;
                     break;
                 case SPK.SensorTVOC:
-                    if (values < 0.6)
+                    if (values < 600)
                         level = 1;
-                    else if (values < 2)
+                    else if (values < 2000)
                         level = 2;
-                    else if (values < 5)
+                    else if (values < 5000)
                         level = 3;
-                    else if (values > 5)
+                    else if (values >= 5000)
                         level = 4;
                     break;
                 case SPK.SensorHumidity:
@@ -248,6 +274,14 @@
                     else if (values < 40)
                         level = 3;
                     break;
+                case SPK.SensorHcho:
+                    if (values <= 0.08)
+                        level = 1;
+                    else if (values <= 0.1)
+                        level = 2;
+                    else
+                        level = 3;
+                    break;
             }
             return level;
         }
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index dcd6964..016c4aa 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -476,7 +476,14 @@
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\ArmCenter\AddInputPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\ArmCenter\AddOutputPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\ArmCenter\AddOutputSettingPage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\FaceManagement\FaceSettingPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Automation\Security.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Electrical\AirSwitchPage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Entity\Function\AirSwitch.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\FaceManagement\FaceSettingResultPage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\FaceManagement\CustomerObj.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Automation\Security.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)DAL\ThirdPartySdk\HDLLinphone.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="$(MSBuildThisFileDirectory)Entity\Device\" />
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 2061e25..5730447 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -25,7 +25,7 @@
         /// <summary>
         /// 鐗堟湰鍙�
         /// </summary>
-        public static string VersionString = "1.2.0821";
+        public static string VersionString = "1.2.0828";
         ///// <summary>
         ///// 瀹㈡埛绔被鍨�
         ///// </summary>
@@ -107,6 +107,7 @@
             SPK.CurtainRoller,SPK.CurtainSwitch,SPK.CurtainTrietex,
             SPK.AcIr,SPK.AcStandard,
             SPK.FloorHeatStandard,
+            SPK.AirFreshStandard,
 
         };
         /// <summary>
@@ -116,6 +117,8 @@
         {
             SPK.EnergyStandard,
             SPK.MusicStandard,
+            SPK.AirSwitch,
+            SPK.ElectricEnergy,
         };
 
 
@@ -159,7 +162,7 @@
                         //})
                         //{ IsBackground = true }.Start();
                         Common.ApiUtlis.Ins.DownloadData();
-
+                        
                         GoUserPage(false,true);
                     }
                 }
@@ -195,7 +198,7 @@
         /// <param name="isFirstOpen">濡傛灉鏄涓�娆″惎鍔� 妫�娴嬫牎楠屽瘑鐮�</param>
         /// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param>
         public static void GoUserPage(bool downloadData , bool isFirstOpen = false, Action pageShowEvent = null)
-        {
+        {     
             BaseView.RemoveAll();
             #region 鍚庨��浜嬩欢
             BasePageView = new PageLayout();
@@ -328,8 +331,11 @@
                     ///绛夊緟鑾峰彇浣忓畢淇℃伅
                     Application.RunOnMainThread( () =>
                     {
-                        waitPage.Hide();
-                        waitPage.RemoveFromParent();
+                        if (waitPage != null)
+                        {
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
 
                         //璺宠浆椤甸潰----
                         UserBasePage = new UserPage();
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index ffff590..33dacc8 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -513,7 +513,11 @@
                 if (showedTime.AddSeconds(30) > DateTime.Now)
                 {
                     thread.Abort();
-                    waitPage.RemoveFromParent();
+                    if (waitPage != null)
+                    {
+                        waitPage.RemoveFromParent();
+                        waitPage = null;
+                    }
                 }
             };
             thread.Start();
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index c0df69b..b91669f 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -20,6 +20,12 @@
                 //璺宠浆鍒板姛鑳戒俊鎭缃〉闈�
                 switch (function.spk)
                 {
+                    case SPK.AirSwitch:
+                        var airSwitchPage = new AirSwitchPage(function);
+                        MainPage.BasePageView.AddChidren(airSwitchPage);
+                        airSwitchPage.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                        break;
                     case SPK.LightSwitch:
                         var relayView = new RelayPage(function);
                         MainPage.BasePageView.AddChidren(relayView);
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index d7f18f7..1de2e9b 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -162,7 +162,7 @@
         /// </summary>
         /// <param name="frame"></param>
         /// <param name="tilte"></param>
-        public void LoadTopView_FunctionTop(Function function, Action action)
+        public void LoadTopView_FunctionTop(Function function, Action action,bool locationSet = true)
         {
             backAction = action;
 
@@ -186,7 +186,7 @@
             {
                 var infoView = new FunctionBaseInfoSetPage(function, action);
                 MainPage.BasePageView.AddChidren(infoView);
-                infoView.LoadPage();
+                infoView.LoadPage(locationSet);
                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
             };
         }
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index e16d57b..def2395 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -209,11 +209,10 @@
                     //etAccount.Text = "1033326940@qq.com";
                     //etAccount.Text = "18022428438";//wjc
                     //etAccount.Text = "13602944661";//kx
-                    //etAccount.Text = "13226233133";//璞嗚眴
-                    //etAccount.Text = "18316672920";//lcg "18316672920";//hzx;// ""//cf;;
+                    etAccount.Text = "13226233133";//璞嗚眴
+                    etAccount.Text = "18316672920";
                     //etAccount.Text = "18316120654";//tujie
-                    // "15622703419"lwn;// "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568 
-                    etAccount.Text = "15626203746";
+                    //etAccount.Text = "15626203746";
                     //etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
                 }
                 else
@@ -232,12 +231,14 @@
                     //etAccount.Text = "15971583093";//楂樿儨
                     //etAccount.Text = "15217626103";//鏄嗘槑閲戣寕椤圭洰
                     //etAccount.Text = "18598273624";
+                    etAccount.Text = "fslcjm5@163.com";
+                    etAccount.Text = "18824864143";//"464027401@qq.com"; //"2791308028@qq.com";//13697499568 
                 }
                 b = !b;
                 etPassword.Text = "123456";
-                if(etAccount.Text == "15626203746")
+                if(etAccount.Text == "fslcjm5@163.com")
                 {
-                    etPassword.Text = "123456";
+                    etPassword.Text = "a123456";
                 }
                 //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 9b24d88..d48c498 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -537,6 +537,18 @@
 
 
 #if DEBUG
+
+
+            //FunctionList.List.Functions.Add(new Function()
+            //{
+            //    spk = SPK.AirSwitch,
+            //    name = "鏅鸿兘绌哄紑",
+            //    attributes = new List<FunctionAttributes>()
+            //    {
+            //        new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
+            //    },
+            //});
+
             //FunctionList.List.Functions.Add(new Function()
             //{
             //    spk = SPK.AirFreshStandard,
@@ -544,20 +556,20 @@
             //    attributes = new List<FunctionAttributes>()
             //    {
             //        new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" },
-            //        new FunctionAttributes(){ key = "fan",curValue= "on",state = "on" ,value = new List<string>(){ "high","low" } },
+            //        new FunctionAttributes(){ key = "fan",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low" } },
             //    },
             //});
 
-            FunctionList.List.Functions.Add(new Function()
-            {
-                spk = SPK.SensorGas,
-                name = "鐕冩皵浼犳劅鍣�",
-                attributes = new List<FunctionAttributes>()
-                {
-                    new FunctionAttributes(){ key = "enable",curValue= "true",state = "true" ,value = new List<string>(){ "true", "false" } },
-                    new FunctionAttributes(){ key = "status",curValue= "normal",state = "normal" ,value = new List<string>(){ "alarm", "normal" } },
-                },
-            });
+            //FunctionList.List.Functions.Add(new Function()
+            //{
+            //    spk = SPK.SensorGas,
+            //    name = "鐕冩皵浼犳劅鍣�",
+            //    attributes = new List<FunctionAttributes>()
+            //    {
+            //        new FunctionAttributes(){ key = "enable",curValue= "true",state = "true" ,value = new List<string>(){ "true", "false" } },
+            //        new FunctionAttributes(){ key = "status",curValue= "normal",state = "normal" ,value = new List<string>(){ "alarm", "normal" } },
+            //    },
+            //});
 
             //FunctionList.List.Functions.Add(new Function() { spk = SPK.PjtIr, name = "娴嬭瘯鎶曞奖浠�",
             //                            attributes = new List<FunctionAttributes>() {
@@ -683,7 +695,11 @@
                             GetUnreadPushMessages();
                             RegisterGetPushMessageAction();
 
-                            waitPage.Hide();
+                            if (waitPage != null)
+                            {
+                                waitPage.RemoveFromParent();
+                                waitPage = null;
+                            }
                         });
                     }
                     catch (Exception ex) {
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 4a678e3..4922410 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -30,21 +30,38 @@
         /// </summary>
         public static void LoadEvent_RefreshSecurityStatus()
         {
-            Application.RunOnMainThread(() =>
+            try
             {
-                if (bodyView != null)
+                Application.RunOnMainThread(() =>
                 {
-                    //foreach(var temp in FunctionList.List.securities)
-                    //{
-                    //    if(temp.status == "enable")
-                    //    {
-                    //        bodyView.btnSecurityStatus.IsSelected = true;
-                    //        return;
-                    //    }
-                    //}
-                    bodyView.btnSecurityStatus.IsSelected = SecurityCenter.Ins.InDefense;
-                }
-            });
+                    if (bodyView != null)
+                    {
+                        lock (FunctionList.List.securities)
+                        {
+                            foreach (var temp in FunctionList.List.securities)
+                            {
+                                if (temp.status == "enable")
+                                {
+                                    if (temp.alarm)
+                                    {
+                                        bodyView.btnSecurityStatus.SelectedImagePath = "Collection/DefenseAlarmIcon.png";
+                                    }
+                                    else
+                                    {
+                                        bodyView.btnSecurityStatus.SelectedImagePath = "Collection/DefenseStatusIcon.png";
+                                    }
+                                    bodyView.btnSecurityStatus.IsSelected = true;
+                                    return;
+                                }
+                            }
+                        }
+                    }
+                });
+            }
+            catch (Exception ex)
+            {
+                MainPage.Log($"瀹夐槻涓婚〉鏇存柊寮傚父锛歿ex.Message}");
+            }
         }
 
         /// <summary>
@@ -618,12 +635,12 @@
                     {
                         //鏈鐨勬秷鎭垪琛�
                         var unreadList = new List<PushMessageInfo>();
+                       
+                        var pushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<PushMessageInfoList>(result.Data.ToString());
 
-                        var pushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PushMessageInfo>>(result.Data.ToString());
-
-                        if (pushMessageInfoList != null && pushMessageInfoList.Count > 0)
+                        if (pushMessageInfoList != null && pushMessageInfoList.list != null && pushMessageInfoList.list.Count > 0)
                         {
-                            foreach (var info in pushMessageInfoList)
+                            foreach (var info in pushMessageInfoList.list)
                             {
                                 if (!info.isRead)
                                 {
@@ -643,7 +660,7 @@
                             {
                                 Application.RunOnMainThread(() =>
                                 {
-                                    ShowMesBtnState(pushMessageInfoList[0], true);
+                                    ShowMesBtnState(pushMessageInfoList.list[0], true);
                                 });
                             }
                         }
diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
index f00ffbe..eb5f464 100644
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -27,16 +27,17 @@
         /// <summary>
         /// menuView
         /// </summary>
-        FrameLayout menuView;
+        HorizontalScrolViewLayout menuView;//2021-08-27 澧炲姞澶氫簡涓�涓彍鍗曟寜閽墍浠ユ敼涓烘粴鍔ㄦ帶浠�
         MenuButton allMenuButton;
         MenuButton shareMenuButton;
         MenuButton alarmMenuButton;
         MenuButton systemMenuButton;
+        MenuButton propertyMenuButton;//澧炲姞鐗╀笟閫氱煡鎸夐挳
         FrameLayout messageView;
 
         /// <summary>
         /// 鏄剧ず鐨勬秷鎭被鍨�
-        /// 0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅
+        /// 0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅 4鐗╀笟鍏憡
         /// </summary>
         int showMesType = 0;
         /// <summary>
@@ -89,14 +90,21 @@
         void AddTopMenuView()
         {
 
-            menuView = new FrameLayout()
+            menuView = new HorizontalScrolViewLayout()
             {
                 Y = Application.GetRealHeight(64),
                 Height = Application.GetRealWidth(117),
                 BackgroundColor = CSS_Color.MainBackgroundColor,
+                HorizontalScrollBarEnabled = false//闅愯棌婊氬姩鏉�
             };
             bodyView.AddChidren(menuView);
 
+            //宸adding View
+            menuView.AddChidren(new Button()
+            {
+                Width = Application.GetRealWidth(15),
+                BackgroundColor = CSS_Color.viewTranslucence
+            });
 
             #region 鍏ㄩ儴鎸夐挳
             allMenuButton = new MenuButton()
@@ -184,7 +192,31 @@
                 MenuButtonSelect(3);
             };
             systemMenuButton.SelectAction = systemAction;
-#endregion
+            #endregion
+
+            #region 鐗╀笟閫氱煡
+            propertyMenuButton = new MenuButton()
+            {
+                X = systemMenuButton.Right,
+                Y = Application.GetRealWidth(16),
+            };
+            //menuView.AddChidren(propertyMenuButton); //鍏堝睆钄�
+            propertyMenuButton.ImageButton.SelectedImagePath = "Collection/MesCenter/SystemOn.png";
+            propertyMenuButton.ImageButton.UnSelectedImagePath = "Collection/MesCenter/System.png";
+            propertyMenuButton.TextButton.TextID = StringId.SystemMessage;
+            Action propertyAction = () =>
+            {
+                MenuButtonSelect(4);
+            };
+            propertyMenuButton.SelectAction = propertyAction;
+            #endregion
+
+            //鍏堝睆钄�
+            ////鍙硃addingView 
+            //menuView.AddChidren(new Button() {
+            //    Width = Application.GetRealWidth(15),
+            //    BackgroundColor = CSS_Color.viewTranslucence
+            //});
 
         }
 
@@ -214,7 +246,7 @@
         /// <summary>
         /// 
         /// </summary>
-        /// <param name="selectId">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅</param>
+        /// <param name="selectId">0鍏ㄩ儴 1鍒嗕韩涓庡姛鑳� 2鎶ヨ绫� 3绯荤粺淇℃伅 4鐗╀笟閫氱煡</param>
         void MenuButtonSelect(int selectId)
         {
             showMesType = selectId;
@@ -225,6 +257,7 @@
                 shareMenuButton.IsSelected = true;
                 alarmMenuButton.IsSelected = true;
                 systemMenuButton.IsSelected = true;
+                propertyMenuButton.IsSelected = true;
 
             }
             else if (selectId == 1)
@@ -233,6 +266,7 @@
                 shareMenuButton.IsSelected = true;
                 alarmMenuButton.IsSelected = false;
                 systemMenuButton.IsSelected = false;
+                propertyMenuButton.IsSelected = false;
 
             }
             else if (selectId == 2)
@@ -241,6 +275,7 @@
                 shareMenuButton.IsSelected = false;
                 alarmMenuButton.IsSelected = true;
                 systemMenuButton.IsSelected = false;
+                propertyMenuButton.IsSelected = false;
             }
             else if (selectId == 3)
             {
@@ -248,6 +283,16 @@
                 shareMenuButton.IsSelected = false;
                 alarmMenuButton.IsSelected = false;
                 systemMenuButton.IsSelected = true;
+                propertyMenuButton.IsSelected = false;
+
+            }
+            else if (selectId == 4)
+            {
+                allMenuButton.IsSelected = false;
+                shareMenuButton.IsSelected = false;
+                alarmMenuButton.IsSelected = false;
+                systemMenuButton.IsSelected = false;
+                propertyMenuButton.IsSelected = true;
 
             }
 
@@ -494,7 +539,13 @@
                     var result = new HttpServerRequest().PushSerivceGetPushmessagelist(queryType);
                     if (result.Code == StateCode.SUCCESS)
                     {
-                        PushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PushMessageInfo>>(result.Data.ToString());
+                        //PushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PushMessageInfo>>(result.Data.ToString());
+                        //2021-08-28 鏀逛负鍒嗛〉鎺ュ彛
+                        var mPushMesList = Newtonsoft.Json.JsonConvert.DeserializeObject<PushMessageInfoList>(result.Data.ToString());
+                        if(mPushMesList != null) {
+                            PushMessageInfoList = mPushMesList.list;
+                        }
+
                         Application.RunOnMainThread(() =>
                         {
                             if (PushMessageInfoList != null && PushMessageInfoList.Count > 0)
@@ -745,4 +796,14 @@
         public long createTime;
     }
 
+
+    /// <summary>
+    // 鎺ㄩ�佹秷鎭垎椤靛璞�
+    /// </summary>
+    public class PushMessageInfoList : BasePagingObj
+    {
+        public List<PushMessageInfo> list = new List<PushMessageInfo>();
+
+    }
+
 }
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index 7012fba..bf04c98 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -442,8 +442,11 @@
                     {
                         Application.RunOnMainThread(() =>
                         {
-                            waitPage.Hide();
-                            waitPage.RemoveFromParent();
+                            if (waitPage != null)
+                            {
+                                waitPage.RemoveFromParent();
+                                waitPage = null;
+                            }
                         });
                     }
                 })
@@ -488,8 +491,11 @@
                     {
                         Application.RunOnMainThread(() =>
                         {
-                            waitPage.Hide();
-                            waitPage.RemoveFromParent();
+                            if (waitPage != null)
+                            {
+                                waitPage.RemoveFromParent();
+                                waitPage = null;
+                            }
                         });
                     }
                 })
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index 6e4e320..677aeed 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -736,7 +736,6 @@
                       };
                     }
                     break;
-
             }
             return list;
         }
@@ -1072,7 +1071,7 @@
                         {
                             value = "5";
                         }
-                        else if (text == Language.StringByID(StringId.yanzhong) +":>700PPB")
+                        else if (text == Language.StringByID(StringId.yanzhong) + ":>700PPB")
                         {
                             value = "8";
                         }
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 663d170..91a1d58 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -373,7 +373,7 @@
                 btnZone = new Button()
                 {
                     X = Application.GetRealWidth(12),
-                    Y = btnName.Bottom,
+                    Y = Application.GetRealWidth(68+24),
                     Height = Application.GetRealWidth(18),
                     Width = Application.GetRealWidth(113),
                     TextColor = CSS_Color.MainBackgroundColor,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorEnvironment/AddSensorEnvironmentPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorEnvironment/AddSensorEnvironmentPage.cs
index 0d1da43..d60cf22 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorEnvironment/AddSensorEnvironmentPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorEnvironment/AddSensorEnvironmentPage.cs
@@ -177,7 +177,14 @@
                         }
                         finally
                         {
-                            Application.RunOnMainThread(() => { waitPage.Hide(); });
+                            Application.RunOnMainThread(() =>
+                            {
+                                if (waitPage != null)
+                                {
+                                    waitPage.RemoveFromParent();
+                                    waitPage = null;
+                                }
+                            });
                         }
                     })
                     { IsBackground = true }.Start();
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs
index 69f180e..f56f371 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs
@@ -159,7 +159,13 @@
                         }
                         finally
                         {
-                            Application.RunOnMainThread(() => { waitPage.Hide(); });
+                            Application.RunOnMainThread(() => {
+                                if (waitPage != null)
+                                {
+                                    waitPage.RemoveFromParent();
+                                    waitPage = null;
+                                }
+                            });
                         }
                     })
                     { IsBackground = true }.Start();
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
index 8f56b86..b49af1a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
@@ -70,7 +70,14 @@
                 }
                 finally
                 {
-                    Application.RunOnMainThread(() => { waitPage.Hide(); });
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (waitPage != null)
+                        {
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
+                    });
                 }
             })
             { IsBackground = true }.Start();
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
index b73791d..470121b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -91,7 +91,13 @@
                 }
                 finally
                 {
-                    Application.RunOnMainThread(() => { waitPage.Hide(); });
+                    Application.RunOnMainThread(() => {
+                        if (waitPage != null)
+                        {
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
+                    });
                 }
             })
             { IsBackground = true }.Start();
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/CustomerObj.cs b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/CustomerObj.cs
new file mode 100644
index 0000000..1abf318
--- /dev/null
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/CustomerObj.cs
@@ -0,0 +1,97 @@
+锘縰sing System;
+namespace HDL_ON.Entity
+{
+    public class CustomerObj
+    {
+        public CustomerObj()
+        {
+        }
+
+        /// <summary>
+        /// 浣忔埛id
+        /// </summary>
+        public string customerId;
+        /// <summary>
+        /// 浣忔埛鍚嶇О
+        /// </summary>
+        public string customerName;
+        /// <summary>
+        /// 浣忔埛绫诲瀷
+        /// </summary>
+        public int customerType;
+        /// <summary>
+        /// 浣忔埛绫诲瀷涓枃
+        /// </summary>
+        public string customerTypeText;
+        /// <summary>
+        /// 鑻戞湡鍖虹紪鍙�
+        /// </summary>
+        public string groupCode;
+        /// <summary>
+        /// 妤煎耿缂栧彿
+        /// </summary>
+        public string buildingCode;
+        /// <summary>
+        /// 鍗曞厓缂栧彿
+        /// </summary>
+        public string unitCode;
+        /// <summary>
+        /// 妤煎眰鍙�
+        /// </summary>
+        public string floorNum;
+        /// <summary>
+        /// 鎴垮眿缂栧彿
+        /// </summary>
+        public string houseCode;
+        /// <summary>
+        /// 鎴垮眿鍚嶇О
+        /// </summary>
+        public string houseName;
+        /// <summary>
+        /// 浣忔埛鎵嬫満鍙�
+        /// </summary>
+        public string customerPhone;
+        /// <summary>
+        /// 浣忔埛鍒嗘満鍙�
+        /// </summary>
+        public string customerPhoneProfix;
+        /// <summary>
+        /// 浣忔埛鎬у埆
+        /// </summary>
+        public string customerSex;
+        /// <summary>
+        /// 浣忔埛鎬у埆涓枃
+        /// </summary>
+        public string customerSexText;
+        /// <summary>
+        /// 浣忔埛璇佷欢鍙�
+        /// </summary>
+        public string certificateNo;
+        /// <summary>
+        /// 浣忔埛浜鸿劯url
+        /// </summary>
+        public string customerFaceUrl;
+        /// <summary>
+        /// 浣忔埛鍦板潃
+        /// </summary>
+        public string address;
+        /// <summary>
+        /// 浜鸿劯褰曞叆鐘舵��
+        /// 1锛氬綍鍏ョ姸鎬�
+        /// 2锛氫笅鍙戞垚鍔�
+        /// 3锛氫笅鍙戝け璐� 
+        /// </summary>
+        public int faceStatus = 0;
+        /// <summary>
+        /// 浜鸿劯寮�鍚姸鎬�
+        /// 1锛氬紑鍚姸鎬�
+        /// 2锛氬叧闂姸鎬�
+        /// 3锛氭竻闄や汉鑴告暟鎹�
+        /// </summary>
+        public int faceClose = 0;
+
+
+
+
+    }
+}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
index 3285aae..2d86ddd 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs
@@ -1,4 +1,7 @@
 锘縰sing System;
+using System.Threading;
+using HDL_ON.DAL.Server;
+using HDL_ON.Entity;
 using HDL_ON.UI.CSS;
 using Shared;
 
@@ -7,10 +10,44 @@
     public class FacePassagePage : FrameLayout
     {
         FrameLayout bodyView;
+
+        FrameLayout contentView;
+        Button btnCommunityAccessControlIcon;
+
+        Button btnSetFaceId;
+
+        Button btnEraseData;
+
+        #region 鍥炬爣閫夋嫨閮ㄥ垎鍥炬爣
         /// <summary>
-        /// 闈㈠id
+        /// 鑳屾櫙鍥鹃�夐」鍖哄煙
         /// </summary>
-        string faceid = "";
+        FrameLayout pictureOptionView;
+        /// <summary>
+        /// 鑳屾櫙鍥鹃�夐」閫夋嫨鍖哄煙
+        /// </summary>
+        VerticalScrolViewLayout optionView;
+        /// <summary>
+        /// 鎷嶇収鎸夐挳
+        /// </summary>
+        Button btnTakePicture;
+        /// <summary>
+        /// 鐩稿唽鎸夐挳
+        /// </summary>
+        Button btnAlbum;
+        /// <summary>
+        /// 鍙栨秷鎸夐挳
+        /// </summary>
+        Button btnCancel;
+        #endregion
+
+
+
+
+        /// <summary>
+        /// 浣忔埛璇︽儏
+        /// </summary>
+        CustomerObj customerObj = new CustomerObj();
 
         public FacePassagePage()
         {
@@ -23,10 +60,10 @@
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
 
 
-            var contentView = new FrameLayout()
+            contentView = new FrameLayout()
             {
                 Y = Application.GetRealHeight(64),
-                Height = Application.GetRealHeight(667-64),
+                Height = Application.GetRealHeight(667 - 64),
             };
             bodyView.AddChidren(contentView);
 
@@ -59,7 +96,7 @@
             };
             topView.AddChidren(btnText1);
 
-            topView.AddChidren(new Button() { Height = 1,BackgroundColor = CSS_Color.DividingLineColor,Y = Application.GetRealHeight(188) ,X = Application.GetRealWidth(16),Width = Application.GetRealWidth(359)});
+            topView.AddChidren(new Button() { Height = 1, BackgroundColor = CSS_Color.DividingLineColor, Y = Application.GetRealHeight(188), X = Application.GetRealWidth(16), Width = Application.GetRealWidth(359) });
 
             #region 绀惧尯闂ㄧ閫氳
             var communityRow = new FrameLayout()
@@ -82,7 +119,7 @@
             communityRow.AddChidren(btnCommunityTitle);
 
 
-            var btnCommunityAccessControlIcon = new Button()
+            btnCommunityAccessControlIcon = new Button()
             {
                 X = Application.GetRealWidth(314),
                 Gravity = Gravity.CenterVertical,
@@ -93,7 +130,22 @@
             };
             communityRow.AddChidren(btnCommunityAccessControlIcon);
 
+            btnCommunityAccessControlIcon.MouseUpEventHandler = (sender, e) =>
+            {
+                if (customerObj.faceClose == 3)//娌℃湁浜鸿劯鏁版嵁涓嶈兘寮�鍚汉鑴搁�氳鍔熻兘
+                {
+                    return;
+                }
+                btnCommunityAccessControlIcon.IsSelected = !btnCommunityAccessControlIcon.IsSelected;
+                int switchStatus = btnCommunityAccessControlIcon.IsSelected == true ? 1 : 2;
 
+                //鍒锋柊鍥炶皟
+                Action action = () =>
+                {
+                    initButtonStatus();
+                };
+                editFaceInfo(switchStatus, action);
+            };
 
             #endregion
 
@@ -110,7 +162,7 @@
             contentView.AddChidren(btnTip);
 
 
-            var btnSetFaceId = new Button()
+            btnSetFaceId = new Button()
             {
                 Y = Application.GetRealHeight(539),
                 Gravity = Gravity.CenterHorizontal,
@@ -125,32 +177,395 @@
                 IsBold = true,
             };
             contentView.AddChidren(btnSetFaceId);
-
-            if (string.IsNullOrEmpty(faceid))
+            btnSetFaceId.MouseUpEventHandler = (sender, e) =>
             {
-            }
-            else
-            {
-                btnSetFaceId.TextID = StringId.ResetFace;
+                LoadPictureOptionView();
+            };
 
-                var btnEraseData = new Button()
+            btnEraseData = new Button()
+            {
+                Y = Application.GetRealHeight(481),
+                Gravity = Gravity.CenterHorizontal,
+                Width = Application.GetRealWidth(220),
+                Height = Application.GetRealWidth(44),
+                Radius = (uint)Application.GetRealWidth(22),
+                BackgroundColor = CSS_Color.WarningColor,
+                TextID = StringId.EraseData,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                TextColor = CSS_Color.MainBackgroundColor,
+                TextAlignment = TextAlignment.Center,
+                IsBold = true,
+            };
+            btnEraseData.MouseUpEventHandler = (sender, e) =>
+            {
+                Action action = () =>
                 {
-                    Y = Application.GetRealHeight(481),
-                    Gravity = Gravity.CenterHorizontal,
-                    Width = Application.GetRealWidth(220),
-                    Height = Application.GetRealWidth(44),
-                    Radius = (uint)Application.GetRealWidth(22),
-                    BackgroundColor = CSS_Color.WarningColor,
-                    TextID = StringId.EraseData,
-                    TextSize = CSS_FontSize.SubheadingFontSize,
-                    TextColor = CSS_Color.MainBackgroundColor,
-                    TextAlignment = TextAlignment.Center,
-                    IsBold = true,
+                    initButtonStatus();
                 };
-                contentView.AddChidren(btnEraseData);
+                editFaceInfo(3, action);
+            };
+
+            ReadFaceInfo();
+        }
+
+        /// <summary>
+        /// 鑾峰彇浜鸿劯淇℃伅
+        /// </summary>
+        void ReadFaceInfo(bool isLoading = true)
+        {
+            Loading waitPage = null;
+            if (isLoading)
+            {
+                waitPage = new Loading();
+                waitPage.Start();
             }
 
+            new Thread(() =>
+            {
+                try
+                {
+                    var hsr = new HttpServerRequest();
+                    var pack = hsr.GetCustomerInfo();
+                    if (pack != null)
+                    {
+                        if (pack.Code == StateCode.SUCCESS)
+                        {
+                            var cus = Newtonsoft.Json.JsonConvert.DeserializeObject<CustomerObj>(pack.Data.ToString());
+                            if (cus != null)
+                            {
+                                customerObj = cus;
+                                Application.RunOnMainThread(() =>
+                                {
+                                    initButtonStatus();
+                                });
+                            }
+
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    MainPage.Log($"璇诲彇浜鸿劯淇℃伅寮傚父:{ex.Message}");
+                }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (waitPage != null)
+                        {
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
+                    });
+                }
+            })
+            { IsBackground = true }.Start();
+        }
+        /// <summary>
+        /// 娓呴櫎浜鸿劯鏁版嵁
+        /// </summary>
+        void editFaceInfo(int status, Action action)
+        {
+            var waitPage = new Loading();
+            waitPage.Start();
+            new Thread(() =>
+            {
+                try
+                {
+                    var hsr = new HttpServerRequest();
+                    var pack = hsr.EditFaceFunction(status);
+                    if (pack != null)
+                    {
+                        if (pack.Code == StateCode.SUCCESS)
+                        {
+                            customerObj.faceClose = status;
+                        }
+                        else
+                        {
+                            Application.RunOnMainThread(() =>
+                            {
+                                IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+                            });
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    MainPage.Log($"娓呴櫎浜鸿劯淇℃伅寮傚父:{ex.Message}");
+                }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (waitPage != null)
+                        {
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
+                        action?.Invoke();
+                    });
+                }
+            })
+            { IsBackground = true }.Start();
+        }
+
+        /// <summary>
+        /// 鍒濆鍖栧簳閮ㄦ寜閽�
+        /// </summary>
+        void initButtonStatus()
+        {
+            if (customerObj.faceClose == 1 || customerObj.faceClose == 2)//浜鸿劯鏁版嵁宸茬粡瀛樺湪1:浜鸿劯閫氳寮�鍚紱2锛氬叧闂�
+            {
+                if (customerObj.faceStatus == 2)//浜鸿劯鏁版嵁涓嬪彂闂ㄥ彛鏈烘垚鍔�
+                {
+                    btnCommunityAccessControlIcon.IsSelected = customerObj.faceClose == 1;//浜鸿劯閫氳鍔熻兘鏄惁寮�鍚�
+                    contentView.AddChidren(btnEraseData);
+                    btnSetFaceId.TextID = StringId.ResetFace;
+                    return;
+                }
+            }
+            btnCommunityAccessControlIcon.IsSelected = false;
+            btnEraseData.RemoveFromParent();
+            btnSetFaceId.TextID = StringId.SetFace;
+        }
+
+
+
+
+        /// <summary>
+        /// 鍔犺浇鍥炬爣閫夋嫨閫夐」
+        /// </summary>
+        void LoadPictureOptionView()
+        {
+            var pView = new FrameLayout()
+            {
+                BackgroundColor = CSS_Color.DialogTransparentColor1,
+            };
+            bodyView.AddChidren(pView);
+
+            pictureOptionView = new FrameLayout()
+            {
+                Y = Application.GetRealHeight(445 + 50),
+                Height = Application.GetRealHeight(250),
+                AnimateSpeed = 0.3f,
+                Animate = Animate.DownToUp,
+            };
+            pView.AddChidren(pictureOptionView);
+
+            optionView = new VerticalScrolViewLayout()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                Width = Application.GetRealWidth(343),
+                Height = Application.GetRealHeight(100),
+                BackgroundColor = CSS_Color.MainBackgroundColor,
+                Radius = (uint)Application.GetRealWidth(12),
+            };
+            pictureOptionView.AddChidren(optionView);
+
+            btnTakePicture = new Button()
+            {
+                Height = Application.GetRealHeight(50),
+                TextAlignment = TextAlignment.Center,
+                TextColor = CSS_Color.TextualColor,
+                SelectedTextColor = CSS_Color.MainColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                TextID = StringId.TakePicture,
+            };
+            optionView.AddChidren(btnTakePicture);
+
+            optionView.AddChidren(new Button() { Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
+
+            btnAlbum = new Button()
+            {
+                Height = Application.GetRealHeight(50),
+                TextAlignment = TextAlignment.Center,
+                TextColor = CSS_Color.TextualColor,
+                SelectedTextColor = CSS_Color.MainColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                TextID = StringId.Album,
+            };
+            optionView.AddChidren(btnAlbum);
+
+            optionView.AddChidren(new Button() { Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
+
+            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,
+            };
+            pictureOptionView.AddChidren(btnCancel);
+
+
+            LoadEvent_PictureOptionViewEventList(pView);
+        }
+
+        /// <summary>
+        /// 鍔犺浇鑳屾櫙鍥鹃�夋嫨鍖哄煙浜嬩欢鍒楄〃
+        /// </summary>
+        void LoadEvent_PictureOptionViewEventList(FrameLayout pView)
+        {
+            pictureOptionView.MouseUpEventHandler = (sender, e) =>
+            {
+                pictureOptionView.Parent.RemoveFromParent();
+            };
+            pView.MouseUpEventHandler = (sender, e) =>
+            {
+                pictureOptionView.Parent.RemoveFromParent();
+            };
+
+            btnCancel.MouseUpEventHandler = (sender, e) =>
+            {
+                pictureOptionView.Parent.RemoveFromParent();
+            };
+            btnTakePicture.MouseDownEventHandler = (sender, e) =>
+            {
+                btnTakePicture.IsSelected = true;
+            };
+            btnTakePicture.MouseUpEventHandler = (sender, e) =>
+            {
+                btnTakePicture.IsSelected = false;
+                var imageName = Guid.NewGuid().ToString();
+                CropImage.TakePicture((imagePath) =>
+                {
+                    CropImageCallBack(imagePath, 1, imageName);
+                }, imageName, 4, 6, 400);
+
+                pictureOptionView.Parent.RemoveFromParent();
+            };
+            btnAlbum.MouseDownEventHandler = (sender, e) =>
+            {
+                btnAlbum.IsSelected = true;
+            };
+
+            btnAlbum.MouseUpEventHandler = (sender, e) =>
+            {
+                btnAlbum.IsSelected = false;
+                //浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
+                var imageName = Guid.NewGuid().ToString();
+                //var imageName = scene.sid;
+                CropImage.SelectPicture((imagePath) =>
+                {
+                    CropImageCallBack(imagePath, 2, imageName);
+                }, imageName, 4, 6, 400);//OutputYSize鐩墠浠呭Android鏈変簺 400浠h〃Y鐨勬渶澶氬垎杈ㄧ巼锛屾墍浠ユ渶缁堝緱鍒板浘鐗囩殑鍒嗚鲸鐜囦负锛�266*400
+
+                pictureOptionView.Parent.RemoveFromParent();
+            };
 
         }
+
+
+        /// <summary>
+        /// 瑁佸壀瀹岀収鐗囧洖璋冿紝缁熶竴澶勭悊
+        /// </summary>
+        /// <param name="imagePath">瑁佸壀鍚庣殑鐪熷疄璺緞</param>
+        /// <param name="imageSource">鐓х墖鏉ユ簮锛�1锛氭媿鐓э紱2锛氬浘搴�</param>
+        void CropImageCallBack(string selectImagePath, int imageSource, string imageName)
+        {
+            if (string.IsNullOrEmpty(selectImagePath) == true)
+            {
+                return;
+            }
+            //涓婁紶鎴愬姛鍒板洖璋�
+            Action<bool> uploadSuccessAction = (isSuccess) =>
+            {
+                //鐐瑰嚮閲嶆柊褰曞叆浜嬩欢
+                Action action = () =>
+                {
+                    if (!isSuccess)
+                    {
+                        if (imageSource == 1)
+                        {
+                            CropImage.TakePicture((imagePath) =>
+                            {
+                                CropImageCallBack(imagePath, 2, imageName);
+                            }, imageName, 4, 6, 400);
+                        }
+                        else
+                        {
+                            CropImage.SelectPicture((imagePath) =>
+                            {
+                                CropImageCallBack(imagePath, 1, imageName);
+                            }, imageName, 4, 6, 400);
+                        }
+                    }
+                };
+
+                if (isSuccess)
+                {
+                    ReadFaceInfo(false);
+                }
+
+                Application.RunOnMainThread(() =>
+                {
+                    var page = new FaceSettingResultPage(action);
+                    MainPage.BasePageView.AddChidren(page);
+                    page.LoadPage(isSuccess);
+                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                });
+            };
+            //涓婁紶鍥剧墖鍒颁簯绔�
+            UploadImage(selectImagePath, uploadSuccessAction);
+        }
+
+        /// <summary>
+        /// 涓婁紶鍥剧墖鏂规硶
+        /// </summary>
+        /// <param name="selectImagePath">瑁佸壀鍚庣殑鍥剧墖璺緞</param>
+        /// <param name="imageView"></param>
+        /// <param name="uploadResultAction"></param>
+        void UploadImage(string selectImagePath, Action<bool> uploadResultAction)
+        {
+            try
+            {
+                //1.璇诲彇瑁佸壀鍚庣殑鍥剧墖锛岀劧鍚庡垹闄�
+                var imageBytes = Shared.IO.FileUtils.ReadFile(selectImagePath);
+                System.IO.File.Delete(selectImagePath);
+
+                var waitPage = new Loading();
+                bodyView.AddChidren(waitPage);
+                waitPage.Start(Language.StringByID(StringId.PleaseWait));
+                //寮�濮嬩笂浼�
+                new Thread(() =>
+                {
+                    try
+                    {
+                        string base64string = Convert.ToBase64String(imageBytes);
+                        var pack = new HttpServerRequest().FaceSetting(base64string);
+                        if (pack != null)
+                        {
+                            Utlis.WriteLine("涓婁紶缁撴灉锛�" + pack.message);
+                            uploadResultAction?.Invoke(pack.Code == StateCode.SUCCESS);
+                        }
+
+                    }
+                    catch (Exception ex)
+                    {
+                    }
+                    finally
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            if (waitPage != null)
+                            {
+                                waitPage.RemoveFromParent();
+                                waitPage = null;
+                            }
+                        });
+                    }
+                })
+                { IsBackground = true }.Start();
+            }
+            catch { }
+        }
+
+
     }
+
 }
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingPage.cs
new file mode 100644
index 0000000..9987878
--- /dev/null
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingPage.cs
@@ -0,0 +1,197 @@
+锘�//using System;
+//using HDL_ON.UI.CSS;
+//using Shared;
+//namespace HDL_ON.UI
+//{
+//    public class FaceSettingPage : FrameLayout
+//    {
+//        FrameLayout bodyView;
+
+//        #region 鍥炬爣閫夋嫨閮ㄥ垎鍥炬爣
+//        /// <summary>
+//        /// 鑳屾櫙鍥鹃�夐」鍖哄煙
+//        /// </summary>
+//        FrameLayout pictureOptionView;
+//        /// <summary>
+//        /// 鑳屾櫙鍥鹃�夐」閫夋嫨鍖哄煙
+//        /// </summary>
+//        VerticalScrolViewLayout optionView;
+//        /// <summary>
+//        /// 鎷嶇収鎸夐挳
+//        /// </summary>
+//        Button btnTakePicture;
+//        /// <summary>
+//        /// 鐩稿唽鎸夐挳
+//        /// </summary>
+//        Button btnAlbum;
+//        /// <summary>
+//        /// 鍙栨秷鎸夐挳
+//        /// </summary>
+//        Button btnCancel;
+//        #endregion
+
+//        public FaceSettingPage()
+//        {
+//            bodyView = this;
+//        }
+
+//        public void LoadPage()
+//        {
+//            new TopViewDiv(bodyView, Language.StringByID(StringId.FacePassage)).LoadTopView();
+//            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
+
+//            var contentView = new FrameLayout()
+//            {
+//                Y = Application.GetRealHeight(64),
+//                Height = Application.GetRealHeight(667 - 64),
+//                BackgroundColor = 0xFFFFFFFF,
+//            };
+//            bodyView.AddChidren(contentView);
+
+
+//            var imageName = Guid.NewGuid().ToString();
+//            CropImage.TakePicture((imagePath) =>
+//            {
+
+//            }, imageName, 4, 3);
+
+
+//        }
+
+
+
+        
+//        /// <summary>
+//        /// 鍔犺浇鍥炬爣閫夋嫨閫夐」
+//        /// </summary>
+//        void LoadPictureOptionView()
+//        {
+//            var pView = new FrameLayout()
+//            {
+//                BackgroundColor = CSS_Color.DialogTransparentColor1,
+//            };
+//            bodyView.AddChidren(pView);
+
+//            pictureOptionView = new FrameLayout()
+//            {
+//                Y = Application.GetRealHeight(445),
+//                Height = Application.GetRealHeight(250),
+//                AnimateSpeed = 0.3f,
+//                Animate = Animate.DownToUp,
+//            };
+//            pView.AddChidren(pictureOptionView);
+
+//            optionView = new VerticalScrolViewLayout()
+//            {
+//                Gravity = Gravity.CenterHorizontal,
+//                Width = Application.GetRealWidth(343),
+//                Height = Application.GetRealHeight(150),
+//                BackgroundColor = CSS_Color.MainBackgroundColor,
+//                Radius = (uint)Application.GetRealWidth(12),
+//            };
+//            pictureOptionView.AddChidren(optionView);
+
+//            btnTakePicture = new Button()
+//            {
+//                Height = Application.GetRealHeight(50),
+//                TextAlignment = TextAlignment.Center,
+//                TextColor = CSS_Color.TextualColor,
+//                SelectedTextColor = CSS_Color.MainColor,
+//                TextSize = CSS_FontSize.SubheadingFontSize,
+//                TextID = StringId.TakePicture,
+//            };
+//            optionView.AddChidren(btnTakePicture);
+
+//            optionView.AddChidren(new Button() { Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
+
+//            btnAlbum = new Button()
+//            {
+//                Height = Application.GetRealHeight(50),
+//                TextAlignment = TextAlignment.Center,
+//                TextColor = CSS_Color.TextualColor,
+//                SelectedTextColor = CSS_Color.MainColor,
+//                TextSize = CSS_FontSize.SubheadingFontSize,
+//                TextID = StringId.Album,
+//            };
+//            optionView.AddChidren(btnAlbum);
+
+//            optionView.AddChidren(new Button() { Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
+
+//            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,
+//            };
+//            pictureOptionView.AddChidren(btnCancel);
+
+
+//            LoadEvent_PictureOptionViewEventList(pView);
+//        }
+
+//        /// <summary>
+//        /// 鍔犺浇鑳屾櫙鍥鹃�夋嫨鍖哄煙浜嬩欢鍒楄〃
+//        /// </summary>
+//        void LoadEvent_PictureOptionViewEventList(FrameLayout pView)
+//        {
+//            pictureOptionView.MouseUpEventHandler = (sender, e) =>
+//            {
+//                pictureOptionView.Parent.RemoveFromParent();
+//            };
+//            pView.MouseUpEventHandler = (sender, e) =>
+//            {
+//                pictureOptionView.Parent.RemoveFromParent();
+//            };
+
+//            btnCancel.MouseUpEventHandler = (sender, e) =>
+//            {
+//                pictureOptionView.Parent.RemoveFromParent();
+//            };
+//            btnTakePicture.MouseDownEventHandler = (sender, e) => {
+//                btnTakePicture.IsSelected = true;
+//            };
+//            btnTakePicture.MouseUpEventHandler = (sender, e) =>
+//            {
+//                btnTakePicture.IsSelected = false;
+//                var imageName = Guid.NewGuid().ToString();
+//                //var imageName = scene.sid;
+//                CropImage.TakePicture((imagePath) =>
+//                {
+//                    CropImageCallBack(imagePath);
+
+//                }, imageName, 4, 3);
+
+//                //if (pageTitleId == StringId.EditScene)
+//                //{
+//                //    scene.SaveFunctionData();
+//                //}
+//                pictureOptionView.Parent.RemoveFromParent();
+//            };
+//            btnAlbum.MouseDownEventHandler = (sender, e) => {
+//                btnAlbum.IsSelected = true;
+//            };
+
+//            btnAlbum.MouseUpEventHandler = (sender, e) =>
+//            {
+//                btnAlbum.IsSelected = false;
+//                //浠庣浉鍐岄�夋嫨鍥剧墖瑁佸壀
+//                var imageName = Guid.NewGuid().ToString();
+//                //var imageName = scene.sid;
+//                CropImage.SelectPicture((imagePath) =>
+//                {
+//                    //CropImageCallBack(imagePath);
+//                }, imageName, 4, 3);
+
+//                pictureOptionView.Parent.RemoveFromParent();
+//            };
+
+//        }
+
+//    }
+//}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingResultPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingResultPage.cs
new file mode 100644
index 0000000..c9645e4
--- /dev/null
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingResultPage.cs
@@ -0,0 +1,97 @@
+锘縰sing System;
+using HDL_ON.UI.CSS;
+using Shared;
+namespace HDL_ON.UI
+{
+    public class FaceSettingResultPage : FrameLayout
+    {
+        FrameLayout bodyView;
+
+        Action backAction;
+        public FaceSettingResultPage(Action action)
+        {
+            bodyView = this;
+            backAction = action;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="isSuccess">鏄惁鎴愬姛</param>
+        public void LoadPage(bool isSuccess)
+        {
+            new TopViewDiv(bodyView, Language.StringByID(StringId.FacePassage)).LoadTopView();
+            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
+
+
+            var contentView = new FrameLayout()
+            {
+                Y = Application.GetRealHeight(64),
+                Height = Application.GetRealHeight(667 - 64),
+            };
+            bodyView.AddChidren(contentView);
+
+
+
+            var btnResultIcon = new Button()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                Y = Application.GetRealHeight(99),
+                Width = Application.GetRealWidth(100),
+                Height = Application.GetRealWidth(100),
+                UnSelectedImagePath = "PersonalCenter/FacePassage/FailIcon.png",
+                SelectedImagePath = "PersonalCenter/FacePassage/TrueIcon.png",
+                IsSelected = isSuccess,
+            };
+            contentView.AddChidren(btnResultIcon);
+
+            Button btnResultText = new Button()
+            {
+                Y = Application.GetRealHeight(240),
+                Height = Application.GetRealHeight(40),
+                TextAlignment = TextAlignment.Center,
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+            };
+            contentView.AddChidren(btnResultText);
+
+            if(isSuccess)
+            {
+                btnResultText.TextID = StringId.FaceInputSucceeded;
+            }
+            else
+            {
+                btnResultText.TextID = StringId.FaceInputFailed;
+            }
+
+            var btnSetFaceId = new Button()
+            {
+                Y = Application.GetRealHeight(539),
+                Gravity = Gravity.CenterHorizontal,
+                Width = Application.GetRealWidth(220),
+                Height = Application.GetRealWidth(44),
+                Radius = (uint)Application.GetRealWidth(22),
+                BackgroundColor = CSS_Color.MainColor,
+                TextID = isSuccess ? StringId.Complete :StringId.Retry,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                TextColor = CSS_Color.MainBackgroundColor,
+                TextAlignment = TextAlignment.Center,
+                IsBold = true,
+            };
+            contentView.AddChidren(btnSetFaceId);
+
+            btnSetFaceId.MouseUpEventHandler = (sender, e) => {
+                if (isSuccess)
+                {
+                    this.RemoveFromParent();
+                }
+                else
+                {
+                    backAction?.Invoke();
+                    this.RemoveFromParent();
+                }
+            };
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 2c0a039..8ad95c4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -84,7 +84,6 @@
         /// 鍖哄煙鎴愬憳灏忓尯鍩熸枃鏈�
         /// </summary>
         Button btnResidenceMemberText;
-        #region F3闃舵
         /// <summary>
         /// 鍖哄煙瀹夋斁灏忓尯鍩�
         /// </summary>
@@ -121,9 +120,7 @@
         /// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熸枃鏈�
         /// </summary>
         Button btnResidenceAddFunctionText;
-        #endregion
 
-        #region F3闃舵
         ///// <summary>
         ///// 杞欢璁剧疆鍖哄煙
         ///// </summary>
@@ -155,7 +152,6 @@
         /// </summary>
         Button btnSmartSpeakerText;
 
-        #endregion
 
         public PersonalCenterPage()
         {
@@ -478,7 +474,6 @@
                     residenceArmView.AddChidren(btnResidenceArmText);
                     #endregion
                 }
-                #region F3闃舵
 
                 #region ---鏁版嵁澶囦唤鍖哄煙
                 //residenceDataBackupView = new FrameLayout()
@@ -541,37 +536,39 @@
                 //residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionText);
                 #endregion
 
-                #region ---娣诲姞鍔熻兘鍖哄煙
-                residenceAddFunctionView = new FrameLayout()
+                if (DB_ResidenceData.Instance.GatewayType == 1)
                 {
-                    //X = residenceMemberView.Right,
-                    X = Application.GetRealWidth(28 - 24),
-                    Y = residenceManageView.Bottom,
-                    Width = Application.GetRealWidth(64 + 48),
-                    Height = Application.GetRealWidth(64),
-                };
-                residenceInfoView.AddChidren(residenceAddFunctionView);
-                btnResidenceAddFunctionIcon = new Button
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    Y = Application.GetRealHeight(5),
-                    Width = Application.GetMinRealAverage(30),
-                    Height = Application.GetMinRealAverage(30),
-                    UnSelectedImagePath = "PersonalCenter/AddFunctionIcon.png",
-                };
-                residenceAddFunctionView.AddChidren(btnResidenceAddFunctionIcon);
-                btnResidenceAddFunctionText = new Button()
-                {
-                    Y = btnResidenceManageIcon.Bottom,
-                    Height = Application.GetRealHeight(29),
-                    TextID = StringId.AddFunction,
-                    TextAlignment = TextAlignment.Center,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel
-                };
-                residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
-                #endregion
-                #endregion
+                    #region ---娣诲姞鍔熻兘鍖哄煙
+                    residenceAddFunctionView = new FrameLayout()
+                    {
+                        //X = residenceMemberView.Right,
+                        X = Application.GetRealWidth(28 - 24),
+                        Y = residenceManageView.Bottom,
+                        Width = Application.GetRealWidth(64 + 48),
+                        Height = Application.GetRealWidth(64),
+                    };
+                    residenceInfoView.AddChidren(residenceAddFunctionView);
+                    btnResidenceAddFunctionIcon = new Button
+                    {
+                        Gravity = Gravity.CenterHorizontal,
+                        Y = Application.GetRealHeight(5),
+                        Width = Application.GetMinRealAverage(30),
+                        Height = Application.GetMinRealAverage(30),
+                        UnSelectedImagePath = "PersonalCenter/AddFunctionIcon.png",
+                    };
+                    residenceAddFunctionView.AddChidren(btnResidenceAddFunctionIcon);
+                    btnResidenceAddFunctionText = new Button()
+                    {
+                        Y = btnResidenceManageIcon.Bottom,
+                        Height = Application.GetRealHeight(29),
+                        TextID = StringId.AddFunction,
+                        TextAlignment = TextAlignment.Center,
+                        TextColor = CSS_Color.FirstLevelTitleColor,
+                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+                    };
+                    residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
+                    #endregion
+                }
             }
             else
             {
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index dad9f45..8bd3b10 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -40,12 +40,23 @@
             if (btnResidenceArmIcon != null)
             {
                 btnResidenceArmIcon.IsSelected = false;
-                foreach (var temp in FunctionList.List.securities)
+                lock (FunctionList.List.securities)
                 {
-                    if (temp.status == "enable")
+                    foreach (var temp in FunctionList.List.securities)
                     {
-                        btnResidenceArmIcon.IsSelected = true;
-                        break;
+                        if (temp.status == "enable")
+                        {
+                            if (temp.alarm)
+                            {
+                                btnResidenceArmIcon.SelectedImagePath = "PersonalCenter/ResidenceInAlarmIcon.png";
+                            }
+                            else
+                            {
+                                btnResidenceArmIcon.SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png";
+                            }
+                            btnResidenceArmIcon.IsSelected = true;
+                            break;
+                        }
                     }
                 }
                 btnResidenceArmIcon.MouseUpEventHandler = (sender, e) =>
@@ -308,15 +319,22 @@
         #region 娣诲姞璁惧
         void LoadEvent_SkipbtnAddFunctionPage()
         {
-            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+            if (DB_ResidenceData.Instance.GatewayType == 1)
             {
-                var page = new BrandListPage();
-                MainPage.BasePageView.AddChidren(page);
-                page.LoadPage();
-                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-            };
-            btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler;
-            btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler;
+                try
+                {
+                    EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+                    {
+                        var page = new BrandListPage();
+                        MainPage.BasePageView.AddChidren(page);
+                        page.LoadPage();
+                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                    };
+                    btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler;
+                    btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler;
+                }
+                catch { }
+            }
         }
         #endregion
 
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index 8c65a3e..e7f2bb5 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -259,11 +259,17 @@
             /// </summary>
             optionListView = new VerticalScrolViewLayout()
             {
-                Height = Application.GetRealHeight(51 * (6+1)),
+                Height = Application.GetRealHeight(51 * 6),
                 BackgroundColor = CSS_Color.MainBackgroundColor,
                 ScrollEnabled = false,
             };
             bodyScrolView.AddChidren(optionListView);
+
+            if(Entity.DB_ResidenceData.Instance.SupportFacePass)
+            {
+                optionListView.Height = Application.GetRealHeight(51 * (6 + 1));
+            }
+
             #region 涓汉閫夐」-鍚嶅瓧鍖哄煙
             /// <summary>
             /// 涓汉閫夐」-鍚嶅瓧鍖哄煙
@@ -563,46 +569,46 @@
             optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
             #endregion
 
-
-            #region 涓汉閫夐」-浜鸿劯閫氳绠$悊
-            faceManagementView = new FrameLayout()
+            if (Entity.DB_ResidenceData.Instance.SupportFacePass)
             {
-                Height = Application.GetRealHeight(50),
-            };
-            optionListView.AddChidren(faceManagementView);
+                #region 涓汉閫夐」-浜鸿劯閫氳绠$悊
+                faceManagementView = new FrameLayout()
+                {
+                    Height = Application.GetRealHeight(50),
+                };
+                optionListView.AddChidren(faceManagementView);
 
-            var btnFaceManagementRight = new Button()
-            {
-                X = Application.GetRealWidth(339),
-                Gravity = Gravity.CenterVertical,
-                Width = Application.GetMinRealAverage(16),
-                Height = Application.GetMinRealAverage(16),
-                UnSelectedImagePath = "Public/Right.png",
-            };
-            faceManagementView.AddChidren(btnFaceManagementRight);
+                var btnFaceManagementRight = new Button()
+                {
+                    X = Application.GetRealWidth(339),
+                    Gravity = Gravity.CenterVertical,
+                    Width = Application.GetMinRealAverage(16),
+                    Height = Application.GetMinRealAverage(16),
+                    UnSelectedImagePath = "Public/Right.png",
+                };
+                faceManagementView.AddChidren(btnFaceManagementRight);
 
-            btnFaceManagementText = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextID = StringId.FacePassageSetting,
-            };
-            faceManagementView.AddChidren(btnFaceManagementText);
+                btnFaceManagementText = new Button()
+                {
+                    X = Application.GetRealWidth(16),
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextColor = CSS_Color.FirstLevelTitleColor,
+                    TextSize = CSS_FontSize.SubheadingFontSize,
+                    TextID = StringId.FacePassageSetting,
+                };
+                faceManagementView.AddChidren(btnFaceManagementText);
 
-            btnFaceManagementText.MouseUpEventHandler = (sender, e) =>
-            {
-                var page = new FacePassagePage();
-                MainPage.BasePageView.AddChidren(page);
-                page.LoadPage();
-                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                
-            };
+                btnFaceManagementText.MouseUpEventHandler = (sender, e) =>
+                {
+                    var page = new FacePassagePage();
+                    MainPage.BasePageView.AddChidren(page);
+                    page.LoadPage();
+                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                };
 
-            #endregion
+                #endregion
 
-
+            }
 
             #endregion
 
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs
index 601ccd4..5e20a72 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs
@@ -486,7 +486,11 @@
                     {
                         Application.RunOnMainThread(() =>
                         {
-                            waitPage.Hide();
+                            if (waitPage != null)
+                            {
+                                waitPage.RemoveFromParent();
+                                waitPage = null;
+                            }
                         });
                     }
                 })
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/RoomBinglingFloorPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/RoomBinglingFloorPage.cs
index 48f2341..312e8f1 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/RoomBinglingFloorPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/RoomBinglingFloorPage.cs
@@ -110,8 +110,11 @@
                 finally
                 {
                     Application.RunOnMainThread(() => {
-                        waitPage.Hide();
-                        waitPage.RemoveFromParent();
+                        if (waitPage != null)
+                        {
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
                         int count = SpatialInfo.CurrentSpatial.FloorList.Count > 10 ? 10 : SpatialInfo.CurrentSpatial.FloorList.Count;
                         floorsListView.Height = Application.GetRealHeight(50 * count);
                         contentView.Height = Application.GetRealHeight(50 * (count + 1));
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs
index 6da1bf5..15ceafd 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs
@@ -151,8 +151,11 @@
                     finally
                     {
                         Application.RunOnMainThread(() => {
-                            waitPage.Hide();
-                            waitPage.RemoveFromParent();
+                            if (waitPage != null)
+                            {
+                                waitPage.RemoveFromParent();
+                                waitPage = null;
+                            }
                         });
                     }
                 })
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
index 3ab1bf7..558cb68 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
@@ -59,8 +59,11 @@
                             finally
                             {
                                 Application.RunOnMainThread(() => {
-                                    waitPage.Hide();
-                                    waitPage.RemoveFromParent();
+                                    if (waitPage != null)
+                                    {
+                                        waitPage.RemoveFromParent();
+                                        waitPage = null;
+                                    }
                                 });
                             }
                         })
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
index 25a6f44..6ac07bb 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
@@ -63,8 +63,11 @@
                         {
                             Application.RunOnMainThread(() =>
                             {
-                                waitPage.Hide();
-                                waitPage.RemoveFromParent();
+                                if (waitPage != null)
+                                {
+                                    waitPage.RemoveFromParent();
+                                    waitPage = null;
+                                }
                             });
                         }
                     })
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
index b2d0460..e6f08bd 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs
@@ -66,19 +66,21 @@
             fanSpeedList = device.GetAttribute(FunctionAttributeKey.FanSpeed).value;
             btnFan.MouseUpEventHandler += (sender, e) =>
             {
-                if( !btnSwitch.IsSelected){return;}
-                var curFanSpeedIndex = fanSpeedList.IndexOf(device.GetAttrState(FunctionAttributeKey.FanSpeed));
-                var sendFanSpeedIndex = curFanSpeedIndex == fanSpeedList.Count - 1 ? 0 : 1+curFanSpeedIndex;
+                ShowFanSelectView();
+                //return;
+                //if ( !btnSwitch.IsSelected){return;}
+                //var curFanSpeedIndex = fanSpeedList.IndexOf(device.GetAttrState(FunctionAttributeKey.FanSpeed));
+                //var sendFanSpeedIndex = curFanSpeedIndex == fanSpeedList.Count - 1 ? 0 : 1+curFanSpeedIndex;
 
-                device.SetAttrState(FunctionAttributeKey.FanSpeed, fanSpeedList[sendFanSpeedIndex]);
-                new System.Threading.Thread(() =>
-                {
-                    Dictionary<string, string> d = new Dictionary<string, string>();
-                    d.Add(FunctionAttributeKey.FanSpeed, fanSpeedList[sendFanSpeedIndex]);
-                    Control.Ins.SendWriteCommand(device, d);
-                })
-                { IsBackground = true }.Start();
-                RefreshFanSpeed();
+                //device.SetAttrState(FunctionAttributeKey.FanSpeed, fanSpeedList[sendFanSpeedIndex]);
+                //new System.Threading.Thread(() =>
+                //{
+                //    Dictionary<string, string> d = new Dictionary<string, string>();
+                //    d.Add(FunctionAttributeKey.FanSpeed, fanSpeedList[sendFanSpeedIndex]);
+                //    Control.Ins.SendWriteCommand(device, d);
+                //})
+                //{ IsBackground = true }.Start();
+                //RefreshFanSpeed();
             };
             //椋庨�熸枃鏈�
             this.btnFanView = new NormalViewControl(this.FrameWhiteCentet1.Width / 3, Application.GetRealHeight(18), false);
@@ -140,40 +142,107 @@
             };
             frameBack.Show();
 
+            var fanAttr = device.GetAttribute(FunctionAttributeKey.FanSpeed);
+            if(fanAttr == null)
+            {
+                return;
+            }
+            var valueCount = fanAttr.value.Count;
+
             //鑿滃崟鎺т欢(椋庨��)
-            var menuContr = new DialogTitleMenuControl(3, Language.StringByID(StringId.FanSpeed));
-            menuContr.X = Application.GetRealWidth(209);
+            var menuContr = new DialogTitleMenuControl(valueCount, Language.StringByID(StringId.FanSpeed));
+            //menuContr.X = Application.GetRealWidth(209);
+            menuContr.Gravity = Gravity.CenterHorizontal;
             menuContr.Y = Application.GetRealHeight(231);
             menuContr.Width = Application.GetRealWidth(160);
-            menuContr.Height = Application.GetRealHeight(199);
+            if (valueCount > 2)
+            {
+                menuContr.Height = Application.GetRealHeight(199);
+            }
+            else
+            {
+                menuContr.Height = Application.GetRealHeight(154);
+            }
             dialogBody.AddChidren(menuContr);
 
-            //1妗�
-            var iconPath = this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "low" ? "FunctionIcon/AirFresh/Fan1Select.png" : "FunctionIcon/AirFresh/Fan1.png";
-            menuContr.AddRowMenu(Language.StringByID(StringId.FanOneGear), iconPath, this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "low", () =>
+            foreach(var fanAttrValue in fanAttr.value)
             {
-                frameBack.Close();
-                //鍙戦�佹。浣嶅懡浠�
-                this.SendOtherComand(this.btnFan, FunctionAttributeKey.FanSpeed, "low");
-            });
+                bool isSelecte = false;
+                var iconPath = "FunctionIcon/AirFresh/Fan1.png";
+                string text = Language.StringByID(StringId.FanOneGear);
+                if (fanAttrValue == "low" || fanAttrValue == "level_1")
+                {
+                    text = Language.StringByID(StringId.LowWindSpeed);
+                    if (this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "low"|| this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "level_1")
+                    {
+                        iconPath = "FunctionIcon/AirFresh/Fan1Select.png";
+                        isSelecte = true;
+                    }
+                }
+                else if (fanAttrValue == "medium" || fanAttrValue == "level_2")
+                {
+                    text = Language.StringByID(StringId.MiddleWindSpeed);
+                    iconPath = "FunctionIcon/AirFresh/Fan2.png";
+                    if (this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "medium" || this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "level_2")
+                    {
+                        iconPath = "FunctionIcon/AirFresh/Fan2Select.png";
+                        isSelecte = true;
+                    }
+                }
+                else if (fanAttrValue == "high" || fanAttrValue == "level_3")
+                {
+                    text = Language.StringByID(StringId.HighWindSpeed);
+                    iconPath = "FunctionIcon/AirFresh/Fan3.png";
+                    if (this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "high" || this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "level_3")
+                    {
+                        iconPath = "FunctionIcon/AirFresh/Fan3Select.png";
+                        isSelecte = true;
+                    }
+                }
 
-            //2妗�
-            iconPath = this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "medium" ? "FunctionIcon/AirFresh/Fan2Select.png" : "FunctionIcon/AirFresh/Fan2.png";
-            menuContr.AddRowMenu(Language.StringByID(StringId.FanTwoGear), iconPath, this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "medium", () =>
-            {
-                frameBack.Close();
-                //鍙戦�佹。浣嶅懡浠�
-                this.SendOtherComand(this.btnFan, FunctionAttributeKey.FanSpeed, "medium");
-            });
+                menuContr.AddRowMenu(text, iconPath, isSelecte, () =>
+                {
+                    frameBack.Close();
+                    //鍙戦�佹。浣嶅懡浠�
+                    this.SendOtherComand(this.btnFan, FunctionAttributeKey.FanSpeed, fanAttrValue);
+                });
+            }
 
-            //3妗�
-            iconPath = this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "high" ? "FunctionIcon/AirFresh/Fan3Select.png" : "FunctionIcon/AirFresh/Fan3.png";
-            menuContr.AddRowMenu(Language.StringByID(StringId.FanThreeGear), iconPath, this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "high", () =>
-            {
-                frameBack.Close();
-                //鍙戦�佹。浣嶅懡浠�
-                this.SendOtherComand(this.btnFan, FunctionAttributeKey.FanSpeed, "high");
-            });
+            //if (fanAttr.value.Contains("low"))
+            //{
+            //    //1妗�
+            //    var iconPath = this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "low" ? "FunctionIcon/AirFresh/Fan1Select.png" : "FunctionIcon/AirFresh/Fan1.png";
+            //    menuContr.AddRowMenu(Language.StringByID(StringId.FanOneGear), iconPath, this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "low", () =>
+            //    {
+            //        frameBack.Close();
+            //        //鍙戦�佹。浣嶅懡浠�
+            //        this.SendOtherComand(this.btnFan, FunctionAttributeKey.FanSpeed, "low");
+            //    });
+            //}
+
+            //if (fanAttr.value.Contains("medium"))
+            //{
+            //    //2妗�
+            //    var iconPath = this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "medium" ? "FunctionIcon/AirFresh/Fan2Select.png" : "FunctionIcon/AirFresh/Fan2.png";
+            //    menuContr.AddRowMenu(Language.StringByID(StringId.FanTwoGear), iconPath, this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "medium", () =>
+            //    {
+            //        frameBack.Close();
+            //        //鍙戦�佹。浣嶅懡浠�
+            //        this.SendOtherComand(this.btnFan, FunctionAttributeKey.FanSpeed, "medium");
+            //    });
+            //}
+
+            //if (fanAttr.value.Contains("high"))
+            //{
+            //    //3妗�
+            //    var iconPath = this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "high" ? "FunctionIcon/AirFresh/Fan3Select.png" : "FunctionIcon/AirFresh/Fan3.png";
+            //    menuContr.AddRowMenu(Language.StringByID(StringId.FanThreeGear), iconPath, this.device.GetAttrState(FunctionAttributeKey.FanSpeed) == "high", () =>
+            //    {
+            //        frameBack.Close();
+            //        //鍙戦�佹。浣嶅懡浠�
+            //        this.SendOtherComand(this.btnFan, FunctionAttributeKey.FanSpeed, "high");
+            //    });
+            //}
         }
 
         #endregion
@@ -300,5 +369,8 @@
 
         #endregion
 
+
+
+
     }
 }
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs
index 8d15c4e..eac2055 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs
@@ -249,7 +249,11 @@
                     finally
                     {
                         Application.RunOnMainThread(() => {
-                            waitPage.Hide();
+                            if (waitPage != null)
+                            {
+                                waitPage.RemoveFromParent();
+                                waitPage = null;
+                            }
                         });
                     }
                 })
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
index 6f1d164..c3506ee 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
@@ -1,4 +1,5 @@
 锘縰sing System;
+using System.Collections.Generic;
 using HDL_ON.DriverLayer;
 using HDL_ON.Entity;
 using HDL_ON.UI.CSS;
@@ -34,6 +35,15 @@
         /// 鎾ら槻鍖哄煙
         /// </summary>
         FrameLayout disarmView;
+
+        /// <summary>
+        /// 甯冮槻鎺ュ彛
+        /// </summary>
+        SecurityAlarm InDefenseMode = null;
+        /// <summary>
+        /// 鑷畾涔夊竷闃叉帶浠跺垪琛�
+        /// </summary>
+        List<ArmDiyView> armDiyViewList = new List<ArmDiyView>();
 
         public ArmCenterPage()
         {
@@ -84,16 +94,20 @@
             {
                 Width = Application.GetRealWidth(198),
                 Height = Application.GetRealWidth(198),
+                UnSelectedImagePath = "FunctionIcon/ArmCenter/InAlarmBigIcon.png",
             };
             btnInalarmIcon.MouseUpEventHandler = (sender, e) => {
-                if(SecurityCenter.Ins.InDefenseMode!= null)
+                if(InDefenseMode!= null)
                 {
-                    SecurityCenter.Ins.InDefenseMode.alarm = false;
-                    Control.Ins.ControlSecurity(SecurityCenter.Ins.InDefenseMode, "enable");
+                    Action action = () =>
+                    {
+                        InDefenseMode.alarm = false;
+                        Control.Ins.ControlSecurity(InDefenseMode, "enable");
+                    };
+                    new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.ClearTheSecurityAlarmTip, action);
+
                 }
             };
-            InitAlarmStatus(SecurityCenter.Ins.InAlarm);
-
 
             btnDefenseName = new Button()
             {
@@ -141,17 +155,17 @@
                 //        break;
                 //    }
                 //}
-                if(SecurityCenter.Ins.InDefenseMode!= null)
+                if(InDefenseMode!= null)
                 {
-                    Control.Ins.ControlSecurity(SecurityCenter.Ins.InDefenseMode, "disable");
+                    Control.Ins.ControlSecurity(InDefenseMode, "disable");
                 }
             };
 
-                #endregion
+            #endregion
 
-                #region 鑷畾涔夊竷闃�
-                //鑷畾涔夊竷闃叉爣棰�
-                Button btnCustomDeploymentTitle = new Button()
+            #region 鑷畾涔夊竷闃�
+            //鑷畾涔夊竷闃叉爣棰�
+            Button btnCustomDeploymentTitle = new Button()
             {
                 X = Application.GetRealWidth(24),
                 Height = Application.GetRealWidth(54),
@@ -243,24 +257,31 @@
             #endregion
 
 
-
-
-            ///鍒锋柊鐣岄潰
-            LoadEvent_RefreshSecurityStatus();
+            iniCustomDeploymentView();
 
         }
 
+        /// <summary>
+        /// 鍒濆鍖栨姤璀︾姸鎬�
+        /// </summary>
+        /// <param name="inAlarm"></param>
         public void InitAlarmStatus(bool inAlarm)
         {
             try
             {
                 if (inAlarm)
                 {
-                    alarmIconBgView.AddChidren(btnInalarmIcon);
+                    if (btnInalarmIcon.Parent == null)
+                    {
+                        alarmIconBgView.AddChidren(btnInalarmIcon);
+                    }
                 }
                 else
                 {
-                    btnInalarmIcon.RemoveFromParent();
+                    if (btnInalarmIcon.Parent != null)
+                    {
+                        btnInalarmIcon.RemoveFromParent();
+                    }
                 }
             }
             catch { }
@@ -272,11 +293,11 @@
         private void iniCustomDeploymentView()
         {
             customDeploymentView.RemoveAll();
-
+            armDiyViewList.Clear();
             foreach (var mode in FunctionList.List.securities)
             {
                 var armDiyView = new ArmDiyView("FunctionIcon/ArmCenter/AtHomeDefenseIcon.png", "FunctionIcon/ArmCenter/AtHomeDefenseIconOn.png",
-                mode.name);
+                mode.name,mode.sid);
                 customDeploymentView.AddChidren(armDiyView);
                 EventHandler<MouseEventArgs> event2 = (sender, e) =>
                 {
@@ -286,13 +307,18 @@
                 if (mode.status == "enable")
                 {
                     armDiyView.LightingView(true);
+                    InDefenseMode = mode;
+
+                    ///鍒锋柊鐣岄潰
+                    LoadEvent_RefreshSecurityStatus(InDefenseMode);
                 }
+                armDiyViewList.Add(armDiyView);
             }
 
             if (FunctionList.List.securities.Count < 4)
             {
                 var view = new ArmDiyView("FunctionIcon/ArmCenter/AddDefenseIcon.png", "FunctionIcon/ArmCenter/AddDefenseIcon.png",
-                  Language.StringByID(StringId.Custom));
+                  Language.StringByID(StringId.Custom),"customSid");
                 customDeploymentView.AddChidren(view);
                 EventHandler<MouseEventArgs> event1 = (sender, e) =>
                 {
@@ -381,13 +407,12 @@
             }
 
             btnOpen.MouseUpEventHandler = (sender, e) => {
-                if (alarm.status == "disable")
+                string controlStatus = alarm.status == "disable" ? "enable" : "disable";
+                new System.Threading.Thread(() =>
                 {
-                    Control.Ins.ControlSecurity(alarm, "enable");
-                }else
-                {
-                    Control.Ins.ControlSecurity(alarm, "disable");
-                }
+                    Control.Ins.ControlSecurity(alarm, controlStatus);
+                })
+                { IsBackground = true }.Start();
                 dialog.Close();  
             };
 
@@ -411,28 +436,68 @@
 
         }
 
-        public static void LoadEvent_RefreshSecurityStatus()
+        public static void LoadEvent_RefreshSecurityStatus(SecurityAlarm updataTemp)
         {
             Application.RunOnMainThread(() =>
             {
-                if (bodyView != null)
+                try
                 {
-                    bodyView.iniCustomDeploymentView();
-                    bodyView.disarmView.Height = 0;
-                    bodyView.btnArmTipIcon.IsSelected = false;
-                    bodyView.btnDefenseName.Text = "";
-                    foreach (var temp in FunctionList.List.securities)
+                    if (bodyView != null)
                     {
-                        if (temp.status == "enable")
+                        //甯冮槻
+                        if (updataTemp.status == "enable")
                         {
-                            bodyView.disarmView.Height = Application.GetRealHeight(68);
-                            bodyView.btnArmTipIcon.IsSelected = true;
-                            bodyView.btnDefenseName.Text = temp.name;
-
-                            bodyView.InitAlarmStatus(temp.alarm);
-                            break;
+                            bodyView.InDefenseMode = updataTemp;
+                            foreach (var tempView in bodyView.armDiyViewList)
+                            {
+                                tempView.LightingView(false);
+                                if (tempView.sid == updataTemp.sid)
+                                {
+                                    tempView.LightingView(updataTemp.status == "enable");
+                                }
+                            }
                         }
+                        else
+                        {
+                            //鎾ら槻
+                            if(bodyView.InDefenseMode.sid == updataTemp.sid)
+                            {
+                                foreach (var tempView in bodyView.armDiyViewList)
+                                {
+                                    tempView.LightingView(false);
+                                }
+                            }
+                        }
+
+
+                        //foreach(var tempView in bodyView.armDiyViewList)
+                        //{
+                        //    tempView.LightingView(false);
+                        //    if(tempView.sid == updataTemp.sid)
+                        //    {
+                        //        tempView.LightingView(updataTemp.status == "enable");
+                        //    }
+                        //}
+
+                        //娌℃湁甯冮槻鐨勬儏鍐�
+                        if (bodyView.InDefenseMode ==null|| bodyView.InDefenseMode.status == "disable")
+                        {
+                            bodyView.disarmView.Height = 0;   
+                            bodyView.btnArmTipIcon.IsSelected = false;   
+                            bodyView.btnDefenseName.Text = "";   
+                        }
+                        else
+                        {
+                            bodyView.disarmView.Height = Application.GetRealHeight(68); 
+                            bodyView.btnArmTipIcon.IsSelected = true; 
+                            bodyView.btnDefenseName.Text = bodyView.InDefenseMode.name; 
+                        }
+                        bodyView.InitAlarmStatus(bodyView.InDefenseMode.alarm);
                     }
+                }
+                catch (Exception ex)
+                {
+                    MainPage.Log($"瀹夐槻鐣岄潰鏇存柊寮傚父锛歿ex.Message}");
                 }
             });
         }
@@ -446,14 +511,16 @@
     {
         Button btnIcon;
         Button btnText;
+        public string sid;
         /// <summary>
         /// 鑷畾涔夊竷闃茬晫闈�
         /// </summary>
         /// <param name="UnSelectedIconPath">鍥剧墖璺緞</param>
         /// <param name="SelectedIconPath">鍥剧墖璺緞</param>
         /// <param name="Text">鏄剧ず鏂囨湰</param>
-        public ArmDiyView(string UnSelectedIconPath, string SelectedIconPath, string Text)
+        public ArmDiyView(string UnSelectedIconPath, string SelectedIconPath, string Text,string inSid)
         {
+            sid = inSid;
             this.Width = Application.GetRealWidth(82);
             this.Height = Application.GetRealWidth(80);
 
@@ -497,6 +564,9 @@
 
     }
 
+    /// <summary>
+    /// 鍥哄畾甯冮槻鎺т欢
+    /// </summary>
     public class FixedArmView : FrameLayout
     {
         /// <summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmDeploymentSettingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmDeploymentSettingPage.cs
index 4cf7387..df3ec88 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmDeploymentSettingPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmDeploymentSettingPage.cs
@@ -235,7 +235,11 @@
                     finally
                     {
                         Application.RunOnMainThread(() => {
-                            waitPage.Hide();
+                            if (waitPage != null)
+                            {
+                                waitPage.RemoveFromParent();
+                                waitPage = null;
+                            }
                         });
                     }
                 })
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
index 0087ce3..f571b61 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs
@@ -85,18 +85,26 @@
                 Control.Ins.SendWriteCommand(function, d);
             };
 
+
             btnCurtainStop.MouseDownEventHandler = (sender, e) =>
             {
                 btnCurtainStop.IsSelected = true;
+                btnCurtainClose.IsSelected = false;
+                btnCurtainOpen.IsSelected = false;
             };
             btnCurtainOpen.MouseDownEventHandler = (sender, e) =>
             {
                 btnCurtainOpen.IsSelected = true;
+                btnCurtainClose.IsSelected = false;
+                btnCurtainStop.IsSelected = false;
             };
             btnCurtainClose.MouseDownEventHandler = (sender, e) =>
             {
                 btnCurtainClose.IsSelected = true;
+                btnCurtainOpen.IsSelected = false;
+                btnCurtainStop.IsSelected = false;
             };
+
             btnCurtainStop.MouseUpEventHandler = (sender, e) =>
             {
                 new System.Threading.Thread(() => {
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
index c94975f..95a00e3 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs
@@ -19,14 +19,14 @@
                     return;
                 if (updateTemp.spk == bodyView.function.spk && updateTemp.sid == bodyView.function.sid)
                 {
-                    var percentString = updateTemp.GetAttrState(FunctionAttributeKey.Percent);
-                    if (percentString != null)
-                    {
-                        int percent = 0;
-                        int.TryParse(percentString, out percent);
-                        bodyView.btnCurtainOpen.IsSelected = percent > 0;
-                        bodyView.btnCurtainClose.IsSelected = percent == 0;
-                    }
+                    //var percentString = updateTemp.GetAttrState(FunctionAttributeKey.Percent);
+                    //if (percentString != null)
+                    //{
+                    //    int percent = 0;
+                    //    int.TryParse(percentString, out percent);
+                    //    bodyView.btnCurtainOpen.IsSelected = percent > 0;
+                    //    bodyView.btnCurtainClose.IsSelected = percent == 0;
+                    //}
                     try
                     {
                         if (!bodyView.onCurtainAnimation)
@@ -136,13 +136,15 @@
         {
             btnCurtainClose.MouseUpEventHandler = (sender, e) =>
             {
-                //new System.Threading.Thread(() => {
-                //    System.Threading.Thread.Sleep(2000);
-                //    Application.RunOnMainThread(() => {
-                //        btnCurtainClose.IsSelected = false;
-                //    });
-                //})
-                //{ IsBackground = true }.Start();
+                new System.Threading.Thread(() =>
+                {
+                    System.Threading.Thread.Sleep(2000);
+                    Application.RunOnMainThread(() =>
+                    {
+                        btnCurtainClose.IsSelected = false;
+                    });
+                })
+                { IsBackground = true }.Start();
                 function.trait_on_off.curValue = "off";
                 function.SetAttrState(FunctionAttributeKey.Percent, 0);
                 System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
@@ -171,13 +173,15 @@
 
             btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
             {
-                //new System.Threading.Thread(() => {
-                //    System.Threading.Thread.Sleep(2000);
-                //    Application.RunOnMainThread(() => {
-                //        btnCurtainOpen.IsSelected = false;
-                //    });
-                //})
-                //{ IsBackground = true }.Start();
+                new System.Threading.Thread(() =>
+                {
+                    System.Threading.Thread.Sleep(2000);
+                    Application.RunOnMainThread(() =>
+                    {
+                        btnCurtainOpen.IsSelected = false;
+                    });
+                })
+                { IsBackground = true }.Start();
                 function.trait_on_off.curValue = "on";
                 function.SetAttrState(FunctionAttributeKey.Percent, 100);
                 System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
@@ -190,16 +194,20 @@
             btnCurtainStop.MouseDownEventHandler = (sender, e) =>
             {
                 btnCurtainStop.IsSelected = true;
+                btnCurtainClose.IsSelected = false;
+                btnCurtainOpen.IsSelected = false;
             };
             btnCurtainOpen.MouseDownEventHandler = (sender, e) =>
             {
                 btnCurtainOpen.IsSelected = true;
                 btnCurtainClose.IsSelected = false;
+                btnCurtainStop.IsSelected = false;
             };
             btnCurtainClose.MouseDownEventHandler = (sender, e) =>
             {
                 btnCurtainClose.IsSelected = true;
                 btnCurtainOpen.IsSelected = false;
+                btnCurtainStop.IsSelected = false;
             };
 
             //btnMinusSignIcon.MouseUpEventHandler = (sender, e) =>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index 511c748..3405938 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -19,11 +19,11 @@
                     return;
                 if (updateTemp.spk == bodyView.function.spk && updateTemp.sid == bodyView.function.sid)
                 {
-                    var percentString = updateTemp.GetAttrState(FunctionAttributeKey.Percent);
-                    int percent = 0;
-                    int.TryParse(percentString, out percent);
-                    bodyView.btnCurtainOpen.IsSelected = percent > 0;
-                    bodyView.btnCurtainClose.IsSelected = percent == 0;
+                    //var percentString = updateTemp.GetAttrState(FunctionAttributeKey.Percent);
+                    //int percent = 0;
+                    //int.TryParse(percentString, out percent);
+                    //bodyView.btnCurtainOpen.IsSelected = percent > 0;
+                    //bodyView.btnCurtainClose.IsSelected = percent == 0;
                     try
                     {
                         if (!bodyView.onCurtainAnimation)
@@ -133,13 +133,15 @@
         {
             btnCurtainClose.MouseUpEventHandler = (sender, e) =>
             {
-                //new System.Threading.Thread(() => {
-                //    System.Threading.Thread.Sleep(2000);
-                //    Application.RunOnMainThread(() => {
-                //        btnCurtainClose.IsSelected = false;
-                //    });
-                //})
-                //{ IsBackground = true }.Start();
+                new System.Threading.Thread(() =>
+                {
+                    System.Threading.Thread.Sleep(2000);
+                    Application.RunOnMainThread(() =>
+                    {
+                        btnCurtainClose.IsSelected = false;
+                    });
+                })
+                { IsBackground = true }.Start();
                 function.trait_on_off.curValue = "off";
                 function.SetAttrState(FunctionAttributeKey.Percent, 0);
                 System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
@@ -166,13 +168,15 @@
 
             btnCurtainOpen.MouseUpEventHandler = (sender, e) =>
             {
-                //new System.Threading.Thread(() => {
-                //    System.Threading.Thread.Sleep(2000);
-                //    Application.RunOnMainThread(() => {
-                //        btnCurtainOpen.IsSelected = false;
-                //    });
-                //})
-                //{ IsBackground = true }.Start();
+                new System.Threading.Thread(() =>
+                {
+                    System.Threading.Thread.Sleep(2000);
+                    Application.RunOnMainThread(() =>
+                    {
+                        btnCurtainOpen.IsSelected = false;
+                    });
+                })
+                { IsBackground = true }.Start();
                 function.trait_on_off.curValue = "on";
                 function.SetAttrState(FunctionAttributeKey.Percent, 100);
                 System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
@@ -203,16 +207,20 @@
             btnCurtainStop.MouseDownEventHandler = (sender, e) =>
             {
                 btnCurtainStop.IsSelected = true;
+                btnCurtainClose.IsSelected = false;
+                btnCurtainOpen.IsSelected = false;
             };
             btnCurtainOpen.MouseDownEventHandler = (sender, e) =>
             {
                 btnCurtainOpen.IsSelected = true;
                 btnCurtainClose.IsSelected = false;
+                btnCurtainStop.IsSelected = false;
             };
             btnCurtainClose.MouseDownEventHandler = (sender, e) =>
             {
                 btnCurtainClose.IsSelected = true;
                 btnCurtainOpen.IsSelected = false;
+                btnCurtainStop.IsSelected = false;
             };
 
 
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs
new file mode 100644
index 0000000..d693db6
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs
@@ -0,0 +1,249 @@
+锘縰sing System;
+using HDL_ON.Entity;
+using HDL_ON.UI.CSS;
+using Shared;
+
+namespace HDL_ON.UI
+{
+    public class AirSwitchPage : FrameLayout
+    {
+
+        #region 鎺т欢闆嗗悎
+        static AirSwitchPage bodyView;
+        /// <summary>
+        /// 鎺у埗鐣岄潰鍔犺浇鍖哄煙
+        /// </summary>
+        FrameLayout controlView;
+        /// <summary>
+        /// 鍔熻兘澶囨敞
+        /// </summary>
+        Button btnFunctionName;
+        /// <summary>
+        /// 鍔熻兘鎵�灞炴ゼ灞傘�佹埧闂�
+        /// </summary>
+        Button btnFromFoorAndRoom;
+        /// <summary>
+        /// 鏀惰棌鎸夐挳
+        /// </summary>
+        Button btnCollection;
+        /// <summary>
+        /// 缁х數鍣ㄧ姸鎬佸浘鏍�
+        /// </summary>
+        Button btnSwitchIcon;
+        /// <summary>
+        /// 寮�鍏虫寜閽�
+        /// </summary>
+        Button btnSwitch;
+        #endregion
+
+        #region 鍖哄煙鍙橀噺
+        Function function;
+        Button btnCollection_Out;
+        Button btnFunctionName_Out;
+        Button btnFromFloor_Out;
+        /// <summary>
+        /// 鍒锋柊鏄剧ず淇℃伅
+        /// </summary>
+        Action actionRefresh;
+        #endregion
+
+        public AirSwitchPage(Function func)
+        {
+            bodyView = this;
+            function = func;
+
+        }
+        /// <summary>
+        /// 鍔犺浇鐣岄潰
+        /// </summary>
+        /// <param name="btnCollectionIcon">鏀惰棌鎸夐挳</param>
+        /// <param name="btnFunctionName">鍔熻兘鍚嶇О淇℃伅鎸夐挳</param>
+        /// <param name="btnFromFloor">鍔熻兘妤煎眰淇℃伅鎸夐挳</param>
+        public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
+        {
+            if (btnCollectionIcon == null)
+            {
+                btnCollection_Out = new Button();
+                btnFunctionName_Out = new Button();
+                btnFromFloor_Out = new Button();
+            }
+            else
+            {
+                btnCollection_Out = btnCollectionIcon;
+                btnFunctionName_Out = btnFunctionNameOut;
+                btnFromFloor_Out = btnFromFloorOut;
+            }
+            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
+            //new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.Lights), function);
+
+            controlView = new FrameLayout()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                Y = Application.GetRealHeight(88),
+                Width = Application.GetRealWidth(327),
+                Height = Application.GetRealHeight(526),
+                BackgroundImagePath = "Public/Fragmentbg.png",
+            };
+            bodyView.AddChidren(controlView);
+
+            btnFunctionName = new Button()
+            {
+                X = Application.GetRealWidth(16),
+                Y = Application.GetRealHeight(14),
+                Width = Application.GetRealWidth(270),
+                Height = Application.GetRealHeight(37),
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
+                Text = function.name,
+            };
+            controlView.AddChidren(btnFunctionName);
+
+            btnFromFoorAndRoom = new Button()
+            {
+                X = Application.GetRealWidth(16),
+                Y = btnFunctionName.Bottom,
+                Width = Application.GetRealWidth(270),
+                Height = Application.GetRealHeight(21),
+                TextColor = CSS_Color.PromptingColor1,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                Text = function.GetRoomListName()
+            };
+            controlView.AddChidren(btnFromFoorAndRoom);
+
+            btnCollection = new Button()
+            {
+                X = Application.GetRealWidth(273),
+                Y = Application.GetRealHeight(14),
+                Width = Application.GetMinRealAverage(40),
+                Height = Application.GetMinRealAverage(40),
+                SelectedImagePath = "Collection/CollectionIcon.png",
+                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
+                IsSelected = function.collect
+            };
+            controlView.AddChidren(btnCollection);
+
+            btnSwitchIcon = new Button()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                Y = Application.GetRealHeight(102),
+                Width = Application.GetRealWidth(148),
+                Height = Application.GetRealWidth(198),
+                UnSelectedImagePath = "FunctionIcon/Electrical/AirSwitch/AirSwitchBgIcon.png",
+                SelectedImagePath = "FunctionIcon/Electrical/AirSwitch/AirSwitchBgOnIcon.png",
+                IsSelected = function.trait_on_off.curValue.ToString() == "on"
+            };
+            controlView.AddChidren(btnSwitchIcon);
+
+            btnSwitch = new Button()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                Y = Application.GetRealHeight(466),// + btnSwitchIcon.Bottom,
+                Width = Application.GetMinRealAverage(32),
+                Height = Application.GetMinRealAverage(32),
+                UnSelectedImagePath = "Public/PowerClose.png",
+                SelectedImagePath = "Public/PowerOpen.png",
+                IsSelected = function.trait_on_off.curValue.ToString() == "on"
+            };
+            controlView.AddChidren(btnSwitch);
+
+            new TopViewDiv(bodyView, Language.StringByID(StringId.Electric)).LoadTopView_FunctionTop(function, actionRefresh,false);
+            new System.Threading.Thread(() =>
+            {
+                DriverLayer.Control.Ins.SendReadCommand(function);
+            })
+            { IsBackground = true }.Start();
+
+
+            LoadEventList();
+        }
+
+
+
+
+        /// <summary>
+        /// 鏇存柊鐘舵��
+        /// </summary>
+        public static void UpdataState(Function updataTemp)
+        {
+            Application.RunOnMainThread(() =>
+            {
+                try
+                {
+                    if (bodyView == null)
+                        return;
+                    if (updataTemp.spk == bodyView.function.spk && updataTemp.sid == bodyView.function.sid)
+                    {
+                        bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = updataTemp.trait_on_off.curValue.ToString() == "on";
+                    }
+                }
+                catch (Exception ex)
+                {
+                    MainPage.Log($"AirSwitch error {ex.Message}");
+                }
+            });
+        }
+        /// <summary>
+        /// 鍔犺浇浜嬩欢鍒楄〃
+        /// </summary>
+        void LoadEventList()
+        {
+            LoadSwitchEvent();
+            LoadCollectionEvent();
+
+            //鍥為��鍒锋柊淇℃伅浜嬩欢
+            actionRefresh = () => {
+                btnFunctionName.Text = btnFunctionName_Out.Text = function.name;
+                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();
+                //function.SaveFunctionData(true);
+            };
+        }
+
+        /// <summary>
+        /// 鏀惰棌鍔熻兘鎸夐挳浜嬩欢
+        /// </summary>
+        void LoadCollectionEvent()
+        {
+            btnCollection.MouseUpEventHandler += (sender, e) => {
+                btnCollection.IsSelected = function.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+                function.CollectFunction();
+            };
+        }
+
+        /// <summary>
+        /// 鍔犺浇寮�鍏充簨浠�
+        /// </summary>
+        void LoadSwitchEvent()
+        {
+            btnSwitchIcon.MouseUpEventHandler = (sender, e) =>
+            {
+                btnSwitch.IsSelected = btnSwitchIcon.IsSelected = !btnSwitchIcon.IsSelected;
+                new System.Threading.Thread(() =>
+                {
+                    function.trait_on_off.curValue = btnSwitchIcon.IsSelected ? "on" : "off";
+                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+                    d.Add("on_off", function.trait_on_off.curValue.ToString());
+                    DriverLayer.Control.Ins.SendWriteCommand(function, d);
+                })
+                { IsBackground = true }.Start();
+            };
+            btnSwitch.MouseUpEventHandler = (sender, e) =>
+            {
+                btnSwitchIcon.IsSelected = btnSwitch.IsSelected = !btnSwitch.IsSelected;
+                new System.Threading.Thread(() =>
+                {
+                    function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
+                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+                    d.Add("on_off", function.trait_on_off.curValue.ToString());
+                    DriverLayer.Control.Ins.SendWriteCommand(function, d);
+                })
+                { IsBackground = true }.Start();
+
+            };
+
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
index 7801755..38805f8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
@@ -381,6 +381,10 @@
                         imagePath = "FunctionIcon/EnvirSensor/TempBg.png";
                         iconPath = "FunctionIcon/EnvirSensor/TempIcon.png";
                         break;
+                    case SPK.SensorHcho:
+                        imagePath = "FunctionIcon/EnvirSensor/HchoBg.png";
+                        iconPath = "FunctionIcon/EnvirSensor/HchoIcon.png";
+                        break;
                 }
                 sensorView.BackgroundImagePath = imagePath;
 
@@ -431,12 +435,13 @@
                     Width = Application.GetRealWidth(100),
                     Height = Application.GetRealWidth(32),
                     TextAlignment = TextAlignment.CenterLeft,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
+                    TextColor = sensorTemp.GetLevelColorList(sensor.spk)[sensorTemp.GetCurLevel(sensor) - 1],
                     TextSize = CSS_FontSize.SubheadingFontSize,
                     TextID = levelTextList[sensorTemp.GetCurLevel(sensor) - 1],
                     Tag = "SensorLevel",
                 };
                 sensorView.AddChidren(btnLevel);
+
                 btnLevel.MouseUpEventHandler = (sender, e) =>
                 {
                     #region 
@@ -523,7 +528,7 @@
                     btnTitle.Text = Language.StringByID(StringId.Temp) + "(掳C)";
                     break;
                 case SPK.SensorTVOC:
-                    btnTitle.Text = "TVOC(PPM)";
+                    btnTitle.Text = "TVOC(PPB)";
                     break;
                 case SPK.SensorCO2:
                     btnTitle.Text = "CO2(PPM)";
@@ -531,6 +536,9 @@
                 case SPK.SensorHumidity:
                     btnTitle.Text = Language.StringByID(StringId.Humidity) + "(%)";
                     break;
+                case SPK.SensorHcho:
+                    btnTitle.Text = Language.StringByID(StringId.Formaldehyde) +"(mg/m3)";
+                    break;
             }
 
             FrameLayout subTitleView = new FrameLayout()
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
index 68f8232..704093f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
@@ -47,7 +47,7 @@
         /// <summary>
         /// 鍔犺浇鐣岄潰
         /// </summary>
-        public void LoadPage()
+        public void LoadPage(bool locationSetting = true)
         {
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
             new TopViewDiv(bodyView, Language.StringByID(StringId.Setting)).LoadTopView(actionRefresh);
@@ -111,58 +111,59 @@
                 });
 
             #endregion
-
-            #region 浣嶇疆绠$悊
-            var locationMagtView = new FrameLayout()
+            if (locationSetting)
             {
-                Height = Application.GetRealHeight(55),
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-            };
-            contentView.AddChidren(locationMagtView);
-
-            var btnLocationMagtTitle = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Width = Application.GetRealWidth(160),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextID = StringId.LocationManagement,
-            };
-            locationMagtView.AddChidren(btnLocationMagtTitle);
-
-            btnLocationValues = new Button()
-            {
-                X = Application.GetRealWidth(86),
-                Width = Application.GetRealWidth(237),
-                TextAlignment = TextAlignment.CenterRight,
-                TextColor = CSS_Color.PromptingColor1,
-                TextSize = CSS_FontSize.TextFontSize,
-                Text = function.GetRoomListName(),
-            };
-            locationMagtView.AddChidren(btnLocationValues);
-
-            btnLocationInfoRight = new Button()
-            {
-                X = Application.GetRealWidth(339),
-                Gravity = Gravity.CenterVertical,
-                Width = Application.GetMinRealAverage(16),
-                Height = Application.GetMinRealAverage(16),
-                UnSelectedImagePath = "Public/RightIcon.png",
-            };
-            locationMagtView.AddChidren(btnLocationInfoRight);
-
-            locationMagtView.AddChidren(
-                new Button()
+                #region 浣嶇疆绠$悊
+                var locationMagtView = new FrameLayout()
                 {
-                    Gravity = Gravity.CenterHorizontal,
-                    Y = Application.GetRealHeight(54),
-                    BackgroundColor = CSS_Color.DividingLineColor,
-                    Width = Application.GetRealWidth(343),
-                    Height = Application.GetRealHeight(1)
-                });
-            #endregion
+                    Height = Application.GetRealHeight(55),
+                    BackgroundColor = CSS_Color.MainBackgroundColor,
+                };
+                contentView.AddChidren(locationMagtView);
 
+                var btnLocationMagtTitle = new Button()
+                {
+                    X = Application.GetRealWidth(16),
+                    Width = Application.GetRealWidth(160),
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextColor = CSS_Color.FirstLevelTitleColor,
+                    TextSize = CSS_FontSize.SubheadingFontSize,
+                    TextID = StringId.LocationManagement,
+                };
+                locationMagtView.AddChidren(btnLocationMagtTitle);
+
+                btnLocationValues = new Button()
+                {
+                    X = Application.GetRealWidth(86),
+                    Width = Application.GetRealWidth(237),
+                    TextAlignment = TextAlignment.CenterRight,
+                    TextColor = CSS_Color.PromptingColor1,
+                    TextSize = CSS_FontSize.TextFontSize,
+                    Text = function.GetRoomListName(),
+                };
+                locationMagtView.AddChidren(btnLocationValues);
+
+                btnLocationInfoRight = new Button()
+                {
+                    X = Application.GetRealWidth(339),
+                    Gravity = Gravity.CenterVertical,
+                    Width = Application.GetMinRealAverage(16),
+                    Height = Application.GetMinRealAverage(16),
+                    UnSelectedImagePath = "Public/RightIcon.png",
+                };
+                locationMagtView.AddChidren(btnLocationInfoRight);
+
+                locationMagtView.AddChidren(
+                    new Button()
+                    {
+                        Gravity = Gravity.CenterHorizontal,
+                        Y = Application.GetRealHeight(54),
+                        BackgroundColor = CSS_Color.DividingLineColor,
+                        Width = Application.GetRealWidth(343),
+                        Height = Application.GetRealHeight(1)
+                    });
+                #endregion
+            }
             #region 鍏变韩
             //var sharedView = new FrameLayout()
             //{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/ObjectClass.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/ObjectClass.cs
index f6d8549..fc82b32 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/ObjectClass.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/ObjectClass.cs
@@ -155,6 +155,14 @@
         /// 涓版灄鍙瀵硅data
         /// </summary>
         public VideoFlData flRoomBindVO = new VideoFlData();
+        /// <summary>
+        ///  璁惧sip璐﹀彿 interphoneType鏄疕DL鏃舵墠浼氭湁鍊�
+        /// </summary>
+        public string deviceSipAccount;
+        /// <summary>
+        ///  homeId
+        /// </summary>
+        public string homeId;
     }
 
     /// <summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index 5198364..41d5dec 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -300,12 +300,14 @@
                             DeviceName = video.deviceName,
                             roomno = video.flRoomBindVO.flRoomId,
                             unitno = video.flRoomBindVO.flBuildingId,
-                            uuid= getUuid(video.deviceId),
-                            cmtID=video.flRoomBindVO.flCmtId,
+                            uuid = getUuid(video.deviceId),
+                            cmtID = video.flRoomBindVO.flCmtId,
                             Lc_AccessToken = video.subAccountToken,
                             Lc_DeviceId = video.deviceId,
                             Lc_Psk = video.deviceName,
                             Lc_PlayToken = video.playToken,
+                            deviceSipAccount = video.deviceSipAccount,
+                            HomeId = video.homeId
                         };
                         ESOnVideo.Current.ShowESVideoMonitor(eSVideoInfo, video.interphoneType);
                     }

--
Gitblit v1.8.0