From 753e67c3705dddb8e913bd853db151f94f81d600 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 六月 2023 09:45:05 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr'

---
 SiriIntents/SiriIntents.csproj                                                                   |    3 
 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs                                      |   10 
 HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs |    2 
 HDL-ON_Android/Assets/Language.ini                                                               |  467 
 HDL_ON/Common/ApiUtlis.cs                                                                        |  168 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/HistoryList.png                                 |    0 
 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs                                     |  210 
 HDL_ON/HDL_ON.projitems                                                                          |   29 
 HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs                                             |  123 
 DLL/Shared.Droid0512.dll                                                                         |    0 
 HDL_ON/DAL/Server/NewApiRes.cs                                                                   |   54 
 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs                                           |   37 
 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs                                   |   42 
 HDL_ON/UI/UI2/FuntionControlView/Music/A31FlieList.cs                                            |  169 
 HDL_ON/Entity/Enumerative/MyEnum.cs                                                              |    4 
 HDL_ON/UI/UI0-Public/PublicAssmebly.cs                                                           |  171 
 HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs                                            |    4 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorLockOpen1.png                          |    0 
 HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs                                                    |    1 
 SiriIntents/Server/HttpUtil.cs                                                                   |   17 
 HDL_ON/Entity/Function/Scene.cs                                                                  |    2 
 SiriIntentsUI/Info.plist                                                                         |    6 
 DLL/Shared.Droid0524.dll                                                                         |    0 
 HDL_ON/Common/Constant.cs                                                                        |    4 
 HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs                                             |    5 
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs                                          |   15 
 HDL_ON/Entity/DB_ResidenceData.cs                                                                |   11 
 DLL/IOS/Shared.IOS.HDLFVSDK.dll                                                                  |    0 
 HDL_ON/UI/UI0-Public/TopViewDiv.cs                                                               |    6 
 SiriIntents/Info.plist                                                                           |    6 
 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs                |    6 
 HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs                                                  |   57 
 HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddCombineDimmingPage.cs                          |  264 
 HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs                                                   |   11 
 DLL/Shared.IOS0525.dll                                                                           |    0 
 HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs                                          |   24 
 HDL-ON_iOS/AppDelegate.cs                                                                        |   81 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLocked.png                                    |    0 
 HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs                                                     |   53 
 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs                                      |  246 
 HDL-ON_iOS/Resources/Language.ini                                                                |  466 
 DLL/Shared.Droid230508.dll                                                                       |    0 
 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs                          |  222 
 HDL-ON_iOS/Resources/Assets.xcassets/launchIcon1.imageset/Contents.json                          |   21 
 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs               |    2 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/RTV.png                                         |    0 
 DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll                                                |    0 
 HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs                                              |   36 
 HDL_ON/UI/UI2/FuntionControlView/Music/A31SongPlay.cs                                            |   53 
 HDL_ON/UI/UI2/FuntionControlView/Music/CommonMethod.cs                                           |  137 
 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs                       |   77 
 HDL-ON_Android/Assets/Phone/LogicIcon/selectlocation.png                                         |    0 
 HDL-ON_Android/Resources/drawable/dialog_background2.xml                                         |    2 
 HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs                                               |    2 
 HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard                                             |   22 
 HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs                              |    4 
 HDL-ON_Android/Resources/drawable/btn_disagree.xml                                               |    2 
 HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage.cs                                       |  572 
 HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/VideoDoorLockOpen1.png                         |    0 
 HDL-ON_iOS/Resources/Phone/MusicIcon/currentPlayList.png                                         |    0 
 HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs                                        |  355 
 HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs                                          |    3 
 HDL-ON_iOS/LaunchScreen.storyboard                                                               |   44 
 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/MechanicalArmPage.cs                               |    9 
 HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs                                        |    4 
 HDL_ON/UI/UI0-Public/DiySelectPopupDialog.cs                                                     |    8 
 HDL-ON_iOS/Info.plist                                                                            |  168 
 HDL_ON/Common/HDLCommon.cs                                                                       |  105 
 HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs                                       |   87 
 HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/UnLocking.png                                  |    0 
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs                                               |    3 
 DLL/LC/Android/LcVideoSdk.dll                                                                    |    0 
 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs                      |  617 
 DLL/Shared.Droid.JPush223.dll                                                                    |    0 
 HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs                                         |   13 
 HDL_ON/UI/UI1-Login/LoginPage.cs                                                                 |  130 
 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs                                    |  108 
 HDL-ON_Android/Other/LocationUtils.cs                                                            |   25 
 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs                          |   53 
 HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs                                                    |    4 
 HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs                                                 |   62 
 HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs                        |  271 
 HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs                            |    2 
 HDL_ON/Entity/Function/Function.cs                                                               |   90 
 HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs                                            |   36 
 HDL_ON/UI/UI2/2-Classification/FunctionPage.cs                                                   |   94 
 HDL_ON/DAL/Server/HttpUtil.cs                                                                    |   32 
 DLL/Shared.Droid.JPush.dll                                                                       |    0 
 HDL-ON_iOS/Resources/Assets.xcassets/launchIcon2.imageset/Contents.json                          |   21 
 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs                        |    2 
 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs                                                        |   33 
 HDL_ON/UI/UI2/1-HomePage/HomePage.cs                                                             |   54 
 HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/HistoryList.png                                |    0 
 HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs                                   |  117 
 HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/Cell.png                                       |    0 
 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs                       |  101 
 HDL_ON/UI/UI2/FuntionControlView/Music/A31UsbMusicList.cs                                        |   43 
 HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/VideoDoorlockClose1.png                        |    0 
 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs                               |  237 
 HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs                                   |   20 
 HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs                               |   39 
 HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs                                          |    2 
 HDL-ON_iOS/Resources/en.lproj/Localizable.strings                                                |   66 
 HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs                                     |   98 
 HDL-ON_Android/Resources/values/styles.xml                                                       |    4 
 DLL/LC/Android/LCDeviceAddModule.dll                                                             |    0 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/VideoDoorLockFunctionBg.png                   |    0 
 HDL_ON/UI/MainPage.cs                                                                            |   75 
 HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockSelectTimePage.cs                              |  104 
 HDL-ON_iOS/Resources/EZ/Base.lproj/EZVideoTalkViewcontroller.xib                                 |   20 
 HDL-ON_iOS/Resources/Phone/PersonalCenter/CombinedDimmingIcon.png                                |    0 
 HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/RTV.png                                        |    0 
 DLL/Linphone/Android/Shared.Droid.HDLLinphone0525.dll                                            |    0 
 HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/UnLocked.png                                   |    0 
 HDL_ON/Entity/FunctionList.cs                                                                    |   58 
 HDL_ON/UI/UI2/3-Intelligence/Automation/ChooseIocate.cs                                          |    6 
 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPageBLL.cs                          |   12 
 DLL/Shared.IOS.dll                                                                               |    0 
 DLL/Shared.IOS0524.dll                                                                           |    0 
 HDL_ON/DAL/Server/NewAPI.cs                                                                      |  129 
 HDL-ON_Android/Assets/Phone/PersonalCenter/CombinedDimmingIcon.png                               |    0 
 HDL_ON/UI/UI0-Stan/Form/HideOptionFileContentForm.cs                                             |    1 
 HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs                                              |   12 
 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/StackTraceLog.cs                                  |   58 
 HDL_ON/Common/R.cs                                                                               |  245 
 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunTypeView.cs                                 |    4 
 HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs                                   |  201 
 DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll                                                   |    0 
 HDL-ON_iOS/HDL-ON_iOS.csproj                                                                     |  151 
 HDL_ON/UI/UI2/2-Classification/RoomPage.cs                                                       |   77 
 HDL_ON/DAL/Server/IMessageCommon.cs                                                              |    2 
 HDL_ON/Entity/Function/Sensor.cs                                                                 |    2 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/OneOpenLock.png                                 |    0 
 HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs                                                          |   16 
 HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs                                |    2 
 HDL-ON_Android/Resources/Resource.designer.cs                                                    | 21739 +++++++++++++++++----------------
 HDL_ON/Entity/Room.cs                                                                            |   10 
 HDL_ON/Common/OnAppConfig.cs                                                                     |    4 
 HDL-ON_Android/Assets/Phone/MusicIcon/currentPlayList.png                                        |    0 
 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs                           |  534 
 HDL-ON_iOS/Resources/LaunchScreen.xib                                                            |   65 
 HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/securitydoorezviz.png                              |    0 
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs                                            |   17 
 HDL_ON/UI/UI1-Login/LoginPageBLL.cs                                                              |  132 
 DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll                                                           |    0 
 HDL_ON/Common/ImageUtlis.cs                                                                      |    3 
 HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorEnvironment/AddSensorEnvironmentPage.cs          |    4 
 HDL-ON_iOS/Resources/Assets.xcassets/launchIcon1.imageset/launchIcon1.png                        |    0 
 HDL-ON_iOS/Resources/Assets.xcassets/launchIcon.imageset/launchIcon.png                          |    0 
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs                                             |   86 
 HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs                                   |   17 
 HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json                                 |  335 
 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs                              |  566 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/securitydoorezviz.png                               |    0 
 HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs                                                            |   25 
 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs                             |  403 
 HDL-ON_iOS/BlueWifi.cs                                                                           |    3 
 HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs                                                    |   28 
 HDL-ON_iOS/ViewController.cs                                                                     |    4 
 HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs                                                          |   85 
 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs                          |  119 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Cell.png                                        |    0 
 HDL_ON/UI/UI2/UserPage.cs                                                                        |    9 
 HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/OneOpenLock.png                                |    0 
 HDL_ON/Entity/ResponseEntity/FreeviewMemberInfo.cs                                               |   39 
 HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs                                              |   12 
 HDL-ON_iOS/Resources/Assets.xcassets/Contents.json                                               |    6 
 HDL_ON/UI/UI0-Stan/Logic/HdlBluetoothAndroidLogic.cs                                             |    2 
 HDL-ON_iOS/Resources/com.hri.hpc.mobile.ios.player.metallib                                      |    0 
 HDL_ON/UI/UI1-Login/RegisterPageBLL.cs                                                           |    3 
 HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs                                            |    9 
 HDL_ON/DAL/DriverLayer/Control.cs                                                                |  214 
 HDL_ON/UI/UI2/FuntionControlView/Video/WanderingAlarmPage.cs                                     |    6 
 SiriIntentsUI/SiriIntentsUI.csproj                                                               |    3 
 HDL-ON_iOS/Resources/Phone/LogicIcon/selectlocation.png                                          |    0 
 HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs                                          |    6 
 HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs                                   |   27 
 HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings                                           |   67 
 HDL-ON_Android/Assets/Phone/FunctionIcon/FunctionBg/VideoDoorLockFunctionBg.png                  |    0 
 HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs                            |  711 +
 HDL_ON/DAL/Server/HttpServerRequest.cs                                                           |  390 
 DLL/EZvizMonitor/ys.dll                                                                          |    0 
 HDL-ON_Android/Properties/AndroidManifest.xml                                                    |    3 
 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs                                |  193 
 HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs                                                        |   12 
 HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs                                            |  334 
 HDL_ON/DAL/Mqtt/MqttClient.cs                                                                    |   28 
 HDL-ON_Android/HDL-ON_Android.csproj                                                             |   42 
 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs                                      |  144 
 HDL_ON/UI/UI2/4-PersonalCenter/Face/FaceManagementPage.cs                                        |   10 
 HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json                                      |  364 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorlockClose1.png                         |    0 
 HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs                                         |   85 
 DLL/Shared.Droid.dll                                                                             |    0 
 HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLocking.png                                   |    0 
 HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs                                       |   77 
 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_AuthorizedPage.cs                                 |    6 
 HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs                                          |    1 
 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs                                   |  622 
 HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs                 |  317 
 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs                                             |   61 
 HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/history.png                                    |    0 
 HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard                                          |   14 
 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/DeliveryQrCodePage.cs                              |  106 
 HDL-ON_Android/Scan.cs                                                                           |    9 
 HDL-ON_iOS/Resources/Assets.xcassets/launchIcon2.imageset/launchIcon2.png                        |    0 
 HDL_ON/DAL/DriverLayer/Control_TcpClient.cs                                                      |   90 
 HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs                                                    |    6 
 HDL_ON/DAL/DriverLayer/UdpSocket.cs                                                              |    6 
 HDL-ON_iOS/Assets.xcassets/device_bg.imageset/Contents.json                                      |  531 
 HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs                                        |  173 
 HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs                                                      |   11 
 HDL-ON_Android/SplashActivity.cs                                                                 |   48 
 DLL/IOS/Shared.IOS.HDLCNVRSDK.dll                                                                |    0 
 HDL_ON/UI/UI0-Stan/Logic/HdlMessageLogic.cs                                                      |   26 
 HDL-ON_Android/Application.cs                                                                    |   13 
 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs                                   |   10 
 HDL_ON/UI/UI2/FuntionControlView/Music/MusicProperty.cs                                          |   32 
 HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs                                          |   63 
 DLL/IOS/EZSDK.IOS.dll                                                                            |    0 
 /dev/null                                                                                        |   25 
 HDL-ON_iOS/Resources/Assets.xcassets/launchIcon.imageset/Contents.json                           |   21 
 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs                                    |   40 
 HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs                            |  251 
 HDL_ON/Common/Utlis/FloorRoomSelectPopupView.cs                                                  |    4 
 HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs                                              |   11 
 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs                                              |    4 
 HDL-ON_Android/Other/JPush/JPushReceiver.cs                                                      |   21 
 228 files changed, 24,133 insertions(+), 13,625 deletions(-)

diff --git a/DLL/EZvizMonitor/ys.dll b/DLL/EZvizMonitor/ys.dll
index 7c6eb30..58dc24a 100644
--- a/DLL/EZvizMonitor/ys.dll
+++ b/DLL/EZvizMonitor/ys.dll
Binary files differ
diff --git a/DLL/IOS/EZSDK.IOS.dll b/DLL/IOS/EZSDK.IOS.dll
index 5d1bcdc..86181a6 100644
--- a/DLL/IOS/EZSDK.IOS.dll
+++ b/DLL/IOS/EZSDK.IOS.dll
Binary files differ
diff --git a/DLL/IOS/Shared.IOS.HDLCNVRSDK.dll b/DLL/IOS/Shared.IOS.HDLCNVRSDK.dll
new file mode 100644
index 0000000..67a55a9
--- /dev/null
+++ b/DLL/IOS/Shared.IOS.HDLCNVRSDK.dll
Binary files differ
diff --git a/DLL/IOS/Shared.IOS.HDLFVSDK.dll b/DLL/IOS/Shared.IOS.HDLFVSDK.dll
index 885c7d7..34666ed 100644
--- a/DLL/IOS/Shared.IOS.HDLFVSDK.dll
+++ b/DLL/IOS/Shared.IOS.HDLFVSDK.dll
Binary files differ
diff --git a/DLL/LC/Android/LCDeviceAddModule-2022-12-06.dll b/DLL/LC/Android/LCDeviceAddModule-2022-12-06.dll
deleted file mode 100644
index 2fd62e7..0000000
--- a/DLL/LC/Android/LCDeviceAddModule-2022-12-06.dll
+++ /dev/null
Binary files differ
diff --git a/DLL/LC/Android/LCDeviceAddModule.dll b/DLL/LC/Android/LCDeviceAddModule.dll
index ca613e3..741b727 100644
--- a/DLL/LC/Android/LCDeviceAddModule.dll
+++ b/DLL/LC/Android/LCDeviceAddModule.dll
Binary files differ
diff --git a/DLL/LC/Android/LcVideoSdk-1.dll b/DLL/LC/Android/LcVideoSdk-1.dll
deleted file mode 100644
index be0179d..0000000
--- a/DLL/LC/Android/LcVideoSdk-1.dll
+++ /dev/null
Binary files differ
diff --git a/DLL/LC/Android/LcVideoSdk.dll b/DLL/LC/Android/LcVideoSdk.dll
index 9c65fd3..5418bb7 100644
--- a/DLL/LC/Android/LcVideoSdk.dll
+++ b/DLL/LC/Android/LcVideoSdk.dll
Binary files differ
diff --git a/DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll b/DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll
index 8faec09..c5fd19b 100644
--- a/DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll
+++ b/DLL/LC/IOS/Shared.IOS.LCVideoOnSDK.dll
Binary files differ
diff --git a/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll b/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll
index fb85f28..8e7c9a7 100644
--- a/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll
+++ b/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll
Binary files differ
diff --git a/DLL/Linphone/Android/Shared.Droid.HDLLinphone0525.dll b/DLL/Linphone/Android/Shared.Droid.HDLLinphone0525.dll
new file mode 100644
index 0000000..fb85f28
--- /dev/null
+++ b/DLL/Linphone/Android/Shared.Droid.HDLLinphone0525.dll
Binary files differ
diff --git a/DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll b/DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll
index d60003a..eb3bd71 100644
--- a/DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll
+++ b/DLL/Linphone/iOS/Shared.IOS.HDLLinphoneSDK.dll
Binary files differ
diff --git a/DLL/Shared.Droid.JPush.dll b/DLL/Shared.Droid.JPush.dll
index e45eb53..8bf06ba 100644
--- a/DLL/Shared.Droid.JPush.dll
+++ b/DLL/Shared.Droid.JPush.dll
Binary files differ
diff --git a/DLL/Shared.Droid.JPush223.dll b/DLL/Shared.Droid.JPush223.dll
new file mode 100644
index 0000000..e45eb53
--- /dev/null
+++ b/DLL/Shared.Droid.JPush223.dll
Binary files differ
diff --git a/DLL/Shared.Droid.dll b/DLL/Shared.Droid.dll
index dd23a23..9644e79 100644
--- a/DLL/Shared.Droid.dll
+++ b/DLL/Shared.Droid.dll
Binary files differ
diff --git a/DLL/Shared.Droid0512.dll b/DLL/Shared.Droid0512.dll
new file mode 100644
index 0000000..dcfb70c
--- /dev/null
+++ b/DLL/Shared.Droid0512.dll
Binary files differ
diff --git a/DLL/Shared.Droid0524.dll b/DLL/Shared.Droid0524.dll
new file mode 100644
index 0000000..de703bc
--- /dev/null
+++ b/DLL/Shared.Droid0524.dll
Binary files differ
diff --git a/DLL/Shared.Droid230508.dll b/DLL/Shared.Droid230508.dll
new file mode 100644
index 0000000..2219ca6
--- /dev/null
+++ b/DLL/Shared.Droid230508.dll
Binary files differ
diff --git a/DLL/Shared.IOS.dll b/DLL/Shared.IOS.dll
index d191e8c..7ee6e6b 100644
--- a/DLL/Shared.IOS.dll
+++ b/DLL/Shared.IOS.dll
Binary files differ
diff --git a/DLL/Shared.IOS0524.dll b/DLL/Shared.IOS0524.dll
new file mode 100644
index 0000000..d191e8c
--- /dev/null
+++ b/DLL/Shared.IOS0524.dll
Binary files differ
diff --git a/DLL/Shared.IOS0525.dll b/DLL/Shared.IOS0525.dll
new file mode 100644
index 0000000..217278a
--- /dev/null
+++ b/DLL/Shared.IOS0525.dll
Binary files differ
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index 7e4223d..1888200 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -5,6 +5,7 @@
 using Android.App;
 using Android.Content;
 using Android.Net;
+using Android.Net.Wifi;
 using Android.OS;
 using Android.Runtime;
 using Android.Widget;
@@ -24,6 +25,8 @@
     [Android.App.Application(Theme = "@style/MyTheme")]
     public class Application : Android.App.Application, Android.App.Application.IActivityLifecycleCallbacks
     {
+        //澶勭悊瀹夊崜鎺ユ敹涓嶅埌udp鍛戒护闂
+        WifiManager.MulticastLock multicast;
 
         static void reStartApp(Android.App.Application application)
         {
@@ -36,6 +39,7 @@
         public Application(IntPtr handle, Android.Runtime.JniHandleOwnership ownerShip) : base(handle, ownerShip) { }
         public override void OnCreate()
         {
+
             if (Shared.Application.Activity != null)
             {
                 //reStartApp(this);
@@ -43,6 +47,11 @@
             }
 
             base.OnCreate();
+
+            WifiManager manager = (WifiManager)this.GetSystemService(Context.WifiService);
+
+            multicast = manager.CreateMulticastLock("UDPwifi");
+
 
             Language.CurrentLanguage = "Chinese";
             Locale locale1 = Locale.Default;
@@ -97,9 +106,12 @@
             {
                 Console.WriteLine("HHH OnActivityStarted锛歠oreground");
                 BusSocketStart();
+                multicast.Acquire();
+
                 //鍚庡彴鍥炲埌鍓嶅彴
                 new HDL_ON.UI.AppUnlockPage().LoadPage();
             }
+
         }
 
         public void OnActivityStopped(Activity activity)
@@ -110,6 +122,7 @@
             {
                 Console.WriteLine("HHH OnActivityStopped锛� background");
                 BusSocketStop();
+                multicast.Release();
                 //杩涘叆鍚庡彴
                 UserInfo.Current.unlockTime = DateTime.Now;
 
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 2793501..5edc896 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -20,7 +20,7 @@
 19=The phone number is incorrect. Please re-enter.
 20=The password and confirmation you typed do not match. Please re-enter your password.
 21=The password format does not comply with the requirements, please enter again.
-22=The user has existed, yo24-hour defenseu can sign in directly.
+22=The user has existed, you can sign in directly.
 23=Incorrect verification code, please re-enter.
 24=Incorrect account number, please enter the correct email address.
 25=Email address
@@ -375,7 +375,7 @@
 371=Can not use the function, please bind the gateway
 372=Can not create the scene, please bind the gateway
 373=Fail to add the floor
-374=The residential data has been deleted, APP will automatically swift to another residence.
+374=Residence has been delivered or deleted, APP will automatically swift to another residence.
 375=The gateway is not connected to the server, fail to create the scene.
 376=Can not enter special character
 377=The whole residence
@@ -434,7 +434,7 @@
 448=Fixed deployment
 449=*Undo defense does not affect
 450=Disaster defense
-451=24-hour defense
+451=24h defense
 452=Burglar alarm
 453=Alarm mute
 454=Deployment information
@@ -570,6 +570,51 @@
 583=EZVIZ
 584=Deployment status
 585=Failed to obtain third-party platform information
+586=Sort
+587=Face management
+588=Tip
+589=Disagree
+590=Residential delivery
+591=*Member name
+592=Member account
+593=Face photo
+594=Please enter member name
+595=Delete
+596=Group Name
+597=Please enter
+598=Select device
+599=Please input name
+600=Add combined dimming
+601=Please select two or more devices
+602=My Home
+603=   Please read it carefully
+604=    'On Pro Face Information Collection Protocol'
+605=   If you agree to this agreement, please click the [Agree] button.
+606=Account binding is successful.You can continue to complete the device association operation
+607=Previous page
+608=Next page
+609=*The smart entrance machine can automatically identify suspicious personnel at the entrance and initiate a wandering alarm record
+610=Unable to bind this device. Please purchase this type of product from HDL
+611=Load more
+612=Facial Information Collection Protocol
+613=Revoke Authorization
+614=Statement on account binding
+615=After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid
+616=Bind account
+617=Residential status
+618=To_Be_Debugged
+619=Debugging
+620=To_Be_Accepted
+621=INITIAL_TATE
+622=ACCEPTANCE
+623=Latitude and longitude
+624=Triggered range
+625=Residential unbound
+626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed?
+627=The set time needs to be later than the current time.
+628=Temporary password validity period cannot be greater than 24 hours.
+629=Successfully unbound the residence.
+
 
 
 2532=Visitor Invitation Record
@@ -692,7 +737,7 @@
 1095=Select Date
 1096=Generate
 1097=Temporary password has been copied
-1098=Clear Password?
+1098=Do you want to delete the temporary password?
 1099=The expire time must be later than the effective time
 1100=Unlock Method
 1101=It'll synchronize with actual lock, confirm to delete?
@@ -934,23 +979,6 @@
 
  
  
-6000=Rename
-6001=Please enter a name
-6002=Xiaodu
-6003=aispeech
-6004="Unbind requires a third-party APP for operation", "transfer to a third-party APP"
-6005=Unbind
-6006=Smart speaker
-6007=Control content
-6008=Failed to upload data
-6009=Failed to configure data
-6010="There is no speaker yet,", "Please go to the third-party APP to bind the smart speaker."
-6011=Modification of remarks is unsuccessful!
-6012=Do you want to unbind?
-6013=Unbinding...
-6014=transfer to third-party APP
-6015=Add speakers
- 
     
 7000=Create automation
 7001=Edit automation
@@ -1110,7 +1138,7 @@
 7155=Distress/Normal
 7156=Distress
 7157=whether to unlock
-7158=is
+7158=Is
 7159=Fall in the alarm
 7160=Someone called the police
 7161=Warning tone
@@ -1118,9 +1146,24 @@
 7163=Video call
 7164=Manipulator
 7165=Area intrusion alarm
-7166=camera
-7167=main switch
-7168=pm10
+7166=Camera
+7167=Main switch
+7168=PM10
+
+8501=Video door lock
+8502=Electric quantity
+8503=The door is now closed
+8504=The door is not closed
+8505=RVC
+8506=One click to open the lock
+8507=Temporary password
+8508=History
+8509=Fluorite video door lock
+8510=Call from the doorbell
+8511=Door opener
+8512=Serial number
+8513=Model
+
 
 
 
@@ -1615,7 +1658,7 @@
 371=鍔熻兘鏃犳硶浣跨敤锛岃缁戝畾缃戝叧
 372=鏃犳硶鍒涘缓鍦烘櫙锛岃缁戝畾缃戝叧
 373=娣诲姞妤煎眰澶辫触銆�
-374=浣忓畢鏁版嵁宸茶鍒犻櫎锛孉PP灏嗚嚜鍔ㄥ垏鎹㈠埌鍙︿竴浣忓畢銆�
+374=浣忓畢宸插垹闄ゆ垨宸蹭氦浠橈紝APP灏嗚嚜鍔ㄥ垏鎹㈠埌鍙︿竴浣忓畢銆�
 375=缃戝叧鏈繛鎺ユ湇鍔″櫒锛屾棤娉曞垱寤哄満鏅��
 376=鏃犳硶杈撳叆鐗规畩瀛楃
 377=鍏ㄥ畢鍖哄煙
@@ -1810,7 +1853,50 @@
 583=钀ょ煶鎽勫儚澶�
 584=甯冮槻鐘舵��
 585=鑾峰彇绗笁鏂瑰钩鍙颁俊鎭け璐�
-
+586=鎺掑簭
+587=浜鸿劯绠$悊
+588=浜鸿劯淇℃伅閲囬泦鍗忚鎻愮ず
+589=涓嶅悓鎰�
+590=浣忓畢浜や粯
+591=*鎴愬憳鍚嶇О
+592=鎴愬憳璐﹀彿
+593=浜鸿劯鐓х墖
+594=璇疯緭鍏ユ垚鍛樺悕绉�
+595=鍒犻櫎浜鸿劯鏁版嵁
+596=缁勫悕绉�
+597=璇疯緭鍏�
+598=閫夋嫨缇ゆ帶璁惧
+599=璇疯緭鍏ョ粍鍚嶇О
+600=娣诲姞缁勫悎璋冨厜
+601=璇烽�夋嫨涓や釜浠ヤ笂鐨勮澶�
+602=鎴戠殑瀹跺涵
+603=    涓轰繚鎶ゆ偍鐨勪釜浜洪殣绉佹潈鐩婏紝鐗瑰悜鎮ㄩ�氱煡骞剁敵璇锋槑纭悓鎰忔巿鏉冦�傝浣犱粩缁嗛槄璇�
+604=    銆奜n Pro浜鸿劯淇℃伅閲囬泦鍗忚銆�
+605=    鑻ュ悓鎰忚鍗忚锛岃鐐瑰嚮銆愬悓鎰忋�戞寜閿紝琛ㄧず鎮ㄥ凡缁忕悊瑙e苟鍚屾剰浜鸿劯淇℃伅閲囬泦鍗忚銆�
+606=璐︽埛缁戝畾鎴愬姛锛屾偍鍙互缁х画瀹屾垚璁惧鍏宠仈鎿嶄綔
+607=涓婁竴椤�
+608=涓嬩竴椤�
+609=*鍙瀵硅鍙互鑷姩璇嗗埆闂ㄥ彛鍙枒浜哄憳锛屽苟鍙戣捣寰樺緤鎶ヨ璁板綍
+610=鏃犳硶缁戝畾璇ヨ澶囷紝璇蜂粠娌充笢娓犻亾璐拱璇ョ被鍨嬩骇鍝�
+611=鍔犺浇鏇村
+612=浜鸿劯淇℃伅閲囬泦鍗忚
+613=鎾ゅ洖鎺堟潈
+614=鍏充簬璐﹀彿缁戝畾鐨勫0鏄�
+615=鎾ら攢鎺堟潈鍚庯紝璇ュ搧鐗屽叧鑱斿湪On Pro涓殑璁惧灏嗗叏閮ㄨ瑙g粦锛岀浉鍏充娇鐢ㄤ俊鎭悎璁惧鍊间篃灏嗗け鏁�
+616=缁戝畾璐﹀彿
+617=浣忓畢鐘舵��
+618=寰呰皟璇�
+619=璋冭瘯涓�
+620=寰呴獙鏀�
+621=鍒濆鎬�
+622=楠屾敹
+623=缁忕含搴�
+624=瑙﹀彂鑼冨洿
+625=浣忓畢瑙g粦
+626=浣忓畢瑙g粦涔嬪悗锛屼綇瀹呭皢浼氫粠浣犵殑璐﹀彿涓Щ闄わ紝纭畾瑕佹搷浣滃悧锛�
+627=璁剧疆鐨勬椂闂撮渶瑕佹櫄浜庡綋鍓嶆椂闂�
+628=涓存椂瀵嗙爜鏈夋晥鏈熶笉鑳藉ぇ浜�24灏忔椂銆�
+629=浣忓畢瑙g粦鎴愬姛銆�
 
 2532=璁垮閭�璇疯褰�
 2533=璁垮绠$悊
@@ -1941,8 +2027,8 @@
 1095=閫夋嫨鏃ユ湡
 1096=鐢熸垚
 1097=涓存椂瀵嗙爜宸茬粡澶嶅埗
-1098=娓呴櫎褰撳墠涓存椂瀵嗙爜锛�
-1099=鐢熸晥鏃堕棿蹇呴』澶т簬澶辨晥鏃堕棿
+1098=鏄惁鍒犻櫎涓存椂瀵嗙爜锛�
+1099=鐢熸晥鏃堕棿蹇呴』鏃╀簬澶辨晥鏃堕棿
 1100=寮�閿佹柟寮忕鐞�
 1101=鍒犻櫎鎿嶄綔灏嗚鍚屾浜庡疄浣撻攣涓妠0}鏄惁杩橀渶瑕佸垹闄わ紵
 1102=纭鍒犻櫎
@@ -2345,7 +2431,28 @@
 7165=鍖哄煙鍏ヤ镜鍛婅
 7166=鎽勫儚澶�
 7167=鎬绘帶寮�鍏�
-7168=pm10
+7168=PM10
+
+
+8501=瑙嗛闂ㄩ攣
+8502=鐢甸噺
+8503=褰撳墠闂ㄥ凡鍏�
+8504=褰撳墠闂ㄦ湭鍏�
+8505=瀹炴椂瑙嗛
+8506=涓�閿紑閿�
+8507=涓存椂瀵嗙爜
+8508=鍘嗗彶璁板綍
+8509=钀ょ煶瑙嗛闂ㄩ攣
+8510=鏉ヨ嚜鈥滈棬閾冣�濆懠鍙�
+8511=寮�闂ㄤ汉鍛�
+8512=搴忓垪鍙�
+8513=鍨嬪彿
+
+
+
+
+
+
 
 
 
@@ -3026,6 +3133,51 @@
 583=EZVIZ
 584=Deployment status
 585=Failed to obtain third-party platform information
+586=Sort
+587=Face management
+588=Tip
+589=Disagree
+590=Residential delivery
+591=*Member name
+592=Member account
+593=Face photo
+594=Please enter member name
+595=Delete
+596=Group Name
+597=Please enter
+598=Select device
+599=Please input name
+600=Add combined dimming
+601=Please select two or more devices
+602=My Home
+603=   In order to protect your personal privacy rights, we hereby notify you and apply for explicit consent authorization. Please read it carefully
+604=    'On Pro Face Information Collection Protocol'
+605=   If you agree to this agreement, please click the [Agree] button to indicate that you have understood and agreed to the face information collection agreement.
+606=Account binding is successful.You can continue to complete the device association operation
+607=Previous page
+608=Next page
+609=*The smart entrance machine can automatically identify suspicious personnel at the entrance and initiate a wandering alarm record
+610=Unable to bind this device. Please purchase this type of product from HDL
+611=Load more
+612=Facial Information Collection Protocol
+613=Revoke Authorization
+614=Statement on account binding
+615=After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid
+616=Bind account
+617=Residential status
+618=To_Be_Debugged
+619=Debugging
+620=To_Be_Accepted
+621=INITIAL_TATE
+622=ACCEPTANCE
+623=Latitude and longitude
+624=Triggered range
+625=Residential unbound
+626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed?
+627=The set time needs to be later than the current time.
+628=Temporary password validity period cannot be greater than 24 hours.
+629=Successfully unbound the residence.
+
 
 
 2532=Visitor Invitation Record
@@ -3287,6 +3439,8 @@
 5045=袨褋薪芯胁薪邪褟 谐褉芯屑泻芯褋褌褜
 5046=袪械谐褍谢懈褉芯胁泻邪 谐褉芯屑泻芯褋褌懈
 5047=小械褉胁懈褋"QQ music" 薪械 褍褋褌邪薪芯胁谢械薪 薪邪 胁邪褕械屑 屑芯斜懈谢褜薪芯屑 褌械谢械褎芯薪械, 锌芯卸邪谢褍泄褋褌邪, 锌械褉械泄写懈褌械 胁 褑械薪褌褉 锌褉懈谢芯卸械薪懈泄.
+5048= Progressive cycle
+5049=Single play
 
 6000=袧芯褉屑邪谢褜薪褘泄
 6001=小芯褋褌芯褟薪懈械 褍褋褌褉芯泄褋褌胁邪
@@ -3386,23 +3540,6 @@
 
 
 
-
-6000=袩械褉械懈屑械薪芯胁邪褌褜
-6001=袩芯卸邪谢褍泄褋褌邪, 胁胁械写懈褌械 薪邪蟹胁邪薪懈械
-6002=屑邪褉泻邪 Xiaodu
-6003=袪邪褋锌芯蟹薪邪胁邪褌械谢褜 褉械褔懈
-6004="袛谢褟 芯褌屑械薪褘 锌褉懈胁褟蟹泻懈 褌褉械斜褍械褌褋褟 褋褌芯褉芯薪薪械械 锌褉懈谢芯卸械薪懈械 ", "锌械褉械写邪褌褜 胁 褋褌芯褉芯薪薪械械 锌褉懈谢芯卸械薪懈械"
-6005=袨褌胁褟蟹邪褌褜
-6006=校屑薪褘泄 写懈薪邪屑懈泻
-6007=校锌褉邪胁谢械薪懈械 褋芯写械褉卸懈屑褘屑
-6008=袧械 褍写邪谢芯褋褜 蟹邪谐褉褍蟹懈褌褜 写邪薪薪褘械
-6009=袧械 褍写邪谢芯褋褜 薪邪褋褌褉芯懈褌褜 写邪薪薪褘械
-6010="袛懈薪邪屑懈泻 械褖械 薪械 褍褋褌邪薪芯胁谢械薪", "袩芯卸邪谢褍泄褋褌邪, 锌械褉械泄写懈褌械 胁 褋褌芯褉芯薪薪械械 锌褉懈谢芯卸械薪懈械, 褔褌芯斜褘 锌褉懈胁褟蟹邪褌褜 褋屑邪褉褌 写懈薪邪屑懈泻".
-6011=袠蟹屑械薪械薪懈械 锌褉懈屑械褔邪薪懈泄 薪械 褍写邪谢芯褋褜!
-6012=袙褘 褏芯褌懈褌械 芯褌屑械薪懈褌褜 锌褉懈胁褟蟹泻褍?
-6013=袨褌胁褟蟹褘胁邪薪懈械...
-6014=锌械褉械褏芯写 胁 褋褌芯褉芯薪薪械械 锌褉懈谢芯卸械薪懈械
-6015=袛芯斜邪胁懈褌褜 写懈薪邪屑懈泻懈
 
 
 7000=小芯蟹写邪褌褜 邪胁褌芯屑邪褌懈蟹邪褑懈褞
@@ -3560,6 +3697,34 @@
 7152=袩芯泻懈薪褍褌褜 懈谢懈 锌褉懈斜褘褌褜
 7153=袩芯泻懈薪褍褌褜
 7154=袩褉懈斜褘褌褜
+7155=Distress/Normal
+7156=Distress
+7157=whether to unlock
+7158=Is
+7159=Fall in the alarm
+7160=Someone called the police
+7161=Warning tone
+7162=Face to open the door
+7163=Video call
+7164=Manipulator
+7165=Area intrusion alarm
+7166=Camera
+7167=Main switch
+7168=PM10
+
+8501=Video door lock
+8502=Electric quantity
+8503=The door is now closed
+8504=The door is not closed
+8505=RVC
+8506=One click to open the lock
+8507=Temporary password
+8508=History
+8509=Fluorite video door lock
+8510=Call from the doorbell
+8511=Door opener
+8512=Serial number
+8513=Model
 
 
 
@@ -4245,6 +4410,52 @@
 583=EZVIZ
 584=Deployment status
 585=Failed to obtain third-party platform information
+586=Sort
+587=Face management
+588=Tip
+589=Disagree
+590=Residential delivery
+591=*Member name
+592=Member account
+593=Face photo
+594=Please enter member name
+595=Delete
+596=Group Name
+597=Please enter
+598=Select device
+599=Please input name
+600=Add combined dimming
+601=Please select two or more devices
+602=My Home
+603=   In order to protect your personal privacy rights, we hereby notify you and apply for explicit consent authorization. Please read it carefully
+604=    'On Pro Face Information Collection Protocol'
+605=   If you agree to this agreement, please click the [Agree] button to indicate that you have understood and agreed to the face information collection agreement.
+606=Account binding is successful.You can continue to complete the device association operation
+607=Previous page
+608=Next page
+609=*The smart entrance machine can automatically identify suspicious personnel at the entrance and initiate a wandering alarm record
+610=Unable to bind this device. Please purchase this type of product from HDL
+611=Load more
+612=Facial Information Collection Protocol
+613=Revoke Authorization
+614=Statement on account binding
+615=After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid
+616=Bind account
+617=Residential status
+618=To_Be_Debugged
+619=Debugging
+620=To_Be_Accepted
+621=INITIAL_TATE
+622=ACCEPTANCE
+623=Latitude and longitude
+624=Triggered range
+625=Residential unbound
+626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed?
+627=The set time needs to be later than the current time.
+628=Temporary password validity period cannot be greater than 24 hours.
+629=Successfully unbound the residence.
+
+
 
 
 
@@ -4507,6 +4718,8 @@
 5045=Volumen general
 5046=Ajustar volumen 
 5047="QQ music" no se ha instalado en su tel茅fono celular, proceda en el Centro de aplicaciones.
+5048= Progressive cycle
+5049=Single play
 
 6000=Normal 
 6001=Estado del dispositivo
@@ -4602,22 +4815,7 @@
 6093=El dispositivo no esta en linea
 6094=El dispositivo de puerta de enlace no existe
 6095=Mas de 30 botondes de adici贸n 
-6000=Renombrar
-6001=Introduzca el nombre
-6002=Xiaodu
-6003=aispeech
-6004=El sistema est谩 en mantenimiento ~ Int茅ntelo de nuevo m谩s tarde ~
-6005=Desvinculado
-6006=Altavoz inteligente
-6007=Controlar contenido
-6008=Error al cagar datos 
-6009=Error al configurar datos 
-6010="Todav铆a no hay altavoz", "Vaya a la aplicaci贸n de terceros para vincular el altavoz inteligente".
-6011=La modificaci贸n de los comentarios no tiene 茅xito
-6012=Quieres desvincularte? 
-6013=Desvinculaci贸n 
-6014=transferir a app de terceros 
-6015=A帽adir altavoces
+
 7000=Crear automatizaci贸n
 7001=Etidar automatizaci贸n
 7002=Si
@@ -4773,6 +4971,35 @@
 7152=Dejar o Arrivar a un lugar 
 7153=Salir 
 7154=Llegar 
+7155=Distress/Normal
+7156=Distress
+7157=whether to unlock
+7158=Is
+7159=Fall in the alarm
+7160=Someone called the police
+7161=Warning tone
+7162=Face to open the door
+7163=Video call
+7164=Manipulator
+7165=Area intrusion alarm
+7166=Camera
+7167=Main switch
+7168=PM10
+
+8501=Video door lock
+8502=Electric quantity
+8503=The door is now closed
+8504=The door is not closed
+8505=RVC
+8506=One click to open the lock
+8507=Temporary password
+8508=History
+8509=Fluorite video door lock
+8510=Call from the doorbell
+8511=Door opener
+8512=Serial number
+8513=Model
+
 9000=Inicio sesi贸n con un nuevo n煤mero de tel茅fono celular 
 9001=Inicie sesi贸n con una nueva direcci贸n de correo el茅ctr贸nico 
 9002=Nuevo numero de celular revisado
@@ -5450,6 +5677,74 @@
 583=EZVIZ
 584=Deployment status
 585=Failed to obtain third-party platform information
+586=Sort
+587=Face management
+588=Tip
+589=Disagree
+590=Residential delivery
+591=*Member name
+592=Member account
+593=Face photo
+594=Please enter member name
+595=Delete
+596=Group Name
+597=Please enter
+598=Select device
+599=Please input name
+600=Add combined dimming
+601=Please select two or more devices
+602=My Home
+603=   In order to protect your personal privacy rights, we hereby notify you and apply for explicit consent authorization. Please read it carefully
+604=    'On Pro Face Information Collection Protocol'
+605=   If you agree to this agreement, please click the [Agree] button to indicate that you have understood and agreed to the face information collection agreement.
+606=Account binding is successful.You can continue to complete the device association operation
+607=Previous page
+608=Next page
+609=*The smart entrance machine can automatically identify suspicious personnel at the entrance and initiate a wandering alarm record
+610=Unable to bind this device. Please purchase this type of product from HDL
+611=Load more
+612=Facial Information Collection Protocol
+613=Revoke Authorization
+614=Statement on account binding
+615=After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid
+616=Bind account
+617=Residential status
+618=To_Be_Debugged
+619=Debugging
+620=To_Be_Accepted
+621=INITIAL_TATE
+622=ACCEPTANCE
+623=Latitude and longitude
+624=Triggered range
+625=Residential unbound
+626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed?
+627=The set time needs to be later than the current time.
+628=Temporary password validity period cannot be greater than 24 hours.
+629=Successfully unbound the residence.
+
+
+
+2532=Visitor Invitation Record
+2533=Visitor management
+2534=Visitor Invitation
+2535=Record
+2536=*After you initiate the visitor certificate, you can  unlock the door by password or swipe the code  freely within the validity period you set. Please share the certificate carefully.
+2537=Input phone number of the visitor
+2538=Input 6-digits temporary password
+2539=Random Generation
+2540=After confirmation, the visitor QR code will be generated, and the 6-digit dynamic digital password SMS will also be sent to the visitor mobile phone.
+2541=Are you sure to delete visitor credentials?
+2542=Long press the QR code to save the QR code to the album
+2543=QR code is invalid
+2544=Generate Visitor Credentials
+2545=Cancle Visitor Credentials
+2546=Visitor QR Code
+2547=Phone Number
+2548=Please enter a correct phone number
+2549=Please select a effective time
+2550=Please select a expire time
+2551=Temporary password is invalid
+
 
 
 1000=袙谢邪卸薪芯褋褌 胁 褋褌邪褟褌邪
@@ -5690,6 +5985,8 @@
 5045=小懈谢邪 薪邪 芯褋薪芯胁薪懈褟 蟹胁褍泻
 5046=袪械谐褍谢懈褉邪薪械 薪邪 蟹胁褍泻邪
 5047="鈥濹Q Music鈥� 薪械 械 懈薪褋褌邪谢懈褉邪薪 薪邪 胁邪褕懈褟 屑芯斜懈谢械薪 褌械谢械褎芯薪{\r\n}袦芯谢褟, 懈薪褋褌邪谢懈褉邪泄褌械 谐芯.
+5048= Progressive cycle
+5049=Single play
 
 6000=袧芯褉屑邪谢薪芯
 6001=小褗褋褌芯褟薪懈械 薪邪 褍褋褌褉芯泄褋褌胁芯褌芯
@@ -5790,22 +6087,6 @@
 
 
 
-6000=袩褉械懈屑械薪褍胁邪薪械
-6001=袦芯谢褟, 胁褗胁械写械褌械 懈屑械
-6002=Xiaodu
-6003=aispeech
-6004="袨褌胁褗褉蟹胁邪薪械褌芯 懈蟹懈褋泻胁邪 锌褉懈谢芯卸械薪懈械 薪邪 褌褉械褌邪 褋褌褉邪薪邪 蟹邪 褉邪斜芯褌邪", "锌褉械褏胁褗褉谢褟薪械 泻褗屑 锌褉懈谢芯卸械薪懈械 薪邪 褌褉械褌邪 褋褌褉邪薪邪"
-6005=袨褌胁褗褉蟹邪薪芯
-6006=校屑械薪 胁懈褋芯泻芯谐芯胁芯褉懈褌械谢
-6007=袣芯薪褌褉芯谢 薪邪 褋褗写褗褉卸邪薪懈械褌芯
-6008=袧械褍褋锌械褕薪芯 泻邪褔胁邪薪械 薪邪 写邪薪薪懈
-6009=袧械褍褋锌械褕薪芯 泻芯薪褎懈谐褍褉懈褉邪薪械 薪邪 写邪薪薪懈褌械
-6010="袙褋械 芯褖械 薪褟屑邪 胁懈褋芯泻芯谐芯胁芯褉懈褌械谢,", "袦芯谢褟, 芯褌懈写械褌械 胁 锌褉懈谢芯卸械薪懈械褌芯 薪邪 褌褉械褌邪 褋褌褉邪薪邪, 蟹邪 写邪 褋胁褗褉卸械褌械 懈薪褌械谢懈谐械薪褌薪懈褟 胁懈褋芯泻芯谐芯胁芯褉懈褌械谢."
-6011=袩褉芯屑褟薪邪褌邪 薪邪 蟹邪斜械谢械卸泻懈褌械 械 薪械褍褋锌械褕薪邪!
-6012=袠褋泻邪褌械 谢懈 写邪 芯褌胁褗褉卸械褌械?
-6013=袨褌胁褗褉蟹胁邪薪械...
-6014=锌褉械褏胁褗褉谢褟薪械 泻褗屑 锌褉懈谢芯卸械薪懈械 薪邪 褌褉械褌邪 褋褌褉邪薪邪
-6015=袛芯斜邪胁械褌械 胁懈褋芯泻芯谐芯胁芯褉懈褌械谢懈
 
 
 7000=袧芯胁邪 邪胁褌芯屑邪褌懈蟹邪褑懈褟
@@ -5963,6 +6244,34 @@
 7152=孝褉褗谐薪械褌械 懈谢懈 锌褉懈褋褌懈谐薪械褌械 薪邪 屑褟褋褌芯
 7153=袧邪锌褍褋泻邪薪械
 7154=袩褉懈褋褌懈谐邪薪械
+7155=Distress/Normal
+7156=Distress
+7157=whether to unlock
+7158=Is
+7159=Fall in the alarm
+7160=Someone called the police
+7161=Warning tone
+7162=Face to open the door
+7163=Video call
+7164=Manipulator
+7165=Area intrusion alarm
+7166=Camera
+7167=Main switch
+7168=PM10
+
+8501=Video door lock
+8502=Electric quantity
+8503=The door is now closed
+8504=The door is not closed
+8505=RVC
+8506=One click to open the lock
+8507=Temporary password
+8508=History
+8509=Fluorite video door lock
+8510=Call from the doorbell
+8511=Door opener
+8512=Serial number
+8513=Model
 
 
 
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/Cell.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/Cell.png
new file mode 100644
index 0000000..5ae517b
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/Cell.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/HistoryList.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/HistoryList.png
new file mode 100644
index 0000000..0ad1a69
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/HistoryList.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/OneOpenLock.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/OneOpenLock.png
new file mode 100644
index 0000000..779d661
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/OneOpenLock.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/RTV.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/RTV.png
new file mode 100644
index 0000000..002d330
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/RTV.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/UnLocked.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/UnLocked.png
new file mode 100644
index 0000000..058119f
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/UnLocked.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/UnLocking.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/UnLocking.png
new file mode 100644
index 0000000..6c15f4f
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/UnLocking.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/VideoDoorLockOpen1.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/VideoDoorLockOpen1.png
new file mode 100644
index 0000000..5d35a45
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/VideoDoorLockOpen1.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/VideoDoorlockClose1.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/VideoDoorlockClose1.png
new file mode 100644
index 0000000..e4d40fb
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/VideoDoorlockClose1.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/history.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/history.png
new file mode 100644
index 0000000..7609540
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/DoorLock/history.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/FunctionBg/VideoDoorLockFunctionBg.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/FunctionBg/VideoDoorLockFunctionBg.png
new file mode 100644
index 0000000..eeba7ab
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/FunctionBg/VideoDoorLockFunctionBg.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/securitydoorezviz.png b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/securitydoorezviz.png
new file mode 100644
index 0000000..e4d40fb
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/securitydoorezviz.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/LogicIcon/selectlocation.png b/HDL-ON_Android/Assets/Phone/LogicIcon/selectlocation.png
new file mode 100644
index 0000000..e424a54
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/LogicIcon/selectlocation.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/MusicIcon/currentPlayList.png b/HDL-ON_Android/Assets/Phone/MusicIcon/currentPlayList.png
new file mode 100644
index 0000000..1cb04da
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/MusicIcon/currentPlayList.png
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/CombinedDimmingIcon.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/CombinedDimmingIcon.png
new file mode 100644
index 0000000..3f836f1
--- /dev/null
+++ b/HDL-ON_Android/Assets/Phone/PersonalCenter/CombinedDimmingIcon.png
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index bfd4a20..361fa47 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -65,7 +65,7 @@
     <AndroidSigningStorePass>85521566</AndroidSigningStorePass>
     <AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
     <AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias>
-    <AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
+    <AndroidSupportedAbis>arm64-v8a</AndroidSupportedAbis>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Shared.Droid.JPush">
@@ -163,15 +163,6 @@
     <Reference Include="videophone">
       <HintPath>..\DLL\FL\Android\videophone.dll</HintPath>
     </Reference>
-    <Reference Include="Square.OkHttp3">
-      <HintPath>..\DLL\EZvizMonitor\Square.OkHttp3.dll</HintPath>
-    </Reference>
-    <Reference Include="Square.OkIO">
-      <HintPath>..\DLL\EZvizMonitor\Square.OkIO.dll</HintPath>
-    </Reference>
-    <Reference Include="ys">
-      <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>
-    </Reference>
     <Reference Include="UMSdkDroid">
       <HintPath>..\DLL\UMeng\UMSdkDroid.dll</HintPath>
     </Reference>
@@ -203,6 +194,9 @@
     <Reference Include="LcVideoSdk">
       <HintPath>..\DLL\LC\Android\LcVideoSdk.dll</HintPath>
     </Reference>
+    <Reference Include="ys">
+      <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
@@ -232,6 +226,7 @@
     <Compile Include="Zxing\CustomCaptureActivity.cs" />
     <Compile Include="Zxing\ScanActivity.cs" />
     <Compile Include="LeChengVideo\LeTest.cs" />
+    <Compile Include="Other\LocationUtils.cs" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\agconnect-services.json" />
@@ -419,6 +414,19 @@
     <AndroidAsset Include="Assets\h5\static\img\equal-plant-ic.7ef6befa.png" />
     <AndroidAsset Include="Assets\h5\static\img\coal-save-ic.6c5fd125.png" />
     <AndroidAsset Include="Assets\h5\static\font\SourceHanSansCN-Normal.otf" />
+    <AndroidAsset Include="Assets\Phone\MusicIcon\currentPlayList.png" />
+    <AndroidAsset Include="Assets\Phone\PersonalCenter\CombinedDimmingIcon.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\OneOpenLock.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\RTV.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UnLocked.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\UnLocking.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\History.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Cell.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\VideoDoorLockFunctionBg.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\securitydoorezviz.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorlockClose1.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen1.png" />
+    <AndroidAsset Include="Assets\Phone\LogicIcon\selectlocation.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\values\colors.xml" />
@@ -767,14 +775,20 @@
     <PackageReference Include="Xamarin.Android.Support.Constraint.Layout.Solver">
       <Version>1.1.0</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.AppCenter">
-      <Version>4.2.0</Version>
-    </PackageReference>
     <PackageReference Include="Microsoft.AppCenter.Crashes">
       <Version>4.2.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AppCenter.Analytics">
       <Version>4.2.0</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.AppCenter">
+      <Version>4.2.0</Version>
+    </PackageReference>
+    <PackageReference Include="Square.OkHttp3">
+      <Version>3.14.4</Version>
+    </PackageReference>
+    <PackageReference Include="Bugly">
+      <Version>4.3.1</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
@@ -1616,7 +1630,7 @@
     <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\History.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\HistoryList.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorLock.png" />
diff --git a/HDL-ON_Android/Other/JPush/JPushReceiver.cs b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
index 07f2fcb..fdd0833 100644
--- a/HDL-ON_Android/Other/JPush/JPushReceiver.cs
+++ b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
@@ -34,9 +34,10 @@
         /// <param name="notificationMessage"></param>
         public override void OnNotifyMessageOpened(Context context, NotificationMessage notificationMessage)
         {
+
+            
             //2020-12-23 瑙e喅鐐瑰嚮閫氱煡鏍忔墦寮�涓嶄簡APP闂
             //base.OnNotifyMessageOpened(context, notificationMessage);
-
             OpenNotification(context, notificationMessage);
         }
 
@@ -48,7 +49,7 @@
         public override void OnNotifyMessageArrived(Context context, NotificationMessage notificationMessage)
         {
             base.OnNotifyMessageArrived(context, notificationMessage);
-
+         
             var pushMes = new JPushMessageInfo()
             {
                 Title = notificationMessage.NotificationTitle,
@@ -147,9 +148,18 @@
                 Utlis.WriteLine("PushMes extras : " + pushMes.Extras);
                 Utlis.WriteLine("PushMes HomeId : " + pushMes.HomeId);
 
-                Intent i = new Intent(context, typeof(BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
-                i.SetFlags(ActivityFlags.NewTask);
-                context.StartActivity(i);
+                if (Shared.Application.Activity==null)
+                {
+                    Intent i = new Intent(context, typeof(SplashActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
+                    i.SetFlags(ActivityFlags.NewTask);
+                    context.StartActivity(i);
+                }
+                else
+                {
+                    Intent i = new Intent(context, typeof(BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
+                    i.SetFlags(ActivityFlags.NewTask);
+                    context.StartActivity(i);
+                }
                 //瑙f瀽msg
                 AdjustPushMessage(pushMes);
             }
@@ -161,7 +171,6 @@
 
         public static void AdjustPushMessage(JPushMessageInfo pushMes)
         {
-
             new System.Threading.Thread(new System.Threading.ThreadStart(() =>
             {
                 while (MainPage.BasePageView == null)
diff --git a/HDL-ON_Android/Other/LocationUtils.cs b/HDL-ON_Android/Other/LocationUtils.cs
new file mode 100644
index 0000000..7073140
--- /dev/null
+++ b/HDL-ON_Android/Other/LocationUtils.cs
@@ -0,0 +1,25 @@
+锘縰sing System;
+using System.Threading.Tasks;
+using Xamarin.Essentials;
+
+namespace HDL_ON_Android
+{
+    public static class LocationUtils
+    {
+        public static async Task<Location> GetCurrentLocationAsync()
+        {
+            try
+            {
+                var request = new GeolocationRequest(GeolocationAccuracy.Medium);
+                var location = await Geolocation.GetLocationAsync(request);
+                return location;
+            }
+            catch (Exception ex)
+            {
+                // 澶勭悊寮傚父
+                Console.WriteLine($"鑾峰彇浣嶇疆淇℃伅澶辫触: {ex.Message}");
+                return null;
+            }
+        }
+    }
+}
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index c9741a4..bd9897e 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,6 +1,7 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.4" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202302102">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.8.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202306011">
 	<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
+	<uses-permission android:name="android.permission.RECEIVE_SMS" />
 	<!--鍙嬬洘-->
 	<!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
 	<!--<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>-->
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index 61c599d..b127030 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/HDL-ON_Android/Resources/Resource.designer.cs
@@ -14,7 +14,7 @@
 {
 	
 	
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.8.165")]
 	public partial class Resource
 	{
 		
@@ -351,76 +351,82 @@
 			public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2130772040;
 			
 			// aapt resource value: 0x7F010049
-			public const int mobile_common_dialog_appear = 2130772041;
+			public const int floating_action_button_hide = 2130772041;
 			
 			// aapt resource value: 0x7F01004A
-			public const int mobile_common_dialog_disappear = 2130772042;
+			public const int floating_action_button_show = 2130772042;
 			
 			// aapt resource value: 0x7F01004B
-			public const int mobile_common_slide_in_right = 2130772043;
+			public const int mobile_common_dialog_appear = 2130772043;
 			
 			// aapt resource value: 0x7F01004C
-			public const int mobile_common_slide_left_back_in = 2130772044;
+			public const int mobile_common_dialog_disappear = 2130772044;
 			
 			// aapt resource value: 0x7F01004D
-			public const int mobile_common_slide_out_left = 2130772045;
+			public const int mobile_common_slide_in_right = 2130772045;
 			
 			// aapt resource value: 0x7F01004E
-			public const int mobile_common_slide_right_back_out = 2130772046;
+			public const int mobile_common_slide_left_back_in = 2130772046;
 			
 			// aapt resource value: 0x7F01004F
-			public const int move_in = 2130772047;
+			public const int mobile_common_slide_out_left = 2130772047;
 			
 			// aapt resource value: 0x7F010050
-			public const int move_out = 2130772048;
+			public const int mobile_common_slide_right_back_out = 2130772048;
 			
 			// aapt resource value: 0x7F010051
-			public const int pickerview_dialog_scale_in = 2130772049;
+			public const int move_in = 2130772049;
 			
 			// aapt resource value: 0x7F010052
-			public const int pickerview_dialog_scale_out = 2130772050;
+			public const int move_out = 2130772050;
 			
 			// aapt resource value: 0x7F010053
-			public const int pickerview_slide_in_bottom = 2130772051;
+			public const int pickerview_dialog_scale_in = 2130772051;
 			
 			// aapt resource value: 0x7F010054
-			public const int pickerview_slide_out_bottom = 2130772052;
+			public const int pickerview_dialog_scale_out = 2130772052;
 			
 			// aapt resource value: 0x7F010055
-			public const int play_full_multiple_anim_bg = 2130772053;
+			public const int pickerview_slide_in_bottom = 2130772053;
 			
 			// aapt resource value: 0x7F010056
-			public const int rotate_clockwise = 2130772054;
+			public const int pickerview_slide_out_bottom = 2130772054;
 			
 			// aapt resource value: 0x7F010057
-			public const int slide_in_from_bottom = 2130772055;
+			public const int play_full_multiple_anim_bg = 2130772055;
 			
 			// aapt resource value: 0x7F010058
-			public const int slide_in_from_top = 2130772056;
+			public const int rotate_clockwise = 2130772056;
 			
 			// aapt resource value: 0x7F010059
-			public const int slide_in_right = 2130772057;
+			public const int slide_in_from_bottom = 2130772057;
 			
 			// aapt resource value: 0x7F01005A
-			public const int slide_left_back_in = 2130772058;
+			public const int slide_in_from_top = 2130772058;
 			
 			// aapt resource value: 0x7F01005B
-			public const int slide_out_left = 2130772059;
+			public const int slide_in_right = 2130772059;
 			
 			// aapt resource value: 0x7F01005C
-			public const int slide_out_to_bottom = 2130772060;
+			public const int slide_left_back_in = 2130772060;
 			
 			// aapt resource value: 0x7F01005D
-			public const int slide_out_to_top = 2130772061;
+			public const int slide_out_left = 2130772061;
 			
 			// aapt resource value: 0x7F01005E
-			public const int slide_right_back_out = 2130772062;
+			public const int slide_out_to_bottom = 2130772062;
 			
 			// aapt resource value: 0x7F01005F
-			public const int tooltip_enter = 2130772063;
+			public const int slide_out_to_top = 2130772063;
 			
 			// aapt resource value: 0x7F010060
-			public const int tooltip_exit = 2130772064;
+			public const int slide_right_back_out = 2130772064;
+			
+			// aapt resource value: 0x7F010061
+			public const int tooltip_enter = 2130772065;
+			
+			// aapt resource value: 0x7F010062
+			public const int tooltip_exit = 2130772066;
 			
 			static Animation()
 			{
@@ -921,1612 +927,1642 @@
 			public const int contentScrim = 2130968727;
 			
 			// aapt resource value: 0x7F040098
-			public const int controlBackground = 2130968728;
+			public const int contentViewId = 2130968728;
 			
 			// aapt resource value: 0x7F040099
-			public const int countdownTime = 2130968729;
+			public const int controlBackground = 2130968729;
 			
 			// aapt resource value: 0x7F04009A
-			public const int counterEnabled = 2130968730;
+			public const int countdownTime = 2130968730;
 			
 			// aapt resource value: 0x7F04009B
-			public const int counterMaxLength = 2130968731;
+			public const int counterEnabled = 2130968731;
 			
 			// aapt resource value: 0x7F04009C
-			public const int counterOverflowTextAppearance = 2130968732;
+			public const int counterMaxLength = 2130968732;
 			
 			// aapt resource value: 0x7F04009D
-			public const int counterTextAppearance = 2130968733;
+			public const int counterOverflowTextAppearance = 2130968733;
 			
 			// aapt resource value: 0x7F04009E
-			public const int currentItemPosition = 2130968734;
+			public const int counterTextAppearance = 2130968734;
 			
 			// aapt resource value: 0x7F04009F
-			public const int curtain_bar_bg_color = 2130968735;
+			public const int currentItemPosition = 2130968735;
 			
 			// aapt resource value: 0x7F0400A0
-			public const int curtain_bar_border_color = 2130968736;
+			public const int curtain_bar_bg_color = 2130968736;
 			
 			// aapt resource value: 0x7F0400A1
-			public const int curtain_bar_color = 2130968737;
+			public const int curtain_bar_border_color = 2130968737;
 			
 			// aapt resource value: 0x7F0400A2
-			public const int curtain_bar_height = 2130968738;
+			public const int curtain_bar_color = 2130968738;
 			
 			// aapt resource value: 0x7F0400A3
-			public const int curtain_bar_width = 2130968739;
+			public const int curtain_bar_height = 2130968739;
 			
 			// aapt resource value: 0x7F0400A4
-			public const int customNavigationLayout = 2130968740;
+			public const int curtain_bar_width = 2130968740;
 			
 			// aapt resource value: 0x7F0400A5
-			public const int date_text_color = 2130968741;
+			public const int customNavigationLayout = 2130968741;
 			
 			// aapt resource value: 0x7F0400A6
-			public const int date_text_size = 2130968742;
+			public const int date_text_color = 2130968742;
 			
 			// aapt resource value: 0x7F0400A7
-			public const int defaultQueryHint = 2130968743;
+			public const int date_text_size = 2130968743;
 			
 			// aapt resource value: 0x7F0400A8
-			public const int dhscanner_cornerColor = 2130968744;
+			public const int defaultQueryHint = 2130968744;
 			
 			// aapt resource value: 0x7F0400A9
-			public const int dhscanner_cornerLineLength = 2130968745;
+			public const int dhscanner_cornerColor = 2130968745;
 			
 			// aapt resource value: 0x7F0400AA
-			public const int dhscanner_cornerStrokeSize = 2130968746;
+			public const int dhscanner_cornerLineLength = 2130968746;
 			
 			// aapt resource value: 0x7F0400AB
-			public const int dhscanner_scanLineColor = 2130968747;
+			public const int dhscanner_cornerStrokeSize = 2130968747;
 			
 			// aapt resource value: 0x7F0400AC
-			public const int dhscanner_scanLineDrawable = 2130968748;
+			public const int dhscanner_scanLineColor = 2130968748;
 			
 			// aapt resource value: 0x7F0400AD
-			public const int dhscanner_scanLineIsGrid = 2130968749;
+			public const int dhscanner_scanLineDrawable = 2130968749;
 			
 			// aapt resource value: 0x7F0400AE
-			public const int dhscanner_scanLineMoveTime = 2130968750;
+			public const int dhscanner_scanLineIsGrid = 2130968750;
 			
 			// aapt resource value: 0x7F0400AF
-			public const int dhscanner_scanLineNeedReverse = 2130968751;
+			public const int dhscanner_scanLineMoveTime = 2130968751;
 			
 			// aapt resource value: 0x7F0400B0
-			public const int dhscanner_scanLineStrokeSize = 2130968752;
+			public const int dhscanner_scanLineNeedReverse = 2130968752;
 			
 			// aapt resource value: 0x7F0400B1
-			public const int dhscanner_scanMaskColor = 2130968753;
+			public const int dhscanner_scanLineStrokeSize = 2130968753;
 			
 			// aapt resource value: 0x7F0400B2
-			public const int dhscanner_scanRectHeight = 2130968754;
+			public const int dhscanner_scanMaskColor = 2130968754;
 			
 			// aapt resource value: 0x7F0400B3
-			public const int dhscanner_scanRectInCenter = 2130968755;
+			public const int dhscanner_scanRectHeight = 2130968755;
 			
 			// aapt resource value: 0x7F0400B4
-			public const int dhscanner_scanRectMarginTop = 2130968756;
+			public const int dhscanner_scanRectInCenter = 2130968756;
 			
 			// aapt resource value: 0x7F0400B5
-			public const int dhscanner_scanRectWidth = 2130968757;
+			public const int dhscanner_scanRectMarginTop = 2130968757;
 			
 			// aapt resource value: 0x7F0400B6
-			public const int dialogPreferredPadding = 2130968758;
+			public const int dhscanner_scanRectWidth = 2130968758;
 			
 			// aapt resource value: 0x7F0400B7
-			public const int dialogTheme = 2130968759;
+			public const int dialogPreferredPadding = 2130968759;
 			
 			// aapt resource value: 0x7F0400B8
-			public const int displayOptions = 2130968760;
+			public const int dialogTheme = 2130968760;
 			
 			// aapt resource value: 0x7F0400B9
-			public const int divider = 2130968761;
+			public const int displayOptions = 2130968761;
 			
 			// aapt resource value: 0x7F0400BA
-			public const int dividerColor = 2130968762;
+			public const int divider = 2130968762;
 			
 			// aapt resource value: 0x7F0400BB
-			public const int dividerHeight = 2130968763;
+			public const int dividerColor = 2130968763;
 			
 			// aapt resource value: 0x7F0400BC
-			public const int dividerHorizontal = 2130968764;
+			public const int dividerHeight = 2130968764;
 			
 			// aapt resource value: 0x7F0400BD
-			public const int dividerPadding = 2130968765;
+			public const int dividerHorizontal = 2130968765;
 			
 			// aapt resource value: 0x7F0400BE
-			public const int dividerVertical = 2130968766;
+			public const int dividerPadding = 2130968766;
 			
 			// aapt resource value: 0x7F0400BF
-			public const int drag_edge = 2130968767;
-			
-			// aapt resource value: 0x7F0400C1
-			public const int drawableSize = 2130968769;
-			
-			// aapt resource value: 0x7F0400C2
-			public const int drawerArrowStyle = 2130968770;
+			public const int dividerVertical = 2130968767;
 			
 			// aapt resource value: 0x7F0400C0
-			public const int drawRoundRect = 2130968768;
+			public const int drag_edge = 2130968768;
 			
-			// aapt resource value: 0x7F0400C4
-			public const int dropdownListPreferredItemHeight = 2130968772;
+			// aapt resource value: 0x7F0400C2
+			public const int drawableSize = 2130968770;
 			
 			// aapt resource value: 0x7F0400C3
-			public const int dropDownListViewStyle = 2130968771;
+			public const int drawerArrowStyle = 2130968771;
+			
+			// aapt resource value: 0x7F0400C1
+			public const int drawRoundRect = 2130968769;
 			
 			// aapt resource value: 0x7F0400C5
-			public const int editTextBackground = 2130968773;
+			public const int dropdownListPreferredItemHeight = 2130968773;
+			
+			// aapt resource value: 0x7F0400C4
+			public const int dropDownListViewStyle = 2130968772;
 			
 			// aapt resource value: 0x7F0400C6
-			public const int editTextColor = 2130968774;
+			public const int editTextBackground = 2130968774;
 			
 			// aapt resource value: 0x7F0400C7
-			public const int editTextStyle = 2130968775;
+			public const int editTextColor = 2130968775;
 			
 			// aapt resource value: 0x7F0400C8
-			public const int elevation = 2130968776;
+			public const int editTextStyle = 2130968776;
 			
 			// aapt resource value: 0x7F0400C9
-			public const int emptyVisibility = 2130968777;
+			public const int elevation = 2130968777;
 			
 			// aapt resource value: 0x7F0400CA
-			public const int errorEnabled = 2130968778;
+			public const int emptyVisibility = 2130968778;
 			
 			// aapt resource value: 0x7F0400CB
-			public const int errorTextAppearance = 2130968779;
+			public const int errorEnabled = 2130968779;
 			
 			// aapt resource value: 0x7F0400CC
-			public const int expandActivityOverflowButtonDrawable = 2130968780;
+			public const int errorTextAppearance = 2130968780;
 			
 			// aapt resource value: 0x7F0400CD
-			public const int expanded = 2130968781;
+			public const int expandActivityOverflowButtonDrawable = 2130968781;
 			
 			// aapt resource value: 0x7F0400CE
-			public const int expandedTitleGravity = 2130968782;
+			public const int expanded = 2130968782;
 			
 			// aapt resource value: 0x7F0400CF
-			public const int expandedTitleMargin = 2130968783;
+			public const int expandedTitleGravity = 2130968783;
 			
 			// aapt resource value: 0x7F0400D0
-			public const int expandedTitleMarginBottom = 2130968784;
+			public const int expandedTitleMargin = 2130968784;
 			
 			// aapt resource value: 0x7F0400D1
-			public const int expandedTitleMarginEnd = 2130968785;
+			public const int expandedTitleMarginBottom = 2130968785;
 			
 			// aapt resource value: 0x7F0400D2
-			public const int expandedTitleMarginStart = 2130968786;
+			public const int expandedTitleMarginEnd = 2130968786;
 			
 			// aapt resource value: 0x7F0400D3
-			public const int expandedTitleMarginTop = 2130968787;
+			public const int expandedTitleMarginStart = 2130968787;
 			
 			// aapt resource value: 0x7F0400D4
-			public const int expandedTitleTextAppearance = 2130968788;
+			public const int expandedTitleMarginTop = 2130968788;
 			
 			// aapt resource value: 0x7F0400D5
-			public const int fabSize = 2130968789;
+			public const int expandedTitleTextAppearance = 2130968789;
+			
+			// aapt resource value: 0x7F0400D6
+			public const int fabSize = 2130968790;
 			
 			// aapt resource value: 0x7F040000
 			public const int FadeEnabled = 2130968576;
 			
-			// aapt resource value: 0x7F0400D6
-			public const int fastScrollEnabled = 2130968790;
-			
 			// aapt resource value: 0x7F0400D7
-			public const int fastScrollHorizontalThumbDrawable = 2130968791;
+			public const int fastScrollEnabled = 2130968791;
 			
 			// aapt resource value: 0x7F0400D8
-			public const int fastScrollHorizontalTrackDrawable = 2130968792;
+			public const int fastScrollHorizontalThumbDrawable = 2130968792;
 			
 			// aapt resource value: 0x7F0400D9
-			public const int fastScrollVerticalThumbDrawable = 2130968793;
+			public const int fastScrollHorizontalTrackDrawable = 2130968793;
 			
 			// aapt resource value: 0x7F0400DA
-			public const int fastScrollVerticalTrackDrawable = 2130968794;
-			
-			// aapt resource value: 0x7F0400DD
-			public const int fillet_border_color = 2130968797;
-			
-			// aapt resource value: 0x7F0400DE
-			public const int fillet_border_color_normal = 2130968798;
-			
-			// aapt resource value: 0x7F0400DF
-			public const int fillet_border_color_selected = 2130968799;
-			
-			// aapt resource value: 0x7F0400E0
-			public const int fillet_border_width = 2130968800;
-			
-			// aapt resource value: 0x7F0400E1
-			public const int fillet_radius = 2130968801;
-			
-			// aapt resource value: 0x7F0400E2
-			public const int fillet_shape_type = 2130968802;
+			public const int fastScrollVerticalThumbDrawable = 2130968794;
 			
 			// aapt resource value: 0x7F0400DB
-			public const int fill_color = 2130968795;
+			public const int fastScrollVerticalTrackDrawable = 2130968795;
 			
-			// aapt resource value: 0x7F0400DC
-			public const int fill_height = 2130968796;
+			// aapt resource value: 0x7F0400DE
+			public const int fillet_border_color = 2130968798;
+			
+			// aapt resource value: 0x7F0400DF
+			public const int fillet_border_color_normal = 2130968799;
+			
+			// aapt resource value: 0x7F0400E0
+			public const int fillet_border_color_selected = 2130968800;
+			
+			// aapt resource value: 0x7F0400E1
+			public const int fillet_border_width = 2130968801;
+			
+			// aapt resource value: 0x7F0400E2
+			public const int fillet_radius = 2130968802;
 			
 			// aapt resource value: 0x7F0400E3
-			public const int first_text = 2130968803;
+			public const int fillet_shape_type = 2130968803;
+			
+			// aapt resource value: 0x7F0400DC
+			public const int fill_color = 2130968796;
+			
+			// aapt resource value: 0x7F0400DD
+			public const int fill_height = 2130968797;
 			
 			// aapt resource value: 0x7F0400E4
-			public const int first_text_color = 2130968804;
+			public const int first_text = 2130968804;
 			
 			// aapt resource value: 0x7F0400E5
-			public const int first_text_size = 2130968805;
+			public const int first_text_color = 2130968805;
 			
 			// aapt resource value: 0x7F0400E6
-			public const int font = 2130968806;
+			public const int first_text_size = 2130968806;
 			
 			// aapt resource value: 0x7F0400E7
-			public const int fontFamily = 2130968807;
+			public const int font = 2130968807;
 			
 			// aapt resource value: 0x7F0400E8
-			public const int fontProviderAuthority = 2130968808;
+			public const int fontFamily = 2130968808;
 			
 			// aapt resource value: 0x7F0400E9
-			public const int fontProviderCerts = 2130968809;
+			public const int fontProviderAuthority = 2130968809;
 			
 			// aapt resource value: 0x7F0400EA
-			public const int fontProviderFetchStrategy = 2130968810;
+			public const int fontProviderCerts = 2130968810;
 			
 			// aapt resource value: 0x7F0400EB
-			public const int fontProviderFetchTimeout = 2130968811;
+			public const int fontProviderFetchStrategy = 2130968811;
 			
 			// aapt resource value: 0x7F0400EC
-			public const int fontProviderPackage = 2130968812;
+			public const int fontProviderFetchTimeout = 2130968812;
 			
 			// aapt resource value: 0x7F0400ED
-			public const int fontProviderQuery = 2130968813;
+			public const int fontProviderPackage = 2130968813;
 			
 			// aapt resource value: 0x7F0400EE
-			public const int fontStyle = 2130968814;
+			public const int fontProviderQuery = 2130968814;
 			
 			// aapt resource value: 0x7F0400EF
-			public const int fontWeight = 2130968815;
+			public const int fontStyle = 2130968815;
 			
 			// aapt resource value: 0x7F0400F0
-			public const int foregroundInsidePadding = 2130968816;
+			public const int fontWeight = 2130968816;
 			
 			// aapt resource value: 0x7F0400F1
-			public const int gapBetweenBars = 2130968817;
-			
-			// aapt resource value: 0x7F0400F3
-			public const int god_mode = 2130968819;
+			public const int foregroundInsidePadding = 2130968817;
 			
 			// aapt resource value: 0x7F0400F2
-			public const int goIcon = 2130968818;
+			public const int gapBetweenBars = 2130968818;
 			
 			// aapt resource value: 0x7F0400F4
-			public const int gravity = 2130968820;
+			public const int god_mode = 2130968820;
+			
+			// aapt resource value: 0x7F0400F3
+			public const int goIcon = 2130968819;
 			
 			// aapt resource value: 0x7F0400F5
-			public const int halfVisibleItemCount = 2130968821;
+			public const int gravity = 2130968821;
 			
 			// aapt resource value: 0x7F0400F6
-			public const int hdl_arc_thumb_mode = 2130968822;
+			public const int halfVisibleItemCount = 2130968822;
 			
 			// aapt resource value: 0x7F0400F7
-			public const int headerLayout = 2130968823;
+			public const int hdl_arc_thumb_mode = 2130968823;
 			
 			// aapt resource value: 0x7F0400F8
-			public const int headerMonthHeight = 2130968824;
+			public const int headerLayout = 2130968824;
 			
 			// aapt resource value: 0x7F0400F9
-			public const int height = 2130968825;
+			public const int headerMonthHeight = 2130968825;
 			
 			// aapt resource value: 0x7F0400FA
-			public const int height_relative = 2130968826;
+			public const int height = 2130968826;
 			
 			// aapt resource value: 0x7F0400FB
-			public const int hideLeft = 2130968827;
+			public const int height_relative = 2130968827;
 			
 			// aapt resource value: 0x7F0400FC
-			public const int hideOnContentScroll = 2130968828;
+			public const int hideLeft = 2130968828;
 			
 			// aapt resource value: 0x7F0400FD
-			public const int hideRight = 2130968829;
+			public const int hideOnContentScroll = 2130968829;
 			
 			// aapt resource value: 0x7F0400FE
-			public const int hintAnimationEnabled = 2130968830;
+			public const int hideRight = 2130968830;
 			
 			// aapt resource value: 0x7F0400FF
-			public const int hintEnabled = 2130968831;
+			public const int hintAnimationEnabled = 2130968831;
 			
 			// aapt resource value: 0x7F040100
-			public const int hintTextAppearance = 2130968832;
+			public const int hintEnabled = 2130968832;
 			
 			// aapt resource value: 0x7F040101
-			public const int homeAsUpIndicator = 2130968833;
+			public const int hintTextAppearance = 2130968833;
 			
 			// aapt resource value: 0x7F040102
-			public const int homeLayout = 2130968834;
+			public const int homeAsUpIndicator = 2130968834;
 			
 			// aapt resource value: 0x7F040103
-			public const int icon = 2130968835;
-			
-			// aapt resource value: 0x7F040106
-			public const int iconifiedByDefault = 2130968838;
+			public const int homeLayout = 2130968835;
 			
 			// aapt resource value: 0x7F040104
-			public const int iconTint = 2130968836;
-			
-			// aapt resource value: 0x7F040105
-			public const int iconTintMode = 2130968837;
+			public const int icon = 2130968836;
 			
 			// aapt resource value: 0x7F040107
-			public const int imageButtonStyle = 2130968839;
+			public const int iconifiedByDefault = 2130968839;
+			
+			// aapt resource value: 0x7F040105
+			public const int iconTint = 2130968837;
+			
+			// aapt resource value: 0x7F040106
+			public const int iconTintMode = 2130968838;
 			
 			// aapt resource value: 0x7F040108
-			public const int image_bg = 2130968840;
+			public const int imageButtonStyle = 2130968840;
 			
 			// aapt resource value: 0x7F040109
-			public const int indeterminateProgressStyle = 2130968841;
+			public const int image_bg = 2130968841;
 			
 			// aapt resource value: 0x7F04010A
-			public const int indicatorText = 2130968842;
+			public const int indeterminateProgressStyle = 2130968842;
 			
 			// aapt resource value: 0x7F04010B
-			public const int indicatorTextColor = 2130968843;
+			public const int indicatorColor = 2130968843;
 			
 			// aapt resource value: 0x7F04010C
-			public const int indicatorTextSize = 2130968844;
+			public const int indicatorName = 2130968844;
 			
 			// aapt resource value: 0x7F04010D
-			public const int initialActivityCount = 2130968845;
+			public const int indicatorText = 2130968845;
 			
 			// aapt resource value: 0x7F04010E
-			public const int insetForeground = 2130968846;
+			public const int indicatorTextColor = 2130968846;
 			
 			// aapt resource value: 0x7F04010F
-			public const int isAllVisible = 2130968847;
+			public const int indicatorTextSize = 2130968847;
 			
 			// aapt resource value: 0x7F040110
-			public const int isCyclic = 2130968848;
+			public const int initialActivityCount = 2130968848;
 			
 			// aapt resource value: 0x7F040111
-			public const int isLightTheme = 2130968849;
+			public const int insetForeground = 2130968849;
 			
 			// aapt resource value: 0x7F040112
-			public const int itemBackground = 2130968850;
+			public const int isAllVisible = 2130968850;
 			
 			// aapt resource value: 0x7F040113
-			public const int itemHeightSpace = 2130968851;
+			public const int isCyclic = 2130968851;
 			
 			// aapt resource value: 0x7F040114
-			public const int itemIconTint = 2130968852;
+			public const int isLightTheme = 2130968852;
 			
 			// aapt resource value: 0x7F040115
-			public const int itemOffsetPercent = 2130968853;
+			public const int itemBackground = 2130968853;
 			
 			// aapt resource value: 0x7F040116
-			public const int itemPadding = 2130968854;
-			
-			// aapt resource value: 0x7F04011C
-			public const int itemsDimmedAlpha = 2130968860;
+			public const int itemHeightSpace = 2130968854;
 			
 			// aapt resource value: 0x7F040117
-			public const int itemSelector = 2130968855;
-			
-			// aapt resource value: 0x7F04011D
-			public const int itemsPadding = 2130968861;
+			public const int itemIconTint = 2130968855;
 			
 			// aapt resource value: 0x7F040118
-			public const int itemTextAppearance = 2130968856;
+			public const int itemOffsetPercent = 2130968856;
 			
 			// aapt resource value: 0x7F040119
-			public const int itemTextColor = 2130968857;
+			public const int itemPadding = 2130968857;
+			
+			// aapt resource value: 0x7F04011F
+			public const int itemsDimmedAlpha = 2130968863;
 			
 			// aapt resource value: 0x7F04011A
-			public const int itemTextSize = 2130968858;
+			public const int itemSelector = 2130968858;
+			
+			// aapt resource value: 0x7F040120
+			public const int itemsPadding = 2130968864;
 			
 			// aapt resource value: 0x7F04011B
-			public const int itemWidthSpace = 2130968859;
+			public const int itemTextAppearance = 2130968859;
+			
+			// aapt resource value: 0x7F04011C
+			public const int itemTextColor = 2130968860;
+			
+			// aapt resource value: 0x7F04011D
+			public const int itemTextSize = 2130968861;
+			
+			// aapt resource value: 0x7F04011E
+			public const int itemWidthSpace = 2130968862;
 			
 			// aapt resource value: 0x7F040001
 			public const int JazzyViewPagerstyle = 2130968577;
 			
-			// aapt resource value: 0x7F04011E
-			public const int keylines = 2130968862;
-			
-			// aapt resource value: 0x7F04011F
-			public const int landscape_only = 2130968863;
-			
-			// aapt resource value: 0x7F040120
-			public const int layout = 2130968864;
-			
 			// aapt resource value: 0x7F040121
-			public const int layoutManager = 2130968865;
+			public const int keylines = 2130968865;
 			
 			// aapt resource value: 0x7F040122
-			public const int layout_anchor = 2130968866;
+			public const int landscape_only = 2130968866;
 			
 			// aapt resource value: 0x7F040123
-			public const int layout_anchorGravity = 2130968867;
+			public const int layout = 2130968867;
 			
 			// aapt resource value: 0x7F040124
-			public const int layout_behavior = 2130968868;
+			public const int layoutManager = 2130968868;
 			
 			// aapt resource value: 0x7F040125
-			public const int layout_collapseMode = 2130968869;
+			public const int layout_anchor = 2130968869;
 			
 			// aapt resource value: 0x7F040126
-			public const int layout_collapseParallaxMultiplier = 2130968870;
+			public const int layout_anchorGravity = 2130968870;
 			
 			// aapt resource value: 0x7F040127
-			public const int layout_constrainedHeight = 2130968871;
+			public const int layout_behavior = 2130968871;
 			
 			// aapt resource value: 0x7F040128
-			public const int layout_constrainedWidth = 2130968872;
+			public const int layout_collapseMode = 2130968872;
 			
 			// aapt resource value: 0x7F040129
-			public const int layout_constraintBaseline_creator = 2130968873;
+			public const int layout_collapseParallaxMultiplier = 2130968873;
 			
 			// aapt resource value: 0x7F04012A
-			public const int layout_constraintBaseline_toBaselineOf = 2130968874;
+			public const int layout_constrainedHeight = 2130968874;
 			
 			// aapt resource value: 0x7F04012B
-			public const int layout_constraintBottom_creator = 2130968875;
+			public const int layout_constrainedWidth = 2130968875;
 			
 			// aapt resource value: 0x7F04012C
-			public const int layout_constraintBottom_toBottomOf = 2130968876;
+			public const int layout_constraintBaseline_creator = 2130968876;
 			
 			// aapt resource value: 0x7F04012D
-			public const int layout_constraintBottom_toTopOf = 2130968877;
+			public const int layout_constraintBaseline_toBaselineOf = 2130968877;
 			
 			// aapt resource value: 0x7F04012E
-			public const int layout_constraintCircle = 2130968878;
+			public const int layout_constraintBottom_creator = 2130968878;
 			
 			// aapt resource value: 0x7F04012F
-			public const int layout_constraintCircleAngle = 2130968879;
+			public const int layout_constraintBottom_toBottomOf = 2130968879;
 			
 			// aapt resource value: 0x7F040130
-			public const int layout_constraintCircleRadius = 2130968880;
+			public const int layout_constraintBottom_toTopOf = 2130968880;
 			
 			// aapt resource value: 0x7F040131
-			public const int layout_constraintDimensionRatio = 2130968881;
+			public const int layout_constraintCircle = 2130968881;
 			
 			// aapt resource value: 0x7F040132
-			public const int layout_constraintEnd_toEndOf = 2130968882;
+			public const int layout_constraintCircleAngle = 2130968882;
 			
 			// aapt resource value: 0x7F040133
-			public const int layout_constraintEnd_toStartOf = 2130968883;
+			public const int layout_constraintCircleRadius = 2130968883;
 			
 			// aapt resource value: 0x7F040134
-			public const int layout_constraintGuide_begin = 2130968884;
+			public const int layout_constraintDimensionRatio = 2130968884;
 			
 			// aapt resource value: 0x7F040135
-			public const int layout_constraintGuide_end = 2130968885;
+			public const int layout_constraintEnd_toEndOf = 2130968885;
 			
 			// aapt resource value: 0x7F040136
-			public const int layout_constraintGuide_percent = 2130968886;
+			public const int layout_constraintEnd_toStartOf = 2130968886;
 			
 			// aapt resource value: 0x7F040137
-			public const int layout_constraintHeight_default = 2130968887;
+			public const int layout_constraintGuide_begin = 2130968887;
 			
 			// aapt resource value: 0x7F040138
-			public const int layout_constraintHeight_max = 2130968888;
+			public const int layout_constraintGuide_end = 2130968888;
 			
 			// aapt resource value: 0x7F040139
-			public const int layout_constraintHeight_min = 2130968889;
+			public const int layout_constraintGuide_percent = 2130968889;
 			
 			// aapt resource value: 0x7F04013A
-			public const int layout_constraintHeight_percent = 2130968890;
+			public const int layout_constraintHeight_default = 2130968890;
 			
 			// aapt resource value: 0x7F04013B
-			public const int layout_constraintHorizontal_bias = 2130968891;
+			public const int layout_constraintHeight_max = 2130968891;
 			
 			// aapt resource value: 0x7F04013C
-			public const int layout_constraintHorizontal_chainStyle = 2130968892;
+			public const int layout_constraintHeight_min = 2130968892;
 			
 			// aapt resource value: 0x7F04013D
-			public const int layout_constraintHorizontal_weight = 2130968893;
+			public const int layout_constraintHeight_percent = 2130968893;
 			
 			// aapt resource value: 0x7F04013E
-			public const int layout_constraintLeft_creator = 2130968894;
+			public const int layout_constraintHorizontal_bias = 2130968894;
 			
 			// aapt resource value: 0x7F04013F
-			public const int layout_constraintLeft_toLeftOf = 2130968895;
+			public const int layout_constraintHorizontal_chainStyle = 2130968895;
 			
 			// aapt resource value: 0x7F040140
-			public const int layout_constraintLeft_toRightOf = 2130968896;
+			public const int layout_constraintHorizontal_weight = 2130968896;
 			
 			// aapt resource value: 0x7F040141
-			public const int layout_constraintRight_creator = 2130968897;
+			public const int layout_constraintLeft_creator = 2130968897;
 			
 			// aapt resource value: 0x7F040142
-			public const int layout_constraintRight_toLeftOf = 2130968898;
+			public const int layout_constraintLeft_toLeftOf = 2130968898;
 			
 			// aapt resource value: 0x7F040143
-			public const int layout_constraintRight_toRightOf = 2130968899;
+			public const int layout_constraintLeft_toRightOf = 2130968899;
 			
 			// aapt resource value: 0x7F040144
-			public const int layout_constraintStart_toEndOf = 2130968900;
+			public const int layout_constraintRight_creator = 2130968900;
 			
 			// aapt resource value: 0x7F040145
-			public const int layout_constraintStart_toStartOf = 2130968901;
+			public const int layout_constraintRight_toLeftOf = 2130968901;
 			
 			// aapt resource value: 0x7F040146
-			public const int layout_constraintTop_creator = 2130968902;
+			public const int layout_constraintRight_toRightOf = 2130968902;
 			
 			// aapt resource value: 0x7F040147
-			public const int layout_constraintTop_toBottomOf = 2130968903;
+			public const int layout_constraintStart_toEndOf = 2130968903;
 			
 			// aapt resource value: 0x7F040148
-			public const int layout_constraintTop_toTopOf = 2130968904;
+			public const int layout_constraintStart_toStartOf = 2130968904;
 			
 			// aapt resource value: 0x7F040149
-			public const int layout_constraintVertical_bias = 2130968905;
+			public const int layout_constraintTop_creator = 2130968905;
 			
 			// aapt resource value: 0x7F04014A
-			public const int layout_constraintVertical_chainStyle = 2130968906;
+			public const int layout_constraintTop_toBottomOf = 2130968906;
 			
 			// aapt resource value: 0x7F04014B
-			public const int layout_constraintVertical_weight = 2130968907;
+			public const int layout_constraintTop_toTopOf = 2130968907;
 			
 			// aapt resource value: 0x7F04014C
-			public const int layout_constraintWidth_default = 2130968908;
+			public const int layout_constraintVertical_bias = 2130968908;
 			
 			// aapt resource value: 0x7F04014D
-			public const int layout_constraintWidth_max = 2130968909;
+			public const int layout_constraintVertical_chainStyle = 2130968909;
 			
 			// aapt resource value: 0x7F04014E
-			public const int layout_constraintWidth_min = 2130968910;
+			public const int layout_constraintVertical_weight = 2130968910;
 			
 			// aapt resource value: 0x7F04014F
-			public const int layout_constraintWidth_percent = 2130968911;
+			public const int layout_constraintWidth_default = 2130968911;
 			
 			// aapt resource value: 0x7F040150
-			public const int layout_dodgeInsetEdges = 2130968912;
+			public const int layout_constraintWidth_max = 2130968912;
 			
 			// aapt resource value: 0x7F040151
-			public const int layout_editor_absoluteX = 2130968913;
+			public const int layout_constraintWidth_min = 2130968913;
 			
 			// aapt resource value: 0x7F040152
-			public const int layout_editor_absoluteY = 2130968914;
+			public const int layout_constraintWidth_percent = 2130968914;
 			
 			// aapt resource value: 0x7F040153
-			public const int layout_goneMarginBottom = 2130968915;
+			public const int layout_dodgeInsetEdges = 2130968915;
 			
 			// aapt resource value: 0x7F040154
-			public const int layout_goneMarginEnd = 2130968916;
+			public const int layout_editor_absoluteX = 2130968916;
 			
 			// aapt resource value: 0x7F040155
-			public const int layout_goneMarginLeft = 2130968917;
+			public const int layout_editor_absoluteY = 2130968917;
 			
 			// aapt resource value: 0x7F040156
-			public const int layout_goneMarginRight = 2130968918;
+			public const int layout_goneMarginBottom = 2130968918;
 			
 			// aapt resource value: 0x7F040157
-			public const int layout_goneMarginStart = 2130968919;
+			public const int layout_goneMarginEnd = 2130968919;
 			
 			// aapt resource value: 0x7F040158
-			public const int layout_goneMarginTop = 2130968920;
+			public const int layout_goneMarginLeft = 2130968920;
 			
 			// aapt resource value: 0x7F040159
-			public const int layout_insetEdge = 2130968921;
+			public const int layout_goneMarginRight = 2130968921;
 			
 			// aapt resource value: 0x7F04015A
-			public const int layout_keyline = 2130968922;
+			public const int layout_goneMarginStart = 2130968922;
 			
 			// aapt resource value: 0x7F04015B
-			public const int layout_optimizationLevel = 2130968923;
+			public const int layout_goneMarginTop = 2130968923;
 			
 			// aapt resource value: 0x7F04015C
-			public const int layout_scrollFlags = 2130968924;
+			public const int layout_insetEdge = 2130968924;
 			
 			// aapt resource value: 0x7F04015D
-			public const int layout_scrollInterpolator = 2130968925;
+			public const int layout_keyline = 2130968925;
 			
 			// aapt resource value: 0x7F04015E
-			public const int layout_srlBackgroundColor = 2130968926;
+			public const int layout_optimizationLevel = 2130968926;
 			
 			// aapt resource value: 0x7F04015F
-			public const int layout_srlSpinnerStyle = 2130968927;
+			public const int layout_scrollFlags = 2130968927;
 			
 			// aapt resource value: 0x7F040160
-			public const int leftIcon = 2130968928;
+			public const int layout_scrollInterpolator = 2130968928;
 			
 			// aapt resource value: 0x7F040161
-			public const int left_selector = 2130968929;
+			public const int layout_srlBackgroundColor = 2130968929;
 			
 			// aapt resource value: 0x7F040162
-			public const int left_selector_visible = 2130968930;
+			public const int layout_srlSpinnerStyle = 2130968930;
 			
 			// aapt resource value: 0x7F040163
-			public const int listChoiceBackgroundIndicator = 2130968931;
+			public const int leftIcon = 2130968931;
 			
 			// aapt resource value: 0x7F040164
-			public const int listDividerAlertDialog = 2130968932;
+			public const int leftViewId = 2130968932;
 			
 			// aapt resource value: 0x7F040165
-			public const int listItemLayout = 2130968933;
+			public const int left_selector = 2130968933;
 			
 			// aapt resource value: 0x7F040166
-			public const int listLayout = 2130968934;
+			public const int left_selector_visible = 2130968934;
 			
 			// aapt resource value: 0x7F040167
-			public const int listMenuViewStyle = 2130968935;
+			public const int listChoiceBackgroundIndicator = 2130968935;
 			
 			// aapt resource value: 0x7F040168
-			public const int listPopupWindowStyle = 2130968936;
+			public const int listDividerAlertDialog = 2130968936;
 			
 			// aapt resource value: 0x7F040169
-			public const int listPreferredItemHeight = 2130968937;
+			public const int listItemLayout = 2130968937;
 			
 			// aapt resource value: 0x7F04016A
-			public const int listPreferredItemHeightLarge = 2130968938;
+			public const int listLayout = 2130968938;
 			
 			// aapt resource value: 0x7F04016B
-			public const int listPreferredItemHeightSmall = 2130968939;
+			public const int listMenuViewStyle = 2130968939;
 			
 			// aapt resource value: 0x7F04016C
-			public const int listPreferredItemPaddingLeft = 2130968940;
+			public const int listPopupWindowStyle = 2130968940;
 			
 			// aapt resource value: 0x7F04016D
-			public const int listPreferredItemPaddingRight = 2130968941;
+			public const int listPreferredItemHeight = 2130968941;
 			
 			// aapt resource value: 0x7F04016E
-			public const int logo = 2130968942;
+			public const int listPreferredItemHeightLarge = 2130968942;
 			
 			// aapt resource value: 0x7F04016F
-			public const int logoDescription = 2130968943;
+			public const int listPreferredItemHeightSmall = 2130968943;
 			
 			// aapt resource value: 0x7F040170
-			public const int mainColor = 2130968944;
+			public const int listPreferredItemPaddingLeft = 2130968944;
 			
 			// aapt resource value: 0x7F040171
-			public const int maxActionInlineWidth = 2130968945;
+			public const int listPreferredItemPaddingRight = 2130968945;
 			
 			// aapt resource value: 0x7F040172
-			public const int maxButtonHeight = 2130968946;
+			public const int liveplay_angle_style = 2130968946;
 			
 			// aapt resource value: 0x7F040173
-			public const int max_time = 2130968947;
+			public const int logo = 2130968947;
 			
 			// aapt resource value: 0x7F040174
-			public const int measureWithLargestChild = 2130968948;
+			public const int logoDescription = 2130968948;
 			
 			// aapt resource value: 0x7F040175
-			public const int menu = 2130968949;
+			public const int mainColor = 2130968949;
 			
 			// aapt resource value: 0x7F040176
-			public const int ml_border_color = 2130968950;
+			public const int maxActionInlineWidth = 2130968950;
 			
 			// aapt resource value: 0x7F040177
-			public const int ml_border_width = 2130968951;
+			public const int maxButtonHeight = 2130968951;
 			
 			// aapt resource value: 0x7F040178
-			public const int ml_press_alpha = 2130968952;
+			public const int maxHeight = 2130968952;
 			
 			// aapt resource value: 0x7F040179
-			public const int ml_press_color = 2130968953;
+			public const int maxWidth = 2130968953;
 			
 			// aapt resource value: 0x7F04017A
-			public const int ml_radius = 2130968954;
+			public const int max_time = 2130968954;
 			
 			// aapt resource value: 0x7F04017B
-			public const int ml_shape_type = 2130968955;
+			public const int measureWithLargestChild = 2130968955;
 			
 			// aapt resource value: 0x7F04017C
-			public const int modeOfDay = 2130968956;
+			public const int menu = 2130968956;
 			
 			// aapt resource value: 0x7F04017D
-			public const int multiChoiceItemLayout = 2130968957;
+			public const int minHeight = 2130968957;
 			
 			// aapt resource value: 0x7F04017E
-			public const int navigationContentDescription = 2130968958;
+			public const int minWidth = 2130968958;
 			
 			// aapt resource value: 0x7F04017F
-			public const int navigationIcon = 2130968959;
+			public const int ml_border_color = 2130968959;
 			
 			// aapt resource value: 0x7F040180
-			public const int navigationMode = 2130968960;
+			public const int ml_border_width = 2130968960;
 			
 			// aapt resource value: 0x7F040181
-			public const int numericModifiers = 2130968961;
+			public const int ml_press_alpha = 2130968961;
 			
 			// aapt resource value: 0x7F040182
-			public const int outlineColor = 2130968962;
+			public const int ml_press_color = 2130968962;
 			
 			// aapt resource value: 0x7F040183
-			public const int outlineEnabled = 2130968963;
+			public const int ml_radius = 2130968963;
 			
 			// aapt resource value: 0x7F040184
-			public const int overlapAnchor = 2130968964;
+			public const int ml_shape_type = 2130968964;
 			
 			// aapt resource value: 0x7F040185
-			public const int paddingBottomNoButtons = 2130968965;
+			public const int modeOfDay = 2130968965;
 			
 			// aapt resource value: 0x7F040186
-			public const int paddingEnd = 2130968966;
+			public const int multiChoiceItemLayout = 2130968966;
 			
 			// aapt resource value: 0x7F040187
-			public const int paddingStart = 2130968967;
+			public const int navigationContentDescription = 2130968967;
 			
 			// aapt resource value: 0x7F040188
-			public const int paddingTopNoTitle = 2130968968;
+			public const int navigationIcon = 2130968968;
 			
 			// aapt resource value: 0x7F040189
-			public const int panelBackground = 2130968969;
+			public const int navigationMode = 2130968969;
 			
 			// aapt resource value: 0x7F04018A
-			public const int panelMenuListTheme = 2130968970;
+			public const int numericModifiers = 2130968970;
 			
 			// aapt resource value: 0x7F04018B
-			public const int panelMenuListWidth = 2130968971;
+			public const int outlineColor = 2130968971;
 			
 			// aapt resource value: 0x7F04018C
-			public const int passwordToggleContentDescription = 2130968972;
+			public const int outlineEnabled = 2130968972;
 			
 			// aapt resource value: 0x7F04018D
-			public const int passwordToggleDrawable = 2130968973;
+			public const int overlapAnchor = 2130968973;
 			
 			// aapt resource value: 0x7F04018E
-			public const int passwordToggleEnabled = 2130968974;
+			public const int paddingBottomNoButtons = 2130968974;
 			
 			// aapt resource value: 0x7F04018F
-			public const int passwordToggleTint = 2130968975;
+			public const int paddingEnd = 2130968975;
 			
 			// aapt resource value: 0x7F040190
-			public const int passwordToggleTintMode = 2130968976;
+			public const int paddingStart = 2130968976;
 			
 			// aapt resource value: 0x7F040191
-			public const int popupMenuStyle = 2130968977;
+			public const int paddingTopNoTitle = 2130968977;
 			
 			// aapt resource value: 0x7F040192
-			public const int popupTheme = 2130968978;
+			public const int panelBackground = 2130968978;
 			
 			// aapt resource value: 0x7F040193
-			public const int popupWindowStyle = 2130968979;
+			public const int panelMenuListTheme = 2130968979;
 			
 			// aapt resource value: 0x7F040194
-			public const int preserveIconSpacing = 2130968980;
+			public const int panelMenuListWidth = 2130968980;
 			
 			// aapt resource value: 0x7F040195
-			public const int pressedTranslationZ = 2130968981;
+			public const int passwordToggleContentDescription = 2130968981;
 			
 			// aapt resource value: 0x7F040196
-			public const int progressBarPadding = 2130968982;
+			public const int passwordToggleDrawable = 2130968982;
 			
 			// aapt resource value: 0x7F040197
-			public const int progressBarStyle = 2130968983;
+			public const int passwordToggleEnabled = 2130968983;
 			
 			// aapt resource value: 0x7F040198
-			public const int progressTextColor = 2130968984;
+			public const int passwordToggleTint = 2130968984;
 			
 			// aapt resource value: 0x7F040199
-			public const int progressTextSize = 2130968985;
+			public const int passwordToggleTintMode = 2130968985;
 			
 			// aapt resource value: 0x7F04019A
-			public const int ptrAdapterViewBackground = 2130968986;
+			public const int popupMenuStyle = 2130968986;
 			
 			// aapt resource value: 0x7F04019B
-			public const int ptrAnimationStyle = 2130968987;
+			public const int popupTheme = 2130968987;
 			
 			// aapt resource value: 0x7F04019C
-			public const int ptrDrawable = 2130968988;
+			public const int popupWindowStyle = 2130968988;
 			
 			// aapt resource value: 0x7F04019D
-			public const int ptrDrawableBottom = 2130968989;
+			public const int preserveIconSpacing = 2130968989;
 			
 			// aapt resource value: 0x7F04019E
-			public const int ptrDrawableEnd = 2130968990;
+			public const int pressedTranslationZ = 2130968990;
 			
 			// aapt resource value: 0x7F04019F
-			public const int ptrDrawableIng = 2130968991;
+			public const int progressBarPadding = 2130968991;
 			
 			// aapt resource value: 0x7F0401A0
-			public const int ptrDrawableStart = 2130968992;
+			public const int progressBarStyle = 2130968992;
 			
 			// aapt resource value: 0x7F0401A1
-			public const int ptrDrawableTop = 2130968993;
+			public const int progressTextColor = 2130968993;
 			
 			// aapt resource value: 0x7F0401A2
-			public const int ptrHeaderBackground = 2130968994;
+			public const int progressTextSize = 2130968994;
 			
 			// aapt resource value: 0x7F0401A3
-			public const int ptrHeaderSubTextColor = 2130968995;
+			public const int ptrAdapterViewBackground = 2130968995;
 			
 			// aapt resource value: 0x7F0401A4
-			public const int ptrHeaderTextAppearance = 2130968996;
+			public const int ptrAnimationStyle = 2130968996;
 			
 			// aapt resource value: 0x7F0401A5
-			public const int ptrHeaderTextColor = 2130968997;
+			public const int ptrDrawable = 2130968997;
 			
 			// aapt resource value: 0x7F0401A6
-			public const int ptrListViewExtrasEnabled = 2130968998;
+			public const int ptrDrawableBottom = 2130968998;
 			
 			// aapt resource value: 0x7F0401A7
-			public const int ptrMode = 2130968999;
+			public const int ptrDrawableEnd = 2130968999;
 			
 			// aapt resource value: 0x7F0401A8
-			public const int ptrOverScroll = 2130969000;
+			public const int ptrDrawableIng = 2130969000;
 			
 			// aapt resource value: 0x7F0401A9
-			public const int ptrRefreshableViewBackground = 2130969001;
+			public const int ptrDrawableStart = 2130969001;
 			
 			// aapt resource value: 0x7F0401AA
-			public const int ptrRotateDrawableWhilePulling = 2130969002;
+			public const int ptrDrawableTop = 2130969002;
 			
 			// aapt resource value: 0x7F0401AB
-			public const int ptrScrollingWhileRefreshingEnabled = 2130969003;
+			public const int ptrHeaderBackground = 2130969003;
 			
 			// aapt resource value: 0x7F0401AC
-			public const int ptrShowIndicator = 2130969004;
+			public const int ptrHeaderSubTextColor = 2130969004;
 			
 			// aapt resource value: 0x7F0401AD
-			public const int ptrSubHeaderTextAppearance = 2130969005;
+			public const int ptrHeaderTextAppearance = 2130969005;
 			
 			// aapt resource value: 0x7F0401AE
-			public const int queryBackground = 2130969006;
+			public const int ptrHeaderTextColor = 2130969006;
 			
 			// aapt resource value: 0x7F0401AF
-			public const int queryHint = 2130969007;
+			public const int ptrListViewExtrasEnabled = 2130969007;
 			
 			// aapt resource value: 0x7F0401B0
-			public const int radioButtonStyle = 2130969008;
+			public const int ptrMode = 2130969008;
 			
 			// aapt resource value: 0x7F0401B1
-			public const int radius = 2130969009;
+			public const int ptrOverScroll = 2130969009;
 			
 			// aapt resource value: 0x7F0401B2
-			public const int ratingBarStyle = 2130969010;
+			public const int ptrRefreshableViewBackground = 2130969010;
 			
 			// aapt resource value: 0x7F0401B3
-			public const int ratingBarStyleIndicator = 2130969011;
+			public const int ptrRotateDrawableWhilePulling = 2130969011;
 			
 			// aapt resource value: 0x7F0401B4
-			public const int ratingBarStyleSmall = 2130969012;
+			public const int ptrScrollingWhileRefreshingEnabled = 2130969012;
 			
 			// aapt resource value: 0x7F0401B5
-			public const int ratio = 2130969013;
+			public const int ptrShowIndicator = 2130969013;
 			
 			// aapt resource value: 0x7F0401B6
-			public const int reverseLayout = 2130969014;
+			public const int ptrSubHeaderTextAppearance = 2130969014;
 			
 			// aapt resource value: 0x7F0401B7
-			public const int rightIcon = 2130969015;
+			public const int queryBackground = 2130969015;
 			
 			// aapt resource value: 0x7F0401B8
-			public const int right_selector = 2130969016;
+			public const int queryHint = 2130969016;
 			
 			// aapt resource value: 0x7F0401B9
-			public const int right_selector_visible = 2130969017;
-			
-			// aapt resource value: 0x7F0401BC
-			public const int ringbgColor = 2130969020;
+			public const int radioButtonStyle = 2130969017;
 			
 			// aapt resource value: 0x7F0401BA
-			public const int ringColor = 2130969018;
+			public const int radius = 2130969018;
 			
 			// aapt resource value: 0x7F0401BB
-			public const int ringWidth = 2130969019;
+			public const int ratingBarStyle = 2130969019;
+			
+			// aapt resource value: 0x7F0401BC
+			public const int ratingBarStyleIndicator = 2130969020;
 			
 			// aapt resource value: 0x7F0401BD
-			public const int rippleColor = 2130969021;
+			public const int ratingBarStyleSmall = 2130969021;
 			
 			// aapt resource value: 0x7F0401BE
-			public const int scale_text_color = 2130969022;
+			public const int ratio = 2130969022;
 			
 			// aapt resource value: 0x7F0401BF
-			public const int scale_text_size = 2130969023;
+			public const int reverseLayout = 2130969023;
 			
 			// aapt resource value: 0x7F0401C0
-			public const int scrimAnimationDuration = 2130969024;
+			public const int rightIcon = 2130969024;
 			
 			// aapt resource value: 0x7F0401C1
-			public const int scrimVisibleHeightTrigger = 2130969025;
+			public const int rightViewId = 2130969025;
 			
 			// aapt resource value: 0x7F0401C2
-			public const int searchHintIcon = 2130969026;
+			public const int right_selector = 2130969026;
 			
 			// aapt resource value: 0x7F0401C3
-			public const int searchIcon = 2130969027;
-			
-			// aapt resource value: 0x7F0401C4
-			public const int searchViewStyle = 2130969028;
-			
-			// aapt resource value: 0x7F0401C5
-			public const int second_curtain_bar_color = 2130969029;
+			public const int right_selector_visible = 2130969027;
 			
 			// aapt resource value: 0x7F0401C6
-			public const int second_text = 2130969030;
+			public const int ringbgColor = 2130969030;
+			
+			// aapt resource value: 0x7F0401C4
+			public const int ringColor = 2130969028;
+			
+			// aapt resource value: 0x7F0401C5
+			public const int ringWidth = 2130969029;
 			
 			// aapt resource value: 0x7F0401C7
-			public const int second_text_color = 2130969031;
+			public const int rippleColor = 2130969031;
 			
 			// aapt resource value: 0x7F0401C8
-			public const int second_text_size = 2130969032;
+			public const int scale_text_color = 2130969032;
 			
 			// aapt resource value: 0x7F0401C9
-			public const int second_wave_color = 2130969033;
+			public const int scale_text_size = 2130969033;
 			
 			// aapt resource value: 0x7F0401CA
-			public const int seekBarStyle = 2130969034;
+			public const int scrimAnimationDuration = 2130969034;
 			
 			// aapt resource value: 0x7F0401CB
-			public const int selectableItemBackground = 2130969035;
+			public const int scrimVisibleHeightTrigger = 2130969035;
 			
 			// aapt resource value: 0x7F0401CC
-			public const int selectableItemBackgroundBorderless = 2130969036;
+			public const int searchHintIcon = 2130969036;
 			
 			// aapt resource value: 0x7F0401CD
-			public const int selectedBorderColor = 2130969037;
+			public const int searchIcon = 2130969037;
 			
 			// aapt resource value: 0x7F0401CE
-			public const int selectedDayRadius = 2130969038;
+			public const int searchViewStyle = 2130969038;
 			
 			// aapt resource value: 0x7F0401CF
-			public const int selectedTextColor = 2130969039;
+			public const int second_curtain_bar_color = 2130969039;
 			
 			// aapt resource value: 0x7F0401D0
-			public const int selectedTextSize = 2130969040;
+			public const int second_text = 2130969040;
 			
 			// aapt resource value: 0x7F0401D1
-			public const int selectionDivider = 2130969041;
+			public const int second_text_color = 2130969041;
 			
 			// aapt resource value: 0x7F0401D2
-			public const int selectionDividerActiveAlpha = 2130969042;
+			public const int second_text_size = 2130969042;
 			
 			// aapt resource value: 0x7F0401D3
-			public const int selectionDividerDimmedAlpha = 2130969043;
+			public const int second_wave_color = 2130969043;
 			
 			// aapt resource value: 0x7F0401D4
-			public const int selectionDividerHeight = 2130969044;
+			public const int seekBarStyle = 2130969044;
 			
 			// aapt resource value: 0x7F0401D5
-			public const int selectionDividerWidth = 2130969045;
+			public const int selectableItemBackground = 2130969045;
 			
 			// aapt resource value: 0x7F0401D6
-			public const int shape_type = 2130969046;
+			public const int selectableItemBackgroundBorderless = 2130969046;
 			
 			// aapt resource value: 0x7F0401D7
-			public const int showAsAction = 2130969047;
+			public const int selectedBorderColor = 2130969047;
 			
 			// aapt resource value: 0x7F0401D8
-			public const int showDividers = 2130969048;
+			public const int selectedDayRadius = 2130969048;
 			
 			// aapt resource value: 0x7F0401D9
-			public const int showText = 2130969049;
+			public const int selectedTextColor = 2130969049;
 			
 			// aapt resource value: 0x7F0401DA
-			public const int showTitle = 2130969050;
+			public const int selectedTextSize = 2130969050;
 			
 			// aapt resource value: 0x7F0401DB
-			public const int show_mode = 2130969051;
+			public const int selectionDivider = 2130969051;
 			
 			// aapt resource value: 0x7F0401DC
-			public const int singleChoiceItemLayout = 2130969052;
+			public const int selectionDividerActiveAlpha = 2130969052;
 			
 			// aapt resource value: 0x7F0401DD
-			public const int spanCount = 2130969053;
+			public const int selectionDividerDimmedAlpha = 2130969053;
 			
 			// aapt resource value: 0x7F0401DE
-			public const int spinBars = 2130969054;
+			public const int selectionDividerHeight = 2130969054;
 			
 			// aapt resource value: 0x7F0401DF
-			public const int spinnerDropDownItemStyle = 2130969055;
+			public const int selectionDividerWidth = 2130969055;
 			
 			// aapt resource value: 0x7F0401E0
-			public const int spinnerStyle = 2130969056;
+			public const int shape_type = 2130969056;
 			
 			// aapt resource value: 0x7F0401E1
-			public const int splitTrack = 2130969057;
+			public const int showAsAction = 2130969057;
 			
 			// aapt resource value: 0x7F0401E2
-			public const int srcCompat = 2130969058;
+			public const int showDividers = 2130969058;
 			
 			// aapt resource value: 0x7F0401E3
-			public const int srlAccentColor = 2130969059;
+			public const int showText = 2130969059;
 			
 			// aapt resource value: 0x7F0401E4
-			public const int srlAnimatingColor = 2130969060;
+			public const int showTitle = 2130969060;
 			
 			// aapt resource value: 0x7F0401E5
-			public const int srlClassicsSpinnerStyle = 2130969061;
+			public const int show_mode = 2130969061;
 			
 			// aapt resource value: 0x7F0401E6
-			public const int srlDisableContentWhenLoading = 2130969062;
+			public const int singleChoiceItemLayout = 2130969062;
 			
 			// aapt resource value: 0x7F0401E7
-			public const int srlDisableContentWhenRefresh = 2130969063;
+			public const int spanCount = 2130969063;
 			
 			// aapt resource value: 0x7F0401E8
-			public const int srlDragRate = 2130969064;
+			public const int spinBars = 2130969064;
 			
 			// aapt resource value: 0x7F0401E9
-			public const int srlDrawableArrow = 2130969065;
+			public const int spinnerDropDownItemStyle = 2130969065;
 			
 			// aapt resource value: 0x7F0401EA
-			public const int srlDrawableArrowSize = 2130969066;
+			public const int spinnerStyle = 2130969066;
 			
 			// aapt resource value: 0x7F0401EB
-			public const int srlDrawableMarginRight = 2130969067;
+			public const int splitTrack = 2130969067;
 			
 			// aapt resource value: 0x7F0401EC
-			public const int srlDrawableProgress = 2130969068;
+			public const int srcCompat = 2130969068;
 			
 			// aapt resource value: 0x7F0401ED
-			public const int srlDrawableProgressSize = 2130969069;
+			public const int srlAccentColor = 2130969069;
 			
 			// aapt resource value: 0x7F0401EE
-			public const int srlDrawableSize = 2130969070;
+			public const int srlAnimatingColor = 2130969070;
 			
 			// aapt resource value: 0x7F0401EF
-			public const int srlEnableAutoLoadMore = 2130969071;
+			public const int srlClassicsSpinnerStyle = 2130969071;
 			
 			// aapt resource value: 0x7F0401F0
-			public const int srlEnableClipFooterWhenFixedBehind = 2130969072;
+			public const int srlDisableContentWhenLoading = 2130969072;
 			
 			// aapt resource value: 0x7F0401F1
-			public const int srlEnableClipHeaderWhenFixedBehind = 2130969073;
+			public const int srlDisableContentWhenRefresh = 2130969073;
 			
 			// aapt resource value: 0x7F0401F2
-			public const int srlEnableFooterFollowWhenLoadFinished = 2130969074;
+			public const int srlDragRate = 2130969074;
 			
 			// aapt resource value: 0x7F0401F3
-			public const int srlEnableFooterFollowWhenNoMoreData = 2130969075;
+			public const int srlDrawableArrow = 2130969075;
 			
 			// aapt resource value: 0x7F0401F4
-			public const int srlEnableFooterTranslationContent = 2130969076;
+			public const int srlDrawableArrowSize = 2130969076;
 			
 			// aapt resource value: 0x7F0401F5
-			public const int srlEnableHeaderTranslationContent = 2130969077;
+			public const int srlDrawableMarginRight = 2130969077;
 			
 			// aapt resource value: 0x7F0401F6
-			public const int srlEnableHorizontalDrag = 2130969078;
+			public const int srlDrawableProgress = 2130969078;
 			
 			// aapt resource value: 0x7F0401F7
-			public const int srlEnableLastTime = 2130969079;
+			public const int srlDrawableProgressSize = 2130969079;
 			
 			// aapt resource value: 0x7F0401F8
-			public const int srlEnableLoadMore = 2130969080;
+			public const int srlDrawableSize = 2130969080;
 			
 			// aapt resource value: 0x7F0401F9
-			public const int srlEnableLoadMoreWhenContentNotFull = 2130969081;
+			public const int srlEnableAutoLoadMore = 2130969081;
 			
 			// aapt resource value: 0x7F0401FA
-			public const int srlEnableNestedScrolling = 2130969082;
+			public const int srlEnableClipFooterWhenFixedBehind = 2130969082;
 			
 			// aapt resource value: 0x7F0401FB
-			public const int srlEnableOverScrollBounce = 2130969083;
+			public const int srlEnableClipHeaderWhenFixedBehind = 2130969083;
 			
 			// aapt resource value: 0x7F0401FC
-			public const int srlEnableOverScrollDrag = 2130969084;
+			public const int srlEnableFooterFollowWhenLoadFinished = 2130969084;
 			
 			// aapt resource value: 0x7F0401FD
-			public const int srlEnablePreviewInEditMode = 2130969085;
+			public const int srlEnableFooterFollowWhenNoMoreData = 2130969085;
 			
 			// aapt resource value: 0x7F0401FE
-			public const int srlEnablePullToCloseTwoLevel = 2130969086;
+			public const int srlEnableFooterTranslationContent = 2130969086;
 			
 			// aapt resource value: 0x7F0401FF
-			public const int srlEnablePureScrollMode = 2130969087;
+			public const int srlEnableHeaderTranslationContent = 2130969087;
 			
 			// aapt resource value: 0x7F040200
-			public const int srlEnableRefresh = 2130969088;
+			public const int srlEnableHorizontalDrag = 2130969088;
 			
 			// aapt resource value: 0x7F040201
-			public const int srlEnableScrollContentWhenLoaded = 2130969089;
+			public const int srlEnableLastTime = 2130969089;
 			
 			// aapt resource value: 0x7F040202
-			public const int srlEnableScrollContentWhenRefreshed = 2130969090;
+			public const int srlEnableLoadMore = 2130969090;
 			
 			// aapt resource value: 0x7F040203
-			public const int srlEnableTwoLevel = 2130969091;
+			public const int srlEnableLoadMoreWhenContentNotFull = 2130969091;
 			
 			// aapt resource value: 0x7F040204
-			public const int srlFinishDuration = 2130969092;
+			public const int srlEnableNestedScrolling = 2130969092;
 			
 			// aapt resource value: 0x7F040205
-			public const int srlFixedFooterViewId = 2130969093;
+			public const int srlEnableOverScrollBounce = 2130969093;
 			
 			// aapt resource value: 0x7F040206
-			public const int srlFixedHeaderViewId = 2130969094;
+			public const int srlEnableOverScrollDrag = 2130969094;
 			
 			// aapt resource value: 0x7F040207
-			public const int srlFloorDuration = 2130969095;
+			public const int srlEnablePreviewInEditMode = 2130969095;
 			
 			// aapt resource value: 0x7F040208
-			public const int srlFloorRage = 2130969096;
+			public const int srlEnablePullToCloseTwoLevel = 2130969096;
 			
 			// aapt resource value: 0x7F040209
-			public const int srlFooterHeight = 2130969097;
+			public const int srlEnablePureScrollMode = 2130969097;
 			
 			// aapt resource value: 0x7F04020A
-			public const int srlFooterInsetStart = 2130969098;
+			public const int srlEnableRefresh = 2130969098;
 			
 			// aapt resource value: 0x7F04020B
-			public const int srlFooterMaxDragRate = 2130969099;
+			public const int srlEnableScrollContentWhenLoaded = 2130969099;
 			
 			// aapt resource value: 0x7F04020C
-			public const int srlFooterTranslationViewId = 2130969100;
+			public const int srlEnableScrollContentWhenRefreshed = 2130969100;
 			
 			// aapt resource value: 0x7F04020D
-			public const int srlFooterTriggerRate = 2130969101;
+			public const int srlEnableTwoLevel = 2130969101;
 			
 			// aapt resource value: 0x7F04020E
-			public const int srlHeaderHeight = 2130969102;
+			public const int srlFinishDuration = 2130969102;
 			
 			// aapt resource value: 0x7F04020F
-			public const int srlHeaderInsetStart = 2130969103;
+			public const int srlFixedFooterViewId = 2130969103;
 			
 			// aapt resource value: 0x7F040210
-			public const int srlHeaderMaxDragRate = 2130969104;
+			public const int srlFixedHeaderViewId = 2130969104;
 			
 			// aapt resource value: 0x7F040211
-			public const int srlHeaderTranslationViewId = 2130969105;
+			public const int srlFloorDuration = 2130969105;
 			
 			// aapt resource value: 0x7F040212
-			public const int srlHeaderTriggerRate = 2130969106;
+			public const int srlFloorRage = 2130969106;
 			
 			// aapt resource value: 0x7F040213
-			public const int srlMaxRage = 2130969107;
+			public const int srlFooterHeight = 2130969107;
 			
 			// aapt resource value: 0x7F040214
-			public const int srlNormalColor = 2130969108;
+			public const int srlFooterInsetStart = 2130969108;
 			
 			// aapt resource value: 0x7F040215
-			public const int srlPrimaryColor = 2130969109;
+			public const int srlFooterMaxDragRate = 2130969109;
 			
 			// aapt resource value: 0x7F040216
-			public const int srlReboundDuration = 2130969110;
+			public const int srlFooterTranslationViewId = 2130969110;
 			
 			// aapt resource value: 0x7F040217
-			public const int srlRefreshRage = 2130969111;
+			public const int srlFooterTriggerRate = 2130969111;
 			
 			// aapt resource value: 0x7F040218
-			public const int srlTextFailed = 2130969112;
+			public const int srlHeaderHeight = 2130969112;
 			
 			// aapt resource value: 0x7F040219
-			public const int srlTextFinish = 2130969113;
+			public const int srlHeaderInsetStart = 2130969113;
 			
 			// aapt resource value: 0x7F04021A
-			public const int srlTextLoading = 2130969114;
+			public const int srlHeaderMaxDragRate = 2130969114;
 			
 			// aapt resource value: 0x7F04021B
-			public const int srlTextNothing = 2130969115;
+			public const int srlHeaderTranslationViewId = 2130969115;
 			
 			// aapt resource value: 0x7F04021C
-			public const int srlTextPulling = 2130969116;
+			public const int srlHeaderTriggerRate = 2130969116;
 			
 			// aapt resource value: 0x7F04021D
-			public const int srlTextRefreshing = 2130969117;
+			public const int srlMaxRage = 2130969117;
 			
 			// aapt resource value: 0x7F04021E
-			public const int srlTextRelease = 2130969118;
+			public const int srlNormalColor = 2130969118;
 			
 			// aapt resource value: 0x7F04021F
-			public const int srlTextSecondary = 2130969119;
+			public const int srlPrimaryColor = 2130969119;
 			
 			// aapt resource value: 0x7F040220
-			public const int srlTextSizeTime = 2130969120;
+			public const int srlReboundDuration = 2130969120;
 			
 			// aapt resource value: 0x7F040221
-			public const int srlTextSizeTitle = 2130969121;
+			public const int srlRefreshRage = 2130969121;
 			
 			// aapt resource value: 0x7F040222
-			public const int srlTextTimeMarginTop = 2130969122;
+			public const int srlTextFailed = 2130969122;
 			
 			// aapt resource value: 0x7F040223
-			public const int srlTextUpdate = 2130969123;
+			public const int srlTextFinish = 2130969123;
 			
 			// aapt resource value: 0x7F040224
-			public const int stackFromEnd = 2130969124;
+			public const int srlTextLoading = 2130969124;
 			
 			// aapt resource value: 0x7F040225
-			public const int state_above_anchor = 2130969125;
+			public const int srlTextNothing = 2130969125;
 			
 			// aapt resource value: 0x7F040226
-			public const int state_collapsed = 2130969126;
+			public const int srlTextPulling = 2130969126;
 			
 			// aapt resource value: 0x7F040227
-			public const int state_collapsible = 2130969127;
+			public const int srlTextRefreshing = 2130969127;
 			
 			// aapt resource value: 0x7F040228
-			public const int statusBarBackground = 2130969128;
+			public const int srlTextRelease = 2130969128;
 			
 			// aapt resource value: 0x7F040229
-			public const int statusBarScrim = 2130969129;
+			public const int srlTextSecondary = 2130969129;
 			
 			// aapt resource value: 0x7F04022A
-			public const int subMenuArrow = 2130969130;
+			public const int srlTextSizeTime = 2130969130;
 			
 			// aapt resource value: 0x7F04022B
-			public const int submitBackground = 2130969131;
+			public const int srlTextSizeTitle = 2130969131;
 			
 			// aapt resource value: 0x7F04022C
-			public const int subtitle = 2130969132;
+			public const int srlTextTimeMarginTop = 2130969132;
 			
 			// aapt resource value: 0x7F04022D
-			public const int subtitleTextAppearance = 2130969133;
+			public const int srlTextUpdate = 2130969133;
 			
 			// aapt resource value: 0x7F04022E
-			public const int subtitleTextColor = 2130969134;
+			public const int stackFromEnd = 2130969134;
 			
 			// aapt resource value: 0x7F04022F
-			public const int subtitleTextStyle = 2130969135;
+			public const int state_above_anchor = 2130969135;
 			
 			// aapt resource value: 0x7F040230
-			public const int suggestionRowLayout = 2130969136;
+			public const int state_collapsed = 2130969136;
 			
 			// aapt resource value: 0x7F040231
-			public const int switchMinWidth = 2130969137;
+			public const int state_collapsible = 2130969137;
 			
 			// aapt resource value: 0x7F040232
-			public const int switchPadding = 2130969138;
+			public const int statusBarBackground = 2130969138;
 			
 			// aapt resource value: 0x7F040233
-			public const int switchStyle = 2130969139;
+			public const int statusBarScrim = 2130969139;
 			
 			// aapt resource value: 0x7F040234
-			public const int switchTextAppearance = 2130969140;
+			public const int subMenuArrow = 2130969140;
 			
 			// aapt resource value: 0x7F040235
-			public const int tabBackground = 2130969141;
+			public const int submitBackground = 2130969141;
 			
 			// aapt resource value: 0x7F040236
-			public const int tabContentStart = 2130969142;
+			public const int subtitle = 2130969142;
 			
 			// aapt resource value: 0x7F040237
-			public const int tabGravity = 2130969143;
+			public const int subtitleTextAppearance = 2130969143;
 			
 			// aapt resource value: 0x7F040238
-			public const int tabIndicatorColor = 2130969144;
+			public const int subtitleTextColor = 2130969144;
 			
 			// aapt resource value: 0x7F040239
-			public const int tabIndicatorHeight = 2130969145;
+			public const int subtitleTextStyle = 2130969145;
 			
 			// aapt resource value: 0x7F04023A
-			public const int tabMaxWidth = 2130969146;
+			public const int suggestionRowLayout = 2130969146;
 			
 			// aapt resource value: 0x7F04023B
-			public const int tabMinWidth = 2130969147;
+			public const int switchMinWidth = 2130969147;
 			
 			// aapt resource value: 0x7F04023C
-			public const int tabMode = 2130969148;
+			public const int switchPadding = 2130969148;
 			
 			// aapt resource value: 0x7F04023D
-			public const int tabPadding = 2130969149;
+			public const int switchStyle = 2130969149;
 			
 			// aapt resource value: 0x7F04023E
-			public const int tabPaddingBottom = 2130969150;
+			public const int switchTextAppearance = 2130969150;
 			
 			// aapt resource value: 0x7F04023F
-			public const int tabPaddingEnd = 2130969151;
+			public const int tabBackground = 2130969151;
 			
 			// aapt resource value: 0x7F040240
-			public const int tabPaddingStart = 2130969152;
+			public const int tabContentStart = 2130969152;
 			
 			// aapt resource value: 0x7F040241
-			public const int tabPaddingTop = 2130969153;
+			public const int tabGravity = 2130969153;
 			
 			// aapt resource value: 0x7F040242
-			public const int tabSelectedTextColor = 2130969154;
+			public const int tabIndicatorColor = 2130969154;
 			
 			// aapt resource value: 0x7F040243
-			public const int tabTextAppearance = 2130969155;
+			public const int tabIndicatorHeight = 2130969155;
 			
 			// aapt resource value: 0x7F040244
-			public const int tabTextColor = 2130969156;
+			public const int tabMaxWidth = 2130969156;
 			
 			// aapt resource value: 0x7F040245
-			public const int textAllCaps = 2130969157;
+			public const int tabMinWidth = 2130969157;
 			
 			// aapt resource value: 0x7F040246
-			public const int textAppearanceLargePopupMenu = 2130969158;
+			public const int tabMode = 2130969158;
 			
 			// aapt resource value: 0x7F040247
-			public const int textAppearanceListItem = 2130969159;
+			public const int tabPadding = 2130969159;
 			
 			// aapt resource value: 0x7F040248
-			public const int textAppearanceListItemSecondary = 2130969160;
+			public const int tabPaddingBottom = 2130969160;
 			
 			// aapt resource value: 0x7F040249
-			public const int textAppearanceListItemSmall = 2130969161;
+			public const int tabPaddingEnd = 2130969161;
 			
 			// aapt resource value: 0x7F04024A
-			public const int textAppearancePopupMenuHeader = 2130969162;
+			public const int tabPaddingStart = 2130969162;
 			
 			// aapt resource value: 0x7F04024B
-			public const int textAppearanceSearchResultSubtitle = 2130969163;
+			public const int tabPaddingTop = 2130969163;
 			
 			// aapt resource value: 0x7F04024C
-			public const int textAppearanceSearchResultTitle = 2130969164;
+			public const int tabSelectedTextColor = 2130969164;
 			
 			// aapt resource value: 0x7F04024D
-			public const int textAppearanceSmallPopupMenu = 2130969165;
+			public const int tabTextAppearance = 2130969165;
 			
 			// aapt resource value: 0x7F04024E
-			public const int textColor = 2130969166;
+			public const int tabTextColor = 2130969166;
 			
 			// aapt resource value: 0x7F04024F
-			public const int textColorAlertDialogListItem = 2130969167;
+			public const int textAllCaps = 2130969167;
 			
 			// aapt resource value: 0x7F040250
-			public const int textColorError = 2130969168;
+			public const int textAppearanceLargePopupMenu = 2130969168;
 			
 			// aapt resource value: 0x7F040251
-			public const int textColorSearchUrl = 2130969169;
+			public const int textAppearanceListItem = 2130969169;
 			
 			// aapt resource value: 0x7F040252
-			public const int textGradual = 2130969170;
+			public const int textAppearanceListItemSecondary = 2130969170;
 			
 			// aapt resource value: 0x7F040253
-			public const int textPadding = 2130969171;
+			public const int textAppearanceListItemSmall = 2130969171;
 			
 			// aapt resource value: 0x7F040254
-			public const int textSize = 2130969172;
+			public const int textAppearancePopupMenuHeader = 2130969172;
 			
 			// aapt resource value: 0x7F040255
-			public const int textSizeDay = 2130969173;
+			public const int textAppearanceSearchResultSubtitle = 2130969173;
 			
 			// aapt resource value: 0x7F040256
-			public const int textSizeDayName = 2130969174;
+			public const int textAppearanceSearchResultTitle = 2130969174;
 			
 			// aapt resource value: 0x7F040257
-			public const int textSizeMonth = 2130969175;
+			public const int textAppearanceSmallPopupMenu = 2130969175;
 			
 			// aapt resource value: 0x7F040258
-			public const int textStyle = 2130969176;
+			public const int textColor = 2130969176;
 			
 			// aapt resource value: 0x7F040259
-			public const int theme = 2130969177;
+			public const int textColorAlertDialogListItem = 2130969177;
 			
 			// aapt resource value: 0x7F04025A
-			public const int thickness = 2130969178;
+			public const int textColorError = 2130969178;
 			
 			// aapt resource value: 0x7F04025B
-			public const int thumbTextPadding = 2130969179;
+			public const int textColorSearchUrl = 2130969179;
 			
 			// aapt resource value: 0x7F04025C
-			public const int thumbTint = 2130969180;
+			public const int textGradual = 2130969180;
 			
 			// aapt resource value: 0x7F04025D
-			public const int thumbTintMode = 2130969181;
+			public const int textPadding = 2130969181;
 			
 			// aapt resource value: 0x7F04025E
-			public const int thumb_color = 2130969182;
+			public const int textSize = 2130969182;
 			
 			// aapt resource value: 0x7F04025F
-			public const int tickMark = 2130969183;
+			public const int textSizeDay = 2130969183;
 			
 			// aapt resource value: 0x7F040260
-			public const int tickMarkTint = 2130969184;
+			public const int textSizeDayName = 2130969184;
 			
 			// aapt resource value: 0x7F040261
-			public const int tickMarkTintMode = 2130969185;
+			public const int textSizeMonth = 2130969185;
 			
 			// aapt resource value: 0x7F040262
-			public const int tint = 2130969186;
+			public const int textStyle = 2130969186;
 			
 			// aapt resource value: 0x7F040263
-			public const int tintMode = 2130969187;
+			public const int theme = 2130969187;
 			
 			// aapt resource value: 0x7F040264
-			public const int title = 2130969188;
+			public const int thickness = 2130969188;
 			
 			// aapt resource value: 0x7F040265
-			public const int titleEnabled = 2130969189;
+			public const int thumbTextPadding = 2130969189;
 			
 			// aapt resource value: 0x7F040266
-			public const int titleHeight = 2130969190;
+			public const int thumbTint = 2130969190;
 			
 			// aapt resource value: 0x7F040267
-			public const int titleMargin = 2130969191;
+			public const int thumbTintMode = 2130969191;
 			
 			// aapt resource value: 0x7F040268
-			public const int titleMarginBottom = 2130969192;
+			public const int thumb_color = 2130969192;
 			
 			// aapt resource value: 0x7F040269
-			public const int titleMarginEnd = 2130969193;
-			
-			// aapt resource value: 0x7F04026C
-			public const int titleMargins = 2130969196;
+			public const int tickMark = 2130969193;
 			
 			// aapt resource value: 0x7F04026A
-			public const int titleMarginStart = 2130969194;
+			public const int tickMarkTint = 2130969194;
 			
 			// aapt resource value: 0x7F04026B
-			public const int titleMarginTop = 2130969195;
+			public const int tickMarkTintMode = 2130969195;
+			
+			// aapt resource value: 0x7F04026C
+			public const int tint = 2130969196;
 			
 			// aapt resource value: 0x7F04026D
-			public const int titleText = 2130969197;
+			public const int tintMode = 2130969197;
 			
 			// aapt resource value: 0x7F04026E
-			public const int titleTextAppearance = 2130969198;
+			public const int title = 2130969198;
 			
 			// aapt resource value: 0x7F04026F
-			public const int titleTextColor = 2130969199;
+			public const int titleEnabled = 2130969199;
 			
 			// aapt resource value: 0x7F040270
-			public const int titleTextStyle = 2130969200;
+			public const int titleHeight = 2130969200;
 			
 			// aapt resource value: 0x7F040271
-			public const int title_background = 2130969201;
+			public const int titleMargin = 2130969201;
 			
 			// aapt resource value: 0x7F040272
-			public const int toolbarId = 2130969202;
+			public const int titleMarginBottom = 2130969202;
 			
 			// aapt resource value: 0x7F040273
-			public const int toolbarNavigationButtonStyle = 2130969203;
-			
-			// aapt resource value: 0x7F040274
-			public const int toolbarStyle = 2130969204;
-			
-			// aapt resource value: 0x7F040275
-			public const int tooltipForegroundColor = 2130969205;
+			public const int titleMarginEnd = 2130969203;
 			
 			// aapt resource value: 0x7F040276
-			public const int tooltipFrameBackground = 2130969206;
+			public const int titleMargins = 2130969206;
+			
+			// aapt resource value: 0x7F040274
+			public const int titleMarginStart = 2130969204;
+			
+			// aapt resource value: 0x7F040275
+			public const int titleMarginTop = 2130969205;
 			
 			// aapt resource value: 0x7F040277
-			public const int tooltipText = 2130969207;
+			public const int titleText = 2130969207;
 			
 			// aapt resource value: 0x7F040278
-			public const int topBarLeft = 2130969208;
+			public const int titleTextAppearance = 2130969208;
 			
 			// aapt resource value: 0x7F040279
-			public const int topBarRight = 2130969209;
+			public const int titleTextColor = 2130969209;
 			
 			// aapt resource value: 0x7F04027A
-			public const int topBarTitle = 2130969210;
+			public const int titleTextStyle = 2130969210;
 			
 			// aapt resource value: 0x7F04027B
-			public const int track = 2130969211;
+			public const int title_background = 2130969211;
 			
 			// aapt resource value: 0x7F04027C
-			public const int trackTint = 2130969212;
+			public const int toolbarId = 2130969212;
 			
 			// aapt resource value: 0x7F04027D
-			public const int trackTintMode = 2130969213;
+			public const int toolbarNavigationButtonStyle = 2130969213;
 			
 			// aapt resource value: 0x7F04027E
-			public const int umanoAnchorPoint = 2130969214;
+			public const int toolbarStyle = 2130969214;
 			
 			// aapt resource value: 0x7F04027F
-			public const int umanoClipPanel = 2130969215;
+			public const int tooltipForegroundColor = 2130969215;
 			
 			// aapt resource value: 0x7F040280
-			public const int umanoDragView = 2130969216;
+			public const int tooltipFrameBackground = 2130969216;
 			
 			// aapt resource value: 0x7F040281
-			public const int umanoFadeColor = 2130969217;
+			public const int tooltipText = 2130969217;
 			
 			// aapt resource value: 0x7F040282
-			public const int umanoFlingVelocity = 2130969218;
+			public const int topBarLeft = 2130969218;
 			
 			// aapt resource value: 0x7F040283
-			public const int umanoInitialState = 2130969219;
+			public const int topBarRight = 2130969219;
 			
 			// aapt resource value: 0x7F040284
-			public const int umanoOverlay = 2130969220;
+			public const int topBarTitle = 2130969220;
 			
 			// aapt resource value: 0x7F040285
-			public const int umanoPanelHeight = 2130969221;
+			public const int track = 2130969221;
 			
 			// aapt resource value: 0x7F040286
-			public const int umanoParallaxOffset = 2130969222;
-			
-			// aapt resource value: 0x7F040288
-			public const int umanoScrollableView = 2130969224;
+			public const int trackTint = 2130969222;
 			
 			// aapt resource value: 0x7F040287
-			public const int umanoScrollInterpolator = 2130969223;
+			public const int trackTintMode = 2130969223;
+			
+			// aapt resource value: 0x7F040288
+			public const int umanoAnchorPoint = 2130969224;
 			
 			// aapt resource value: 0x7F040289
-			public const int umanoShadowHeight = 2130969225;
+			public const int umanoClipPanel = 2130969225;
 			
 			// aapt resource value: 0x7F04028A
-			public const int useCompatPadding = 2130969226;
+			public const int umanoDragView = 2130969226;
 			
 			// aapt resource value: 0x7F04028B
-			public const int visibleItems = 2130969227;
+			public const int umanoFadeColor = 2130969227;
 			
 			// aapt resource value: 0x7F04028C
-			public const int voiceIcon = 2130969228;
+			public const int umanoFlingVelocity = 2130969228;
 			
 			// aapt resource value: 0x7F04028D
-			public const int wave_bg_color = 2130969229;
+			public const int umanoInitialState = 2130969229;
 			
 			// aapt resource value: 0x7F04028E
-			public const int wave_border_color = 2130969230;
+			public const int umanoOverlay = 2130969230;
 			
 			// aapt resource value: 0x7F04028F
-			public const int wave_color = 2130969231;
+			public const int umanoPanelHeight = 2130969231;
 			
 			// aapt resource value: 0x7F040290
-			public const int wave_height = 2130969232;
-			
-			// aapt resource value: 0x7F040291
-			public const int wave_width = 2130969233;
+			public const int umanoParallaxOffset = 2130969232;
 			
 			// aapt resource value: 0x7F040292
-			public const int wheelCyclic = 2130969234;
+			public const int umanoScrollableView = 2130969234;
+			
+			// aapt resource value: 0x7F040291
+			public const int umanoScrollInterpolator = 2130969233;
 			
 			// aapt resource value: 0x7F040293
-			public const int wheelview_dividerColor = 2130969235;
+			public const int umanoShadowHeight = 2130969235;
 			
 			// aapt resource value: 0x7F040294
-			public const int wheelview_gravity = 2130969236;
+			public const int useCompatPadding = 2130969236;
 			
 			// aapt resource value: 0x7F040295
-			public const int wheelview_lineSpacingMultiplier = 2130969237;
+			public const int visibleItems = 2130969237;
 			
 			// aapt resource value: 0x7F040296
-			public const int wheelview_textColorCenter = 2130969238;
+			public const int voiceIcon = 2130969238;
 			
 			// aapt resource value: 0x7F040297
-			public const int wheelview_textColorOut = 2130969239;
+			public const int wave_bg_color = 2130969239;
 			
 			// aapt resource value: 0x7F040298
-			public const int wheelview_textSize = 2130969240;
+			public const int wave_border_color = 2130969240;
 			
 			// aapt resource value: 0x7F040299
-			public const int width_relative = 2130969241;
+			public const int wave_color = 2130969241;
 			
 			// aapt resource value: 0x7F04029A
-			public const int windowActionBar = 2130969242;
+			public const int wave_height = 2130969242;
 			
 			// aapt resource value: 0x7F04029B
-			public const int windowActionBarOverlay = 2130969243;
+			public const int wave_width = 2130969243;
 			
 			// aapt resource value: 0x7F04029C
-			public const int windowActionModeOverlay = 2130969244;
+			public const int wheelCyclic = 2130969244;
 			
 			// aapt resource value: 0x7F04029D
-			public const int windowFixedHeightMajor = 2130969245;
+			public const int wheelview_dividerColor = 2130969245;
 			
 			// aapt resource value: 0x7F04029E
-			public const int windowFixedHeightMinor = 2130969246;
+			public const int wheelview_gravity = 2130969246;
 			
 			// aapt resource value: 0x7F04029F
-			public const int windowFixedWidthMajor = 2130969247;
+			public const int wheelview_lineSpacingMultiplier = 2130969247;
 			
 			// aapt resource value: 0x7F0402A0
-			public const int windowFixedWidthMinor = 2130969248;
+			public const int wheelview_textColorCenter = 2130969248;
 			
 			// aapt resource value: 0x7F0402A1
-			public const int windowMinWidthMajor = 2130969249;
+			public const int wheelview_textColorOut = 2130969249;
 			
 			// aapt resource value: 0x7F0402A2
-			public const int windowMinWidthMinor = 2130969250;
+			public const int wheelview_textSize = 2130969250;
 			
 			// aapt resource value: 0x7F0402A3
-			public const int windowNoTitle = 2130969251;
+			public const int width_relative = 2130969251;
 			
 			// aapt resource value: 0x7F0402A4
-			public const int zoomInSelectedItem = 2130969252;
+			public const int windowActionBar = 2130969252;
 			
 			// aapt resource value: 0x7F0402A5
-			public const int zxing_framing_rect_height = 2130969253;
+			public const int windowActionBarOverlay = 2130969253;
 			
 			// aapt resource value: 0x7F0402A6
-			public const int zxing_framing_rect_width = 2130969254;
+			public const int windowActionModeOverlay = 2130969254;
 			
 			// aapt resource value: 0x7F0402A7
-			public const int zxing_possible_result_points = 2130969255;
+			public const int windowFixedHeightMajor = 2130969255;
 			
 			// aapt resource value: 0x7F0402A8
-			public const int zxing_preview_scaling_strategy = 2130969256;
+			public const int windowFixedHeightMinor = 2130969256;
 			
 			// aapt resource value: 0x7F0402A9
-			public const int zxing_result_view = 2130969257;
+			public const int windowFixedWidthMajor = 2130969257;
 			
 			// aapt resource value: 0x7F0402AA
-			public const int zxing_scanner_layout = 2130969258;
+			public const int windowFixedWidthMinor = 2130969258;
 			
 			// aapt resource value: 0x7F0402AB
-			public const int zxing_use_texture_view = 2130969259;
+			public const int windowMinWidthMajor = 2130969259;
 			
 			// aapt resource value: 0x7F0402AC
-			public const int zxing_viewfinder_laser = 2130969260;
+			public const int windowMinWidthMinor = 2130969260;
 			
 			// aapt resource value: 0x7F0402AD
-			public const int zxing_viewfinder_mask = 2130969261;
+			public const int windowNoTitle = 2130969261;
+			
+			// aapt resource value: 0x7F0402AE
+			public const int zoomInSelectedItem = 2130969262;
+			
+			// aapt resource value: 0x7F0402AF
+			public const int zxing_framing_rect_height = 2130969263;
+			
+			// aapt resource value: 0x7F0402B0
+			public const int zxing_framing_rect_width = 2130969264;
+			
+			// aapt resource value: 0x7F0402B1
+			public const int zxing_possible_result_points = 2130969265;
+			
+			// aapt resource value: 0x7F0402B2
+			public const int zxing_preview_scaling_strategy = 2130969266;
+			
+			// aapt resource value: 0x7F0402B3
+			public const int zxing_result_view = 2130969267;
+			
+			// aapt resource value: 0x7F0402B4
+			public const int zxing_scanner_layout = 2130969268;
+			
+			// aapt resource value: 0x7F0402B5
+			public const int zxing_use_texture_view = 2130969269;
+			
+			// aapt resource value: 0x7F0402B6
+			public const int zxing_viewfinder_laser = 2130969270;
+			
+			// aapt resource value: 0x7F0402B7
+			public const int zxing_viewfinder_mask = 2130969271;
 			
 			static Attribute()
 			{
@@ -2845,704 +2881,728 @@
 			// aapt resource value: 0x7F06005B
 			public const int color_0fff = 2131099739;
 			
+			// aapt resource value: 0x7F06005C
+			public const int color_1B2D4D = 2131099740;
+			
 			// aapt resource value: 0x7F06005D
-			public const int color_background = 2131099741;
+			public const int color_4484F4 = 2131099741;
 			
 			// aapt resource value: 0x7F06005E
-			public const int color_bar = 2131099742;
+			public const int color_648FFC = 2131099742;
 			
 			// aapt resource value: 0x7F06005F
-			public const int color_bg = 2131099743;
+			public const int color_798394 = 2131099743;
 			
 			// aapt resource value: 0x7F060060
-			public const int color_default = 2131099744;
-			
-			// aapt resource value: 0x7F060061
-			public const int color_disable = 2131099745;
-			
-			// aapt resource value: 0x7F06005C
-			public const int color_F6F6F6 = 2131099740;
-			
-			// aapt resource value: 0x7F060062
-			public const int color_r1_cancel_color = 2131099746;
-			
-			// aapt resource value: 0x7F060063
-			public const int color_select = 2131099747;
-			
-			// aapt resource value: 0x7F060064
-			public const int color_white = 2131099748;
-			
-			// aapt resource value: 0x7F060065
-			public const int common_bg = 2131099749;
-			
-			// aapt resource value: 0x7F060066
-			public const int common_hint_text = 2131099750;
+			public const int color_7fffffff = 2131099744;
 			
 			// aapt resource value: 0x7F060067
-			public const int common_line = 2131099751;
+			public const int color_background = 2131099751;
 			
 			// aapt resource value: 0x7F060068
-			public const int common_sub_text = 2131099752;
+			public const int color_bar = 2131099752;
 			
 			// aapt resource value: 0x7F060069
-			public const int common_text = 2131099753;
+			public const int color_bg = 2131099753;
+			
+			// aapt resource value: 0x7F060061
+			public const int color_C0C7D4 = 2131099745;
 			
 			// aapt resource value: 0x7F06006A
-			public const int common_text_sel = 2131099754;
+			public const int color_default = 2131099754;
 			
 			// aapt resource value: 0x7F06006B
-			public const int common_title_tab_text_color = 2131099755;
+			public const int color_disable = 2131099755;
+			
+			// aapt resource value: 0x7F060062
+			public const int color_E1E1E1 = 2131099746;
+			
+			// aapt resource value: 0x7F060063
+			public const int color_ECEDEE = 2131099747;
+			
+			// aapt resource value: 0x7F060064
+			public const int color_F2F3F7 = 2131099748;
+			
+			// aapt resource value: 0x7F060065
+			public const int color_F6F6F6 = 2131099749;
+			
+			// aapt resource value: 0x7F060066
+			public const int color_FF5757 = 2131099750;
 			
 			// aapt resource value: 0x7F06006C
-			public const int common_title_text_color = 2131099756;
+			public const int color_r1_cancel_color = 2131099756;
 			
 			// aapt resource value: 0x7F06006D
-			public const int corsor_color = 2131099757;
+			public const int color_select = 2131099757;
 			
 			// aapt resource value: 0x7F06006E
-			public const int dark_bg_20p = 2131099758;
+			public const int color_white = 2131099758;
 			
 			// aapt resource value: 0x7F06006F
-			public const int dark_bg_70p = 2131099759;
+			public const int common_bg = 2131099759;
 			
 			// aapt resource value: 0x7F060070
-			public const int del_button_text_selector = 2131099760;
+			public const int common_hint_text = 2131099760;
 			
 			// aapt resource value: 0x7F060071
-			public const int design_bottom_navigation_shadow_color = 2131099761;
+			public const int common_line = 2131099761;
 			
 			// aapt resource value: 0x7F060072
-			public const int design_error = 2131099762;
+			public const int common_sub_text = 2131099762;
 			
 			// aapt resource value: 0x7F060073
-			public const int design_fab_shadow_end_color = 2131099763;
+			public const int common_text = 2131099763;
 			
 			// aapt resource value: 0x7F060074
-			public const int design_fab_shadow_mid_color = 2131099764;
+			public const int common_text_sel = 2131099764;
 			
 			// aapt resource value: 0x7F060075
-			public const int design_fab_shadow_start_color = 2131099765;
+			public const int common_title_tab_text_color = 2131099765;
 			
 			// aapt resource value: 0x7F060076
-			public const int design_fab_stroke_end_inner_color = 2131099766;
+			public const int common_title_text_color = 2131099766;
 			
 			// aapt resource value: 0x7F060077
-			public const int design_fab_stroke_end_outer_color = 2131099767;
+			public const int corsor_color = 2131099767;
 			
 			// aapt resource value: 0x7F060078
-			public const int design_fab_stroke_top_inner_color = 2131099768;
+			public const int dark_bg_20p = 2131099768;
 			
 			// aapt resource value: 0x7F060079
-			public const int design_fab_stroke_top_outer_color = 2131099769;
+			public const int dark_bg_70p = 2131099769;
 			
 			// aapt resource value: 0x7F06007A
-			public const int design_snackbar_background_color = 2131099770;
+			public const int del_button_text_selector = 2131099770;
 			
 			// aapt resource value: 0x7F06007B
-			public const int design_tint_password_toggle = 2131099771;
+			public const int design_bottom_navigation_shadow_color = 2131099771;
 			
 			// aapt resource value: 0x7F06007C
-			public const int device_top_item_text_normal = 2131099772;
+			public const int design_error = 2131099772;
 			
 			// aapt resource value: 0x7F06007D
-			public const int dim_foreground_disabled_material_dark = 2131099773;
+			public const int design_fab_shadow_end_color = 2131099773;
 			
 			// aapt resource value: 0x7F06007E
-			public const int dim_foreground_disabled_material_light = 2131099774;
+			public const int design_fab_shadow_mid_color = 2131099774;
 			
 			// aapt resource value: 0x7F06007F
-			public const int dim_foreground_material_dark = 2131099775;
+			public const int design_fab_shadow_start_color = 2131099775;
 			
 			// aapt resource value: 0x7F060080
-			public const int dim_foreground_material_light = 2131099776;
+			public const int design_fab_stroke_end_inner_color = 2131099776;
 			
 			// aapt resource value: 0x7F060081
-			public const int divider = 2131099777;
+			public const int design_fab_stroke_end_outer_color = 2131099777;
 			
 			// aapt resource value: 0x7F060082
-			public const int emui_color_gray_1 = 2131099778;
+			public const int design_fab_stroke_top_inner_color = 2131099778;
 			
 			// aapt resource value: 0x7F060083
-			public const int emui_color_gray_10 = 2131099779;
+			public const int design_fab_stroke_top_outer_color = 2131099779;
 			
 			// aapt resource value: 0x7F060084
-			public const int emui_color_gray_7 = 2131099780;
+			public const int design_snackbar_background_color = 2131099780;
 			
 			// aapt resource value: 0x7F060085
-			public const int error_color_material = 2131099781;
+			public const int design_tint_password_toggle = 2131099781;
 			
 			// aapt resource value: 0x7F060086
-			public const int event_message_bg_selector = 2131099782;
+			public const int device_top_item_text_normal = 2131099782;
 			
 			// aapt resource value: 0x7F060087
-			public const int event_message_from_tv = 2131099783;
+			public const int dim_foreground_disabled_material_dark = 2131099783;
 			
 			// aapt resource value: 0x7F060088
-			public const int event_message_play_btn = 2131099784;
+			public const int dim_foreground_disabled_material_light = 2131099784;
 			
 			// aapt resource value: 0x7F060089
-			public const int ez_c1 = 2131099785;
+			public const int dim_foreground_material_dark = 2131099785;
 			
 			// aapt resource value: 0x7F06008A
-			public const int ez_playback_tab_color_selector = 2131099786;
+			public const int dim_foreground_material_light = 2131099786;
 			
 			// aapt resource value: 0x7F06008B
-			public const int foreground_material_dark = 2131099787;
+			public const int divider = 2131099787;
 			
 			// aapt resource value: 0x7F06008C
-			public const int foreground_material_light = 2131099788;
+			public const int emui_color_gray_1 = 2131099788;
 			
 			// aapt resource value: 0x7F06008D
-			public const int fragment_line_color = 2131099789;
+			public const int emui_color_gray_10 = 2131099789;
 			
 			// aapt resource value: 0x7F06008E
-			public const int gd_top_view = 2131099790;
+			public const int emui_color_gray_7 = 2131099790;
 			
 			// aapt resource value: 0x7F06008F
-			public const int gray = 2131099791;
+			public const int error_color_material = 2131099791;
 			
 			// aapt resource value: 0x7F060090
-			public const int gray_bg = 2131099792;
+			public const int event_message_bg_selector = 2131099792;
 			
 			// aapt resource value: 0x7F060091
-			public const int gray_text = 2131099793;
+			public const int event_message_from_tv = 2131099793;
 			
 			// aapt resource value: 0x7F060092
-			public const int green = 2131099794;
+			public const int event_message_play_btn = 2131099794;
 			
 			// aapt resource value: 0x7F060093
-			public const int green_text = 2131099795;
+			public const int ez_c1 = 2131099795;
 			
 			// aapt resource value: 0x7F060094
-			public const int grey = 2131099796;
+			public const int ez_playback_tab_color_selector = 2131099796;
 			
 			// aapt resource value: 0x7F060095
-			public const int grouplayout_item_bg_sel = 2131099797;
+			public const int foreground_material_dark = 2131099797;
 			
 			// aapt resource value: 0x7F060096
-			public const int help_link = 2131099798;
+			public const int foreground_material_light = 2131099798;
 			
 			// aapt resource value: 0x7F060097
-			public const int highlighted_text_material_dark = 2131099799;
+			public const int fragment_line_color = 2131099799;
 			
 			// aapt resource value: 0x7F060098
-			public const int highlighted_text_material_light = 2131099800;
+			public const int gd_top_view = 2131099800;
 			
 			// aapt resource value: 0x7F060099
-			public const int ic_launcher_background = 2131099801;
+			public const int gray = 2131099801;
 			
 			// aapt resource value: 0x7F06009A
-			public const int lc_color_4ea7f2 = 2131099802;
+			public const int gray_bg = 2131099802;
 			
 			// aapt resource value: 0x7F06009B
-			public const int lc_demo_color_000000 = 2131099803;
+			public const int gray_text = 2131099803;
 			
 			// aapt resource value: 0x7F06009C
-			public const int lc_demo_color_00ffffff = 2131099804;
+			public const int green = 2131099804;
 			
 			// aapt resource value: 0x7F06009D
-			public const int lc_demo_color_0B8C0D = 2131099805;
+			public const int green_text = 2131099805;
 			
 			// aapt resource value: 0x7F06009E
-			public const int lc_demo_color_2c2c2c = 2131099806;
+			public const int grey = 2131099806;
 			
 			// aapt resource value: 0x7F06009F
-			public const int lc_demo_color_442c2c2c = 2131099807;
+			public const int grouplayout_item_bg_sel = 2131099807;
 			
 			// aapt resource value: 0x7F0600A0
-			public const int lc_demo_color_66000000 = 2131099808;
+			public const int help_link = 2131099808;
 			
 			// aapt resource value: 0x7F0600A1
-			public const int lc_demo_color_66f18d00 = 2131099809;
+			public const int highlighted_text_material_dark = 2131099809;
 			
 			// aapt resource value: 0x7F0600A2
-			public const int lc_demo_color_880B8C0D = 2131099810;
+			public const int highlighted_text_material_light = 2131099810;
 			
 			// aapt resource value: 0x7F0600A3
-			public const int lc_demo_color_8f8f8f = 2131099811;
-			
-			// aapt resource value: 0x7F0600A5
-			public const int lc_demo_color_d9d9d9 = 2131099813;
-			
-			// aapt resource value: 0x7F0600A6
-			public const int lc_demo_color_f18d00 = 2131099814;
-			
-			// aapt resource value: 0x7F0600A7
-			public const int lc_demo_color_f2f2f2 = 2131099815;
+			public const int ic_launcher_background = 2131099811;
 			
 			// aapt resource value: 0x7F0600A4
-			public const int lc_demo_color_FF4F4F = 2131099812;
+			public const int lc_color_4ea7f2 = 2131099812;
+			
+			// aapt resource value: 0x7F0600A5
+			public const int lc_demo_color_000000 = 2131099813;
+			
+			// aapt resource value: 0x7F0600A6
+			public const int lc_demo_color_00ffffff = 2131099814;
+			
+			// aapt resource value: 0x7F0600A7
+			public const int lc_demo_color_0B8C0D = 2131099815;
 			
 			// aapt resource value: 0x7F0600A8
-			public const int lc_demo_color_ffffff = 2131099816;
+			public const int lc_demo_color_2c2c2c = 2131099816;
 			
 			// aapt resource value: 0x7F0600A9
-			public const int leavemessage_gray = 2131099817;
+			public const int lc_demo_color_442c2c2c = 2131099817;
 			
 			// aapt resource value: 0x7F0600AA
-			public const int leavemessage_text_color = 2131099818;
+			public const int lc_demo_color_66000000 = 2131099818;
 			
 			// aapt resource value: 0x7F0600AB
-			public const int leavemessage_time_text_color = 2131099819;
+			public const int lc_demo_color_66f18d00 = 2131099819;
 			
 			// aapt resource value: 0x7F0600AC
-			public const int line_color = 2131099820;
+			public const int lc_demo_color_880B8C0D = 2131099820;
 			
 			// aapt resource value: 0x7F0600AD
-			public const int loading_text = 2131099821;
-			
-			// aapt resource value: 0x7F0600AE
-			public const int login_line_color = 2131099822;
+			public const int lc_demo_color_8f8f8f = 2131099821;
 			
 			// aapt resource value: 0x7F0600AF
-			public const int lpsdk_app_bg = 2131099823;
+			public const int lc_demo_color_d9d9d9 = 2131099823;
 			
 			// aapt resource value: 0x7F0600B0
-			public const int lpsdk_app_line = 2131099824;
+			public const int lc_demo_color_f18d00 = 2131099824;
 			
 			// aapt resource value: 0x7F0600B1
-			public const int lpsdk_color_white = 2131099825;
+			public const int lc_demo_color_f2f2f2 = 2131099825;
+			
+			// aapt resource value: 0x7F0600AE
+			public const int lc_demo_color_FF4F4F = 2131099822;
 			
 			// aapt resource value: 0x7F0600B2
-			public const int lpsdk_textColor = 2131099826;
+			public const int lc_demo_color_ffffff = 2131099826;
 			
 			// aapt resource value: 0x7F0600B3
-			public const int material_blue_grey_800 = 2131099827;
+			public const int leavemessage_gray = 2131099827;
 			
 			// aapt resource value: 0x7F0600B4
-			public const int material_blue_grey_900 = 2131099828;
+			public const int leavemessage_text_color = 2131099828;
 			
 			// aapt resource value: 0x7F0600B5
-			public const int material_blue_grey_950 = 2131099829;
+			public const int leavemessage_time_text_color = 2131099829;
 			
 			// aapt resource value: 0x7F0600B6
-			public const int material_deep_teal_200 = 2131099830;
+			public const int line_color = 2131099830;
 			
 			// aapt resource value: 0x7F0600B7
-			public const int material_deep_teal_500 = 2131099831;
+			public const int loading_text = 2131099831;
 			
 			// aapt resource value: 0x7F0600B8
-			public const int material_grey_100 = 2131099832;
+			public const int login_line_color = 2131099832;
 			
 			// aapt resource value: 0x7F0600B9
-			public const int material_grey_300 = 2131099833;
+			public const int lpsdk_app_bg = 2131099833;
 			
 			// aapt resource value: 0x7F0600BA
-			public const int material_grey_50 = 2131099834;
+			public const int lpsdk_app_line = 2131099834;
 			
 			// aapt resource value: 0x7F0600BB
-			public const int material_grey_600 = 2131099835;
+			public const int lpsdk_color_white = 2131099835;
 			
 			// aapt resource value: 0x7F0600BC
-			public const int material_grey_800 = 2131099836;
+			public const int lpsdk_textColor = 2131099836;
 			
 			// aapt resource value: 0x7F0600BD
-			public const int material_grey_850 = 2131099837;
+			public const int main_background = 2131099837;
 			
 			// aapt resource value: 0x7F0600BE
-			public const int material_grey_900 = 2131099838;
+			public const int material_blue_grey_800 = 2131099838;
 			
 			// aapt resource value: 0x7F0600BF
-			public const int material_red_500 = 2131099839;
+			public const int material_blue_grey_900 = 2131099839;
 			
 			// aapt resource value: 0x7F0600C0
-			public const int message_bg = 2131099840;
+			public const int material_blue_grey_950 = 2131099840;
 			
 			// aapt resource value: 0x7F0600C1
-			public const int message_button_text = 2131099841;
+			public const int material_deep_teal_200 = 2131099841;
 			
 			// aapt resource value: 0x7F0600C2
-			public const int message_button_text_selector = 2131099842;
+			public const int material_deep_teal_500 = 2131099842;
 			
 			// aapt resource value: 0x7F0600C3
-			public const int mobile_common_text_edit_enable_selector = 2131099843;
+			public const int material_grey_100 = 2131099843;
 			
 			// aapt resource value: 0x7F0600C4
-			public const int mobile_common_text_name_enable_selector = 2131099844;
+			public const int material_grey_300 = 2131099844;
 			
 			// aapt resource value: 0x7F0600C5
-			public const int mobile_common_title_text_color_selector = 2131099845;
+			public const int material_grey_50 = 2131099845;
 			
 			// aapt resource value: 0x7F0600C6
-			public const int mobile_common_transparent = 2131099846;
+			public const int material_grey_600 = 2131099846;
 			
 			// aapt resource value: 0x7F0600C7
-			public const int mode_bg = 2131099847;
+			public const int material_grey_800 = 2131099847;
 			
 			// aapt resource value: 0x7F0600C8
-			public const int more_color = 2131099848;
+			public const int material_grey_850 = 2131099848;
 			
 			// aapt resource value: 0x7F0600C9
-			public const int my_list_deviver = 2131099849;
+			public const int material_grey_900 = 2131099849;
 			
 			// aapt resource value: 0x7F0600CA
-			public const int normal_color = 2131099850;
+			public const int material_red_500 = 2131099850;
 			
 			// aapt resource value: 0x7F0600CB
-			public const int notification_action_color_filter = 2131099851;
+			public const int message_bg = 2131099851;
 			
 			// aapt resource value: 0x7F0600CC
-			public const int notification_icon_bg_color = 2131099852;
+			public const int message_button_text = 2131099852;
 			
 			// aapt resource value: 0x7F0600CD
-			public const int notification_material_background_media_default_color = 2131099853;
+			public const int message_button_text_selector = 2131099853;
 			
 			// aapt resource value: 0x7F0600CE
-			public const int on_off_text_selector = 2131099854;
+			public const int mobile_common_text_edit_enable_selector = 2131099854;
 			
 			// aapt resource value: 0x7F0600CF
-			public const int opensdk_cameralist_bg = 2131099855;
+			public const int mobile_common_text_name_enable_selector = 2131099855;
 			
 			// aapt resource value: 0x7F0600D0
-			public const int orange = 2131099856;
+			public const int mobile_common_title_text_color_selector = 2131099856;
 			
 			// aapt resource value: 0x7F0600D1
-			public const int orange_text = 2131099857;
+			public const int mobile_common_transparent = 2131099857;
 			
 			// aapt resource value: 0x7F0600D2
-			public const int page_bg_color = 2131099858;
+			public const int mode_bg = 2131099858;
 			
 			// aapt resource value: 0x7F0600D3
-			public const int page_change_gray = 2131099859;
+			public const int more_color = 2131099859;
 			
 			// aapt resource value: 0x7F0600D4
-			public const int pickerview_bgColor_default = 2131099860;
+			public const int my_list_deviver = 2131099860;
 			
 			// aapt resource value: 0x7F0600D5
-			public const int pickerview_bgColor_overlay = 2131099861;
+			public const int normal_color = 2131099861;
 			
 			// aapt resource value: 0x7F0600D6
-			public const int pickerview_bg_topbar = 2131099862;
+			public const int notification_action_color_filter = 2131099862;
 			
 			// aapt resource value: 0x7F0600D7
-			public const int pickerview_timebtn_nor = 2131099863;
+			public const int notification_icon_bg_color = 2131099863;
 			
 			// aapt resource value: 0x7F0600D8
-			public const int pickerview_timebtn_pre = 2131099864;
+			public const int notification_material_background_media_default_color = 2131099864;
 			
 			// aapt resource value: 0x7F0600D9
-			public const int pickerview_topbar_title = 2131099865;
+			public const int on_off_text_selector = 2131099865;
 			
 			// aapt resource value: 0x7F0600DA
-			public const int pickerview_wheelview_textcolor_center = 2131099866;
+			public const int opensdk_cameralist_bg = 2131099866;
 			
 			// aapt resource value: 0x7F0600DB
-			public const int pickerview_wheelview_textcolor_divider = 2131099867;
+			public const int orange = 2131099867;
 			
 			// aapt resource value: 0x7F0600DC
-			public const int pickerview_wheelview_textcolor_out = 2131099868;
+			public const int orange_text = 2131099868;
 			
 			// aapt resource value: 0x7F0600DD
-			public const int play_translucent_bg = 2131099869;
+			public const int page_bg_color = 2131099869;
 			
 			// aapt resource value: 0x7F0600DE
-			public const int possible_result_points = 2131099870;
+			public const int page_change_gray = 2131099870;
 			
 			// aapt resource value: 0x7F0600DF
-			public const int preview_quality_color = 2131099871;
+			public const int pickerview_bgColor_default = 2131099871;
 			
 			// aapt resource value: 0x7F0600E0
-			public const int primary_dark_material_dark = 2131099872;
+			public const int pickerview_bgColor_overlay = 2131099872;
 			
 			// aapt resource value: 0x7F0600E1
-			public const int primary_dark_material_light = 2131099873;
+			public const int pickerview_bg_topbar = 2131099873;
 			
 			// aapt resource value: 0x7F0600E2
-			public const int primary_material_dark = 2131099874;
+			public const int pickerview_timebtn_nor = 2131099874;
 			
 			// aapt resource value: 0x7F0600E3
-			public const int primary_material_light = 2131099875;
+			public const int pickerview_timebtn_pre = 2131099875;
 			
 			// aapt resource value: 0x7F0600E4
-			public const int primary_text_default_material_dark = 2131099876;
+			public const int pickerview_topbar_title = 2131099876;
 			
 			// aapt resource value: 0x7F0600E5
-			public const int primary_text_default_material_light = 2131099877;
+			public const int pickerview_wheelview_textcolor_center = 2131099877;
 			
 			// aapt resource value: 0x7F0600E6
-			public const int primary_text_disabled_material_dark = 2131099878;
+			public const int pickerview_wheelview_textcolor_divider = 2131099878;
 			
 			// aapt resource value: 0x7F0600E7
-			public const int primary_text_disabled_material_light = 2131099879;
+			public const int pickerview_wheelview_textcolor_out = 2131099879;
 			
 			// aapt resource value: 0x7F0600E8
-			public const int progress_back = 2131099880;
+			public const int play_translucent_bg = 2131099880;
 			
 			// aapt resource value: 0x7F0600E9
-			public const int progress_select = 2131099881;
+			public const int possible_result_points = 2131099881;
 			
 			// aapt resource value: 0x7F0600EA
-			public const int pureblack = 2131099882;
+			public const int preview_quality_color = 2131099882;
 			
 			// aapt resource value: 0x7F0600EB
-			public const int quality_color_selector = 2131099883;
+			public const int primary_dark_material_dark = 2131099883;
 			
 			// aapt resource value: 0x7F0600EC
-			public const int quality_focused_color = 2131099884;
+			public const int primary_dark_material_light = 2131099884;
 			
 			// aapt resource value: 0x7F0600ED
-			public const int r1_item_bg = 2131099885;
+			public const int primary_material_dark = 2131099885;
 			
 			// aapt resource value: 0x7F0600EE
-			public const int read_button_text_selector = 2131099886;
+			public const int primary_material_light = 2131099886;
 			
 			// aapt resource value: 0x7F0600EF
-			public const int realplay_loading_text = 2131099887;
+			public const int primary_text_default_material_dark = 2131099887;
 			
 			// aapt resource value: 0x7F0600F0
-			public const int record_alarm = 2131099888;
+			public const int primary_text_default_material_light = 2131099888;
 			
 			// aapt resource value: 0x7F0600F1
-			public const int record_normal = 2131099889;
+			public const int primary_text_disabled_material_dark = 2131099889;
 			
 			// aapt resource value: 0x7F0600F2
-			public const int record_osd = 2131099890;
+			public const int primary_text_disabled_material_light = 2131099890;
 			
 			// aapt resource value: 0x7F0600F3
-			public const int record_point = 2131099891;
+			public const int progress_back = 2131099891;
 			
 			// aapt resource value: 0x7F0600F4
-			public const int record_time = 2131099892;
+			public const int progress_select = 2131099892;
 			
 			// aapt resource value: 0x7F0600F5
-			public const int red = 2131099893;
+			public const int pureblack = 2131099893;
 			
 			// aapt resource value: 0x7F0600F6
-			public const int reg_deal_text_bule = 2131099894;
+			public const int quality_color_selector = 2131099894;
 			
 			// aapt resource value: 0x7F0600F7
-			public const int remotefile_line_color = 2131099895;
+			public const int quality_focused_color = 2131099895;
 			
 			// aapt resource value: 0x7F0600F8
-			public const int remotefile_timebar_alarm_color = 2131099896;
+			public const int r1_item_bg = 2131099896;
 			
 			// aapt resource value: 0x7F0600F9
-			public const int remotefile_timebar_color = 2131099897;
+			public const int read_button_text_selector = 2131099897;
 			
 			// aapt resource value: 0x7F0600FA
-			public const int remotelist_item_duration_text_color = 2131099898;
+			public const int realplay_loading_text = 2131099898;
 			
 			// aapt resource value: 0x7F0600FB
-			public const int remotelist_item_select = 2131099899;
+			public const int record_alarm = 2131099899;
 			
 			// aapt resource value: 0x7F0600FC
-			public const int result_view = 2131099900;
+			public const int record_normal = 2131099900;
 			
 			// aapt resource value: 0x7F0600FD
-			public const int ripple_material_dark = 2131099901;
+			public const int record_osd = 2131099901;
 			
 			// aapt resource value: 0x7F0600FE
-			public const int ripple_material_light = 2131099902;
+			public const int record_point = 2131099902;
 			
 			// aapt resource value: 0x7F0600FF
-			public const int scan_yellow = 2131099903;
+			public const int record_time = 2131099903;
 			
 			// aapt resource value: 0x7F060100
-			public const int secondary_text_default_material_dark = 2131099904;
+			public const int red = 2131099904;
 			
 			// aapt resource value: 0x7F060101
-			public const int secondary_text_default_material_light = 2131099905;
+			public const int reg_deal_text_bule = 2131099905;
 			
 			// aapt resource value: 0x7F060102
-			public const int secondary_text_disabled_material_dark = 2131099906;
+			public const int remotefile_line_color = 2131099906;
 			
 			// aapt resource value: 0x7F060103
-			public const int secondary_text_disabled_material_light = 2131099907;
+			public const int remotefile_timebar_alarm_color = 2131099907;
 			
 			// aapt resource value: 0x7F060104
-			public const int setting_hint_text = 2131099908;
+			public const int remotefile_timebar_color = 2131099908;
 			
 			// aapt resource value: 0x7F060105
-			public const int shadow = 2131099909;
+			public const int remotelist_item_duration_text_color = 2131099909;
 			
 			// aapt resource value: 0x7F060106
-			public const int share_bule = 2131099910;
+			public const int remotelist_item_select = 2131099910;
 			
 			// aapt resource value: 0x7F060107
-			public const int share_green = 2131099911;
+			public const int result_view = 2131099911;
 			
 			// aapt resource value: 0x7F060108
-			public const int share_red = 2131099912;
+			public const int ripple_material_dark = 2131099912;
 			
 			// aapt resource value: 0x7F060109
-			public const int share_tip_red = 2131099913;
+			public const int ripple_material_light = 2131099913;
 			
 			// aapt resource value: 0x7F06010A
-			public const int source_detection_btn_color = 2131099914;
+			public const int scan_yellow = 2131099914;
 			
 			// aapt resource value: 0x7F06010B
-			public const int state_abnormal_text = 2131099915;
+			public const int secondary_text_default_material_dark = 2131099915;
 			
 			// aapt resource value: 0x7F06010C
-			public const int state_normal_text = 2131099916;
+			public const int secondary_text_default_material_light = 2131099916;
 			
 			// aapt resource value: 0x7F06010D
-			public const int state_off_text = 2131099917;
+			public const int secondary_text_disabled_material_dark = 2131099917;
 			
 			// aapt resource value: 0x7F06010E
-			public const int switch_thumb_disabled_material_dark = 2131099918;
+			public const int secondary_text_disabled_material_light = 2131099918;
 			
 			// aapt resource value: 0x7F06010F
-			public const int switch_thumb_disabled_material_light = 2131099919;
+			public const int setting_hint_text = 2131099919;
 			
 			// aapt resource value: 0x7F060110
-			public const int switch_thumb_material_dark = 2131099920;
+			public const int shadow = 2131099920;
 			
 			// aapt resource value: 0x7F060111
-			public const int switch_thumb_material_light = 2131099921;
+			public const int share_bule = 2131099921;
 			
 			// aapt resource value: 0x7F060112
-			public const int switch_thumb_normal_material_dark = 2131099922;
+			public const int share_green = 2131099922;
 			
 			// aapt resource value: 0x7F060113
-			public const int switch_thumb_normal_material_light = 2131099923;
-			
-			// aapt resource value: 0x7F060116
-			public const int table_value = 2131099926;
+			public const int share_red = 2131099923;
 			
 			// aapt resource value: 0x7F060114
-			public const int tab_color = 2131099924;
+			public const int share_tip_red = 2131099924;
 			
 			// aapt resource value: 0x7F060115
-			public const int tab_sel_color = 2131099925;
+			public const int source_detection_btn_color = 2131099925;
 			
-			// aapt resource value: 0x7F060118
-			public const int textview_txtcolor_selector = 2131099928;
+			// aapt resource value: 0x7F060116
+			public const int state_abnormal_text = 2131099926;
 			
 			// aapt resource value: 0x7F060117
-			public const int text_black = 2131099927;
+			public const int state_normal_text = 2131099927;
+			
+			// aapt resource value: 0x7F060118
+			public const int state_off_text = 2131099928;
 			
 			// aapt resource value: 0x7F060119
-			public const int tip_bg = 2131099929;
+			public const int switch_thumb_disabled_material_dark = 2131099929;
 			
 			// aapt resource value: 0x7F06011A
-			public const int tip_color = 2131099930;
+			public const int switch_thumb_disabled_material_light = 2131099930;
 			
 			// aapt resource value: 0x7F06011B
-			public const int title_down_text_selector = 2131099931;
+			public const int switch_thumb_material_dark = 2131099931;
 			
 			// aapt resource value: 0x7F06011C
-			public const int title_line = 2131099932;
+			public const int switch_thumb_material_light = 2131099932;
 			
 			// aapt resource value: 0x7F06011D
-			public const int title_text = 2131099933;
+			public const int switch_thumb_normal_material_dark = 2131099933;
 			
 			// aapt resource value: 0x7F06011E
-			public const int tooltip_background_dark = 2131099934;
-			
-			// aapt resource value: 0x7F06011F
-			public const int tooltip_background_light = 2131099935;
-			
-			// aapt resource value: 0x7F060120
-			public const int topbar_title_color = 2131099936;
-			
-			// aapt resource value: 0x7F060122
-			public const int translucent_black = 2131099938;
-			
-			// aapt resource value: 0x7F060123
-			public const int transparent = 2131099939;
-			
-			// aapt resource value: 0x7F060124
-			public const int transparent_bg = 2131099940;
+			public const int switch_thumb_normal_material_light = 2131099934;
 			
 			// aapt resource value: 0x7F060121
-			public const int trans_bg_color = 2131099937;
+			public const int table_value = 2131099937;
+			
+			// aapt resource value: 0x7F06011F
+			public const int tab_color = 2131099935;
+			
+			// aapt resource value: 0x7F060120
+			public const int tab_sel_color = 2131099936;
+			
+			// aapt resource value: 0x7F060123
+			public const int textview_txtcolor_selector = 2131099939;
+			
+			// aapt resource value: 0x7F060122
+			public const int text_black = 2131099938;
+			
+			// aapt resource value: 0x7F060124
+			public const int tip_bg = 2131099940;
 			
 			// aapt resource value: 0x7F060125
-			public const int tv_my_blue = 2131099941;
+			public const int tip_color = 2131099941;
 			
 			// aapt resource value: 0x7F060126
-			public const int unopen = 2131099942;
+			public const int title_down_text_selector = 2131099942;
 			
 			// aapt resource value: 0x7F060127
-			public const int upgrade_gray = 2131099943;
+			public const int title_line = 2131099943;
 			
 			// aapt resource value: 0x7F060128
-			public const int upgrade_green = 2131099944;
+			public const int title_text = 2131099944;
 			
 			// aapt resource value: 0x7F060129
-			public const int upgrade_orange = 2131099945;
+			public const int tooltip_background_dark = 2131099945;
 			
 			// aapt resource value: 0x7F06012A
-			public const int upgrade_red = 2131099946;
+			public const int tooltip_background_light = 2131099946;
 			
 			// aapt resource value: 0x7F06012B
-			public const int upload_sel_count = 2131099947;
-			
-			// aapt resource value: 0x7F06012C
-			public const int upsdk_color_gray_1 = 2131099948;
+			public const int topbar_title_color = 2131099947;
 			
 			// aapt resource value: 0x7F06012D
-			public const int upsdk_color_gray_10 = 2131099949;
+			public const int translucent_black = 2131099949;
 			
 			// aapt resource value: 0x7F06012E
-			public const int upsdk_color_gray_7 = 2131099950;
+			public const int transparent = 2131099950;
 			
 			// aapt resource value: 0x7F06012F
-			public const int version_gray = 2131099951;
+			public const int transparent_bg = 2131099951;
+			
+			// aapt resource value: 0x7F06012C
+			public const int trans_bg_color = 2131099948;
 			
 			// aapt resource value: 0x7F060130
-			public const int video_talk_sdk_black = 2131099952;
+			public const int tv_my_blue = 2131099952;
 			
 			// aapt resource value: 0x7F060131
-			public const int video_talk_sdk_hint_color_gray = 2131099953;
+			public const int unopen = 2131099953;
 			
 			// aapt resource value: 0x7F060132
-			public const int video_talk_sdk_text_color_black = 2131099954;
+			public const int upgrade_gray = 2131099954;
 			
 			// aapt resource value: 0x7F060133
-			public const int video_talk_sdk_text_color_gray = 2131099955;
+			public const int upgrade_green = 2131099955;
 			
 			// aapt resource value: 0x7F060134
-			public const int video_talk_sdk_white = 2131099956;
+			public const int upgrade_orange = 2131099956;
 			
 			// aapt resource value: 0x7F060135
-			public const int viewfinder_frame = 2131099957;
+			public const int upgrade_red = 2131099957;
 			
 			// aapt resource value: 0x7F060136
-			public const int viewfinder_laser = 2131099958;
+			public const int upload_sel_count = 2131099958;
 			
 			// aapt resource value: 0x7F060137
-			public const int viewfinder_mask = 2131099959;
+			public const int version_gray = 2131099959;
 			
 			// aapt resource value: 0x7F060138
-			public const int white = 2131099960;
+			public const int video_talk_sdk_black = 2131099960;
 			
 			// aapt resource value: 0x7F060139
-			public const int yahei = 2131099961;
+			public const int video_talk_sdk_hint_color_gray = 2131099961;
 			
 			// aapt resource value: 0x7F06013A
-			public const int yellow_text = 2131099962;
+			public const int video_talk_sdk_text_color_black = 2131099962;
 			
 			// aapt resource value: 0x7F06013B
-			public const int zxing_custom_possible_result_points = 2131099963;
+			public const int video_talk_sdk_text_color_gray = 2131099963;
 			
 			// aapt resource value: 0x7F06013C
-			public const int zxing_custom_result_view = 2131099964;
+			public const int video_talk_sdk_white = 2131099964;
 			
 			// aapt resource value: 0x7F06013D
-			public const int zxing_custom_viewfinder_laser = 2131099965;
+			public const int viewfinder_frame = 2131099965;
 			
 			// aapt resource value: 0x7F06013E
-			public const int zxing_custom_viewfinder_mask = 2131099966;
+			public const int viewfinder_laser = 2131099966;
 			
 			// aapt resource value: 0x7F06013F
-			public const int zxing_possible_result_points = 2131099967;
+			public const int viewfinder_mask = 2131099967;
 			
 			// aapt resource value: 0x7F060140
-			public const int zxing_result_view = 2131099968;
+			public const int white = 2131099968;
 			
 			// aapt resource value: 0x7F060141
-			public const int zxing_status_text = 2131099969;
+			public const int yahei = 2131099969;
 			
 			// aapt resource value: 0x7F060142
-			public const int zxing_transparent = 2131099970;
+			public const int yellow_text = 2131099970;
 			
 			// aapt resource value: 0x7F060143
-			public const int zxing_viewfinder_laser = 2131099971;
+			public const int zxing_custom_possible_result_points = 2131099971;
 			
 			// aapt resource value: 0x7F060144
-			public const int zxing_viewfinder_mask = 2131099972;
+			public const int zxing_custom_result_view = 2131099972;
+			
+			// aapt resource value: 0x7F060145
+			public const int zxing_custom_viewfinder_laser = 2131099973;
+			
+			// aapt resource value: 0x7F060146
+			public const int zxing_custom_viewfinder_mask = 2131099974;
+			
+			// aapt resource value: 0x7F060147
+			public const int zxing_possible_result_points = 2131099975;
+			
+			// aapt resource value: 0x7F060148
+			public const int zxing_result_view = 2131099976;
+			
+			// aapt resource value: 0x7F060149
+			public const int zxing_status_text = 2131099977;
+			
+			// aapt resource value: 0x7F06014A
+			public const int zxing_transparent = 2131099978;
+			
+			// aapt resource value: 0x7F06014B
+			public const int zxing_viewfinder_laser = 2131099979;
+			
+			// aapt resource value: 0x7F06014C
+			public const int zxing_viewfinder_mask = 2131099980;
 			
 			static Color()
 			{
@@ -4014,3484 +4074,3505 @@
 			public const int disabled_alpha_material_light = 2131165335;
 			
 			// aapt resource value: 0x7F070098
-			public const int dp_10 = 2131165336;
+			public const int dp_066 = 2131165336;
 			
 			// aapt resource value: 0x7F070099
-			public const int dp_12 = 2131165337;
+			public const int dp_10 = 2131165337;
 			
 			// aapt resource value: 0x7F07009A
-			public const int dp_15 = 2131165338;
+			public const int dp_12 = 2131165338;
 			
 			// aapt resource value: 0x7F07009B
-			public const int dp_18 = 2131165339;
+			public const int dp_14 = 2131165339;
 			
 			// aapt resource value: 0x7F07009C
-			public const int dp_20 = 2131165340;
+			public const int dp_15 = 2131165340;
 			
 			// aapt resource value: 0x7F07009D
-			public const int dp_45 = 2131165341;
+			public const int dp_18 = 2131165341;
 			
 			// aapt resource value: 0x7F07009E
-			public const int dp_5 = 2131165342;
+			public const int dp_20 = 2131165342;
 			
 			// aapt resource value: 0x7F07009F
-			public const int f0 = 2131165343;
+			public const int dp_22 = 2131165343;
 			
 			// aapt resource value: 0x7F0700A0
-			public const int f1 = 2131165344;
+			public const int dp_36 = 2131165344;
 			
 			// aapt resource value: 0x7F0700A1
-			public const int f2 = 2131165345;
+			public const int dp_4 = 2131165345;
 			
 			// aapt resource value: 0x7F0700A2
-			public const int f3 = 2131165346;
+			public const int dp_40 = 2131165346;
 			
 			// aapt resource value: 0x7F0700A3
-			public const int f4 = 2131165347;
+			public const int dp_45 = 2131165347;
 			
 			// aapt resource value: 0x7F0700A4
-			public const int f5 = 2131165348;
+			public const int dp_5 = 2131165348;
 			
 			// aapt resource value: 0x7F0700A5
-			public const int f6 = 2131165349;
+			public const int dp_6 = 2131165349;
 			
 			// aapt resource value: 0x7F0700A6
-			public const int f7 = 2131165350;
+			public const int dp_60 = 2131165350;
 			
 			// aapt resource value: 0x7F0700A7
-			public const int fab_margin = 2131165351;
+			public const int dp_72 = 2131165351;
 			
 			// aapt resource value: 0x7F0700A8
-			public const int fastscroll_default_thickness = 2131165352;
+			public const int f0 = 2131165352;
 			
 			// aapt resource value: 0x7F0700A9
-			public const int fastscroll_margin = 2131165353;
+			public const int f1 = 2131165353;
 			
 			// aapt resource value: 0x7F0700AA
-			public const int fastscroll_minimum_range = 2131165354;
+			public const int f2 = 2131165354;
 			
 			// aapt resource value: 0x7F0700AB
-			public const int fingerprint_icon_size = 2131165355;
+			public const int f3 = 2131165355;
 			
 			// aapt resource value: 0x7F0700AC
-			public const int fingerprint_status_layout_margin_vertical = 2131165356;
+			public const int f4 = 2131165356;
 			
 			// aapt resource value: 0x7F0700AD
-			public const int fourteen = 2131165357;
+			public const int f5 = 2131165357;
 			
 			// aapt resource value: 0x7F0700AE
-			public const int fun_height_size = 2131165358;
+			public const int f6 = 2131165358;
 			
 			// aapt resource value: 0x7F0700AF
-			public const int guide_large_text_size = 2131165359;
+			public const int f7 = 2131165359;
 			
 			// aapt resource value: 0x7F0700B0
-			public const int guide_text_size = 2131165360;
+			public const int fab_margin = 2131165360;
 			
 			// aapt resource value: 0x7F0700B1
-			public const int header_footer_left_right_padding = 2131165361;
+			public const int fastscroll_default_thickness = 2131165361;
 			
 			// aapt resource value: 0x7F0700B2
-			public const int header_footer_top_bottom_padding = 2131165362;
+			public const int fastscroll_margin = 2131165362;
 			
 			// aapt resource value: 0x7F0700B3
-			public const int highlight_alpha_material_colored = 2131165363;
+			public const int fastscroll_minimum_range = 2131165363;
 			
 			// aapt resource value: 0x7F0700B4
-			public const int highlight_alpha_material_dark = 2131165364;
+			public const int fingerprint_icon_size = 2131165364;
 			
 			// aapt resource value: 0x7F0700B5
-			public const int highlight_alpha_material_light = 2131165365;
+			public const int fingerprint_status_layout_margin_vertical = 2131165365;
 			
 			// aapt resource value: 0x7F0700B6
-			public const int hint_alpha_material_dark = 2131165366;
+			public const int fourteen = 2131165366;
 			
 			// aapt resource value: 0x7F0700B7
-			public const int hint_alpha_material_light = 2131165367;
+			public const int fun_height_size = 2131165367;
 			
 			// aapt resource value: 0x7F0700B8
-			public const int hint_pressed_alpha_material_dark = 2131165368;
+			public const int guide_large_text_size = 2131165368;
 			
 			// aapt resource value: 0x7F0700B9
-			public const int hint_pressed_alpha_material_light = 2131165369;
+			public const int guide_text_size = 2131165369;
 			
 			// aapt resource value: 0x7F0700BA
-			public const int indicator_corner_radius = 2131165370;
+			public const int header_footer_left_right_padding = 2131165370;
 			
 			// aapt resource value: 0x7F0700BB
-			public const int indicator_internal_padding = 2131165371;
+			public const int header_footer_top_bottom_padding = 2131165371;
 			
 			// aapt resource value: 0x7F0700BC
-			public const int indicator_right_padding = 2131165372;
+			public const int highlight_alpha_material_colored = 2131165372;
 			
 			// aapt resource value: 0x7F0700BD
-			public const int item_touch_helper_max_drag_scroll_per_frame = 2131165373;
+			public const int highlight_alpha_material_dark = 2131165373;
 			
 			// aapt resource value: 0x7F0700BE
-			public const int item_touch_helper_swipe_escape_max_velocity = 2131165374;
+			public const int highlight_alpha_material_light = 2131165374;
 			
 			// aapt resource value: 0x7F0700BF
-			public const int item_touch_helper_swipe_escape_velocity = 2131165375;
+			public const int hint_alpha_material_dark = 2131165375;
 			
 			// aapt resource value: 0x7F0700C0
-			public const int large_text_size = 2131165376;
+			public const int hint_alpha_material_light = 2131165376;
 			
 			// aapt resource value: 0x7F0700C1
-			public const int layout_margin_bottom = 2131165377;
+			public const int hint_pressed_alpha_material_dark = 2131165377;
 			
 			// aapt resource value: 0x7F0700C2
-			public const int layout_margin_left = 2131165378;
+			public const int hint_pressed_alpha_material_light = 2131165378;
 			
 			// aapt resource value: 0x7F0700C3
-			public const int layout_margin_right = 2131165379;
+			public const int indicator_corner_radius = 2131165379;
 			
 			// aapt resource value: 0x7F0700C4
-			public const int layout_margin_top = 2131165380;
+			public const int indicator_internal_padding = 2131165380;
 			
 			// aapt resource value: 0x7F0700C5
-			public const int leavemessage_text_size = 2131165381;
+			public const int indicator_right_padding = 2131165381;
 			
 			// aapt resource value: 0x7F0700C6
-			public const int loading_text_size = 2131165382;
+			public const int item_touch_helper_max_drag_scroll_per_frame = 2131165382;
 			
 			// aapt resource value: 0x7F0700C7
-			public const int login_text_size = 2131165383;
+			public const int item_touch_helper_swipe_escape_max_velocity = 2131165383;
 			
 			// aapt resource value: 0x7F0700C8
-			public const int logo_version_distance_left = 2131165384;
+			public const int item_touch_helper_swipe_escape_velocity = 2131165384;
 			
 			// aapt resource value: 0x7F0700C9
-			public const int logo_version_distance_top = 2131165385;
+			public const int large_text_size = 2131165385;
 			
 			// aapt resource value: 0x7F0700CA
-			public const int maintab_message_count_text_size = 2131165386;
+			public const int layout_margin_bottom = 2131165386;
 			
 			// aapt resource value: 0x7F0700CB
-			public const int margin_line_widget = 2131165387;
+			public const int layout_margin_left = 2131165387;
 			
 			// aapt resource value: 0x7F0700CC
-			public const int margin_normal = 2131165388;
+			public const int layout_margin_right = 2131165388;
 			
 			// aapt resource value: 0x7F0700CD
-			public const int mobile_common_common_title_height = 2131165389;
+			public const int layout_margin_top = 2131165389;
 			
 			// aapt resource value: 0x7F0700CE
-			public const int mobile_common_common_title_text_size_large = 2131165390;
+			public const int leavemessage_text_size = 2131165390;
 			
 			// aapt resource value: 0x7F0700CF
-			public const int mobile_common_common_title_text_size_mid = 2131165391;
+			public const int loading_text_size = 2131165391;
 			
 			// aapt resource value: 0x7F0700D0
-			public const int mobile_common_divider_wider = 2131165392;
+			public const int login_text_size = 2131165392;
 			
 			// aapt resource value: 0x7F0700D1
-			public const int mobile_common_dp_10 = 2131165393;
+			public const int logo_version_distance_left = 2131165393;
 			
 			// aapt resource value: 0x7F0700D2
-			public const int mobile_common_dp_20 = 2131165394;
+			public const int logo_version_distance_top = 2131165394;
 			
 			// aapt resource value: 0x7F0700D3
-			public const int mobile_common_dp_30 = 2131165395;
+			public const int maintab_message_count_text_size = 2131165395;
 			
 			// aapt resource value: 0x7F0700D4
-			public const int mobile_common_dp_5 = 2131165396;
+			public const int margin_line_widget = 2131165396;
 			
 			// aapt resource value: 0x7F0700D5
-			public const int mobile_common_dp_6 = 2131165397;
+			public const int margin_normal = 2131165397;
 			
 			// aapt resource value: 0x7F0700D6
-			public const int mobile_common_dp_8 = 2131165398;
+			public const int mobile_common_common_title_height = 2131165398;
 			
 			// aapt resource value: 0x7F0700D7
-			public const int mobile_common_lc_alert_dialog_button_text_size = 2131165399;
+			public const int mobile_common_common_title_text_size_large = 2131165399;
 			
 			// aapt resource value: 0x7F0700D8
-			public const int mobile_common_page_margin = 2131165400;
+			public const int mobile_common_common_title_text_size_mid = 2131165400;
 			
 			// aapt resource value: 0x7F0700D9
-			public const int mobile_common_sp_16 = 2131165401;
+			public const int mobile_common_divider_wider = 2131165401;
 			
 			// aapt resource value: 0x7F0700DA
-			public const int mobile_common_sp_17 = 2131165402;
+			public const int mobile_common_dp_10 = 2131165402;
 			
 			// aapt resource value: 0x7F0700DB
-			public const int mobile_common_sp_18 = 2131165403;
+			public const int mobile_common_dp_20 = 2131165403;
 			
 			// aapt resource value: 0x7F0700DC
-			public const int mobile_common_text_size_mid = 2131165404;
+			public const int mobile_common_dp_30 = 2131165404;
 			
 			// aapt resource value: 0x7F0700DD
-			public const int mobile_common_text_size_small = 2131165405;
+			public const int mobile_common_dp_5 = 2131165405;
 			
 			// aapt resource value: 0x7F0700DE
-			public const int mobile_common_title_height = 2131165406;
+			public const int mobile_common_dp_6 = 2131165406;
 			
 			// aapt resource value: 0x7F0700DF
-			public const int more_layout_height = 2131165407;
+			public const int mobile_common_dp_8 = 2131165407;
 			
 			// aapt resource value: 0x7F0700E0
-			public const int notification_action_icon_size = 2131165408;
+			public const int mobile_common_lc_alert_dialog_button_text_size = 2131165408;
 			
 			// aapt resource value: 0x7F0700E1
-			public const int notification_action_text_size = 2131165409;
+			public const int mobile_common_page_margin = 2131165409;
 			
 			// aapt resource value: 0x7F0700E2
-			public const int notification_big_circle_margin = 2131165410;
+			public const int mobile_common_sp_16 = 2131165410;
 			
 			// aapt resource value: 0x7F0700E3
-			public const int notification_content_margin_start = 2131165411;
+			public const int mobile_common_sp_17 = 2131165411;
 			
 			// aapt resource value: 0x7F0700E4
-			public const int notification_large_icon_height = 2131165412;
+			public const int mobile_common_sp_18 = 2131165412;
 			
 			// aapt resource value: 0x7F0700E5
-			public const int notification_large_icon_width = 2131165413;
+			public const int mobile_common_text_size_mid = 2131165413;
 			
 			// aapt resource value: 0x7F0700E6
-			public const int notification_main_column_padding_top = 2131165414;
+			public const int mobile_common_text_size_small = 2131165414;
 			
 			// aapt resource value: 0x7F0700E7
-			public const int notification_media_narrow_margin = 2131165415;
+			public const int mobile_common_title_height = 2131165415;
 			
 			// aapt resource value: 0x7F0700E8
-			public const int notification_right_icon_size = 2131165416;
+			public const int more_layout_height = 2131165416;
 			
 			// aapt resource value: 0x7F0700E9
-			public const int notification_right_side_padding_top = 2131165417;
+			public const int notification_action_icon_size = 2131165417;
 			
 			// aapt resource value: 0x7F0700EA
-			public const int notification_small_icon_background_padding = 2131165418;
+			public const int notification_action_text_size = 2131165418;
 			
 			// aapt resource value: 0x7F0700EB
-			public const int notification_small_icon_size_as_large = 2131165419;
+			public const int notification_big_circle_margin = 2131165419;
 			
 			// aapt resource value: 0x7F0700EC
-			public const int notification_subtext_size = 2131165420;
+			public const int notification_content_margin_start = 2131165420;
 			
 			// aapt resource value: 0x7F0700ED
-			public const int notification_top_pad = 2131165421;
+			public const int notification_large_icon_height = 2131165421;
 			
 			// aapt resource value: 0x7F0700EE
-			public const int notification_top_pad_large_text = 2131165422;
+			public const int notification_large_icon_width = 2131165422;
 			
 			// aapt resource value: 0x7F0700EF
-			public const int page_margin = 2131165423;
+			public const int notification_main_column_padding_top = 2131165423;
 			
 			// aapt resource value: 0x7F0700F0
-			public const int pickerview_textsize = 2131165424;
+			public const int notification_media_narrow_margin = 2131165424;
 			
 			// aapt resource value: 0x7F0700F1
-			public const int pickerview_topbar_btn_textsize = 2131165425;
+			public const int notification_right_icon_size = 2131165425;
 			
 			// aapt resource value: 0x7F0700F2
-			public const int pickerview_topbar_height = 2131165426;
+			public const int notification_right_side_padding_top = 2131165426;
 			
 			// aapt resource value: 0x7F0700F3
-			public const int pickerview_topbar_padding = 2131165427;
+			public const int notification_small_icon_background_padding = 2131165427;
 			
 			// aapt resource value: 0x7F0700F4
-			public const int pickerview_topbar_title_textsize = 2131165428;
+			public const int notification_small_icon_size_as_large = 2131165428;
 			
 			// aapt resource value: 0x7F0700F5
-			public const int pwd_text_size = 2131165429;
+			public const int notification_subtext_size = 2131165429;
 			
 			// aapt resource value: 0x7F0700F6
-			public const int px_1 = 2131165430;
+			public const int notification_top_pad = 2131165430;
 			
 			// aapt resource value: 0x7F0700F7
-			public const int px_10 = 2131165431;
+			public const int notification_top_pad_large_text = 2131165431;
 			
 			// aapt resource value: 0x7F0700F8
-			public const int px_100 = 2131165432;
+			public const int page_margin = 2131165432;
 			
 			// aapt resource value: 0x7F0700F9
-			public const int px_1000 = 2131165433;
+			public const int pickerview_textsize = 2131165433;
 			
 			// aapt resource value: 0x7F0700FA
-			public const int px_101 = 2131165434;
+			public const int pickerview_topbar_btn_textsize = 2131165434;
 			
 			// aapt resource value: 0x7F0700FB
-			public const int px_102 = 2131165435;
+			public const int pickerview_topbar_height = 2131165435;
 			
 			// aapt resource value: 0x7F0700FC
-			public const int px_103 = 2131165436;
+			public const int pickerview_topbar_padding = 2131165436;
 			
 			// aapt resource value: 0x7F0700FD
-			public const int px_104 = 2131165437;
+			public const int pickerview_topbar_title_textsize = 2131165437;
 			
 			// aapt resource value: 0x7F0700FE
-			public const int px_105 = 2131165438;
+			public const int pwd_text_size = 2131165438;
 			
 			// aapt resource value: 0x7F0700FF
-			public const int px_106 = 2131165439;
+			public const int px_1 = 2131165439;
 			
 			// aapt resource value: 0x7F070100
-			public const int px_107 = 2131165440;
+			public const int px_10 = 2131165440;
 			
 			// aapt resource value: 0x7F070101
-			public const int px_108 = 2131165441;
+			public const int px_100 = 2131165441;
 			
 			// aapt resource value: 0x7F070102
-			public const int px_109 = 2131165442;
+			public const int px_1000 = 2131165442;
 			
 			// aapt resource value: 0x7F070103
-			public const int px_11 = 2131165443;
+			public const int px_101 = 2131165443;
 			
 			// aapt resource value: 0x7F070104
-			public const int px_110 = 2131165444;
+			public const int px_102 = 2131165444;
 			
 			// aapt resource value: 0x7F070105
-			public const int px_111 = 2131165445;
+			public const int px_103 = 2131165445;
 			
 			// aapt resource value: 0x7F070106
-			public const int px_112 = 2131165446;
+			public const int px_104 = 2131165446;
 			
 			// aapt resource value: 0x7F070107
-			public const int px_113 = 2131165447;
+			public const int px_105 = 2131165447;
 			
 			// aapt resource value: 0x7F070108
-			public const int px_114 = 2131165448;
+			public const int px_106 = 2131165448;
 			
 			// aapt resource value: 0x7F070109
-			public const int px_115 = 2131165449;
+			public const int px_107 = 2131165449;
 			
 			// aapt resource value: 0x7F07010A
-			public const int px_116 = 2131165450;
+			public const int px_108 = 2131165450;
 			
 			// aapt resource value: 0x7F07010B
-			public const int px_117 = 2131165451;
+			public const int px_109 = 2131165451;
 			
 			// aapt resource value: 0x7F07010C
-			public const int px_118 = 2131165452;
+			public const int px_11 = 2131165452;
 			
 			// aapt resource value: 0x7F07010D
-			public const int px_119 = 2131165453;
+			public const int px_110 = 2131165453;
 			
 			// aapt resource value: 0x7F07010E
-			public const int px_12 = 2131165454;
+			public const int px_111 = 2131165454;
 			
 			// aapt resource value: 0x7F07010F
-			public const int px_120 = 2131165455;
+			public const int px_112 = 2131165455;
 			
 			// aapt resource value: 0x7F070110
-			public const int px_121 = 2131165456;
+			public const int px_113 = 2131165456;
 			
 			// aapt resource value: 0x7F070111
-			public const int px_122 = 2131165457;
+			public const int px_114 = 2131165457;
 			
 			// aapt resource value: 0x7F070112
-			public const int px_123 = 2131165458;
+			public const int px_115 = 2131165458;
 			
 			// aapt resource value: 0x7F070113
-			public const int px_124 = 2131165459;
+			public const int px_116 = 2131165459;
 			
 			// aapt resource value: 0x7F070114
-			public const int px_125 = 2131165460;
+			public const int px_117 = 2131165460;
 			
 			// aapt resource value: 0x7F070115
-			public const int px_126 = 2131165461;
+			public const int px_118 = 2131165461;
 			
 			// aapt resource value: 0x7F070116
-			public const int px_127 = 2131165462;
+			public const int px_119 = 2131165462;
 			
 			// aapt resource value: 0x7F070117
-			public const int px_128 = 2131165463;
+			public const int px_12 = 2131165463;
 			
 			// aapt resource value: 0x7F070118
-			public const int px_129 = 2131165464;
+			public const int px_120 = 2131165464;
 			
 			// aapt resource value: 0x7F070119
-			public const int px_13 = 2131165465;
+			public const int px_121 = 2131165465;
 			
 			// aapt resource value: 0x7F07011A
-			public const int px_130 = 2131165466;
+			public const int px_122 = 2131165466;
 			
 			// aapt resource value: 0x7F07011B
-			public const int px_131 = 2131165467;
+			public const int px_123 = 2131165467;
 			
 			// aapt resource value: 0x7F07011C
-			public const int px_132 = 2131165468;
+			public const int px_124 = 2131165468;
 			
 			// aapt resource value: 0x7F07011D
-			public const int px_133 = 2131165469;
+			public const int px_125 = 2131165469;
 			
 			// aapt resource value: 0x7F07011E
-			public const int px_134 = 2131165470;
+			public const int px_126 = 2131165470;
 			
 			// aapt resource value: 0x7F07011F
-			public const int px_135 = 2131165471;
+			public const int px_127 = 2131165471;
 			
 			// aapt resource value: 0x7F070120
-			public const int px_136 = 2131165472;
+			public const int px_128 = 2131165472;
 			
 			// aapt resource value: 0x7F070121
-			public const int px_137 = 2131165473;
+			public const int px_129 = 2131165473;
 			
 			// aapt resource value: 0x7F070122
-			public const int px_138 = 2131165474;
+			public const int px_13 = 2131165474;
 			
 			// aapt resource value: 0x7F070123
-			public const int px_139 = 2131165475;
+			public const int px_130 = 2131165475;
 			
 			// aapt resource value: 0x7F070124
-			public const int px_14 = 2131165476;
+			public const int px_131 = 2131165476;
 			
 			// aapt resource value: 0x7F070125
-			public const int px_140 = 2131165477;
+			public const int px_132 = 2131165477;
 			
 			// aapt resource value: 0x7F070126
-			public const int px_141 = 2131165478;
+			public const int px_133 = 2131165478;
 			
 			// aapt resource value: 0x7F070127
-			public const int px_142 = 2131165479;
+			public const int px_134 = 2131165479;
 			
 			// aapt resource value: 0x7F070128
-			public const int px_143 = 2131165480;
+			public const int px_135 = 2131165480;
 			
 			// aapt resource value: 0x7F070129
-			public const int px_144 = 2131165481;
+			public const int px_136 = 2131165481;
 			
 			// aapt resource value: 0x7F07012A
-			public const int px_145 = 2131165482;
+			public const int px_137 = 2131165482;
 			
 			// aapt resource value: 0x7F07012B
-			public const int px_146 = 2131165483;
+			public const int px_138 = 2131165483;
 			
 			// aapt resource value: 0x7F07012C
-			public const int px_147 = 2131165484;
+			public const int px_139 = 2131165484;
 			
 			// aapt resource value: 0x7F07012D
-			public const int px_148 = 2131165485;
+			public const int px_14 = 2131165485;
 			
 			// aapt resource value: 0x7F07012E
-			public const int px_149 = 2131165486;
+			public const int px_140 = 2131165486;
 			
 			// aapt resource value: 0x7F07012F
-			public const int px_15 = 2131165487;
+			public const int px_141 = 2131165487;
 			
 			// aapt resource value: 0x7F070130
-			public const int px_150 = 2131165488;
+			public const int px_142 = 2131165488;
 			
 			// aapt resource value: 0x7F070131
-			public const int px_151 = 2131165489;
+			public const int px_143 = 2131165489;
 			
 			// aapt resource value: 0x7F070132
-			public const int px_152 = 2131165490;
+			public const int px_144 = 2131165490;
 			
 			// aapt resource value: 0x7F070133
-			public const int px_153 = 2131165491;
+			public const int px_145 = 2131165491;
 			
 			// aapt resource value: 0x7F070134
-			public const int px_154 = 2131165492;
+			public const int px_146 = 2131165492;
 			
 			// aapt resource value: 0x7F070135
-			public const int px_155 = 2131165493;
+			public const int px_147 = 2131165493;
 			
 			// aapt resource value: 0x7F070136
-			public const int px_156 = 2131165494;
+			public const int px_148 = 2131165494;
 			
 			// aapt resource value: 0x7F070137
-			public const int px_157 = 2131165495;
+			public const int px_149 = 2131165495;
 			
 			// aapt resource value: 0x7F070138
-			public const int px_158 = 2131165496;
+			public const int px_15 = 2131165496;
 			
 			// aapt resource value: 0x7F070139
-			public const int px_159 = 2131165497;
+			public const int px_150 = 2131165497;
 			
 			// aapt resource value: 0x7F07013A
-			public const int px_16 = 2131165498;
+			public const int px_151 = 2131165498;
 			
 			// aapt resource value: 0x7F07013B
-			public const int px_160 = 2131165499;
+			public const int px_152 = 2131165499;
 			
 			// aapt resource value: 0x7F07013C
-			public const int px_161 = 2131165500;
+			public const int px_153 = 2131165500;
 			
 			// aapt resource value: 0x7F07013D
-			public const int px_162 = 2131165501;
+			public const int px_154 = 2131165501;
 			
 			// aapt resource value: 0x7F07013E
-			public const int px_163 = 2131165502;
+			public const int px_155 = 2131165502;
 			
 			// aapt resource value: 0x7F07013F
-			public const int px_164 = 2131165503;
+			public const int px_156 = 2131165503;
 			
 			// aapt resource value: 0x7F070140
-			public const int px_165 = 2131165504;
+			public const int px_157 = 2131165504;
 			
 			// aapt resource value: 0x7F070141
-			public const int px_166 = 2131165505;
+			public const int px_158 = 2131165505;
 			
 			// aapt resource value: 0x7F070142
-			public const int px_167 = 2131165506;
+			public const int px_159 = 2131165506;
 			
 			// aapt resource value: 0x7F070143
-			public const int px_168 = 2131165507;
+			public const int px_16 = 2131165507;
 			
 			// aapt resource value: 0x7F070144
-			public const int px_169 = 2131165508;
+			public const int px_160 = 2131165508;
 			
 			// aapt resource value: 0x7F070145
-			public const int px_17 = 2131165509;
+			public const int px_161 = 2131165509;
 			
 			// aapt resource value: 0x7F070146
-			public const int px_170 = 2131165510;
+			public const int px_162 = 2131165510;
 			
 			// aapt resource value: 0x7F070147
-			public const int px_171 = 2131165511;
+			public const int px_163 = 2131165511;
 			
 			// aapt resource value: 0x7F070148
-			public const int px_172 = 2131165512;
+			public const int px_164 = 2131165512;
 			
 			// aapt resource value: 0x7F070149
-			public const int px_173 = 2131165513;
+			public const int px_165 = 2131165513;
 			
 			// aapt resource value: 0x7F07014A
-			public const int px_174 = 2131165514;
+			public const int px_166 = 2131165514;
 			
 			// aapt resource value: 0x7F07014B
-			public const int px_175 = 2131165515;
+			public const int px_167 = 2131165515;
 			
 			// aapt resource value: 0x7F07014C
-			public const int px_176 = 2131165516;
+			public const int px_168 = 2131165516;
 			
 			// aapt resource value: 0x7F07014D
-			public const int px_177 = 2131165517;
+			public const int px_169 = 2131165517;
 			
 			// aapt resource value: 0x7F07014E
-			public const int px_178 = 2131165518;
+			public const int px_17 = 2131165518;
 			
 			// aapt resource value: 0x7F07014F
-			public const int px_179 = 2131165519;
+			public const int px_170 = 2131165519;
 			
 			// aapt resource value: 0x7F070150
-			public const int px_18 = 2131165520;
+			public const int px_171 = 2131165520;
 			
 			// aapt resource value: 0x7F070151
-			public const int px_180 = 2131165521;
+			public const int px_172 = 2131165521;
 			
 			// aapt resource value: 0x7F070152
-			public const int px_181 = 2131165522;
+			public const int px_173 = 2131165522;
 			
 			// aapt resource value: 0x7F070153
-			public const int px_182 = 2131165523;
+			public const int px_174 = 2131165523;
 			
 			// aapt resource value: 0x7F070154
-			public const int px_183 = 2131165524;
+			public const int px_175 = 2131165524;
 			
 			// aapt resource value: 0x7F070155
-			public const int px_184 = 2131165525;
+			public const int px_176 = 2131165525;
 			
 			// aapt resource value: 0x7F070156
-			public const int px_185 = 2131165526;
+			public const int px_177 = 2131165526;
 			
 			// aapt resource value: 0x7F070157
-			public const int px_186 = 2131165527;
+			public const int px_178 = 2131165527;
 			
 			// aapt resource value: 0x7F070158
-			public const int px_187 = 2131165528;
+			public const int px_179 = 2131165528;
 			
 			// aapt resource value: 0x7F070159
-			public const int px_188 = 2131165529;
+			public const int px_18 = 2131165529;
 			
 			// aapt resource value: 0x7F07015A
-			public const int px_189 = 2131165530;
+			public const int px_180 = 2131165530;
 			
 			// aapt resource value: 0x7F07015B
-			public const int px_19 = 2131165531;
+			public const int px_181 = 2131165531;
 			
 			// aapt resource value: 0x7F07015C
-			public const int px_190 = 2131165532;
+			public const int px_182 = 2131165532;
 			
 			// aapt resource value: 0x7F07015D
-			public const int px_191 = 2131165533;
+			public const int px_183 = 2131165533;
 			
 			// aapt resource value: 0x7F07015E
-			public const int px_192 = 2131165534;
+			public const int px_184 = 2131165534;
 			
 			// aapt resource value: 0x7F07015F
-			public const int px_193 = 2131165535;
+			public const int px_185 = 2131165535;
 			
 			// aapt resource value: 0x7F070160
-			public const int px_194 = 2131165536;
+			public const int px_186 = 2131165536;
 			
 			// aapt resource value: 0x7F070161
-			public const int px_195 = 2131165537;
+			public const int px_187 = 2131165537;
 			
 			// aapt resource value: 0x7F070162
-			public const int px_196 = 2131165538;
+			public const int px_188 = 2131165538;
 			
 			// aapt resource value: 0x7F070163
-			public const int px_197 = 2131165539;
+			public const int px_189 = 2131165539;
 			
 			// aapt resource value: 0x7F070164
-			public const int px_198 = 2131165540;
+			public const int px_19 = 2131165540;
 			
 			// aapt resource value: 0x7F070165
-			public const int px_199 = 2131165541;
+			public const int px_190 = 2131165541;
 			
 			// aapt resource value: 0x7F070166
-			public const int px_2 = 2131165542;
+			public const int px_191 = 2131165542;
 			
 			// aapt resource value: 0x7F070167
-			public const int px_20 = 2131165543;
+			public const int px_192 = 2131165543;
 			
 			// aapt resource value: 0x7F070168
-			public const int px_200 = 2131165544;
+			public const int px_193 = 2131165544;
 			
 			// aapt resource value: 0x7F070169
-			public const int px_201 = 2131165545;
+			public const int px_194 = 2131165545;
 			
 			// aapt resource value: 0x7F07016A
-			public const int px_202 = 2131165546;
+			public const int px_195 = 2131165546;
 			
 			// aapt resource value: 0x7F07016B
-			public const int px_203 = 2131165547;
+			public const int px_196 = 2131165547;
 			
 			// aapt resource value: 0x7F07016C
-			public const int px_204 = 2131165548;
+			public const int px_197 = 2131165548;
 			
 			// aapt resource value: 0x7F07016D
-			public const int px_205 = 2131165549;
+			public const int px_198 = 2131165549;
 			
 			// aapt resource value: 0x7F07016E
-			public const int px_206 = 2131165550;
+			public const int px_199 = 2131165550;
 			
 			// aapt resource value: 0x7F07016F
-			public const int px_207 = 2131165551;
+			public const int px_2 = 2131165551;
 			
 			// aapt resource value: 0x7F070170
-			public const int px_208 = 2131165552;
+			public const int px_20 = 2131165552;
 			
 			// aapt resource value: 0x7F070171
-			public const int px_209 = 2131165553;
+			public const int px_200 = 2131165553;
 			
 			// aapt resource value: 0x7F070172
-			public const int px_21 = 2131165554;
+			public const int px_201 = 2131165554;
 			
 			// aapt resource value: 0x7F070173
-			public const int px_210 = 2131165555;
+			public const int px_202 = 2131165555;
 			
 			// aapt resource value: 0x7F070174
-			public const int px_211 = 2131165556;
+			public const int px_203 = 2131165556;
 			
 			// aapt resource value: 0x7F070175
-			public const int px_212 = 2131165557;
+			public const int px_204 = 2131165557;
 			
 			// aapt resource value: 0x7F070176
-			public const int px_213 = 2131165558;
+			public const int px_205 = 2131165558;
 			
 			// aapt resource value: 0x7F070177
-			public const int px_214 = 2131165559;
+			public const int px_206 = 2131165559;
 			
 			// aapt resource value: 0x7F070178
-			public const int px_215 = 2131165560;
+			public const int px_207 = 2131165560;
 			
 			// aapt resource value: 0x7F070179
-			public const int px_216 = 2131165561;
+			public const int px_208 = 2131165561;
 			
 			// aapt resource value: 0x7F07017A
-			public const int px_217 = 2131165562;
+			public const int px_209 = 2131165562;
 			
 			// aapt resource value: 0x7F07017B
-			public const int px_218 = 2131165563;
+			public const int px_21 = 2131165563;
 			
 			// aapt resource value: 0x7F07017C
-			public const int px_219 = 2131165564;
+			public const int px_210 = 2131165564;
 			
 			// aapt resource value: 0x7F07017D
-			public const int px_22 = 2131165565;
+			public const int px_211 = 2131165565;
 			
 			// aapt resource value: 0x7F07017E
-			public const int px_220 = 2131165566;
+			public const int px_212 = 2131165566;
 			
 			// aapt resource value: 0x7F07017F
-			public const int px_221 = 2131165567;
+			public const int px_213 = 2131165567;
 			
 			// aapt resource value: 0x7F070180
-			public const int px_222 = 2131165568;
+			public const int px_214 = 2131165568;
 			
 			// aapt resource value: 0x7F070181
-			public const int px_223 = 2131165569;
+			public const int px_215 = 2131165569;
 			
 			// aapt resource value: 0x7F070182
-			public const int px_224 = 2131165570;
+			public const int px_216 = 2131165570;
 			
 			// aapt resource value: 0x7F070183
-			public const int px_225 = 2131165571;
+			public const int px_217 = 2131165571;
 			
 			// aapt resource value: 0x7F070184
-			public const int px_226 = 2131165572;
+			public const int px_218 = 2131165572;
 			
 			// aapt resource value: 0x7F070185
-			public const int px_227 = 2131165573;
+			public const int px_219 = 2131165573;
 			
 			// aapt resource value: 0x7F070186
-			public const int px_228 = 2131165574;
+			public const int px_22 = 2131165574;
 			
 			// aapt resource value: 0x7F070187
-			public const int px_229 = 2131165575;
+			public const int px_220 = 2131165575;
 			
 			// aapt resource value: 0x7F070188
-			public const int px_23 = 2131165576;
+			public const int px_221 = 2131165576;
 			
 			// aapt resource value: 0x7F070189
-			public const int px_230 = 2131165577;
+			public const int px_222 = 2131165577;
 			
 			// aapt resource value: 0x7F07018A
-			public const int px_231 = 2131165578;
+			public const int px_223 = 2131165578;
 			
 			// aapt resource value: 0x7F07018B
-			public const int px_232 = 2131165579;
+			public const int px_224 = 2131165579;
 			
 			// aapt resource value: 0x7F07018C
-			public const int px_233 = 2131165580;
+			public const int px_225 = 2131165580;
 			
 			// aapt resource value: 0x7F07018D
-			public const int px_234 = 2131165581;
+			public const int px_226 = 2131165581;
 			
 			// aapt resource value: 0x7F07018E
-			public const int px_235 = 2131165582;
+			public const int px_227 = 2131165582;
 			
 			// aapt resource value: 0x7F07018F
-			public const int px_236 = 2131165583;
+			public const int px_228 = 2131165583;
 			
 			// aapt resource value: 0x7F070190
-			public const int px_237 = 2131165584;
+			public const int px_229 = 2131165584;
 			
 			// aapt resource value: 0x7F070191
-			public const int px_238 = 2131165585;
+			public const int px_23 = 2131165585;
 			
 			// aapt resource value: 0x7F070192
-			public const int px_239 = 2131165586;
+			public const int px_230 = 2131165586;
 			
 			// aapt resource value: 0x7F070193
-			public const int px_24 = 2131165587;
+			public const int px_231 = 2131165587;
 			
 			// aapt resource value: 0x7F070194
-			public const int px_240 = 2131165588;
+			public const int px_232 = 2131165588;
 			
 			// aapt resource value: 0x7F070195
-			public const int px_241 = 2131165589;
+			public const int px_233 = 2131165589;
 			
 			// aapt resource value: 0x7F070196
-			public const int px_242 = 2131165590;
+			public const int px_234 = 2131165590;
 			
 			// aapt resource value: 0x7F070197
-			public const int px_243 = 2131165591;
+			public const int px_235 = 2131165591;
 			
 			// aapt resource value: 0x7F070198
-			public const int px_244 = 2131165592;
+			public const int px_236 = 2131165592;
 			
 			// aapt resource value: 0x7F070199
-			public const int px_245 = 2131165593;
+			public const int px_237 = 2131165593;
 			
 			// aapt resource value: 0x7F07019A
-			public const int px_246 = 2131165594;
+			public const int px_238 = 2131165594;
 			
 			// aapt resource value: 0x7F07019B
-			public const int px_247 = 2131165595;
+			public const int px_239 = 2131165595;
 			
 			// aapt resource value: 0x7F07019C
-			public const int px_248 = 2131165596;
+			public const int px_24 = 2131165596;
 			
 			// aapt resource value: 0x7F07019D
-			public const int px_249 = 2131165597;
+			public const int px_240 = 2131165597;
 			
 			// aapt resource value: 0x7F07019E
-			public const int px_25 = 2131165598;
+			public const int px_241 = 2131165598;
 			
 			// aapt resource value: 0x7F07019F
-			public const int px_250 = 2131165599;
+			public const int px_242 = 2131165599;
 			
 			// aapt resource value: 0x7F0701A0
-			public const int px_251 = 2131165600;
+			public const int px_243 = 2131165600;
 			
 			// aapt resource value: 0x7F0701A1
-			public const int px_252 = 2131165601;
+			public const int px_244 = 2131165601;
 			
 			// aapt resource value: 0x7F0701A2
-			public const int px_253 = 2131165602;
+			public const int px_245 = 2131165602;
 			
 			// aapt resource value: 0x7F0701A3
-			public const int px_254 = 2131165603;
+			public const int px_246 = 2131165603;
 			
 			// aapt resource value: 0x7F0701A4
-			public const int px_255 = 2131165604;
+			public const int px_247 = 2131165604;
 			
 			// aapt resource value: 0x7F0701A5
-			public const int px_256 = 2131165605;
+			public const int px_248 = 2131165605;
 			
 			// aapt resource value: 0x7F0701A6
-			public const int px_257 = 2131165606;
+			public const int px_249 = 2131165606;
 			
 			// aapt resource value: 0x7F0701A7
-			public const int px_258 = 2131165607;
+			public const int px_25 = 2131165607;
 			
 			// aapt resource value: 0x7F0701A8
-			public const int px_259 = 2131165608;
+			public const int px_250 = 2131165608;
 			
 			// aapt resource value: 0x7F0701A9
-			public const int px_26 = 2131165609;
+			public const int px_251 = 2131165609;
 			
 			// aapt resource value: 0x7F0701AA
-			public const int px_260 = 2131165610;
+			public const int px_252 = 2131165610;
 			
 			// aapt resource value: 0x7F0701AB
-			public const int px_261 = 2131165611;
+			public const int px_253 = 2131165611;
 			
 			// aapt resource value: 0x7F0701AC
-			public const int px_262 = 2131165612;
+			public const int px_254 = 2131165612;
 			
 			// aapt resource value: 0x7F0701AD
-			public const int px_263 = 2131165613;
+			public const int px_255 = 2131165613;
 			
 			// aapt resource value: 0x7F0701AE
-			public const int px_264 = 2131165614;
+			public const int px_256 = 2131165614;
 			
 			// aapt resource value: 0x7F0701AF
-			public const int px_265 = 2131165615;
+			public const int px_257 = 2131165615;
 			
 			// aapt resource value: 0x7F0701B0
-			public const int px_266 = 2131165616;
+			public const int px_258 = 2131165616;
 			
 			// aapt resource value: 0x7F0701B1
-			public const int px_267 = 2131165617;
+			public const int px_259 = 2131165617;
 			
 			// aapt resource value: 0x7F0701B2
-			public const int px_268 = 2131165618;
+			public const int px_26 = 2131165618;
 			
 			// aapt resource value: 0x7F0701B3
-			public const int px_269 = 2131165619;
+			public const int px_260 = 2131165619;
 			
 			// aapt resource value: 0x7F0701B4
-			public const int px_27 = 2131165620;
+			public const int px_261 = 2131165620;
 			
 			// aapt resource value: 0x7F0701B5
-			public const int px_270 = 2131165621;
+			public const int px_262 = 2131165621;
 			
 			// aapt resource value: 0x7F0701B6
-			public const int px_271 = 2131165622;
+			public const int px_263 = 2131165622;
 			
 			// aapt resource value: 0x7F0701B7
-			public const int px_272 = 2131165623;
+			public const int px_264 = 2131165623;
 			
 			// aapt resource value: 0x7F0701B8
-			public const int px_273 = 2131165624;
+			public const int px_265 = 2131165624;
 			
 			// aapt resource value: 0x7F0701B9
-			public const int px_274 = 2131165625;
+			public const int px_266 = 2131165625;
 			
 			// aapt resource value: 0x7F0701BA
-			public const int px_275 = 2131165626;
+			public const int px_267 = 2131165626;
 			
 			// aapt resource value: 0x7F0701BB
-			public const int px_276 = 2131165627;
+			public const int px_268 = 2131165627;
 			
 			// aapt resource value: 0x7F0701BC
-			public const int px_277 = 2131165628;
+			public const int px_269 = 2131165628;
 			
 			// aapt resource value: 0x7F0701BD
-			public const int px_278 = 2131165629;
+			public const int px_27 = 2131165629;
 			
 			// aapt resource value: 0x7F0701BE
-			public const int px_279 = 2131165630;
+			public const int px_270 = 2131165630;
 			
 			// aapt resource value: 0x7F0701BF
-			public const int px_28 = 2131165631;
+			public const int px_271 = 2131165631;
 			
 			// aapt resource value: 0x7F0701C0
-			public const int px_280 = 2131165632;
+			public const int px_272 = 2131165632;
 			
 			// aapt resource value: 0x7F0701C1
-			public const int px_281 = 2131165633;
+			public const int px_273 = 2131165633;
 			
 			// aapt resource value: 0x7F0701C2
-			public const int px_282 = 2131165634;
+			public const int px_274 = 2131165634;
 			
 			// aapt resource value: 0x7F0701C3
-			public const int px_283 = 2131165635;
+			public const int px_275 = 2131165635;
 			
 			// aapt resource value: 0x7F0701C4
-			public const int px_284 = 2131165636;
+			public const int px_276 = 2131165636;
 			
 			// aapt resource value: 0x7F0701C5
-			public const int px_285 = 2131165637;
+			public const int px_277 = 2131165637;
 			
 			// aapt resource value: 0x7F0701C6
-			public const int px_286 = 2131165638;
+			public const int px_278 = 2131165638;
 			
 			// aapt resource value: 0x7F0701C7
-			public const int px_287 = 2131165639;
+			public const int px_279 = 2131165639;
 			
 			// aapt resource value: 0x7F0701C8
-			public const int px_288 = 2131165640;
+			public const int px_28 = 2131165640;
 			
 			// aapt resource value: 0x7F0701C9
-			public const int px_289 = 2131165641;
+			public const int px_280 = 2131165641;
 			
 			// aapt resource value: 0x7F0701CA
-			public const int px_29 = 2131165642;
+			public const int px_281 = 2131165642;
 			
 			// aapt resource value: 0x7F0701CB
-			public const int px_290 = 2131165643;
+			public const int px_282 = 2131165643;
 			
 			// aapt resource value: 0x7F0701CC
-			public const int px_291 = 2131165644;
+			public const int px_283 = 2131165644;
 			
 			// aapt resource value: 0x7F0701CD
-			public const int px_292 = 2131165645;
+			public const int px_284 = 2131165645;
 			
 			// aapt resource value: 0x7F0701CE
-			public const int px_293 = 2131165646;
+			public const int px_285 = 2131165646;
 			
 			// aapt resource value: 0x7F0701CF
-			public const int px_294 = 2131165647;
+			public const int px_286 = 2131165647;
 			
 			// aapt resource value: 0x7F0701D0
-			public const int px_295 = 2131165648;
+			public const int px_287 = 2131165648;
 			
 			// aapt resource value: 0x7F0701D1
-			public const int px_296 = 2131165649;
+			public const int px_288 = 2131165649;
 			
 			// aapt resource value: 0x7F0701D2
-			public const int px_297 = 2131165650;
+			public const int px_289 = 2131165650;
 			
 			// aapt resource value: 0x7F0701D3
-			public const int px_298 = 2131165651;
+			public const int px_29 = 2131165651;
 			
 			// aapt resource value: 0x7F0701D4
-			public const int px_299 = 2131165652;
+			public const int px_290 = 2131165652;
 			
 			// aapt resource value: 0x7F0701D5
-			public const int px_3 = 2131165653;
+			public const int px_291 = 2131165653;
 			
 			// aapt resource value: 0x7F0701D6
-			public const int px_30 = 2131165654;
+			public const int px_292 = 2131165654;
 			
 			// aapt resource value: 0x7F0701D7
-			public const int px_300 = 2131165655;
+			public const int px_293 = 2131165655;
 			
 			// aapt resource value: 0x7F0701D8
-			public const int px_301 = 2131165656;
+			public const int px_294 = 2131165656;
 			
 			// aapt resource value: 0x7F0701D9
-			public const int px_302 = 2131165657;
+			public const int px_295 = 2131165657;
 			
 			// aapt resource value: 0x7F0701DA
-			public const int px_303 = 2131165658;
+			public const int px_296 = 2131165658;
 			
 			// aapt resource value: 0x7F0701DB
-			public const int px_304 = 2131165659;
+			public const int px_297 = 2131165659;
 			
 			// aapt resource value: 0x7F0701DC
-			public const int px_305 = 2131165660;
+			public const int px_298 = 2131165660;
 			
 			// aapt resource value: 0x7F0701DD
-			public const int px_306 = 2131165661;
+			public const int px_299 = 2131165661;
 			
 			// aapt resource value: 0x7F0701DE
-			public const int px_307 = 2131165662;
+			public const int px_3 = 2131165662;
 			
 			// aapt resource value: 0x7F0701DF
-			public const int px_308 = 2131165663;
+			public const int px_30 = 2131165663;
 			
 			// aapt resource value: 0x7F0701E0
-			public const int px_309 = 2131165664;
+			public const int px_300 = 2131165664;
 			
 			// aapt resource value: 0x7F0701E1
-			public const int px_31 = 2131165665;
+			public const int px_301 = 2131165665;
 			
 			// aapt resource value: 0x7F0701E2
-			public const int px_310 = 2131165666;
+			public const int px_302 = 2131165666;
 			
 			// aapt resource value: 0x7F0701E3
-			public const int px_311 = 2131165667;
+			public const int px_303 = 2131165667;
 			
 			// aapt resource value: 0x7F0701E4
-			public const int px_312 = 2131165668;
+			public const int px_304 = 2131165668;
 			
 			// aapt resource value: 0x7F0701E5
-			public const int px_313 = 2131165669;
+			public const int px_305 = 2131165669;
 			
 			// aapt resource value: 0x7F0701E6
-			public const int px_314 = 2131165670;
+			public const int px_306 = 2131165670;
 			
 			// aapt resource value: 0x7F0701E7
-			public const int px_315 = 2131165671;
+			public const int px_307 = 2131165671;
 			
 			// aapt resource value: 0x7F0701E8
-			public const int px_316 = 2131165672;
+			public const int px_308 = 2131165672;
 			
 			// aapt resource value: 0x7F0701E9
-			public const int px_317 = 2131165673;
+			public const int px_309 = 2131165673;
 			
 			// aapt resource value: 0x7F0701EA
-			public const int px_318 = 2131165674;
+			public const int px_31 = 2131165674;
 			
 			// aapt resource value: 0x7F0701EB
-			public const int px_319 = 2131165675;
+			public const int px_310 = 2131165675;
 			
 			// aapt resource value: 0x7F0701EC
-			public const int px_32 = 2131165676;
+			public const int px_311 = 2131165676;
 			
 			// aapt resource value: 0x7F0701ED
-			public const int px_320 = 2131165677;
+			public const int px_312 = 2131165677;
 			
 			// aapt resource value: 0x7F0701EE
-			public const int px_321 = 2131165678;
+			public const int px_313 = 2131165678;
 			
 			// aapt resource value: 0x7F0701EF
-			public const int px_322 = 2131165679;
+			public const int px_314 = 2131165679;
 			
 			// aapt resource value: 0x7F0701F0
-			public const int px_323 = 2131165680;
+			public const int px_315 = 2131165680;
 			
 			// aapt resource value: 0x7F0701F1
-			public const int px_324 = 2131165681;
+			public const int px_316 = 2131165681;
 			
 			// aapt resource value: 0x7F0701F2
-			public const int px_325 = 2131165682;
+			public const int px_317 = 2131165682;
 			
 			// aapt resource value: 0x7F0701F3
-			public const int px_326 = 2131165683;
+			public const int px_318 = 2131165683;
 			
 			// aapt resource value: 0x7F0701F4
-			public const int px_327 = 2131165684;
+			public const int px_319 = 2131165684;
 			
 			// aapt resource value: 0x7F0701F5
-			public const int px_328 = 2131165685;
+			public const int px_32 = 2131165685;
 			
 			// aapt resource value: 0x7F0701F6
-			public const int px_329 = 2131165686;
+			public const int px_320 = 2131165686;
 			
 			// aapt resource value: 0x7F0701F7
-			public const int px_33 = 2131165687;
+			public const int px_321 = 2131165687;
 			
 			// aapt resource value: 0x7F0701F8
-			public const int px_330 = 2131165688;
+			public const int px_322 = 2131165688;
 			
 			// aapt resource value: 0x7F0701F9
-			public const int px_331 = 2131165689;
+			public const int px_323 = 2131165689;
 			
 			// aapt resource value: 0x7F0701FA
-			public const int px_332 = 2131165690;
+			public const int px_324 = 2131165690;
 			
 			// aapt resource value: 0x7F0701FB
-			public const int px_333 = 2131165691;
+			public const int px_325 = 2131165691;
 			
 			// aapt resource value: 0x7F0701FC
-			public const int px_334 = 2131165692;
+			public const int px_326 = 2131165692;
 			
 			// aapt resource value: 0x7F0701FD
-			public const int px_335 = 2131165693;
+			public const int px_327 = 2131165693;
 			
 			// aapt resource value: 0x7F0701FE
-			public const int px_336 = 2131165694;
+			public const int px_328 = 2131165694;
 			
 			// aapt resource value: 0x7F0701FF
-			public const int px_337 = 2131165695;
+			public const int px_329 = 2131165695;
 			
 			// aapt resource value: 0x7F070200
-			public const int px_338 = 2131165696;
+			public const int px_33 = 2131165696;
 			
 			// aapt resource value: 0x7F070201
-			public const int px_339 = 2131165697;
+			public const int px_330 = 2131165697;
 			
 			// aapt resource value: 0x7F070202
-			public const int px_34 = 2131165698;
+			public const int px_331 = 2131165698;
 			
 			// aapt resource value: 0x7F070203
-			public const int px_340 = 2131165699;
+			public const int px_332 = 2131165699;
 			
 			// aapt resource value: 0x7F070204
-			public const int px_341 = 2131165700;
+			public const int px_333 = 2131165700;
 			
 			// aapt resource value: 0x7F070205
-			public const int px_342 = 2131165701;
+			public const int px_334 = 2131165701;
 			
 			// aapt resource value: 0x7F070206
-			public const int px_343 = 2131165702;
+			public const int px_335 = 2131165702;
 			
 			// aapt resource value: 0x7F070207
-			public const int px_344 = 2131165703;
+			public const int px_336 = 2131165703;
 			
 			// aapt resource value: 0x7F070208
-			public const int px_345 = 2131165704;
+			public const int px_337 = 2131165704;
 			
 			// aapt resource value: 0x7F070209
-			public const int px_346 = 2131165705;
+			public const int px_338 = 2131165705;
 			
 			// aapt resource value: 0x7F07020A
-			public const int px_347 = 2131165706;
+			public const int px_339 = 2131165706;
 			
 			// aapt resource value: 0x7F07020B
-			public const int px_348 = 2131165707;
+			public const int px_34 = 2131165707;
 			
 			// aapt resource value: 0x7F07020C
-			public const int px_349 = 2131165708;
+			public const int px_340 = 2131165708;
 			
 			// aapt resource value: 0x7F07020D
-			public const int px_35 = 2131165709;
+			public const int px_341 = 2131165709;
 			
 			// aapt resource value: 0x7F07020E
-			public const int px_350 = 2131165710;
+			public const int px_342 = 2131165710;
 			
 			// aapt resource value: 0x7F07020F
-			public const int px_351 = 2131165711;
+			public const int px_343 = 2131165711;
 			
 			// aapt resource value: 0x7F070210
-			public const int px_352 = 2131165712;
+			public const int px_344 = 2131165712;
 			
 			// aapt resource value: 0x7F070211
-			public const int px_353 = 2131165713;
+			public const int px_345 = 2131165713;
 			
 			// aapt resource value: 0x7F070212
-			public const int px_354 = 2131165714;
+			public const int px_346 = 2131165714;
 			
 			// aapt resource value: 0x7F070213
-			public const int px_355 = 2131165715;
+			public const int px_347 = 2131165715;
 			
 			// aapt resource value: 0x7F070214
-			public const int px_356 = 2131165716;
+			public const int px_348 = 2131165716;
 			
 			// aapt resource value: 0x7F070215
-			public const int px_357 = 2131165717;
+			public const int px_349 = 2131165717;
 			
 			// aapt resource value: 0x7F070216
-			public const int px_358 = 2131165718;
+			public const int px_35 = 2131165718;
 			
 			// aapt resource value: 0x7F070217
-			public const int px_359 = 2131165719;
+			public const int px_350 = 2131165719;
 			
 			// aapt resource value: 0x7F070218
-			public const int px_36 = 2131165720;
+			public const int px_351 = 2131165720;
 			
 			// aapt resource value: 0x7F070219
-			public const int px_360 = 2131165721;
+			public const int px_352 = 2131165721;
 			
 			// aapt resource value: 0x7F07021A
-			public const int px_361 = 2131165722;
+			public const int px_353 = 2131165722;
 			
 			// aapt resource value: 0x7F07021B
-			public const int px_362 = 2131165723;
+			public const int px_354 = 2131165723;
 			
 			// aapt resource value: 0x7F07021C
-			public const int px_363 = 2131165724;
+			public const int px_355 = 2131165724;
 			
 			// aapt resource value: 0x7F07021D
-			public const int px_364 = 2131165725;
+			public const int px_356 = 2131165725;
 			
 			// aapt resource value: 0x7F07021E
-			public const int px_365 = 2131165726;
+			public const int px_357 = 2131165726;
 			
 			// aapt resource value: 0x7F07021F
-			public const int px_366 = 2131165727;
+			public const int px_358 = 2131165727;
 			
 			// aapt resource value: 0x7F070220
-			public const int px_367 = 2131165728;
+			public const int px_359 = 2131165728;
 			
 			// aapt resource value: 0x7F070221
-			public const int px_368 = 2131165729;
+			public const int px_36 = 2131165729;
 			
 			// aapt resource value: 0x7F070222
-			public const int px_369 = 2131165730;
+			public const int px_360 = 2131165730;
 			
 			// aapt resource value: 0x7F070223
-			public const int px_37 = 2131165731;
+			public const int px_361 = 2131165731;
 			
 			// aapt resource value: 0x7F070224
-			public const int px_370 = 2131165732;
+			public const int px_362 = 2131165732;
 			
 			// aapt resource value: 0x7F070225
-			public const int px_371 = 2131165733;
+			public const int px_363 = 2131165733;
 			
 			// aapt resource value: 0x7F070226
-			public const int px_372 = 2131165734;
+			public const int px_364 = 2131165734;
 			
 			// aapt resource value: 0x7F070227
-			public const int px_373 = 2131165735;
+			public const int px_365 = 2131165735;
 			
 			// aapt resource value: 0x7F070228
-			public const int px_374 = 2131165736;
+			public const int px_366 = 2131165736;
 			
 			// aapt resource value: 0x7F070229
-			public const int px_375 = 2131165737;
+			public const int px_367 = 2131165737;
 			
 			// aapt resource value: 0x7F07022A
-			public const int px_376 = 2131165738;
+			public const int px_368 = 2131165738;
 			
 			// aapt resource value: 0x7F07022B
-			public const int px_377 = 2131165739;
+			public const int px_369 = 2131165739;
 			
 			// aapt resource value: 0x7F07022C
-			public const int px_378 = 2131165740;
+			public const int px_37 = 2131165740;
 			
 			// aapt resource value: 0x7F07022D
-			public const int px_379 = 2131165741;
+			public const int px_370 = 2131165741;
 			
 			// aapt resource value: 0x7F07022E
-			public const int px_38 = 2131165742;
+			public const int px_371 = 2131165742;
 			
 			// aapt resource value: 0x7F07022F
-			public const int px_380 = 2131165743;
+			public const int px_372 = 2131165743;
 			
 			// aapt resource value: 0x7F070230
-			public const int px_381 = 2131165744;
+			public const int px_373 = 2131165744;
 			
 			// aapt resource value: 0x7F070231
-			public const int px_382 = 2131165745;
+			public const int px_374 = 2131165745;
 			
 			// aapt resource value: 0x7F070232
-			public const int px_383 = 2131165746;
+			public const int px_375 = 2131165746;
 			
 			// aapt resource value: 0x7F070233
-			public const int px_384 = 2131165747;
+			public const int px_376 = 2131165747;
 			
 			// aapt resource value: 0x7F070234
-			public const int px_385 = 2131165748;
+			public const int px_377 = 2131165748;
 			
 			// aapt resource value: 0x7F070235
-			public const int px_386 = 2131165749;
+			public const int px_378 = 2131165749;
 			
 			// aapt resource value: 0x7F070236
-			public const int px_387 = 2131165750;
+			public const int px_379 = 2131165750;
 			
 			// aapt resource value: 0x7F070237
-			public const int px_388 = 2131165751;
+			public const int px_38 = 2131165751;
 			
 			// aapt resource value: 0x7F070238
-			public const int px_389 = 2131165752;
+			public const int px_380 = 2131165752;
 			
 			// aapt resource value: 0x7F070239
-			public const int px_39 = 2131165753;
+			public const int px_381 = 2131165753;
 			
 			// aapt resource value: 0x7F07023A
-			public const int px_390 = 2131165754;
+			public const int px_382 = 2131165754;
 			
 			// aapt resource value: 0x7F07023B
-			public const int px_391 = 2131165755;
+			public const int px_383 = 2131165755;
 			
 			// aapt resource value: 0x7F07023C
-			public const int px_392 = 2131165756;
+			public const int px_384 = 2131165756;
 			
 			// aapt resource value: 0x7F07023D
-			public const int px_393 = 2131165757;
+			public const int px_385 = 2131165757;
 			
 			// aapt resource value: 0x7F07023E
-			public const int px_394 = 2131165758;
+			public const int px_386 = 2131165758;
 			
 			// aapt resource value: 0x7F07023F
-			public const int px_395 = 2131165759;
+			public const int px_387 = 2131165759;
 			
 			// aapt resource value: 0x7F070240
-			public const int px_396 = 2131165760;
+			public const int px_388 = 2131165760;
 			
 			// aapt resource value: 0x7F070241
-			public const int px_397 = 2131165761;
+			public const int px_389 = 2131165761;
 			
 			// aapt resource value: 0x7F070242
-			public const int px_398 = 2131165762;
+			public const int px_39 = 2131165762;
 			
 			// aapt resource value: 0x7F070243
-			public const int px_399 = 2131165763;
+			public const int px_390 = 2131165763;
 			
 			// aapt resource value: 0x7F070244
-			public const int px_4 = 2131165764;
+			public const int px_391 = 2131165764;
 			
 			// aapt resource value: 0x7F070245
-			public const int px_40 = 2131165765;
+			public const int px_392 = 2131165765;
 			
 			// aapt resource value: 0x7F070246
-			public const int px_400 = 2131165766;
+			public const int px_393 = 2131165766;
 			
 			// aapt resource value: 0x7F070247
-			public const int px_401 = 2131165767;
+			public const int px_394 = 2131165767;
 			
 			// aapt resource value: 0x7F070248
-			public const int px_402 = 2131165768;
+			public const int px_395 = 2131165768;
 			
 			// aapt resource value: 0x7F070249
-			public const int px_403 = 2131165769;
+			public const int px_396 = 2131165769;
 			
 			// aapt resource value: 0x7F07024A
-			public const int px_404 = 2131165770;
+			public const int px_397 = 2131165770;
 			
 			// aapt resource value: 0x7F07024B
-			public const int px_405 = 2131165771;
+			public const int px_398 = 2131165771;
 			
 			// aapt resource value: 0x7F07024C
-			public const int px_406 = 2131165772;
+			public const int px_399 = 2131165772;
 			
 			// aapt resource value: 0x7F07024D
-			public const int px_407 = 2131165773;
+			public const int px_4 = 2131165773;
 			
 			// aapt resource value: 0x7F07024E
-			public const int px_408 = 2131165774;
+			public const int px_40 = 2131165774;
 			
 			// aapt resource value: 0x7F07024F
-			public const int px_409 = 2131165775;
+			public const int px_400 = 2131165775;
 			
 			// aapt resource value: 0x7F070250
-			public const int px_41 = 2131165776;
+			public const int px_401 = 2131165776;
 			
 			// aapt resource value: 0x7F070251
-			public const int px_410 = 2131165777;
+			public const int px_402 = 2131165777;
 			
 			// aapt resource value: 0x7F070252
-			public const int px_411 = 2131165778;
+			public const int px_403 = 2131165778;
 			
 			// aapt resource value: 0x7F070253
-			public const int px_412 = 2131165779;
+			public const int px_404 = 2131165779;
 			
 			// aapt resource value: 0x7F070254
-			public const int px_413 = 2131165780;
+			public const int px_405 = 2131165780;
 			
 			// aapt resource value: 0x7F070255
-			public const int px_414 = 2131165781;
+			public const int px_406 = 2131165781;
 			
 			// aapt resource value: 0x7F070256
-			public const int px_415 = 2131165782;
+			public const int px_407 = 2131165782;
 			
 			// aapt resource value: 0x7F070257
-			public const int px_416 = 2131165783;
+			public const int px_408 = 2131165783;
 			
 			// aapt resource value: 0x7F070258
-			public const int px_417 = 2131165784;
+			public const int px_409 = 2131165784;
 			
 			// aapt resource value: 0x7F070259
-			public const int px_418 = 2131165785;
+			public const int px_41 = 2131165785;
 			
 			// aapt resource value: 0x7F07025A
-			public const int px_419 = 2131165786;
+			public const int px_410 = 2131165786;
 			
 			// aapt resource value: 0x7F07025B
-			public const int px_42 = 2131165787;
+			public const int px_411 = 2131165787;
 			
 			// aapt resource value: 0x7F07025C
-			public const int px_420 = 2131165788;
+			public const int px_412 = 2131165788;
 			
 			// aapt resource value: 0x7F07025D
-			public const int px_421 = 2131165789;
+			public const int px_413 = 2131165789;
 			
 			// aapt resource value: 0x7F07025E
-			public const int px_422 = 2131165790;
+			public const int px_414 = 2131165790;
 			
 			// aapt resource value: 0x7F07025F
-			public const int px_423 = 2131165791;
+			public const int px_415 = 2131165791;
 			
 			// aapt resource value: 0x7F070260
-			public const int px_424 = 2131165792;
+			public const int px_416 = 2131165792;
 			
 			// aapt resource value: 0x7F070261
-			public const int px_425 = 2131165793;
+			public const int px_417 = 2131165793;
 			
 			// aapt resource value: 0x7F070262
-			public const int px_426 = 2131165794;
+			public const int px_418 = 2131165794;
 			
 			// aapt resource value: 0x7F070263
-			public const int px_427 = 2131165795;
+			public const int px_419 = 2131165795;
 			
 			// aapt resource value: 0x7F070264
-			public const int px_428 = 2131165796;
+			public const int px_42 = 2131165796;
 			
 			// aapt resource value: 0x7F070265
-			public const int px_429 = 2131165797;
+			public const int px_420 = 2131165797;
 			
 			// aapt resource value: 0x7F070266
-			public const int px_43 = 2131165798;
+			public const int px_421 = 2131165798;
 			
 			// aapt resource value: 0x7F070267
-			public const int px_430 = 2131165799;
+			public const int px_422 = 2131165799;
 			
 			// aapt resource value: 0x7F070268
-			public const int px_431 = 2131165800;
+			public const int px_423 = 2131165800;
 			
 			// aapt resource value: 0x7F070269
-			public const int px_432 = 2131165801;
+			public const int px_424 = 2131165801;
 			
 			// aapt resource value: 0x7F07026A
-			public const int px_433 = 2131165802;
+			public const int px_425 = 2131165802;
 			
 			// aapt resource value: 0x7F07026B
-			public const int px_434 = 2131165803;
+			public const int px_426 = 2131165803;
 			
 			// aapt resource value: 0x7F07026C
-			public const int px_435 = 2131165804;
+			public const int px_427 = 2131165804;
 			
 			// aapt resource value: 0x7F07026D
-			public const int px_436 = 2131165805;
+			public const int px_428 = 2131165805;
 			
 			// aapt resource value: 0x7F07026E
-			public const int px_437 = 2131165806;
+			public const int px_429 = 2131165806;
 			
 			// aapt resource value: 0x7F07026F
-			public const int px_438 = 2131165807;
+			public const int px_43 = 2131165807;
 			
 			// aapt resource value: 0x7F070270
-			public const int px_439 = 2131165808;
+			public const int px_430 = 2131165808;
 			
 			// aapt resource value: 0x7F070271
-			public const int px_44 = 2131165809;
+			public const int px_431 = 2131165809;
 			
 			// aapt resource value: 0x7F070272
-			public const int px_440 = 2131165810;
+			public const int px_432 = 2131165810;
 			
 			// aapt resource value: 0x7F070273
-			public const int px_441 = 2131165811;
+			public const int px_433 = 2131165811;
 			
 			// aapt resource value: 0x7F070274
-			public const int px_442 = 2131165812;
+			public const int px_434 = 2131165812;
 			
 			// aapt resource value: 0x7F070275
-			public const int px_443 = 2131165813;
+			public const int px_435 = 2131165813;
 			
 			// aapt resource value: 0x7F070276
-			public const int px_444 = 2131165814;
+			public const int px_436 = 2131165814;
 			
 			// aapt resource value: 0x7F070277
-			public const int px_445 = 2131165815;
+			public const int px_437 = 2131165815;
 			
 			// aapt resource value: 0x7F070278
-			public const int px_446 = 2131165816;
+			public const int px_438 = 2131165816;
 			
 			// aapt resource value: 0x7F070279
-			public const int px_447 = 2131165817;
+			public const int px_439 = 2131165817;
 			
 			// aapt resource value: 0x7F07027A
-			public const int px_448 = 2131165818;
+			public const int px_44 = 2131165818;
 			
 			// aapt resource value: 0x7F07027B
-			public const int px_449 = 2131165819;
+			public const int px_440 = 2131165819;
 			
 			// aapt resource value: 0x7F07027C
-			public const int px_45 = 2131165820;
+			public const int px_441 = 2131165820;
 			
 			// aapt resource value: 0x7F07027D
-			public const int px_450 = 2131165821;
+			public const int px_442 = 2131165821;
 			
 			// aapt resource value: 0x7F07027E
-			public const int px_451 = 2131165822;
+			public const int px_443 = 2131165822;
 			
 			// aapt resource value: 0x7F07027F
-			public const int px_452 = 2131165823;
+			public const int px_444 = 2131165823;
 			
 			// aapt resource value: 0x7F070280
-			public const int px_453 = 2131165824;
+			public const int px_445 = 2131165824;
 			
 			// aapt resource value: 0x7F070281
-			public const int px_454 = 2131165825;
+			public const int px_446 = 2131165825;
 			
 			// aapt resource value: 0x7F070282
-			public const int px_455 = 2131165826;
+			public const int px_447 = 2131165826;
 			
 			// aapt resource value: 0x7F070283
-			public const int px_456 = 2131165827;
+			public const int px_448 = 2131165827;
 			
 			// aapt resource value: 0x7F070284
-			public const int px_457 = 2131165828;
+			public const int px_449 = 2131165828;
 			
 			// aapt resource value: 0x7F070285
-			public const int px_458 = 2131165829;
+			public const int px_45 = 2131165829;
 			
 			// aapt resource value: 0x7F070286
-			public const int px_459 = 2131165830;
+			public const int px_450 = 2131165830;
 			
 			// aapt resource value: 0x7F070287
-			public const int px_46 = 2131165831;
+			public const int px_451 = 2131165831;
 			
 			// aapt resource value: 0x7F070288
-			public const int px_460 = 2131165832;
+			public const int px_452 = 2131165832;
 			
 			// aapt resource value: 0x7F070289
-			public const int px_461 = 2131165833;
+			public const int px_453 = 2131165833;
 			
 			// aapt resource value: 0x7F07028A
-			public const int px_462 = 2131165834;
+			public const int px_454 = 2131165834;
 			
 			// aapt resource value: 0x7F07028B
-			public const int px_463 = 2131165835;
+			public const int px_455 = 2131165835;
 			
 			// aapt resource value: 0x7F07028C
-			public const int px_464 = 2131165836;
+			public const int px_456 = 2131165836;
 			
 			// aapt resource value: 0x7F07028D
-			public const int px_465 = 2131165837;
+			public const int px_457 = 2131165837;
 			
 			// aapt resource value: 0x7F07028E
-			public const int px_466 = 2131165838;
+			public const int px_458 = 2131165838;
 			
 			// aapt resource value: 0x7F07028F
-			public const int px_467 = 2131165839;
+			public const int px_459 = 2131165839;
 			
 			// aapt resource value: 0x7F070290
-			public const int px_468 = 2131165840;
+			public const int px_46 = 2131165840;
 			
 			// aapt resource value: 0x7F070291
-			public const int px_469 = 2131165841;
+			public const int px_460 = 2131165841;
 			
 			// aapt resource value: 0x7F070292
-			public const int px_47 = 2131165842;
+			public const int px_461 = 2131165842;
 			
 			// aapt resource value: 0x7F070293
-			public const int px_470 = 2131165843;
+			public const int px_462 = 2131165843;
 			
 			// aapt resource value: 0x7F070294
-			public const int px_471 = 2131165844;
+			public const int px_463 = 2131165844;
 			
 			// aapt resource value: 0x7F070295
-			public const int px_472 = 2131165845;
+			public const int px_464 = 2131165845;
 			
 			// aapt resource value: 0x7F070296
-			public const int px_473 = 2131165846;
+			public const int px_465 = 2131165846;
 			
 			// aapt resource value: 0x7F070297
-			public const int px_474 = 2131165847;
+			public const int px_466 = 2131165847;
 			
 			// aapt resource value: 0x7F070298
-			public const int px_475 = 2131165848;
+			public const int px_467 = 2131165848;
 			
 			// aapt resource value: 0x7F070299
-			public const int px_476 = 2131165849;
+			public const int px_468 = 2131165849;
 			
 			// aapt resource value: 0x7F07029A
-			public const int px_477 = 2131165850;
+			public const int px_469 = 2131165850;
 			
 			// aapt resource value: 0x7F07029B
-			public const int px_478 = 2131165851;
+			public const int px_47 = 2131165851;
 			
 			// aapt resource value: 0x7F07029C
-			public const int px_479 = 2131165852;
+			public const int px_470 = 2131165852;
 			
 			// aapt resource value: 0x7F07029D
-			public const int px_48 = 2131165853;
+			public const int px_471 = 2131165853;
 			
 			// aapt resource value: 0x7F07029E
-			public const int px_480 = 2131165854;
+			public const int px_472 = 2131165854;
 			
 			// aapt resource value: 0x7F07029F
-			public const int px_481 = 2131165855;
+			public const int px_473 = 2131165855;
 			
 			// aapt resource value: 0x7F0702A0
-			public const int px_482 = 2131165856;
+			public const int px_474 = 2131165856;
 			
 			// aapt resource value: 0x7F0702A1
-			public const int px_483 = 2131165857;
+			public const int px_475 = 2131165857;
 			
 			// aapt resource value: 0x7F0702A2
-			public const int px_484 = 2131165858;
+			public const int px_476 = 2131165858;
 			
 			// aapt resource value: 0x7F0702A3
-			public const int px_485 = 2131165859;
+			public const int px_477 = 2131165859;
 			
 			// aapt resource value: 0x7F0702A4
-			public const int px_486 = 2131165860;
+			public const int px_478 = 2131165860;
 			
 			// aapt resource value: 0x7F0702A5
-			public const int px_487 = 2131165861;
+			public const int px_479 = 2131165861;
 			
 			// aapt resource value: 0x7F0702A6
-			public const int px_488 = 2131165862;
+			public const int px_48 = 2131165862;
 			
 			// aapt resource value: 0x7F0702A7
-			public const int px_489 = 2131165863;
+			public const int px_480 = 2131165863;
 			
 			// aapt resource value: 0x7F0702A8
-			public const int px_49 = 2131165864;
+			public const int px_481 = 2131165864;
 			
 			// aapt resource value: 0x7F0702A9
-			public const int px_490 = 2131165865;
+			public const int px_482 = 2131165865;
 			
 			// aapt resource value: 0x7F0702AA
-			public const int px_491 = 2131165866;
+			public const int px_483 = 2131165866;
 			
 			// aapt resource value: 0x7F0702AB
-			public const int px_492 = 2131165867;
+			public const int px_484 = 2131165867;
 			
 			// aapt resource value: 0x7F0702AC
-			public const int px_493 = 2131165868;
+			public const int px_485 = 2131165868;
 			
 			// aapt resource value: 0x7F0702AD
-			public const int px_494 = 2131165869;
+			public const int px_486 = 2131165869;
 			
 			// aapt resource value: 0x7F0702AE
-			public const int px_495 = 2131165870;
+			public const int px_487 = 2131165870;
 			
 			// aapt resource value: 0x7F0702AF
-			public const int px_496 = 2131165871;
+			public const int px_488 = 2131165871;
 			
 			// aapt resource value: 0x7F0702B0
-			public const int px_497 = 2131165872;
+			public const int px_489 = 2131165872;
 			
 			// aapt resource value: 0x7F0702B1
-			public const int px_498 = 2131165873;
+			public const int px_49 = 2131165873;
 			
 			// aapt resource value: 0x7F0702B2
-			public const int px_499 = 2131165874;
+			public const int px_490 = 2131165874;
 			
 			// aapt resource value: 0x7F0702B3
-			public const int px_5 = 2131165875;
+			public const int px_491 = 2131165875;
 			
 			// aapt resource value: 0x7F0702B4
-			public const int px_50 = 2131165876;
+			public const int px_492 = 2131165876;
 			
 			// aapt resource value: 0x7F0702B5
-			public const int px_500 = 2131165877;
+			public const int px_493 = 2131165877;
 			
 			// aapt resource value: 0x7F0702B6
-			public const int px_501 = 2131165878;
+			public const int px_494 = 2131165878;
 			
 			// aapt resource value: 0x7F0702B7
-			public const int px_502 = 2131165879;
+			public const int px_495 = 2131165879;
 			
 			// aapt resource value: 0x7F0702B8
-			public const int px_503 = 2131165880;
+			public const int px_496 = 2131165880;
 			
 			// aapt resource value: 0x7F0702B9
-			public const int px_504 = 2131165881;
+			public const int px_497 = 2131165881;
 			
 			// aapt resource value: 0x7F0702BA
-			public const int px_505 = 2131165882;
+			public const int px_498 = 2131165882;
 			
 			// aapt resource value: 0x7F0702BB
-			public const int px_506 = 2131165883;
+			public const int px_499 = 2131165883;
 			
 			// aapt resource value: 0x7F0702BC
-			public const int px_507 = 2131165884;
+			public const int px_5 = 2131165884;
 			
 			// aapt resource value: 0x7F0702BD
-			public const int px_508 = 2131165885;
+			public const int px_50 = 2131165885;
 			
 			// aapt resource value: 0x7F0702BE
-			public const int px_509 = 2131165886;
+			public const int px_500 = 2131165886;
 			
 			// aapt resource value: 0x7F0702BF
-			public const int px_51 = 2131165887;
+			public const int px_501 = 2131165887;
 			
 			// aapt resource value: 0x7F0702C0
-			public const int px_510 = 2131165888;
+			public const int px_502 = 2131165888;
 			
 			// aapt resource value: 0x7F0702C1
-			public const int px_511 = 2131165889;
+			public const int px_503 = 2131165889;
 			
 			// aapt resource value: 0x7F0702C2
-			public const int px_512 = 2131165890;
+			public const int px_504 = 2131165890;
 			
 			// aapt resource value: 0x7F0702C3
-			public const int px_513 = 2131165891;
+			public const int px_505 = 2131165891;
 			
 			// aapt resource value: 0x7F0702C4
-			public const int px_514 = 2131165892;
+			public const int px_506 = 2131165892;
 			
 			// aapt resource value: 0x7F0702C5
-			public const int px_515 = 2131165893;
+			public const int px_507 = 2131165893;
 			
 			// aapt resource value: 0x7F0702C6
-			public const int px_516 = 2131165894;
+			public const int px_508 = 2131165894;
 			
 			// aapt resource value: 0x7F0702C7
-			public const int px_517 = 2131165895;
+			public const int px_509 = 2131165895;
 			
 			// aapt resource value: 0x7F0702C8
-			public const int px_518 = 2131165896;
+			public const int px_51 = 2131165896;
 			
 			// aapt resource value: 0x7F0702C9
-			public const int px_519 = 2131165897;
+			public const int px_510 = 2131165897;
 			
 			// aapt resource value: 0x7F0702CA
-			public const int px_52 = 2131165898;
+			public const int px_511 = 2131165898;
 			
 			// aapt resource value: 0x7F0702CB
-			public const int px_520 = 2131165899;
+			public const int px_512 = 2131165899;
 			
 			// aapt resource value: 0x7F0702CC
-			public const int px_521 = 2131165900;
+			public const int px_513 = 2131165900;
 			
 			// aapt resource value: 0x7F0702CD
-			public const int px_522 = 2131165901;
+			public const int px_514 = 2131165901;
 			
 			// aapt resource value: 0x7F0702CE
-			public const int px_523 = 2131165902;
+			public const int px_515 = 2131165902;
 			
 			// aapt resource value: 0x7F0702CF
-			public const int px_524 = 2131165903;
+			public const int px_516 = 2131165903;
 			
 			// aapt resource value: 0x7F0702D0
-			public const int px_525 = 2131165904;
+			public const int px_517 = 2131165904;
 			
 			// aapt resource value: 0x7F0702D1
-			public const int px_526 = 2131165905;
+			public const int px_518 = 2131165905;
 			
 			// aapt resource value: 0x7F0702D2
-			public const int px_527 = 2131165906;
+			public const int px_519 = 2131165906;
 			
 			// aapt resource value: 0x7F0702D3
-			public const int px_528 = 2131165907;
+			public const int px_52 = 2131165907;
 			
 			// aapt resource value: 0x7F0702D4
-			public const int px_529 = 2131165908;
+			public const int px_520 = 2131165908;
 			
 			// aapt resource value: 0x7F0702D5
-			public const int px_53 = 2131165909;
+			public const int px_521 = 2131165909;
 			
 			// aapt resource value: 0x7F0702D6
-			public const int px_530 = 2131165910;
+			public const int px_522 = 2131165910;
 			
 			// aapt resource value: 0x7F0702D7
-			public const int px_531 = 2131165911;
+			public const int px_523 = 2131165911;
 			
 			// aapt resource value: 0x7F0702D8
-			public const int px_532 = 2131165912;
+			public const int px_524 = 2131165912;
 			
 			// aapt resource value: 0x7F0702D9
-			public const int px_533 = 2131165913;
+			public const int px_525 = 2131165913;
 			
 			// aapt resource value: 0x7F0702DA
-			public const int px_534 = 2131165914;
+			public const int px_526 = 2131165914;
 			
 			// aapt resource value: 0x7F0702DB
-			public const int px_535 = 2131165915;
+			public const int px_527 = 2131165915;
 			
 			// aapt resource value: 0x7F0702DC
-			public const int px_536 = 2131165916;
+			public const int px_528 = 2131165916;
 			
 			// aapt resource value: 0x7F0702DD
-			public const int px_537 = 2131165917;
+			public const int px_529 = 2131165917;
 			
 			// aapt resource value: 0x7F0702DE
-			public const int px_538 = 2131165918;
+			public const int px_53 = 2131165918;
 			
 			// aapt resource value: 0x7F0702DF
-			public const int px_539 = 2131165919;
+			public const int px_530 = 2131165919;
 			
 			// aapt resource value: 0x7F0702E0
-			public const int px_54 = 2131165920;
+			public const int px_531 = 2131165920;
 			
 			// aapt resource value: 0x7F0702E1
-			public const int px_540 = 2131165921;
+			public const int px_532 = 2131165921;
 			
 			// aapt resource value: 0x7F0702E2
-			public const int px_541 = 2131165922;
+			public const int px_533 = 2131165922;
 			
 			// aapt resource value: 0x7F0702E3
-			public const int px_542 = 2131165923;
+			public const int px_534 = 2131165923;
 			
 			// aapt resource value: 0x7F0702E4
-			public const int px_543 = 2131165924;
+			public const int px_535 = 2131165924;
 			
 			// aapt resource value: 0x7F0702E5
-			public const int px_544 = 2131165925;
+			public const int px_536 = 2131165925;
 			
 			// aapt resource value: 0x7F0702E6
-			public const int px_545 = 2131165926;
+			public const int px_537 = 2131165926;
 			
 			// aapt resource value: 0x7F0702E7
-			public const int px_546 = 2131165927;
+			public const int px_538 = 2131165927;
 			
 			// aapt resource value: 0x7F0702E8
-			public const int px_547 = 2131165928;
+			public const int px_539 = 2131165928;
 			
 			// aapt resource value: 0x7F0702E9
-			public const int px_548 = 2131165929;
+			public const int px_54 = 2131165929;
 			
 			// aapt resource value: 0x7F0702EA
-			public const int px_549 = 2131165930;
+			public const int px_540 = 2131165930;
 			
 			// aapt resource value: 0x7F0702EB
-			public const int px_55 = 2131165931;
+			public const int px_541 = 2131165931;
 			
 			// aapt resource value: 0x7F0702EC
-			public const int px_550 = 2131165932;
+			public const int px_542 = 2131165932;
 			
 			// aapt resource value: 0x7F0702ED
-			public const int px_551 = 2131165933;
+			public const int px_543 = 2131165933;
 			
 			// aapt resource value: 0x7F0702EE
-			public const int px_552 = 2131165934;
+			public const int px_544 = 2131165934;
 			
 			// aapt resource value: 0x7F0702EF
-			public const int px_553 = 2131165935;
+			public const int px_545 = 2131165935;
 			
 			// aapt resource value: 0x7F0702F0
-			public const int px_554 = 2131165936;
+			public const int px_546 = 2131165936;
 			
 			// aapt resource value: 0x7F0702F1
-			public const int px_555 = 2131165937;
+			public const int px_547 = 2131165937;
 			
 			// aapt resource value: 0x7F0702F2
-			public const int px_556 = 2131165938;
+			public const int px_548 = 2131165938;
 			
 			// aapt resource value: 0x7F0702F3
-			public const int px_557 = 2131165939;
+			public const int px_549 = 2131165939;
 			
 			// aapt resource value: 0x7F0702F4
-			public const int px_558 = 2131165940;
+			public const int px_55 = 2131165940;
 			
 			// aapt resource value: 0x7F0702F5
-			public const int px_559 = 2131165941;
+			public const int px_550 = 2131165941;
 			
 			// aapt resource value: 0x7F0702F6
-			public const int px_56 = 2131165942;
+			public const int px_551 = 2131165942;
 			
 			// aapt resource value: 0x7F0702F7
-			public const int px_560 = 2131165943;
+			public const int px_552 = 2131165943;
 			
 			// aapt resource value: 0x7F0702F8
-			public const int px_561 = 2131165944;
+			public const int px_553 = 2131165944;
 			
 			// aapt resource value: 0x7F0702F9
-			public const int px_562 = 2131165945;
+			public const int px_554 = 2131165945;
 			
 			// aapt resource value: 0x7F0702FA
-			public const int px_563 = 2131165946;
+			public const int px_555 = 2131165946;
 			
 			// aapt resource value: 0x7F0702FB
-			public const int px_564 = 2131165947;
+			public const int px_556 = 2131165947;
 			
 			// aapt resource value: 0x7F0702FC
-			public const int px_565 = 2131165948;
+			public const int px_557 = 2131165948;
 			
 			// aapt resource value: 0x7F0702FD
-			public const int px_566 = 2131165949;
+			public const int px_558 = 2131165949;
 			
 			// aapt resource value: 0x7F0702FE
-			public const int px_567 = 2131165950;
+			public const int px_559 = 2131165950;
 			
 			// aapt resource value: 0x7F0702FF
-			public const int px_568 = 2131165951;
+			public const int px_56 = 2131165951;
 			
 			// aapt resource value: 0x7F070300
-			public const int px_569 = 2131165952;
+			public const int px_560 = 2131165952;
 			
 			// aapt resource value: 0x7F070301
-			public const int px_57 = 2131165953;
+			public const int px_561 = 2131165953;
 			
 			// aapt resource value: 0x7F070302
-			public const int px_570 = 2131165954;
+			public const int px_562 = 2131165954;
 			
 			// aapt resource value: 0x7F070303
-			public const int px_571 = 2131165955;
+			public const int px_563 = 2131165955;
 			
 			// aapt resource value: 0x7F070304
-			public const int px_572 = 2131165956;
+			public const int px_564 = 2131165956;
 			
 			// aapt resource value: 0x7F070305
-			public const int px_573 = 2131165957;
+			public const int px_565 = 2131165957;
 			
 			// aapt resource value: 0x7F070306
-			public const int px_574 = 2131165958;
+			public const int px_566 = 2131165958;
 			
 			// aapt resource value: 0x7F070307
-			public const int px_575 = 2131165959;
+			public const int px_567 = 2131165959;
 			
 			// aapt resource value: 0x7F070308
-			public const int px_576 = 2131165960;
+			public const int px_568 = 2131165960;
 			
 			// aapt resource value: 0x7F070309
-			public const int px_577 = 2131165961;
+			public const int px_569 = 2131165961;
 			
 			// aapt resource value: 0x7F07030A
-			public const int px_578 = 2131165962;
+			public const int px_57 = 2131165962;
 			
 			// aapt resource value: 0x7F07030B
-			public const int px_579 = 2131165963;
+			public const int px_570 = 2131165963;
 			
 			// aapt resource value: 0x7F07030C
-			public const int px_58 = 2131165964;
+			public const int px_571 = 2131165964;
 			
 			// aapt resource value: 0x7F07030D
-			public const int px_580 = 2131165965;
+			public const int px_572 = 2131165965;
 			
 			// aapt resource value: 0x7F07030E
-			public const int px_581 = 2131165966;
+			public const int px_573 = 2131165966;
 			
 			// aapt resource value: 0x7F07030F
-			public const int px_582 = 2131165967;
+			public const int px_574 = 2131165967;
 			
 			// aapt resource value: 0x7F070310
-			public const int px_583 = 2131165968;
+			public const int px_575 = 2131165968;
 			
 			// aapt resource value: 0x7F070311
-			public const int px_584 = 2131165969;
+			public const int px_576 = 2131165969;
 			
 			// aapt resource value: 0x7F070312
-			public const int px_585 = 2131165970;
+			public const int px_577 = 2131165970;
 			
 			// aapt resource value: 0x7F070313
-			public const int px_586 = 2131165971;
+			public const int px_578 = 2131165971;
 			
 			// aapt resource value: 0x7F070314
-			public const int px_587 = 2131165972;
+			public const int px_579 = 2131165972;
 			
 			// aapt resource value: 0x7F070315
-			public const int px_588 = 2131165973;
+			public const int px_58 = 2131165973;
 			
 			// aapt resource value: 0x7F070316
-			public const int px_589 = 2131165974;
+			public const int px_580 = 2131165974;
 			
 			// aapt resource value: 0x7F070317
-			public const int px_59 = 2131165975;
+			public const int px_581 = 2131165975;
 			
 			// aapt resource value: 0x7F070318
-			public const int px_590 = 2131165976;
+			public const int px_582 = 2131165976;
 			
 			// aapt resource value: 0x7F070319
-			public const int px_591 = 2131165977;
+			public const int px_583 = 2131165977;
 			
 			// aapt resource value: 0x7F07031A
-			public const int px_592 = 2131165978;
+			public const int px_584 = 2131165978;
 			
 			// aapt resource value: 0x7F07031B
-			public const int px_593 = 2131165979;
+			public const int px_585 = 2131165979;
 			
 			// aapt resource value: 0x7F07031C
-			public const int px_594 = 2131165980;
+			public const int px_586 = 2131165980;
 			
 			// aapt resource value: 0x7F07031D
-			public const int px_595 = 2131165981;
+			public const int px_587 = 2131165981;
 			
 			// aapt resource value: 0x7F07031E
-			public const int px_596 = 2131165982;
+			public const int px_588 = 2131165982;
 			
 			// aapt resource value: 0x7F07031F
-			public const int px_597 = 2131165983;
+			public const int px_589 = 2131165983;
 			
 			// aapt resource value: 0x7F070320
-			public const int px_598 = 2131165984;
+			public const int px_59 = 2131165984;
 			
 			// aapt resource value: 0x7F070321
-			public const int px_599 = 2131165985;
+			public const int px_590 = 2131165985;
 			
 			// aapt resource value: 0x7F070322
-			public const int px_6 = 2131165986;
+			public const int px_591 = 2131165986;
 			
 			// aapt resource value: 0x7F070323
-			public const int px_60 = 2131165987;
+			public const int px_592 = 2131165987;
 			
 			// aapt resource value: 0x7F070324
-			public const int px_600 = 2131165988;
+			public const int px_593 = 2131165988;
 			
 			// aapt resource value: 0x7F070325
-			public const int px_601 = 2131165989;
+			public const int px_594 = 2131165989;
 			
 			// aapt resource value: 0x7F070326
-			public const int px_602 = 2131165990;
+			public const int px_595 = 2131165990;
 			
 			// aapt resource value: 0x7F070327
-			public const int px_603 = 2131165991;
+			public const int px_596 = 2131165991;
 			
 			// aapt resource value: 0x7F070328
-			public const int px_604 = 2131165992;
+			public const int px_597 = 2131165992;
 			
 			// aapt resource value: 0x7F070329
-			public const int px_605 = 2131165993;
+			public const int px_598 = 2131165993;
 			
 			// aapt resource value: 0x7F07032A
-			public const int px_606 = 2131165994;
+			public const int px_599 = 2131165994;
 			
 			// aapt resource value: 0x7F07032B
-			public const int px_607 = 2131165995;
+			public const int px_6 = 2131165995;
 			
 			// aapt resource value: 0x7F07032C
-			public const int px_608 = 2131165996;
+			public const int px_60 = 2131165996;
 			
 			// aapt resource value: 0x7F07032D
-			public const int px_609 = 2131165997;
+			public const int px_600 = 2131165997;
 			
 			// aapt resource value: 0x7F07032E
-			public const int px_61 = 2131165998;
+			public const int px_601 = 2131165998;
 			
 			// aapt resource value: 0x7F07032F
-			public const int px_610 = 2131165999;
+			public const int px_602 = 2131165999;
 			
 			// aapt resource value: 0x7F070330
-			public const int px_611 = 2131166000;
+			public const int px_603 = 2131166000;
 			
 			// aapt resource value: 0x7F070331
-			public const int px_612 = 2131166001;
+			public const int px_604 = 2131166001;
 			
 			// aapt resource value: 0x7F070332
-			public const int px_613 = 2131166002;
+			public const int px_605 = 2131166002;
 			
 			// aapt resource value: 0x7F070333
-			public const int px_614 = 2131166003;
+			public const int px_606 = 2131166003;
 			
 			// aapt resource value: 0x7F070334
-			public const int px_615 = 2131166004;
+			public const int px_607 = 2131166004;
 			
 			// aapt resource value: 0x7F070335
-			public const int px_616 = 2131166005;
+			public const int px_608 = 2131166005;
 			
 			// aapt resource value: 0x7F070336
-			public const int px_617 = 2131166006;
+			public const int px_609 = 2131166006;
 			
 			// aapt resource value: 0x7F070337
-			public const int px_618 = 2131166007;
+			public const int px_61 = 2131166007;
 			
 			// aapt resource value: 0x7F070338
-			public const int px_619 = 2131166008;
+			public const int px_610 = 2131166008;
 			
 			// aapt resource value: 0x7F070339
-			public const int px_62 = 2131166009;
+			public const int px_611 = 2131166009;
 			
 			// aapt resource value: 0x7F07033A
-			public const int px_620 = 2131166010;
+			public const int px_612 = 2131166010;
 			
 			// aapt resource value: 0x7F07033B
-			public const int px_621 = 2131166011;
+			public const int px_613 = 2131166011;
 			
 			// aapt resource value: 0x7F07033C
-			public const int px_622 = 2131166012;
+			public const int px_614 = 2131166012;
 			
 			// aapt resource value: 0x7F07033D
-			public const int px_623 = 2131166013;
+			public const int px_615 = 2131166013;
 			
 			// aapt resource value: 0x7F07033E
-			public const int px_624 = 2131166014;
+			public const int px_616 = 2131166014;
 			
 			// aapt resource value: 0x7F07033F
-			public const int px_625 = 2131166015;
+			public const int px_617 = 2131166015;
 			
 			// aapt resource value: 0x7F070340
-			public const int px_626 = 2131166016;
+			public const int px_618 = 2131166016;
 			
 			// aapt resource value: 0x7F070341
-			public const int px_627 = 2131166017;
+			public const int px_619 = 2131166017;
 			
 			// aapt resource value: 0x7F070342
-			public const int px_628 = 2131166018;
+			public const int px_62 = 2131166018;
 			
 			// aapt resource value: 0x7F070343
-			public const int px_629 = 2131166019;
+			public const int px_620 = 2131166019;
 			
 			// aapt resource value: 0x7F070344
-			public const int px_63 = 2131166020;
+			public const int px_621 = 2131166020;
 			
 			// aapt resource value: 0x7F070345
-			public const int px_630 = 2131166021;
+			public const int px_622 = 2131166021;
 			
 			// aapt resource value: 0x7F070346
-			public const int px_631 = 2131166022;
+			public const int px_623 = 2131166022;
 			
 			// aapt resource value: 0x7F070347
-			public const int px_632 = 2131166023;
+			public const int px_624 = 2131166023;
 			
 			// aapt resource value: 0x7F070348
-			public const int px_633 = 2131166024;
+			public const int px_625 = 2131166024;
 			
 			// aapt resource value: 0x7F070349
-			public const int px_634 = 2131166025;
+			public const int px_626 = 2131166025;
 			
 			// aapt resource value: 0x7F07034A
-			public const int px_635 = 2131166026;
+			public const int px_627 = 2131166026;
 			
 			// aapt resource value: 0x7F07034B
-			public const int px_636 = 2131166027;
+			public const int px_628 = 2131166027;
 			
 			// aapt resource value: 0x7F07034C
-			public const int px_637 = 2131166028;
+			public const int px_629 = 2131166028;
 			
 			// aapt resource value: 0x7F07034D
-			public const int px_638 = 2131166029;
+			public const int px_63 = 2131166029;
 			
 			// aapt resource value: 0x7F07034E
-			public const int px_639 = 2131166030;
+			public const int px_630 = 2131166030;
 			
 			// aapt resource value: 0x7F07034F
-			public const int px_64 = 2131166031;
+			public const int px_631 = 2131166031;
 			
 			// aapt resource value: 0x7F070350
-			public const int px_640 = 2131166032;
+			public const int px_632 = 2131166032;
 			
 			// aapt resource value: 0x7F070351
-			public const int px_641 = 2131166033;
+			public const int px_633 = 2131166033;
 			
 			// aapt resource value: 0x7F070352
-			public const int px_642 = 2131166034;
+			public const int px_634 = 2131166034;
 			
 			// aapt resource value: 0x7F070353
-			public const int px_643 = 2131166035;
+			public const int px_635 = 2131166035;
 			
 			// aapt resource value: 0x7F070354
-			public const int px_644 = 2131166036;
+			public const int px_636 = 2131166036;
 			
 			// aapt resource value: 0x7F070355
-			public const int px_645 = 2131166037;
+			public const int px_637 = 2131166037;
 			
 			// aapt resource value: 0x7F070356
-			public const int px_646 = 2131166038;
+			public const int px_638 = 2131166038;
 			
 			// aapt resource value: 0x7F070357
-			public const int px_647 = 2131166039;
+			public const int px_639 = 2131166039;
 			
 			// aapt resource value: 0x7F070358
-			public const int px_648 = 2131166040;
+			public const int px_64 = 2131166040;
 			
 			// aapt resource value: 0x7F070359
-			public const int px_649 = 2131166041;
+			public const int px_640 = 2131166041;
 			
 			// aapt resource value: 0x7F07035A
-			public const int px_65 = 2131166042;
+			public const int px_641 = 2131166042;
 			
 			// aapt resource value: 0x7F07035B
-			public const int px_650 = 2131166043;
+			public const int px_642 = 2131166043;
 			
 			// aapt resource value: 0x7F07035C
-			public const int px_651 = 2131166044;
+			public const int px_643 = 2131166044;
 			
 			// aapt resource value: 0x7F07035D
-			public const int px_652 = 2131166045;
+			public const int px_644 = 2131166045;
 			
 			// aapt resource value: 0x7F07035E
-			public const int px_653 = 2131166046;
+			public const int px_645 = 2131166046;
 			
 			// aapt resource value: 0x7F07035F
-			public const int px_654 = 2131166047;
+			public const int px_646 = 2131166047;
 			
 			// aapt resource value: 0x7F070360
-			public const int px_655 = 2131166048;
+			public const int px_647 = 2131166048;
 			
 			// aapt resource value: 0x7F070361
-			public const int px_656 = 2131166049;
+			public const int px_648 = 2131166049;
 			
 			// aapt resource value: 0x7F070362
-			public const int px_657 = 2131166050;
+			public const int px_649 = 2131166050;
 			
 			// aapt resource value: 0x7F070363
-			public const int px_658 = 2131166051;
+			public const int px_65 = 2131166051;
 			
 			// aapt resource value: 0x7F070364
-			public const int px_659 = 2131166052;
+			public const int px_650 = 2131166052;
 			
 			// aapt resource value: 0x7F070365
-			public const int px_66 = 2131166053;
+			public const int px_651 = 2131166053;
 			
 			// aapt resource value: 0x7F070366
-			public const int px_660 = 2131166054;
+			public const int px_652 = 2131166054;
 			
 			// aapt resource value: 0x7F070367
-			public const int px_661 = 2131166055;
+			public const int px_653 = 2131166055;
 			
 			// aapt resource value: 0x7F070368
-			public const int px_662 = 2131166056;
+			public const int px_654 = 2131166056;
 			
 			// aapt resource value: 0x7F070369
-			public const int px_663 = 2131166057;
+			public const int px_655 = 2131166057;
 			
 			// aapt resource value: 0x7F07036A
-			public const int px_664 = 2131166058;
+			public const int px_656 = 2131166058;
 			
 			// aapt resource value: 0x7F07036B
-			public const int px_665 = 2131166059;
+			public const int px_657 = 2131166059;
 			
 			// aapt resource value: 0x7F07036C
-			public const int px_666 = 2131166060;
+			public const int px_658 = 2131166060;
 			
 			// aapt resource value: 0x7F07036D
-			public const int px_667 = 2131166061;
+			public const int px_659 = 2131166061;
 			
 			// aapt resource value: 0x7F07036E
-			public const int px_668 = 2131166062;
+			public const int px_66 = 2131166062;
 			
 			// aapt resource value: 0x7F07036F
-			public const int px_669 = 2131166063;
+			public const int px_660 = 2131166063;
 			
 			// aapt resource value: 0x7F070370
-			public const int px_67 = 2131166064;
+			public const int px_661 = 2131166064;
 			
 			// aapt resource value: 0x7F070371
-			public const int px_670 = 2131166065;
+			public const int px_662 = 2131166065;
 			
 			// aapt resource value: 0x7F070372
-			public const int px_671 = 2131166066;
+			public const int px_663 = 2131166066;
 			
 			// aapt resource value: 0x7F070373
-			public const int px_672 = 2131166067;
+			public const int px_664 = 2131166067;
 			
 			// aapt resource value: 0x7F070374
-			public const int px_673 = 2131166068;
+			public const int px_665 = 2131166068;
 			
 			// aapt resource value: 0x7F070375
-			public const int px_674 = 2131166069;
+			public const int px_666 = 2131166069;
 			
 			// aapt resource value: 0x7F070376
-			public const int px_675 = 2131166070;
+			public const int px_667 = 2131166070;
 			
 			// aapt resource value: 0x7F070377
-			public const int px_676 = 2131166071;
+			public const int px_668 = 2131166071;
 			
 			// aapt resource value: 0x7F070378
-			public const int px_677 = 2131166072;
+			public const int px_669 = 2131166072;
 			
 			// aapt resource value: 0x7F070379
-			public const int px_678 = 2131166073;
+			public const int px_67 = 2131166073;
 			
 			// aapt resource value: 0x7F07037A
-			public const int px_679 = 2131166074;
+			public const int px_670 = 2131166074;
 			
 			// aapt resource value: 0x7F07037B
-			public const int px_68 = 2131166075;
+			public const int px_671 = 2131166075;
 			
 			// aapt resource value: 0x7F07037C
-			public const int px_680 = 2131166076;
+			public const int px_672 = 2131166076;
 			
 			// aapt resource value: 0x7F07037D
-			public const int px_681 = 2131166077;
+			public const int px_673 = 2131166077;
 			
 			// aapt resource value: 0x7F07037E
-			public const int px_682 = 2131166078;
+			public const int px_674 = 2131166078;
 			
 			// aapt resource value: 0x7F07037F
-			public const int px_683 = 2131166079;
+			public const int px_675 = 2131166079;
 			
 			// aapt resource value: 0x7F070380
-			public const int px_684 = 2131166080;
+			public const int px_676 = 2131166080;
 			
 			// aapt resource value: 0x7F070381
-			public const int px_685 = 2131166081;
+			public const int px_677 = 2131166081;
 			
 			// aapt resource value: 0x7F070382
-			public const int px_686 = 2131166082;
+			public const int px_678 = 2131166082;
 			
 			// aapt resource value: 0x7F070383
-			public const int px_687 = 2131166083;
+			public const int px_679 = 2131166083;
 			
 			// aapt resource value: 0x7F070384
-			public const int px_688 = 2131166084;
+			public const int px_68 = 2131166084;
 			
 			// aapt resource value: 0x7F070385
-			public const int px_689 = 2131166085;
+			public const int px_680 = 2131166085;
 			
 			// aapt resource value: 0x7F070386
-			public const int px_69 = 2131166086;
+			public const int px_681 = 2131166086;
 			
 			// aapt resource value: 0x7F070387
-			public const int px_690 = 2131166087;
+			public const int px_682 = 2131166087;
 			
 			// aapt resource value: 0x7F070388
-			public const int px_691 = 2131166088;
+			public const int px_683 = 2131166088;
 			
 			// aapt resource value: 0x7F070389
-			public const int px_692 = 2131166089;
+			public const int px_684 = 2131166089;
 			
 			// aapt resource value: 0x7F07038A
-			public const int px_693 = 2131166090;
+			public const int px_685 = 2131166090;
 			
 			// aapt resource value: 0x7F07038B
-			public const int px_694 = 2131166091;
+			public const int px_686 = 2131166091;
 			
 			// aapt resource value: 0x7F07038C
-			public const int px_695 = 2131166092;
+			public const int px_687 = 2131166092;
 			
 			// aapt resource value: 0x7F07038D
-			public const int px_696 = 2131166093;
+			public const int px_688 = 2131166093;
 			
 			// aapt resource value: 0x7F07038E
-			public const int px_697 = 2131166094;
+			public const int px_689 = 2131166094;
 			
 			// aapt resource value: 0x7F07038F
-			public const int px_698 = 2131166095;
+			public const int px_69 = 2131166095;
 			
 			// aapt resource value: 0x7F070390
-			public const int px_699 = 2131166096;
+			public const int px_690 = 2131166096;
 			
 			// aapt resource value: 0x7F070391
-			public const int px_7 = 2131166097;
+			public const int px_691 = 2131166097;
 			
 			// aapt resource value: 0x7F070392
-			public const int px_70 = 2131166098;
+			public const int px_692 = 2131166098;
 			
 			// aapt resource value: 0x7F070393
-			public const int px_700 = 2131166099;
+			public const int px_693 = 2131166099;
 			
 			// aapt resource value: 0x7F070394
-			public const int px_701 = 2131166100;
+			public const int px_694 = 2131166100;
 			
 			// aapt resource value: 0x7F070395
-			public const int px_702 = 2131166101;
+			public const int px_695 = 2131166101;
 			
 			// aapt resource value: 0x7F070396
-			public const int px_703 = 2131166102;
+			public const int px_696 = 2131166102;
 			
 			// aapt resource value: 0x7F070397
-			public const int px_704 = 2131166103;
+			public const int px_697 = 2131166103;
 			
 			// aapt resource value: 0x7F070398
-			public const int px_705 = 2131166104;
+			public const int px_698 = 2131166104;
 			
 			// aapt resource value: 0x7F070399
-			public const int px_706 = 2131166105;
+			public const int px_699 = 2131166105;
 			
 			// aapt resource value: 0x7F07039A
-			public const int px_707 = 2131166106;
+			public const int px_7 = 2131166106;
 			
 			// aapt resource value: 0x7F07039B
-			public const int px_708 = 2131166107;
+			public const int px_70 = 2131166107;
 			
 			// aapt resource value: 0x7F07039C
-			public const int px_709 = 2131166108;
+			public const int px_700 = 2131166108;
 			
 			// aapt resource value: 0x7F07039D
-			public const int px_71 = 2131166109;
+			public const int px_701 = 2131166109;
 			
 			// aapt resource value: 0x7F07039E
-			public const int px_710 = 2131166110;
+			public const int px_702 = 2131166110;
 			
 			// aapt resource value: 0x7F07039F
-			public const int px_711 = 2131166111;
+			public const int px_703 = 2131166111;
 			
 			// aapt resource value: 0x7F0703A0
-			public const int px_712 = 2131166112;
+			public const int px_704 = 2131166112;
 			
 			// aapt resource value: 0x7F0703A1
-			public const int px_713 = 2131166113;
+			public const int px_705 = 2131166113;
 			
 			// aapt resource value: 0x7F0703A2
-			public const int px_714 = 2131166114;
+			public const int px_706 = 2131166114;
 			
 			// aapt resource value: 0x7F0703A3
-			public const int px_715 = 2131166115;
+			public const int px_707 = 2131166115;
 			
 			// aapt resource value: 0x7F0703A4
-			public const int px_716 = 2131166116;
+			public const int px_708 = 2131166116;
 			
 			// aapt resource value: 0x7F0703A5
-			public const int px_717 = 2131166117;
+			public const int px_709 = 2131166117;
 			
 			// aapt resource value: 0x7F0703A6
-			public const int px_718 = 2131166118;
+			public const int px_71 = 2131166118;
 			
 			// aapt resource value: 0x7F0703A7
-			public const int px_719 = 2131166119;
+			public const int px_710 = 2131166119;
 			
 			// aapt resource value: 0x7F0703A8
-			public const int px_72 = 2131166120;
+			public const int px_711 = 2131166120;
 			
 			// aapt resource value: 0x7F0703A9
-			public const int px_720 = 2131166121;
+			public const int px_712 = 2131166121;
 			
 			// aapt resource value: 0x7F0703AA
-			public const int px_721 = 2131166122;
+			public const int px_713 = 2131166122;
 			
 			// aapt resource value: 0x7F0703AB
-			public const int px_722 = 2131166123;
+			public const int px_714 = 2131166123;
 			
 			// aapt resource value: 0x7F0703AC
-			public const int px_723 = 2131166124;
+			public const int px_715 = 2131166124;
 			
 			// aapt resource value: 0x7F0703AD
-			public const int px_724 = 2131166125;
+			public const int px_716 = 2131166125;
 			
 			// aapt resource value: 0x7F0703AE
-			public const int px_725 = 2131166126;
+			public const int px_717 = 2131166126;
 			
 			// aapt resource value: 0x7F0703AF
-			public const int px_726 = 2131166127;
+			public const int px_718 = 2131166127;
 			
 			// aapt resource value: 0x7F0703B0
-			public const int px_727 = 2131166128;
+			public const int px_719 = 2131166128;
 			
 			// aapt resource value: 0x7F0703B1
-			public const int px_728 = 2131166129;
+			public const int px_72 = 2131166129;
 			
 			// aapt resource value: 0x7F0703B2
-			public const int px_729 = 2131166130;
+			public const int px_720 = 2131166130;
 			
 			// aapt resource value: 0x7F0703B3
-			public const int px_73 = 2131166131;
+			public const int px_721 = 2131166131;
 			
 			// aapt resource value: 0x7F0703B4
-			public const int px_730 = 2131166132;
+			public const int px_722 = 2131166132;
 			
 			// aapt resource value: 0x7F0703B5
-			public const int px_731 = 2131166133;
+			public const int px_723 = 2131166133;
 			
 			// aapt resource value: 0x7F0703B6
-			public const int px_732 = 2131166134;
+			public const int px_724 = 2131166134;
 			
 			// aapt resource value: 0x7F0703B7
-			public const int px_733 = 2131166135;
+			public const int px_725 = 2131166135;
 			
 			// aapt resource value: 0x7F0703B8
-			public const int px_734 = 2131166136;
+			public const int px_726 = 2131166136;
 			
 			// aapt resource value: 0x7F0703B9
-			public const int px_735 = 2131166137;
+			public const int px_727 = 2131166137;
 			
 			// aapt resource value: 0x7F0703BA
-			public const int px_736 = 2131166138;
+			public const int px_728 = 2131166138;
 			
 			// aapt resource value: 0x7F0703BB
-			public const int px_737 = 2131166139;
+			public const int px_729 = 2131166139;
 			
 			// aapt resource value: 0x7F0703BC
-			public const int px_738 = 2131166140;
+			public const int px_73 = 2131166140;
 			
 			// aapt resource value: 0x7F0703BD
-			public const int px_739 = 2131166141;
+			public const int px_730 = 2131166141;
 			
 			// aapt resource value: 0x7F0703BE
-			public const int px_74 = 2131166142;
+			public const int px_731 = 2131166142;
 			
 			// aapt resource value: 0x7F0703BF
-			public const int px_740 = 2131166143;
+			public const int px_732 = 2131166143;
 			
 			// aapt resource value: 0x7F0703C0
-			public const int px_741 = 2131166144;
+			public const int px_733 = 2131166144;
 			
 			// aapt resource value: 0x7F0703C1
-			public const int px_742 = 2131166145;
+			public const int px_734 = 2131166145;
 			
 			// aapt resource value: 0x7F0703C2
-			public const int px_743 = 2131166146;
+			public const int px_735 = 2131166146;
 			
 			// aapt resource value: 0x7F0703C3
-			public const int px_744 = 2131166147;
+			public const int px_736 = 2131166147;
 			
 			// aapt resource value: 0x7F0703C4
-			public const int px_745 = 2131166148;
+			public const int px_737 = 2131166148;
 			
 			// aapt resource value: 0x7F0703C5
-			public const int px_746 = 2131166149;
+			public const int px_738 = 2131166149;
 			
 			// aapt resource value: 0x7F0703C6
-			public const int px_747 = 2131166150;
+			public const int px_739 = 2131166150;
 			
 			// aapt resource value: 0x7F0703C7
-			public const int px_748 = 2131166151;
+			public const int px_74 = 2131166151;
 			
 			// aapt resource value: 0x7F0703C8
-			public const int px_749 = 2131166152;
+			public const int px_740 = 2131166152;
 			
 			// aapt resource value: 0x7F0703C9
-			public const int px_75 = 2131166153;
+			public const int px_741 = 2131166153;
 			
 			// aapt resource value: 0x7F0703CA
-			public const int px_750 = 2131166154;
+			public const int px_742 = 2131166154;
 			
 			// aapt resource value: 0x7F0703CB
-			public const int px_751 = 2131166155;
+			public const int px_743 = 2131166155;
 			
 			// aapt resource value: 0x7F0703CC
-			public const int px_752 = 2131166156;
+			public const int px_744 = 2131166156;
 			
 			// aapt resource value: 0x7F0703CD
-			public const int px_753 = 2131166157;
+			public const int px_745 = 2131166157;
 			
 			// aapt resource value: 0x7F0703CE
-			public const int px_754 = 2131166158;
+			public const int px_746 = 2131166158;
 			
 			// aapt resource value: 0x7F0703CF
-			public const int px_755 = 2131166159;
+			public const int px_747 = 2131166159;
 			
 			// aapt resource value: 0x7F0703D0
-			public const int px_756 = 2131166160;
+			public const int px_748 = 2131166160;
 			
 			// aapt resource value: 0x7F0703D1
-			public const int px_757 = 2131166161;
+			public const int px_749 = 2131166161;
 			
 			// aapt resource value: 0x7F0703D2
-			public const int px_758 = 2131166162;
+			public const int px_75 = 2131166162;
 			
 			// aapt resource value: 0x7F0703D3
-			public const int px_759 = 2131166163;
+			public const int px_750 = 2131166163;
 			
 			// aapt resource value: 0x7F0703D4
-			public const int px_76 = 2131166164;
+			public const int px_751 = 2131166164;
 			
 			// aapt resource value: 0x7F0703D5
-			public const int px_760 = 2131166165;
+			public const int px_752 = 2131166165;
 			
 			// aapt resource value: 0x7F0703D6
-			public const int px_761 = 2131166166;
+			public const int px_753 = 2131166166;
 			
 			// aapt resource value: 0x7F0703D7
-			public const int px_762 = 2131166167;
+			public const int px_754 = 2131166167;
 			
 			// aapt resource value: 0x7F0703D8
-			public const int px_763 = 2131166168;
+			public const int px_755 = 2131166168;
 			
 			// aapt resource value: 0x7F0703D9
-			public const int px_764 = 2131166169;
+			public const int px_756 = 2131166169;
 			
 			// aapt resource value: 0x7F0703DA
-			public const int px_765 = 2131166170;
+			public const int px_757 = 2131166170;
 			
 			// aapt resource value: 0x7F0703DB
-			public const int px_766 = 2131166171;
+			public const int px_758 = 2131166171;
 			
 			// aapt resource value: 0x7F0703DC
-			public const int px_767 = 2131166172;
+			public const int px_759 = 2131166172;
 			
 			// aapt resource value: 0x7F0703DD
-			public const int px_768 = 2131166173;
+			public const int px_76 = 2131166173;
 			
 			// aapt resource value: 0x7F0703DE
-			public const int px_769 = 2131166174;
+			public const int px_760 = 2131166174;
 			
 			// aapt resource value: 0x7F0703DF
-			public const int px_77 = 2131166175;
+			public const int px_761 = 2131166175;
 			
 			// aapt resource value: 0x7F0703E0
-			public const int px_770 = 2131166176;
+			public const int px_762 = 2131166176;
 			
 			// aapt resource value: 0x7F0703E1
-			public const int px_771 = 2131166177;
+			public const int px_763 = 2131166177;
 			
 			// aapt resource value: 0x7F0703E2
-			public const int px_772 = 2131166178;
+			public const int px_764 = 2131166178;
 			
 			// aapt resource value: 0x7F0703E3
-			public const int px_773 = 2131166179;
+			public const int px_765 = 2131166179;
 			
 			// aapt resource value: 0x7F0703E4
-			public const int px_774 = 2131166180;
+			public const int px_766 = 2131166180;
 			
 			// aapt resource value: 0x7F0703E5
-			public const int px_775 = 2131166181;
+			public const int px_767 = 2131166181;
 			
 			// aapt resource value: 0x7F0703E6
-			public const int px_776 = 2131166182;
+			public const int px_768 = 2131166182;
 			
 			// aapt resource value: 0x7F0703E7
-			public const int px_777 = 2131166183;
+			public const int px_769 = 2131166183;
 			
 			// aapt resource value: 0x7F0703E8
-			public const int px_778 = 2131166184;
+			public const int px_77 = 2131166184;
 			
 			// aapt resource value: 0x7F0703E9
-			public const int px_779 = 2131166185;
+			public const int px_770 = 2131166185;
 			
 			// aapt resource value: 0x7F0703EA
-			public const int px_78 = 2131166186;
+			public const int px_771 = 2131166186;
 			
 			// aapt resource value: 0x7F0703EB
-			public const int px_780 = 2131166187;
+			public const int px_772 = 2131166187;
 			
 			// aapt resource value: 0x7F0703EC
-			public const int px_781 = 2131166188;
+			public const int px_773 = 2131166188;
 			
 			// aapt resource value: 0x7F0703ED
-			public const int px_782 = 2131166189;
+			public const int px_774 = 2131166189;
 			
 			// aapt resource value: 0x7F0703EE
-			public const int px_783 = 2131166190;
+			public const int px_775 = 2131166190;
 			
 			// aapt resource value: 0x7F0703EF
-			public const int px_784 = 2131166191;
+			public const int px_776 = 2131166191;
 			
 			// aapt resource value: 0x7F0703F0
-			public const int px_785 = 2131166192;
+			public const int px_777 = 2131166192;
 			
 			// aapt resource value: 0x7F0703F1
-			public const int px_786 = 2131166193;
+			public const int px_778 = 2131166193;
 			
 			// aapt resource value: 0x7F0703F2
-			public const int px_787 = 2131166194;
+			public const int px_779 = 2131166194;
 			
 			// aapt resource value: 0x7F0703F3
-			public const int px_788 = 2131166195;
+			public const int px_78 = 2131166195;
 			
 			// aapt resource value: 0x7F0703F4
-			public const int px_789 = 2131166196;
+			public const int px_780 = 2131166196;
 			
 			// aapt resource value: 0x7F0703F5
-			public const int px_79 = 2131166197;
+			public const int px_781 = 2131166197;
 			
 			// aapt resource value: 0x7F0703F6
-			public const int px_790 = 2131166198;
+			public const int px_782 = 2131166198;
 			
 			// aapt resource value: 0x7F0703F7
-			public const int px_791 = 2131166199;
+			public const int px_783 = 2131166199;
 			
 			// aapt resource value: 0x7F0703F8
-			public const int px_792 = 2131166200;
+			public const int px_784 = 2131166200;
 			
 			// aapt resource value: 0x7F0703F9
-			public const int px_793 = 2131166201;
+			public const int px_785 = 2131166201;
 			
 			// aapt resource value: 0x7F0703FA
-			public const int px_794 = 2131166202;
+			public const int px_786 = 2131166202;
 			
 			// aapt resource value: 0x7F0703FB
-			public const int px_795 = 2131166203;
+			public const int px_787 = 2131166203;
 			
 			// aapt resource value: 0x7F0703FC
-			public const int px_796 = 2131166204;
+			public const int px_788 = 2131166204;
 			
 			// aapt resource value: 0x7F0703FD
-			public const int px_797 = 2131166205;
+			public const int px_789 = 2131166205;
 			
 			// aapt resource value: 0x7F0703FE
-			public const int px_798 = 2131166206;
+			public const int px_79 = 2131166206;
 			
 			// aapt resource value: 0x7F0703FF
-			public const int px_799 = 2131166207;
+			public const int px_790 = 2131166207;
 			
 			// aapt resource value: 0x7F070400
-			public const int px_8 = 2131166208;
+			public const int px_791 = 2131166208;
 			
 			// aapt resource value: 0x7F070401
-			public const int px_80 = 2131166209;
+			public const int px_792 = 2131166209;
 			
 			// aapt resource value: 0x7F070402
-			public const int px_800 = 2131166210;
+			public const int px_793 = 2131166210;
 			
 			// aapt resource value: 0x7F070403
-			public const int px_801 = 2131166211;
+			public const int px_794 = 2131166211;
 			
 			// aapt resource value: 0x7F070404
-			public const int px_802 = 2131166212;
+			public const int px_795 = 2131166212;
 			
 			// aapt resource value: 0x7F070405
-			public const int px_803 = 2131166213;
+			public const int px_796 = 2131166213;
 			
 			// aapt resource value: 0x7F070406
-			public const int px_804 = 2131166214;
+			public const int px_797 = 2131166214;
 			
 			// aapt resource value: 0x7F070407
-			public const int px_805 = 2131166215;
+			public const int px_798 = 2131166215;
 			
 			// aapt resource value: 0x7F070408
-			public const int px_806 = 2131166216;
+			public const int px_799 = 2131166216;
 			
 			// aapt resource value: 0x7F070409
-			public const int px_807 = 2131166217;
+			public const int px_8 = 2131166217;
 			
 			// aapt resource value: 0x7F07040A
-			public const int px_808 = 2131166218;
+			public const int px_80 = 2131166218;
 			
 			// aapt resource value: 0x7F07040B
-			public const int px_809 = 2131166219;
+			public const int px_800 = 2131166219;
 			
 			// aapt resource value: 0x7F07040C
-			public const int px_81 = 2131166220;
+			public const int px_801 = 2131166220;
 			
 			// aapt resource value: 0x7F07040D
-			public const int px_810 = 2131166221;
+			public const int px_802 = 2131166221;
 			
 			// aapt resource value: 0x7F07040E
-			public const int px_811 = 2131166222;
+			public const int px_803 = 2131166222;
 			
 			// aapt resource value: 0x7F07040F
-			public const int px_812 = 2131166223;
+			public const int px_804 = 2131166223;
 			
 			// aapt resource value: 0x7F070410
-			public const int px_813 = 2131166224;
+			public const int px_805 = 2131166224;
 			
 			// aapt resource value: 0x7F070411
-			public const int px_814 = 2131166225;
+			public const int px_806 = 2131166225;
 			
 			// aapt resource value: 0x7F070412
-			public const int px_815 = 2131166226;
+			public const int px_807 = 2131166226;
 			
 			// aapt resource value: 0x7F070413
-			public const int px_816 = 2131166227;
+			public const int px_808 = 2131166227;
 			
 			// aapt resource value: 0x7F070414
-			public const int px_817 = 2131166228;
+			public const int px_809 = 2131166228;
 			
 			// aapt resource value: 0x7F070415
-			public const int px_818 = 2131166229;
+			public const int px_81 = 2131166229;
 			
 			// aapt resource value: 0x7F070416
-			public const int px_819 = 2131166230;
+			public const int px_810 = 2131166230;
 			
 			// aapt resource value: 0x7F070417
-			public const int px_82 = 2131166231;
+			public const int px_811 = 2131166231;
 			
 			// aapt resource value: 0x7F070418
-			public const int px_820 = 2131166232;
+			public const int px_812 = 2131166232;
 			
 			// aapt resource value: 0x7F070419
-			public const int px_821 = 2131166233;
+			public const int px_813 = 2131166233;
 			
 			// aapt resource value: 0x7F07041A
-			public const int px_822 = 2131166234;
+			public const int px_814 = 2131166234;
 			
 			// aapt resource value: 0x7F07041B
-			public const int px_823 = 2131166235;
+			public const int px_815 = 2131166235;
 			
 			// aapt resource value: 0x7F07041C
-			public const int px_824 = 2131166236;
+			public const int px_816 = 2131166236;
 			
 			// aapt resource value: 0x7F07041D
-			public const int px_825 = 2131166237;
+			public const int px_817 = 2131166237;
 			
 			// aapt resource value: 0x7F07041E
-			public const int px_826 = 2131166238;
+			public const int px_818 = 2131166238;
 			
 			// aapt resource value: 0x7F07041F
-			public const int px_827 = 2131166239;
+			public const int px_819 = 2131166239;
 			
 			// aapt resource value: 0x7F070420
-			public const int px_828 = 2131166240;
+			public const int px_82 = 2131166240;
 			
 			// aapt resource value: 0x7F070421
-			public const int px_829 = 2131166241;
+			public const int px_820 = 2131166241;
 			
 			// aapt resource value: 0x7F070422
-			public const int px_83 = 2131166242;
+			public const int px_821 = 2131166242;
 			
 			// aapt resource value: 0x7F070423
-			public const int px_830 = 2131166243;
+			public const int px_822 = 2131166243;
 			
 			// aapt resource value: 0x7F070424
-			public const int px_831 = 2131166244;
+			public const int px_823 = 2131166244;
 			
 			// aapt resource value: 0x7F070425
-			public const int px_832 = 2131166245;
+			public const int px_824 = 2131166245;
 			
 			// aapt resource value: 0x7F070426
-			public const int px_833 = 2131166246;
+			public const int px_825 = 2131166246;
 			
 			// aapt resource value: 0x7F070427
-			public const int px_834 = 2131166247;
+			public const int px_826 = 2131166247;
 			
 			// aapt resource value: 0x7F070428
-			public const int px_835 = 2131166248;
+			public const int px_827 = 2131166248;
 			
 			// aapt resource value: 0x7F070429
-			public const int px_836 = 2131166249;
+			public const int px_828 = 2131166249;
 			
 			// aapt resource value: 0x7F07042A
-			public const int px_837 = 2131166250;
+			public const int px_829 = 2131166250;
 			
 			// aapt resource value: 0x7F07042B
-			public const int px_838 = 2131166251;
+			public const int px_83 = 2131166251;
 			
 			// aapt resource value: 0x7F07042C
-			public const int px_839 = 2131166252;
+			public const int px_830 = 2131166252;
 			
 			// aapt resource value: 0x7F07042D
-			public const int px_84 = 2131166253;
+			public const int px_831 = 2131166253;
 			
 			// aapt resource value: 0x7F07042E
-			public const int px_840 = 2131166254;
+			public const int px_832 = 2131166254;
 			
 			// aapt resource value: 0x7F07042F
-			public const int px_841 = 2131166255;
+			public const int px_833 = 2131166255;
 			
 			// aapt resource value: 0x7F070430
-			public const int px_842 = 2131166256;
+			public const int px_834 = 2131166256;
 			
 			// aapt resource value: 0x7F070431
-			public const int px_843 = 2131166257;
+			public const int px_835 = 2131166257;
 			
 			// aapt resource value: 0x7F070432
-			public const int px_844 = 2131166258;
+			public const int px_836 = 2131166258;
 			
 			// aapt resource value: 0x7F070433
-			public const int px_845 = 2131166259;
+			public const int px_837 = 2131166259;
 			
 			// aapt resource value: 0x7F070434
-			public const int px_846 = 2131166260;
+			public const int px_838 = 2131166260;
 			
 			// aapt resource value: 0x7F070435
-			public const int px_847 = 2131166261;
+			public const int px_839 = 2131166261;
 			
 			// aapt resource value: 0x7F070436
-			public const int px_848 = 2131166262;
+			public const int px_84 = 2131166262;
 			
 			// aapt resource value: 0x7F070437
-			public const int px_849 = 2131166263;
+			public const int px_840 = 2131166263;
 			
 			// aapt resource value: 0x7F070438
-			public const int px_85 = 2131166264;
+			public const int px_841 = 2131166264;
 			
 			// aapt resource value: 0x7F070439
-			public const int px_850 = 2131166265;
+			public const int px_842 = 2131166265;
 			
 			// aapt resource value: 0x7F07043A
-			public const int px_851 = 2131166266;
+			public const int px_843 = 2131166266;
 			
 			// aapt resource value: 0x7F07043B
-			public const int px_852 = 2131166267;
+			public const int px_844 = 2131166267;
 			
 			// aapt resource value: 0x7F07043C
-			public const int px_853 = 2131166268;
+			public const int px_845 = 2131166268;
 			
 			// aapt resource value: 0x7F07043D
-			public const int px_854 = 2131166269;
+			public const int px_846 = 2131166269;
 			
 			// aapt resource value: 0x7F07043E
-			public const int px_855 = 2131166270;
+			public const int px_847 = 2131166270;
 			
 			// aapt resource value: 0x7F07043F
-			public const int px_856 = 2131166271;
+			public const int px_848 = 2131166271;
 			
 			// aapt resource value: 0x7F070440
-			public const int px_857 = 2131166272;
+			public const int px_849 = 2131166272;
 			
 			// aapt resource value: 0x7F070441
-			public const int px_858 = 2131166273;
+			public const int px_85 = 2131166273;
 			
 			// aapt resource value: 0x7F070442
-			public const int px_859 = 2131166274;
+			public const int px_850 = 2131166274;
 			
 			// aapt resource value: 0x7F070443
-			public const int px_86 = 2131166275;
+			public const int px_851 = 2131166275;
 			
 			// aapt resource value: 0x7F070444
-			public const int px_860 = 2131166276;
+			public const int px_852 = 2131166276;
 			
 			// aapt resource value: 0x7F070445
-			public const int px_861 = 2131166277;
+			public const int px_853 = 2131166277;
 			
 			// aapt resource value: 0x7F070446
-			public const int px_862 = 2131166278;
+			public const int px_854 = 2131166278;
 			
 			// aapt resource value: 0x7F070447
-			public const int px_863 = 2131166279;
+			public const int px_855 = 2131166279;
 			
 			// aapt resource value: 0x7F070448
-			public const int px_864 = 2131166280;
+			public const int px_856 = 2131166280;
 			
 			// aapt resource value: 0x7F070449
-			public const int px_865 = 2131166281;
+			public const int px_857 = 2131166281;
 			
 			// aapt resource value: 0x7F07044A
-			public const int px_866 = 2131166282;
+			public const int px_858 = 2131166282;
 			
 			// aapt resource value: 0x7F07044B
-			public const int px_867 = 2131166283;
+			public const int px_859 = 2131166283;
 			
 			// aapt resource value: 0x7F07044C
-			public const int px_868 = 2131166284;
+			public const int px_86 = 2131166284;
 			
 			// aapt resource value: 0x7F07044D
-			public const int px_869 = 2131166285;
+			public const int px_860 = 2131166285;
 			
 			// aapt resource value: 0x7F07044E
-			public const int px_87 = 2131166286;
+			public const int px_861 = 2131166286;
 			
 			// aapt resource value: 0x7F07044F
-			public const int px_870 = 2131166287;
+			public const int px_862 = 2131166287;
 			
 			// aapt resource value: 0x7F070450
-			public const int px_871 = 2131166288;
+			public const int px_863 = 2131166288;
 			
 			// aapt resource value: 0x7F070451
-			public const int px_872 = 2131166289;
+			public const int px_864 = 2131166289;
 			
 			// aapt resource value: 0x7F070452
-			public const int px_873 = 2131166290;
+			public const int px_865 = 2131166290;
 			
 			// aapt resource value: 0x7F070453
-			public const int px_874 = 2131166291;
+			public const int px_866 = 2131166291;
 			
 			// aapt resource value: 0x7F070454
-			public const int px_875 = 2131166292;
+			public const int px_867 = 2131166292;
 			
 			// aapt resource value: 0x7F070455
-			public const int px_876 = 2131166293;
+			public const int px_868 = 2131166293;
 			
 			// aapt resource value: 0x7F070456
-			public const int px_877 = 2131166294;
+			public const int px_869 = 2131166294;
 			
 			// aapt resource value: 0x7F070457
-			public const int px_878 = 2131166295;
+			public const int px_87 = 2131166295;
 			
 			// aapt resource value: 0x7F070458
-			public const int px_879 = 2131166296;
+			public const int px_870 = 2131166296;
 			
 			// aapt resource value: 0x7F070459
-			public const int px_88 = 2131166297;
+			public const int px_871 = 2131166297;
 			
 			// aapt resource value: 0x7F07045A
-			public const int px_880 = 2131166298;
+			public const int px_872 = 2131166298;
 			
 			// aapt resource value: 0x7F07045B
-			public const int px_881 = 2131166299;
+			public const int px_873 = 2131166299;
 			
 			// aapt resource value: 0x7F07045C
-			public const int px_882 = 2131166300;
+			public const int px_874 = 2131166300;
 			
 			// aapt resource value: 0x7F07045D
-			public const int px_883 = 2131166301;
+			public const int px_875 = 2131166301;
 			
 			// aapt resource value: 0x7F07045E
-			public const int px_884 = 2131166302;
+			public const int px_876 = 2131166302;
 			
 			// aapt resource value: 0x7F07045F
-			public const int px_885 = 2131166303;
+			public const int px_877 = 2131166303;
 			
 			// aapt resource value: 0x7F070460
-			public const int px_886 = 2131166304;
+			public const int px_878 = 2131166304;
 			
 			// aapt resource value: 0x7F070461
-			public const int px_887 = 2131166305;
+			public const int px_879 = 2131166305;
 			
 			// aapt resource value: 0x7F070462
-			public const int px_888 = 2131166306;
+			public const int px_88 = 2131166306;
 			
 			// aapt resource value: 0x7F070463
-			public const int px_889 = 2131166307;
+			public const int px_880 = 2131166307;
 			
 			// aapt resource value: 0x7F070464
-			public const int px_89 = 2131166308;
+			public const int px_881 = 2131166308;
 			
 			// aapt resource value: 0x7F070465
-			public const int px_890 = 2131166309;
+			public const int px_882 = 2131166309;
 			
 			// aapt resource value: 0x7F070466
-			public const int px_891 = 2131166310;
+			public const int px_883 = 2131166310;
 			
 			// aapt resource value: 0x7F070467
-			public const int px_892 = 2131166311;
+			public const int px_884 = 2131166311;
 			
 			// aapt resource value: 0x7F070468
-			public const int px_893 = 2131166312;
+			public const int px_885 = 2131166312;
 			
 			// aapt resource value: 0x7F070469
-			public const int px_894 = 2131166313;
+			public const int px_886 = 2131166313;
 			
 			// aapt resource value: 0x7F07046A
-			public const int px_895 = 2131166314;
+			public const int px_887 = 2131166314;
 			
 			// aapt resource value: 0x7F07046B
-			public const int px_896 = 2131166315;
+			public const int px_888 = 2131166315;
 			
 			// aapt resource value: 0x7F07046C
-			public const int px_897 = 2131166316;
+			public const int px_889 = 2131166316;
 			
 			// aapt resource value: 0x7F07046D
-			public const int px_898 = 2131166317;
+			public const int px_89 = 2131166317;
 			
 			// aapt resource value: 0x7F07046E
-			public const int px_899 = 2131166318;
+			public const int px_890 = 2131166318;
 			
 			// aapt resource value: 0x7F07046F
-			public const int px_9 = 2131166319;
+			public const int px_891 = 2131166319;
 			
 			// aapt resource value: 0x7F070470
-			public const int px_90 = 2131166320;
+			public const int px_892 = 2131166320;
 			
 			// aapt resource value: 0x7F070471
-			public const int px_900 = 2131166321;
+			public const int px_893 = 2131166321;
 			
 			// aapt resource value: 0x7F070472
-			public const int px_901 = 2131166322;
+			public const int px_894 = 2131166322;
 			
 			// aapt resource value: 0x7F070473
-			public const int px_902 = 2131166323;
+			public const int px_895 = 2131166323;
 			
 			// aapt resource value: 0x7F070474
-			public const int px_903 = 2131166324;
+			public const int px_896 = 2131166324;
 			
 			// aapt resource value: 0x7F070475
-			public const int px_904 = 2131166325;
+			public const int px_897 = 2131166325;
 			
 			// aapt resource value: 0x7F070476
-			public const int px_905 = 2131166326;
+			public const int px_898 = 2131166326;
 			
 			// aapt resource value: 0x7F070477
-			public const int px_906 = 2131166327;
+			public const int px_899 = 2131166327;
 			
 			// aapt resource value: 0x7F070478
-			public const int px_907 = 2131166328;
+			public const int px_9 = 2131166328;
 			
 			// aapt resource value: 0x7F070479
-			public const int px_908 = 2131166329;
+			public const int px_90 = 2131166329;
 			
 			// aapt resource value: 0x7F07047A
-			public const int px_909 = 2131166330;
+			public const int px_900 = 2131166330;
 			
 			// aapt resource value: 0x7F07047B
-			public const int px_91 = 2131166331;
+			public const int px_901 = 2131166331;
 			
 			// aapt resource value: 0x7F07047C
-			public const int px_910 = 2131166332;
+			public const int px_902 = 2131166332;
 			
 			// aapt resource value: 0x7F07047D
-			public const int px_911 = 2131166333;
+			public const int px_903 = 2131166333;
 			
 			// aapt resource value: 0x7F07047E
-			public const int px_912 = 2131166334;
+			public const int px_904 = 2131166334;
 			
 			// aapt resource value: 0x7F07047F
-			public const int px_913 = 2131166335;
+			public const int px_905 = 2131166335;
 			
 			// aapt resource value: 0x7F070480
-			public const int px_914 = 2131166336;
+			public const int px_906 = 2131166336;
 			
 			// aapt resource value: 0x7F070481
-			public const int px_915 = 2131166337;
+			public const int px_907 = 2131166337;
 			
 			// aapt resource value: 0x7F070482
-			public const int px_916 = 2131166338;
+			public const int px_908 = 2131166338;
 			
 			// aapt resource value: 0x7F070483
-			public const int px_917 = 2131166339;
+			public const int px_909 = 2131166339;
 			
 			// aapt resource value: 0x7F070484
-			public const int px_918 = 2131166340;
+			public const int px_91 = 2131166340;
 			
 			// aapt resource value: 0x7F070485
-			public const int px_919 = 2131166341;
+			public const int px_910 = 2131166341;
 			
 			// aapt resource value: 0x7F070486
-			public const int px_92 = 2131166342;
+			public const int px_911 = 2131166342;
 			
 			// aapt resource value: 0x7F070487
-			public const int px_920 = 2131166343;
+			public const int px_912 = 2131166343;
 			
 			// aapt resource value: 0x7F070488
-			public const int px_921 = 2131166344;
+			public const int px_913 = 2131166344;
 			
 			// aapt resource value: 0x7F070489
-			public const int px_922 = 2131166345;
+			public const int px_914 = 2131166345;
 			
 			// aapt resource value: 0x7F07048A
-			public const int px_923 = 2131166346;
+			public const int px_915 = 2131166346;
 			
 			// aapt resource value: 0x7F07048B
-			public const int px_924 = 2131166347;
+			public const int px_916 = 2131166347;
 			
 			// aapt resource value: 0x7F07048C
-			public const int px_925 = 2131166348;
+			public const int px_917 = 2131166348;
 			
 			// aapt resource value: 0x7F07048D
-			public const int px_926 = 2131166349;
+			public const int px_918 = 2131166349;
 			
 			// aapt resource value: 0x7F07048E
-			public const int px_927 = 2131166350;
+			public const int px_919 = 2131166350;
 			
 			// aapt resource value: 0x7F07048F
-			public const int px_928 = 2131166351;
+			public const int px_92 = 2131166351;
 			
 			// aapt resource value: 0x7F070490
-			public const int px_929 = 2131166352;
+			public const int px_920 = 2131166352;
 			
 			// aapt resource value: 0x7F070491
-			public const int px_93 = 2131166353;
+			public const int px_921 = 2131166353;
 			
 			// aapt resource value: 0x7F070492
-			public const int px_930 = 2131166354;
+			public const int px_922 = 2131166354;
 			
 			// aapt resource value: 0x7F070493
-			public const int px_931 = 2131166355;
+			public const int px_923 = 2131166355;
 			
 			// aapt resource value: 0x7F070494
-			public const int px_932 = 2131166356;
+			public const int px_924 = 2131166356;
 			
 			// aapt resource value: 0x7F070495
-			public const int px_933 = 2131166357;
+			public const int px_925 = 2131166357;
 			
 			// aapt resource value: 0x7F070496
-			public const int px_934 = 2131166358;
+			public const int px_926 = 2131166358;
 			
 			// aapt resource value: 0x7F070497
-			public const int px_935 = 2131166359;
+			public const int px_927 = 2131166359;
 			
 			// aapt resource value: 0x7F070498
-			public const int px_936 = 2131166360;
+			public const int px_928 = 2131166360;
 			
 			// aapt resource value: 0x7F070499
-			public const int px_937 = 2131166361;
+			public const int px_929 = 2131166361;
 			
 			// aapt resource value: 0x7F07049A
-			public const int px_938 = 2131166362;
+			public const int px_93 = 2131166362;
 			
 			// aapt resource value: 0x7F07049B
-			public const int px_939 = 2131166363;
+			public const int px_930 = 2131166363;
 			
 			// aapt resource value: 0x7F07049C
-			public const int px_94 = 2131166364;
+			public const int px_931 = 2131166364;
 			
 			// aapt resource value: 0x7F07049D
-			public const int px_940 = 2131166365;
+			public const int px_932 = 2131166365;
 			
 			// aapt resource value: 0x7F07049E
-			public const int px_941 = 2131166366;
+			public const int px_933 = 2131166366;
 			
 			// aapt resource value: 0x7F07049F
-			public const int px_942 = 2131166367;
+			public const int px_934 = 2131166367;
 			
 			// aapt resource value: 0x7F0704A0
-			public const int px_943 = 2131166368;
+			public const int px_935 = 2131166368;
 			
 			// aapt resource value: 0x7F0704A1
-			public const int px_944 = 2131166369;
+			public const int px_936 = 2131166369;
 			
 			// aapt resource value: 0x7F0704A2
-			public const int px_945 = 2131166370;
+			public const int px_937 = 2131166370;
 			
 			// aapt resource value: 0x7F0704A3
-			public const int px_946 = 2131166371;
+			public const int px_938 = 2131166371;
 			
 			// aapt resource value: 0x7F0704A4
-			public const int px_947 = 2131166372;
+			public const int px_939 = 2131166372;
 			
 			// aapt resource value: 0x7F0704A5
-			public const int px_948 = 2131166373;
+			public const int px_94 = 2131166373;
 			
 			// aapt resource value: 0x7F0704A6
-			public const int px_949 = 2131166374;
+			public const int px_940 = 2131166374;
 			
 			// aapt resource value: 0x7F0704A7
-			public const int px_95 = 2131166375;
+			public const int px_941 = 2131166375;
 			
 			// aapt resource value: 0x7F0704A8
-			public const int px_950 = 2131166376;
+			public const int px_942 = 2131166376;
 			
 			// aapt resource value: 0x7F0704A9
-			public const int px_951 = 2131166377;
+			public const int px_943 = 2131166377;
 			
 			// aapt resource value: 0x7F0704AA
-			public const int px_952 = 2131166378;
+			public const int px_944 = 2131166378;
 			
 			// aapt resource value: 0x7F0704AB
-			public const int px_953 = 2131166379;
+			public const int px_945 = 2131166379;
 			
 			// aapt resource value: 0x7F0704AC
-			public const int px_954 = 2131166380;
+			public const int px_946 = 2131166380;
 			
 			// aapt resource value: 0x7F0704AD
-			public const int px_955 = 2131166381;
+			public const int px_947 = 2131166381;
 			
 			// aapt resource value: 0x7F0704AE
-			public const int px_956 = 2131166382;
+			public const int px_948 = 2131166382;
 			
 			// aapt resource value: 0x7F0704AF
-			public const int px_957 = 2131166383;
+			public const int px_949 = 2131166383;
 			
 			// aapt resource value: 0x7F0704B0
-			public const int px_958 = 2131166384;
+			public const int px_95 = 2131166384;
 			
 			// aapt resource value: 0x7F0704B1
-			public const int px_959 = 2131166385;
+			public const int px_950 = 2131166385;
 			
 			// aapt resource value: 0x7F0704B2
-			public const int px_96 = 2131166386;
+			public const int px_951 = 2131166386;
 			
 			// aapt resource value: 0x7F0704B3
-			public const int px_960 = 2131166387;
+			public const int px_952 = 2131166387;
 			
 			// aapt resource value: 0x7F0704B4
-			public const int px_961 = 2131166388;
+			public const int px_953 = 2131166388;
 			
 			// aapt resource value: 0x7F0704B5
-			public const int px_962 = 2131166389;
+			public const int px_954 = 2131166389;
 			
 			// aapt resource value: 0x7F0704B6
-			public const int px_963 = 2131166390;
+			public const int px_955 = 2131166390;
 			
 			// aapt resource value: 0x7F0704B7
-			public const int px_964 = 2131166391;
+			public const int px_956 = 2131166391;
 			
 			// aapt resource value: 0x7F0704B8
-			public const int px_965 = 2131166392;
+			public const int px_957 = 2131166392;
 			
 			// aapt resource value: 0x7F0704B9
-			public const int px_966 = 2131166393;
+			public const int px_958 = 2131166393;
 			
 			// aapt resource value: 0x7F0704BA
-			public const int px_967 = 2131166394;
+			public const int px_959 = 2131166394;
 			
 			// aapt resource value: 0x7F0704BB
-			public const int px_968 = 2131166395;
+			public const int px_96 = 2131166395;
 			
 			// aapt resource value: 0x7F0704BC
-			public const int px_969 = 2131166396;
+			public const int px_960 = 2131166396;
 			
 			// aapt resource value: 0x7F0704BD
-			public const int px_97 = 2131166397;
+			public const int px_961 = 2131166397;
 			
 			// aapt resource value: 0x7F0704BE
-			public const int px_970 = 2131166398;
+			public const int px_962 = 2131166398;
 			
 			// aapt resource value: 0x7F0704BF
-			public const int px_971 = 2131166399;
+			public const int px_963 = 2131166399;
 			
 			// aapt resource value: 0x7F0704C0
-			public const int px_972 = 2131166400;
+			public const int px_964 = 2131166400;
 			
 			// aapt resource value: 0x7F0704C1
-			public const int px_973 = 2131166401;
+			public const int px_965 = 2131166401;
 			
 			// aapt resource value: 0x7F0704C2
-			public const int px_974 = 2131166402;
+			public const int px_966 = 2131166402;
 			
 			// aapt resource value: 0x7F0704C3
-			public const int px_975 = 2131166403;
+			public const int px_967 = 2131166403;
 			
 			// aapt resource value: 0x7F0704C4
-			public const int px_976 = 2131166404;
+			public const int px_968 = 2131166404;
 			
 			// aapt resource value: 0x7F0704C5
-			public const int px_977 = 2131166405;
+			public const int px_969 = 2131166405;
 			
 			// aapt resource value: 0x7F0704C6
-			public const int px_978 = 2131166406;
+			public const int px_97 = 2131166406;
 			
 			// aapt resource value: 0x7F0704C7
-			public const int px_979 = 2131166407;
+			public const int px_970 = 2131166407;
 			
 			// aapt resource value: 0x7F0704C8
-			public const int px_98 = 2131166408;
+			public const int px_971 = 2131166408;
 			
 			// aapt resource value: 0x7F0704C9
-			public const int px_980 = 2131166409;
+			public const int px_972 = 2131166409;
 			
 			// aapt resource value: 0x7F0704CA
-			public const int px_981 = 2131166410;
+			public const int px_973 = 2131166410;
 			
 			// aapt resource value: 0x7F0704CB
-			public const int px_982 = 2131166411;
+			public const int px_974 = 2131166411;
 			
 			// aapt resource value: 0x7F0704CC
-			public const int px_983 = 2131166412;
+			public const int px_975 = 2131166412;
 			
 			// aapt resource value: 0x7F0704CD
-			public const int px_984 = 2131166413;
+			public const int px_976 = 2131166413;
 			
 			// aapt resource value: 0x7F0704CE
-			public const int px_985 = 2131166414;
+			public const int px_977 = 2131166414;
 			
 			// aapt resource value: 0x7F0704CF
-			public const int px_986 = 2131166415;
+			public const int px_978 = 2131166415;
 			
 			// aapt resource value: 0x7F0704D0
-			public const int px_987 = 2131166416;
+			public const int px_979 = 2131166416;
 			
 			// aapt resource value: 0x7F0704D1
-			public const int px_988 = 2131166417;
+			public const int px_98 = 2131166417;
 			
 			// aapt resource value: 0x7F0704D2
-			public const int px_989 = 2131166418;
+			public const int px_980 = 2131166418;
 			
 			// aapt resource value: 0x7F0704D3
-			public const int px_99 = 2131166419;
+			public const int px_981 = 2131166419;
 			
 			// aapt resource value: 0x7F0704D4
-			public const int px_990 = 2131166420;
+			public const int px_982 = 2131166420;
 			
 			// aapt resource value: 0x7F0704D5
-			public const int px_991 = 2131166421;
+			public const int px_983 = 2131166421;
 			
 			// aapt resource value: 0x7F0704D6
-			public const int px_992 = 2131166422;
+			public const int px_984 = 2131166422;
 			
 			// aapt resource value: 0x7F0704D7
-			public const int px_993 = 2131166423;
+			public const int px_985 = 2131166423;
 			
 			// aapt resource value: 0x7F0704D8
-			public const int px_994 = 2131166424;
+			public const int px_986 = 2131166424;
 			
 			// aapt resource value: 0x7F0704D9
-			public const int px_995 = 2131166425;
+			public const int px_987 = 2131166425;
 			
 			// aapt resource value: 0x7F0704DA
-			public const int px_996 = 2131166426;
+			public const int px_988 = 2131166426;
 			
 			// aapt resource value: 0x7F0704DB
-			public const int px_997 = 2131166427;
+			public const int px_989 = 2131166427;
 			
 			// aapt resource value: 0x7F0704DC
-			public const int px_998 = 2131166428;
+			public const int px_99 = 2131166428;
 			
 			// aapt resource value: 0x7F0704DD
-			public const int px_999 = 2131166429;
+			public const int px_990 = 2131166429;
 			
 			// aapt resource value: 0x7F0704DE
-			public const int realplay_button_text_size = 2131166430;
+			public const int px_991 = 2131166430;
 			
 			// aapt resource value: 0x7F0704DF
-			public const int realplay_channel_text_size = 2131166431;
+			public const int px_992 = 2131166431;
 			
 			// aapt resource value: 0x7F0704E0
-			public const int realplay_ratio_text_size = 2131166432;
+			public const int px_993 = 2131166432;
 			
 			// aapt resource value: 0x7F0704E1
-			public const int realplay_text_size = 2131166433;
+			public const int px_994 = 2131166433;
 			
 			// aapt resource value: 0x7F0704E2
-			public const int realplay_tip_text_size = 2131166434;
+			public const int px_995 = 2131166434;
 			
 			// aapt resource value: 0x7F0704E3
-			public const int remotelist_item_local_time_size = 2131166435;
+			public const int px_996 = 2131166435;
 			
 			// aapt resource value: 0x7F0704E4
-			public const int remotelist_item_more_text_size = 2131166436;
+			public const int px_997 = 2131166436;
 			
 			// aapt resource value: 0x7F0704E5
-			public const int remotelist_num_tip_size = 2131166437;
+			public const int px_998 = 2131166437;
 			
 			// aapt resource value: 0x7F0704E6
-			public const int remotelist_time_text_size = 2131166438;
+			public const int px_999 = 2131166438;
 			
 			// aapt resource value: 0x7F0704E7
-			public const int remoteplayback_button_text_size = 2131166439;
+			public const int realplay_button_text_size = 2131166439;
 			
 			// aapt resource value: 0x7F0704E8
-			public const int remoteplayback_channel_text_size = 2131166440;
+			public const int realplay_channel_text_size = 2131166440;
 			
 			// aapt resource value: 0x7F0704E9
-			public const int remoteplayback_ratio_text_size = 2131166441;
+			public const int realplay_ratio_text_size = 2131166441;
 			
 			// aapt resource value: 0x7F0704EA
-			public const int remoteplayback_text_size = 2131166442;
+			public const int realplay_text_size = 2131166442;
 			
 			// aapt resource value: 0x7F0704EB
-			public const int remoteplayback_tip_text_size = 2131166443;
+			public const int realplay_tip_text_size = 2131166443;
 			
 			// aapt resource value: 0x7F0704EC
-			public const int source_detection_text_size = 2131166444;
+			public const int remotelist_item_local_time_size = 2131166444;
 			
 			// aapt resource value: 0x7F0704ED
-			public const int sp_14 = 2131166445;
+			public const int remotelist_item_more_text_size = 2131166445;
 			
 			// aapt resource value: 0x7F0704EE
-			public const int storage_layout_height = 2131166446;
+			public const int remotelist_num_tip_size = 2131166446;
 			
 			// aapt resource value: 0x7F0704EF
-			public const int storage_layout_padding = 2131166447;
+			public const int remotelist_time_text_size = 2131166447;
 			
 			// aapt resource value: 0x7F0704F0
-			public const int sub_button_text_size = 2131166448;
+			public const int remoteplayback_button_text_size = 2131166448;
 			
 			// aapt resource value: 0x7F0704F1
-			public const int sub_title_text_size = 2131166449;
+			public const int remoteplayback_channel_text_size = 2131166449;
 			
 			// aapt resource value: 0x7F0704F2
-			public const int t0 = 2131166450;
+			public const int remoteplayback_ratio_text_size = 2131166450;
 			
 			// aapt resource value: 0x7F0704F3
-			public const int t1 = 2131166451;
+			public const int remoteplayback_text_size = 2131166451;
 			
 			// aapt resource value: 0x7F0704F4
-			public const int t2 = 2131166452;
+			public const int remoteplayback_tip_text_size = 2131166452;
 			
 			// aapt resource value: 0x7F0704F5
-			public const int t3 = 2131166453;
+			public const int source_detection_text_size = 2131166453;
 			
 			// aapt resource value: 0x7F0704F6
-			public const int t4 = 2131166454;
+			public const int sp_12 = 2131166454;
 			
 			// aapt resource value: 0x7F0704F7
-			public const int t5 = 2131166455;
+			public const int sp_14 = 2131166455;
 			
 			// aapt resource value: 0x7F0704F8
-			public const int t6 = 2131166456;
+			public const int sp_16 = 2131166456;
 			
 			// aapt resource value: 0x7F0704F9
-			public const int t7 = 2131166457;
+			public const int storage_layout_height = 2131166457;
 			
 			// aapt resource value: 0x7F0704FA
-			public const int t8 = 2131166458;
+			public const int storage_layout_padding = 2131166458;
 			
 			// aapt resource value: 0x7F0704FB
-			public const int tab_button_text_size = 2131166459;
+			public const int sub_button_text_size = 2131166459;
 			
 			// aapt resource value: 0x7F0704FC
-			public const int tab_text_size = 2131166460;
+			public const int sub_title_text_size = 2131166460;
 			
 			// aapt resource value: 0x7F0704FD
-			public const int tab_text_size_half = 2131166461;
+			public const int t0 = 2131166461;
 			
 			// aapt resource value: 0x7F0704FE
-			public const int text_size_large = 2131166462;
+			public const int t1 = 2131166462;
 			
 			// aapt resource value: 0x7F0704FF
-			public const int text_size_mid = 2131166463;
+			public const int t2 = 2131166463;
 			
 			// aapt resource value: 0x7F070500
-			public const int text_size_small = 2131166464;
+			public const int t3 = 2131166464;
 			
 			// aapt resource value: 0x7F070501
-			public const int thumbnail_text_size = 2131166465;
+			public const int t4 = 2131166465;
 			
 			// aapt resource value: 0x7F070502
-			public const int tipTextSize = 2131166466;
+			public const int t5 = 2131166466;
 			
 			// aapt resource value: 0x7F070503
-			public const int tipTitleTextSize = 2131166467;
+			public const int t6 = 2131166467;
 			
 			// aapt resource value: 0x7F070504
-			public const int titleTextSize = 2131166468;
+			public const int t7 = 2131166468;
 			
 			// aapt resource value: 0x7F070505
-			public const int title_button_padding = 2131166469;
+			public const int t8 = 2131166469;
 			
 			// aapt resource value: 0x7F070506
-			public const int title_text_size = 2131166470;
+			public const int tab_button_text_size = 2131166470;
 			
 			// aapt resource value: 0x7F070507
-			public const int title_text_small_size = 2131166471;
+			public const int tab_text_size = 2131166471;
 			
 			// aapt resource value: 0x7F070508
-			public const int tooltip_corner_radius = 2131166472;
-			
-			// aapt resource value: 0x7F070509
-			public const int tooltip_horizontal_padding = 2131166473;
-			
-			// aapt resource value: 0x7F07050A
-			public const int tooltip_margin = 2131166474;
-			
-			// aapt resource value: 0x7F07050B
-			public const int tooltip_precise_anchor_extra_offset = 2131166475;
+			public const int tab_text_size_half = 2131166472;
 			
 			// aapt resource value: 0x7F07050C
-			public const int tooltip_precise_anchor_threshold = 2131166476;
+			public const int textandiconmargin = 2131166476;
+			
+			// aapt resource value: 0x7F070509
+			public const int text_size_large = 2131166473;
+			
+			// aapt resource value: 0x7F07050A
+			public const int text_size_mid = 2131166474;
+			
+			// aapt resource value: 0x7F07050B
+			public const int text_size_small = 2131166475;
 			
 			// aapt resource value: 0x7F07050D
-			public const int tooltip_vertical_padding = 2131166477;
+			public const int thumbnail_text_size = 2131166477;
 			
 			// aapt resource value: 0x7F07050E
-			public const int tooltip_y_offset_non_touch = 2131166478;
+			public const int tipTextSize = 2131166478;
 			
 			// aapt resource value: 0x7F07050F
-			public const int tooltip_y_offset_touch = 2131166479;
+			public const int tipTitleTextSize = 2131166479;
 			
 			// aapt resource value: 0x7F070510
-			public const int top_left_btn_margin = 2131166480;
+			public const int titleTextSize = 2131166480;
 			
 			// aapt resource value: 0x7F070511
-			public const int txt_size_content = 2131166481;
+			public const int title_button_padding = 2131166481;
 			
 			// aapt resource value: 0x7F070512
-			public const int txt_size_notify = 2131166482;
+			public const int title_text_size = 2131166482;
 			
 			// aapt resource value: 0x7F070513
-			public const int txt_size_title = 2131166483;
+			public const int title_text_small_size = 2131166483;
 			
 			// aapt resource value: 0x7F070514
-			public const int updatebar_content_height = 2131166484;
+			public const int tooltip_corner_radius = 2131166484;
 			
 			// aapt resource value: 0x7F070515
-			public const int updatebar_height = 2131166485;
+			public const int tooltip_horizontal_padding = 2131166485;
 			
 			// aapt resource value: 0x7F070516
-			public const int updatebar_padding = 2131166486;
+			public const int tooltip_margin = 2131166486;
 			
 			// aapt resource value: 0x7F070517
-			public const int upsdk_margin_l = 2131166487;
+			public const int tooltip_precise_anchor_extra_offset = 2131166487;
 			
 			// aapt resource value: 0x7F070518
-			public const int upsdk_margin_m = 2131166488;
+			public const int tooltip_precise_anchor_threshold = 2131166488;
 			
 			// aapt resource value: 0x7F070519
-			public const int upsdk_margin_xs = 2131166489;
+			public const int tooltip_vertical_padding = 2131166489;
 			
 			// aapt resource value: 0x7F07051A
-			public const int upsdk_master_body_2 = 2131166490;
+			public const int tooltip_y_offset_non_touch = 2131166490;
 			
 			// aapt resource value: 0x7F07051B
-			public const int upsdk_master_subtitle = 2131166491;
+			public const int tooltip_y_offset_touch = 2131166491;
 			
 			// aapt resource value: 0x7F07051C
-			public const int version_text_size = 2131166492;
+			public const int top_left_btn_margin = 2131166492;
 			
 			// aapt resource value: 0x7F07051D
-			public const int wheel_picker_selected_text_size = 2131166493;
+			public const int txt_size_content = 2131166493;
 			
 			// aapt resource value: 0x7F07051E
-			public const int wheel_picker_text_size = 2131166494;
+			public const int txt_size_notify = 2131166494;
 			
 			// aapt resource value: 0x7F07051F
-			public const int width_functional_widget = 2131166495;
+			public const int txt_size_title = 2131166495;
+			
+			// aapt resource value: 0x7F070520
+			public const int updatebar_content_height = 2131166496;
+			
+			// aapt resource value: 0x7F070521
+			public const int updatebar_height = 2131166497;
+			
+			// aapt resource value: 0x7F070522
+			public const int updatebar_padding = 2131166498;
+			
+			// aapt resource value: 0x7F070523
+			public const int version_text_size = 2131166499;
+			
+			// aapt resource value: 0x7F070524
+			public const int wheel_picker_selected_text_size = 2131166500;
+			
+			// aapt resource value: 0x7F070525
+			public const int wheel_picker_text_size = 2131166501;
+			
+			// aapt resource value: 0x7F070526
+			public const int width_functional_widget = 2131166502;
 			
 			static Dimension()
 			{
@@ -7759,3487 +7840,3610 @@
 			public const int above_shadow = 2131230810;
 			
 			// aapt resource value: 0x7F08005B
-			public const int add2_button = 2131230811;
+			public const int activity_add = 2131230811;
 			
 			// aapt resource value: 0x7F08005C
-			public const int add2_button_sel = 2131230812;
+			public const int activity_back = 2131230812;
 			
 			// aapt resource value: 0x7F08005D
-			public const int add3_button = 2131230813;
+			public const int add2_button = 2131230813;
 			
 			// aapt resource value: 0x7F08005E
-			public const int add3_button_sel = 2131230814;
-			
-			// aapt resource value: 0x7F080066
-			public const int adddevice_box_checkbox = 2131230822;
-			
-			// aapt resource value: 0x7F080067
-			public const int adddevice_box_checkbox_checked = 2131230823;
-			
-			// aapt resource value: 0x7F080068
-			public const int adddevice_default = 2131230824;
-			
-			// aapt resource value: 0x7F08006C
-			public const int adddevice_failhrlp_g1 = 2131230828;
-			
-			// aapt resource value: 0x7F080069
-			public const int adddevice_fail_configurationfailure = 2131230825;
-			
-			// aapt resource value: 0x7F08006A
-			public const int adddevice_fail_rest = 2131230826;
-			
-			// aapt resource value: 0x7F08006B
-			public const int adddevice_fail_undetectable = 2131230827;
-			
-			// aapt resource value: 0x7F08006E
-			public const int adddevice_icon_devicepassword = 2131230830;
-			
-			// aapt resource value: 0x7F08006D
-			public const int adddevice_icon_device_default = 2131230829;
-			
-			// aapt resource value: 0x7F08006F
-			public const int adddevice_icon_falshlight_h = 2131230831;
-			
-			// aapt resource value: 0x7F080070
-			public const int adddevice_icon_falshlight_n = 2131230832;
-			
-			// aapt resource value: 0x7F080071
-			public const int adddevice_icon_help = 2131230833;
-			
-			// aapt resource value: 0x7F080072
-			public const int adddevice_icon_hotspotexplain_fail = 2131230834;
-			
-			// aapt resource value: 0x7F080073
-			public const int adddevice_icon_number = 2131230835;
-			
-			// aapt resource value: 0x7F080074
-			public const int adddevice_icon_photoalbum = 2131230836;
-			
-			// aapt resource value: 0x7F080075
-			public const int adddevice_icon_success = 2131230837;
-			
-			// aapt resource value: 0x7F080076
-			public const int adddevice_icon_success_background = 2131230838;
-			
-			// aapt resource value: 0x7F080077
-			public const int adddevice_icon_success_default = 2131230839;
-			
-			// aapt resource value: 0x7F080078
-			public const int adddevice_icon_switchwifi = 2131230840;
-			
-			// aapt resource value: 0x7F080079
-			public const int adddevice_icon_wifiexplain = 2131230841;
-			
-			// aapt resource value: 0x7F08007A
-			public const int adddevice_icon_wifiexplain_choosewifi = 2131230842;
-			
-			// aapt resource value: 0x7F08007B
-			public const int adddevice_icon_wifipassword = 2131230843;
-			
-			// aapt resource value: 0x7F08007C
-			public const int adddevice_icon_wifipassword_no5g = 2131230844;
-			
-			// aapt resource value: 0x7F08007D
-			public const int adddevice_icon_wifipassword_nosupport5g = 2131230845;
-			
-			// aapt resource value: 0x7F08007E
-			public const int adddevice_icon_wifipassword_nosupport5g_layer = 2131230846;
-			
-			// aapt resource value: 0x7F08007F
-			public const int adddevice_netsetting_battery = 2131230847;
-			
-			// aapt resource value: 0x7F080080
-			public const int adddevice_netsetting_closeto = 2131230848;
-			
-			// aapt resource value: 0x7F080081
-			public const int adddevice_netsetting_cloudserver = 2131230849;
-			
-			// aapt resource value: 0x7F080082
-			public const int adddevice_netsetting_connectcloud_1 = 2131230850;
-			
-			// aapt resource value: 0x7F080083
-			public const int adddevice_netsetting_connectcloud_2 = 2131230851;
-			
-			// aapt resource value: 0x7F080084
-			public const int adddevice_netsetting_connectcloud_3 = 2131230852;
-			
-			// aapt resource value: 0x7F080085
-			public const int adddevice_netsetting_connectcloud_cloud1 = 2131230853;
-			
-			// aapt resource value: 0x7F080086
-			public const int adddevice_netsetting_connectcloud_cloud2 = 2131230854;
-			
-			// aapt resource value: 0x7F080087
-			public const int adddevice_netsetting_connectrouter = 2131230855;
-			
-			// aapt resource value: 0x7F080088
-			public const int adddevice_netsetting_connectrouter_1 = 2131230856;
-			
-			// aapt resource value: 0x7F080089
-			public const int adddevice_netsetting_connectrouter_2 = 2131230857;
-			
-			// aapt resource value: 0x7F08008A
-			public const int adddevice_netsetting_connectrouter_3 = 2131230858;
-			
-			// aapt resource value: 0x7F08008B
-			public const int adddevice_netsetting_connectrouter_4 = 2131230859;
-			
-			// aapt resource value: 0x7F08008C
-			public const int adddevice_netsetting_connectwifi = 2131230860;
-			
-			// aapt resource value: 0x7F08008D
-			public const int adddevice_netsetting_connectwifi_config = 2131230861;
-			
-			// aapt resource value: 0x7F08008E
-			public const int adddevice_netsetting_detection = 2131230862;
-			
-			// aapt resource value: 0x7F08008F
-			public const int adddevice_netsetting_detection_1 = 2131230863;
-			
-			// aapt resource value: 0x7F080090
-			public const int adddevice_netsetting_near = 2131230864;
-			
-			// aapt resource value: 0x7F080091
-			public const int adddevice_netsetting_networkcable = 2131230865;
-			
-			// aapt resource value: 0x7F080092
-			public const int adddevice_netsetting_pairing = 2131230866;
-			
-			// aapt resource value: 0x7F080093
-			public const int adddevice_netsetting_pairing_1 = 2131230867;
-			
-			// aapt resource value: 0x7F080094
-			public const int adddevice_netsetting_pairing_2 = 2131230868;
-			
-			// aapt resource value: 0x7F080095
-			public const int adddevice_pic_imei = 2131230869;
-			
-			// aapt resource value: 0x7F080096
-			public const int adddevice_pic_qrcode = 2131230870;
-			
-			// aapt resource value: 0x7F080097
-			public const int adddevice_pic_safetycode = 2131230871;
-			
-			// aapt resource value: 0x7F080098
-			public const int adddevice_pic_scanqrcode = 2131230872;
-			
-			// aapt resource value: 0x7F080099
-			public const int adddevice_pic_serialnumber = 2131230873;
-			
-			// aapt resource value: 0x7F08009A
-			public const int adddevice_qrcode_scanline = 2131230874;
-			
-			// aapt resource value: 0x7F08009B
-			public const int adddevice_samenet = 2131230875;
-			
-			// aapt resource value: 0x7F08009C
-			public const int adddevice_setting_icon_copy = 2131230876;
-			
-			// aapt resource value: 0x7F08009D
-			public const int adddevice_supportsoftap = 2131230877;
+			public const int add2_button_sel = 2131230814;
 			
 			// aapt resource value: 0x7F08005F
-			public const int add_button = 2131230815;
+			public const int add3_button = 2131230815;
 			
 			// aapt resource value: 0x7F080060
-			public const int add_button_dis = 2131230816;
+			public const int add3_button_sel = 2131230816;
 			
-			// aapt resource value: 0x7F080061
-			public const int add_button_sel = 2131230817;
+			// aapt resource value: 0x7F08006A
+			public const int adddevice_box_checkbox = 2131230826;
 			
-			// aapt resource value: 0x7F080062
-			public const int add_camera_button_dis = 2131230818;
+			// aapt resource value: 0x7F08006B
+			public const int adddevice_box_checkbox_checked = 2131230827;
 			
-			// aapt resource value: 0x7F080063
-			public const int add_camera_not_button = 2131230819;
+			// aapt resource value: 0x7F08006C
+			public const int adddevice_default = 2131230828;
 			
-			// aapt resource value: 0x7F080064
-			public const int add_camera_not_button_click = 2131230820;
+			// aapt resource value: 0x7F080070
+			public const int adddevice_failhrlp_g1 = 2131230832;
 			
-			// aapt resource value: 0x7F080065
-			public const int add_device_number_bg = 2131230821;
+			// aapt resource value: 0x7F08006D
+			public const int adddevice_fail_configurationfailure = 2131230829;
+			
+			// aapt resource value: 0x7F08006E
+			public const int adddevice_fail_rest = 2131230830;
+			
+			// aapt resource value: 0x7F08006F
+			public const int adddevice_fail_undetectable = 2131230831;
+			
+			// aapt resource value: 0x7F080072
+			public const int adddevice_icon_devicepassword = 2131230834;
+			
+			// aapt resource value: 0x7F080071
+			public const int adddevice_icon_device_default = 2131230833;
+			
+			// aapt resource value: 0x7F080073
+			public const int adddevice_icon_falshlight_h = 2131230835;
+			
+			// aapt resource value: 0x7F080074
+			public const int adddevice_icon_falshlight_n = 2131230836;
+			
+			// aapt resource value: 0x7F080075
+			public const int adddevice_icon_help = 2131230837;
+			
+			// aapt resource value: 0x7F080076
+			public const int adddevice_icon_hotspotexplain_fail = 2131230838;
+			
+			// aapt resource value: 0x7F080077
+			public const int adddevice_icon_number = 2131230839;
+			
+			// aapt resource value: 0x7F080078
+			public const int adddevice_icon_photoalbum = 2131230840;
+			
+			// aapt resource value: 0x7F080079
+			public const int adddevice_icon_success = 2131230841;
+			
+			// aapt resource value: 0x7F08007A
+			public const int adddevice_icon_success_background = 2131230842;
+			
+			// aapt resource value: 0x7F08007B
+			public const int adddevice_icon_success_default = 2131230843;
+			
+			// aapt resource value: 0x7F08007C
+			public const int adddevice_icon_switchwifi = 2131230844;
+			
+			// aapt resource value: 0x7F08007D
+			public const int adddevice_icon_wifiexplain = 2131230845;
+			
+			// aapt resource value: 0x7F08007E
+			public const int adddevice_icon_wifiexplain_choosewifi = 2131230846;
+			
+			// aapt resource value: 0x7F08007F
+			public const int adddevice_icon_wifipassword = 2131230847;
+			
+			// aapt resource value: 0x7F080080
+			public const int adddevice_icon_wifipassword_no5g = 2131230848;
+			
+			// aapt resource value: 0x7F080081
+			public const int adddevice_icon_wifipassword_nosupport5g = 2131230849;
+			
+			// aapt resource value: 0x7F080082
+			public const int adddevice_icon_wifipassword_nosupport5g_layer = 2131230850;
+			
+			// aapt resource value: 0x7F080083
+			public const int adddevice_netsetting_battery = 2131230851;
+			
+			// aapt resource value: 0x7F080084
+			public const int adddevice_netsetting_closeto = 2131230852;
+			
+			// aapt resource value: 0x7F080085
+			public const int adddevice_netsetting_cloudserver = 2131230853;
+			
+			// aapt resource value: 0x7F080086
+			public const int adddevice_netsetting_connectcloud_1 = 2131230854;
+			
+			// aapt resource value: 0x7F080087
+			public const int adddevice_netsetting_connectcloud_2 = 2131230855;
+			
+			// aapt resource value: 0x7F080088
+			public const int adddevice_netsetting_connectcloud_3 = 2131230856;
+			
+			// aapt resource value: 0x7F080089
+			public const int adddevice_netsetting_connectcloud_cloud1 = 2131230857;
+			
+			// aapt resource value: 0x7F08008A
+			public const int adddevice_netsetting_connectcloud_cloud2 = 2131230858;
+			
+			// aapt resource value: 0x7F08008B
+			public const int adddevice_netsetting_connectrouter = 2131230859;
+			
+			// aapt resource value: 0x7F08008C
+			public const int adddevice_netsetting_connectrouter_1 = 2131230860;
+			
+			// aapt resource value: 0x7F08008D
+			public const int adddevice_netsetting_connectrouter_2 = 2131230861;
+			
+			// aapt resource value: 0x7F08008E
+			public const int adddevice_netsetting_connectrouter_3 = 2131230862;
+			
+			// aapt resource value: 0x7F08008F
+			public const int adddevice_netsetting_connectrouter_4 = 2131230863;
+			
+			// aapt resource value: 0x7F080090
+			public const int adddevice_netsetting_connectwifi = 2131230864;
+			
+			// aapt resource value: 0x7F080091
+			public const int adddevice_netsetting_connectwifi_config = 2131230865;
+			
+			// aapt resource value: 0x7F080092
+			public const int adddevice_netsetting_detection = 2131230866;
+			
+			// aapt resource value: 0x7F080093
+			public const int adddevice_netsetting_detection_1 = 2131230867;
+			
+			// aapt resource value: 0x7F080094
+			public const int adddevice_netsetting_near = 2131230868;
+			
+			// aapt resource value: 0x7F080095
+			public const int adddevice_netsetting_networkcable = 2131230869;
+			
+			// aapt resource value: 0x7F080096
+			public const int adddevice_netsetting_pairing = 2131230870;
+			
+			// aapt resource value: 0x7F080097
+			public const int adddevice_netsetting_pairing_1 = 2131230871;
+			
+			// aapt resource value: 0x7F080098
+			public const int adddevice_netsetting_pairing_2 = 2131230872;
+			
+			// aapt resource value: 0x7F080099
+			public const int adddevice_pic_imei = 2131230873;
+			
+			// aapt resource value: 0x7F08009A
+			public const int adddevice_pic_qrcode = 2131230874;
+			
+			// aapt resource value: 0x7F08009B
+			public const int adddevice_pic_safetycode = 2131230875;
+			
+			// aapt resource value: 0x7F08009C
+			public const int adddevice_pic_scanqrcode = 2131230876;
+			
+			// aapt resource value: 0x7F08009D
+			public const int adddevice_pic_serialnumber = 2131230877;
 			
 			// aapt resource value: 0x7F08009E
-			public const int alarm_encrypt_image_mid = 2131230878;
+			public const int adddevice_qrcode_scanline = 2131230878;
 			
 			// aapt resource value: 0x7F08009F
-			public const int amplify_screen_dis = 2131230879;
+			public const int adddevice_samenet = 2131230879;
 			
 			// aapt resource value: 0x7F0800A0
-			public const int amplify_screen_normal = 2131230880;
+			public const int adddevice_setting_icon_copy = 2131230880;
 			
 			// aapt resource value: 0x7F0800A1
-			public const int amplify_screen_pressed = 2131230881;
+			public const int adddevice_supportsoftap = 2131230881;
+			
+			// aapt resource value: 0x7F080061
+			public const int add_button = 2131230817;
+			
+			// aapt resource value: 0x7F080062
+			public const int add_button_dis = 2131230818;
+			
+			// aapt resource value: 0x7F080063
+			public const int add_button_sel = 2131230819;
+			
+			// aapt resource value: 0x7F080064
+			public const int add_camera_button_dis = 2131230820;
+			
+			// aapt resource value: 0x7F080065
+			public const int add_camera_not_button = 2131230821;
+			
+			// aapt resource value: 0x7F080066
+			public const int add_camera_not_button_click = 2131230822;
+			
+			// aapt resource value: 0x7F080067
+			public const int add_device_number_bg = 2131230823;
+			
+			// aapt resource value: 0x7F080068
+			public const int add_temp_bg = 2131230824;
+			
+			// aapt resource value: 0x7F080069
+			public const int add_temp_right = 2131230825;
 			
 			// aapt resource value: 0x7F0800A2
-			public const int answer = 2131230882;
+			public const int alarm_encrypt_image_mid = 2131230882;
 			
 			// aapt resource value: 0x7F0800A3
-			public const int arrow_down = 2131230883;
+			public const int amplify_screen_dis = 2131230883;
 			
 			// aapt resource value: 0x7F0800A4
-			public const int arrow_next = 2131230884;
-			
-			// aapt resource value: 0x7F0800B4
-			public const int autologin_off = 2131230900;
-			
-			// aapt resource value: 0x7F0800B5
-			public const int autologin_on = 2131230901;
+			public const int amplify_screen_normal = 2131230884;
 			
 			// aapt resource value: 0x7F0800A5
-			public const int auto_button_blue_sel = 2131230885;
+			public const int amplify_screen_pressed = 2131230885;
 			
 			// aapt resource value: 0x7F0800A6
-			public const int auto_button_bule = 2131230886;
+			public const int answer = 2131230886;
 			
 			// aapt resource value: 0x7F0800A7
-			public const int auto_button_red = 2131230887;
+			public const int arrow_down = 2131230887;
 			
 			// aapt resource value: 0x7F0800A8
-			public const int auto_button_red_sel = 2131230888;
-			
-			// aapt resource value: 0x7F0800A9
-			public const int auto_wifi_add_success_2 = 2131230889;
-			
-			// aapt resource value: 0x7F0800AA
-			public const int auto_wifi_cicle_120 = 2131230890;
-			
-			// aapt resource value: 0x7F0800AB
-			public const int auto_wifi_cicle_240 = 2131230891;
-			
-			// aapt resource value: 0x7F0800AC
-			public const int auto_wifi_cicle_bg = 2131230892;
-			
-			// aapt resource value: 0x7F0800AD
-			public const int auto_wifi_failed = 2131230893;
-			
-			// aapt resource value: 0x7F0800AE
-			public const int auto_wifi_link_account_bg = 2131230894;
-			
-			// aapt resource value: 0x7F0800AF
-			public const int auto_wifi_wait = 2131230895;
-			
-			// aapt resource value: 0x7F0800B0
-			public const int auto_wifi_wait1 = 2131230896;
-			
-			// aapt resource value: 0x7F0800B1
-			public const int auto_wifi_wait2 = 2131230897;
-			
-			// aapt resource value: 0x7F0800B2
-			public const int auto_wifi_wait3 = 2131230898;
-			
-			// aapt resource value: 0x7F0800B3
-			public const int auto_wifi_wait4 = 2131230899;
-			
-			// aapt resource value: 0x7F0800B6
-			public const int avd_hide_password = 2131230902;
-			
-			// aapt resource value: 0x7F0800B7
-			public const int avd_show_password = 2131230903;
+			public const int arrow_next = 2131230888;
 			
 			// aapt resource value: 0x7F0800B8
-			public const int back = 2131230904;
-			
-			// aapt resource value: 0x7F0800BB
-			public const int backbtn_selector = 2131230907;
+			public const int autologin_off = 2131230904;
 			
 			// aapt resource value: 0x7F0800B9
-			public const int back_icon = 2131230905;
+			public const int autologin_on = 2131230905;
+			
+			// aapt resource value: 0x7F0800A9
+			public const int auto_button_blue_sel = 2131230889;
+			
+			// aapt resource value: 0x7F0800AA
+			public const int auto_button_bule = 2131230890;
+			
+			// aapt resource value: 0x7F0800AB
+			public const int auto_button_red = 2131230891;
+			
+			// aapt resource value: 0x7F0800AC
+			public const int auto_button_red_sel = 2131230892;
+			
+			// aapt resource value: 0x7F0800AD
+			public const int auto_wifi_add_success_2 = 2131230893;
+			
+			// aapt resource value: 0x7F0800AE
+			public const int auto_wifi_cicle_120 = 2131230894;
+			
+			// aapt resource value: 0x7F0800AF
+			public const int auto_wifi_cicle_240 = 2131230895;
+			
+			// aapt resource value: 0x7F0800B0
+			public const int auto_wifi_cicle_bg = 2131230896;
+			
+			// aapt resource value: 0x7F0800B1
+			public const int auto_wifi_failed = 2131230897;
+			
+			// aapt resource value: 0x7F0800B2
+			public const int auto_wifi_link_account_bg = 2131230898;
+			
+			// aapt resource value: 0x7F0800B3
+			public const int auto_wifi_wait = 2131230899;
+			
+			// aapt resource value: 0x7F0800B4
+			public const int auto_wifi_wait1 = 2131230900;
+			
+			// aapt resource value: 0x7F0800B5
+			public const int auto_wifi_wait2 = 2131230901;
+			
+			// aapt resource value: 0x7F0800B6
+			public const int auto_wifi_wait3 = 2131230902;
+			
+			// aapt resource value: 0x7F0800B7
+			public const int auto_wifi_wait4 = 2131230903;
 			
 			// aapt resource value: 0x7F0800BA
-			public const int back_press = 2131230906;
+			public const int avd_hide_password = 2131230906;
+			
+			// aapt resource value: 0x7F0800BB
+			public const int avd_show_password = 2131230907;
 			
 			// aapt resource value: 0x7F0800BC
-			public const int below_shadow = 2131230908;
-			
-			// aapt resource value: 0x7F0800BD
-			public const int bg = 2131230909;
-			
-			// aapt resource value: 0x7F0800BE
-			public const int border = 2131230910;
+			public const int back = 2131230908;
 			
 			// aapt resource value: 0x7F0800BF
-			public const int border_selector = 2131230911;
+			public const int backbtn_selector = 2131230911;
+			
+			// aapt resource value: 0x7F0800BD
+			public const int back_icon = 2131230909;
+			
+			// aapt resource value: 0x7F0800BE
+			public const int back_press = 2131230910;
 			
 			// aapt resource value: 0x7F0800C0
-			public const int border_transparent = 2131230912;
+			public const int below_shadow = 2131230912;
 			
 			// aapt resource value: 0x7F0800C1
-			public const int bottom_divider = 2131230913;
+			public const int bg = 2131230913;
 			
 			// aapt resource value: 0x7F0800C2
-			public const int btn_2_normal = 2131230914;
+			public const int border = 2131230914;
 			
 			// aapt resource value: 0x7F0800C3
-			public const int btn_2_select = 2131230915;
+			public const int border_selector = 2131230915;
 			
 			// aapt resource value: 0x7F0800C4
-			public const int btn_agree = 2131230916;
+			public const int border_transparent = 2131230916;
 			
 			// aapt resource value: 0x7F0800C5
-			public const int btn_auto_blue_selector = 2131230917;
+			public const int bottom_divider = 2131230917;
 			
 			// aapt resource value: 0x7F0800C6
-			public const int btn_auto_red_selector = 2131230918;
+			public const int btn_2_normal = 2131230918;
 			
 			// aapt resource value: 0x7F0800C7
-			public const int btn_click_lp_screenshot = 2131230919;
+			public const int btn_2_select = 2131230919;
 			
 			// aapt resource value: 0x7F0800C8
-			public const int btn_click_lp_unlock = 2131230920;
+			public const int btn_agree = 2131230920;
 			
 			// aapt resource value: 0x7F0800C9
-			public const int btn_collect = 2131230921;
+			public const int btn_auto_blue_selector = 2131230921;
 			
 			// aapt resource value: 0x7F0800CA
-			public const int btn_collect_prs = 2131230922;
+			public const int btn_auto_red_selector = 2131230922;
 			
 			// aapt resource value: 0x7F0800CB
-			public const int btn_disagree = 2131230923;
+			public const int btn_click_lp_screenshot = 2131230923;
 			
 			// aapt resource value: 0x7F0800CC
-			public const int btn_moveplan_switch = 2131230924;
+			public const int btn_click_lp_unlock = 2131230924;
 			
 			// aapt resource value: 0x7F0800CD
-			public const int btn_r1_retry_dis = 2131230925;
+			public const int btn_collect = 2131230925;
 			
 			// aapt resource value: 0x7F0800CE
-			public const int btn_r1_retry_normal = 2131230926;
+			public const int btn_collect_prs = 2131230926;
 			
 			// aapt resource value: 0x7F0800CF
-			public const int btn_r1_retry_pressed = 2131230927;
+			public const int btn_disagree = 2131230927;
 			
 			// aapt resource value: 0x7F0800D0
-			public const int btn_r1_retry_selector = 2131230928;
+			public const int btn_moveplan_switch = 2131230928;
 			
 			// aapt resource value: 0x7F0800D1
-			public const int btn_style_alert_dialog_special_normal = 2131230929;
+			public const int btn_r1_retry_dis = 2131230929;
 			
 			// aapt resource value: 0x7F0800D2
-			public const int btn_style_alert_dialog_special_pressed = 2131230930;
+			public const int btn_r1_retry_normal = 2131230930;
 			
 			// aapt resource value: 0x7F0800D3
-			public const int btn_style_one_disabled = 2131230931;
+			public const int btn_r1_retry_pressed = 2131230931;
 			
 			// aapt resource value: 0x7F0800D4
-			public const int btn_style_one_focused = 2131230932;
+			public const int btn_r1_retry_selector = 2131230932;
 			
 			// aapt resource value: 0x7F0800D5
-			public const int btn_style_one_normal = 2131230933;
+			public const int btn_style_alert_dialog_special_normal = 2131230933;
 			
 			// aapt resource value: 0x7F0800D6
-			public const int btn_style_one_pressed = 2131230934;
+			public const int btn_style_alert_dialog_special_pressed = 2131230934;
 			
 			// aapt resource value: 0x7F0800D7
-			public const int btn_white_selector = 2131230935;
+			public const int btn_style_one_disabled = 2131230935;
 			
 			// aapt resource value: 0x7F0800D8
-			public const int c3w_250 = 2131230936;
+			public const int btn_style_one_focused = 2131230936;
 			
 			// aapt resource value: 0x7F0800D9
-			public const int c6c_250_1080 = 2131230937;
+			public const int btn_style_one_normal = 2131230937;
 			
 			// aapt resource value: 0x7F0800DA
-			public const int c6c_250_720 = 2131230938;
+			public const int btn_style_one_pressed = 2131230938;
 			
 			// aapt resource value: 0x7F0800DB
-			public const int c6h_250 = 2131230939;
+			public const int btn_white_selector = 2131230939;
 			
 			// aapt resource value: 0x7F0800DC
-			public const int c6p_250 = 2131230940;
+			public const int c3w_250 = 2131230940;
 			
 			// aapt resource value: 0x7F0800DD
-			public const int c6p_bg = 2131230941;
+			public const int c6c_250_1080 = 2131230941;
 			
 			// aapt resource value: 0x7F0800DE
-			public const int calendar_date_sel = 2131230942;
+			public const int c6c_250_720 = 2131230942;
 			
 			// aapt resource value: 0x7F0800DF
-			public const int calendar_date_today = 2131230943;
-			
-			// aapt resource value: 0x7F0800E7
-			public const int cameralist_add_camer_btn = 2131230951;
-			
-			// aapt resource value: 0x7F0800E8
-			public const int cameralist_add_camer_btn_sel = 2131230952;
-			
-			// aapt resource value: 0x7F0800E9
-			public const int cameralist_button_selector = 2131230953;
-			
-			// aapt resource value: 0x7F0800EA
-			public const int cameralist_history_video_selector = 2131230954;
-			
-			// aapt resource value: 0x7F0800EB
-			public const int cameralist_item_selector = 2131230955;
+			public const int c6h_250 = 2131230943;
 			
 			// aapt resource value: 0x7F0800E0
-			public const int camera_crop_height = 2131230944;
+			public const int c6p_250 = 2131230944;
 			
 			// aapt resource value: 0x7F0800E1
-			public const int camera_crop_width = 2131230945;
+			public const int c6p_bg = 2131230945;
 			
 			// aapt resource value: 0x7F0800E2
-			public const int camera_focus_ring_fail = 2131230946;
+			public const int calendar_date_sel = 2131230946;
 			
 			// aapt resource value: 0x7F0800E3
-			public const int camera_focus_ring_success = 2131230947;
+			public const int calendar_date_today = 2131230947;
 			
-			// aapt resource value: 0x7F0800E4
-			public const int camera_list_item = 2131230948;
-			
-			// aapt resource value: 0x7F0800E5
-			public const int camera_list_item_press = 2131230949;
-			
-			// aapt resource value: 0x7F0800E6
-			public const int camera_list_refresh = 2131230950;
+			// aapt resource value: 0x7F0800EB
+			public const int cameralist_add_camer_btn = 2131230955;
 			
 			// aapt resource value: 0x7F0800EC
-			public const int capture = 2131230956;
-			
-			// aapt resource value: 0x7F0800EF
-			public const int capturebtn_selector = 2131230959;
+			public const int cameralist_add_camer_btn_sel = 2131230956;
 			
 			// aapt resource value: 0x7F0800ED
-			public const int capture_disable = 2131230957;
+			public const int cameralist_button_selector = 2131230957;
 			
 			// aapt resource value: 0x7F0800EE
-			public const int capture_press = 2131230958;
+			public const int cameralist_history_video_selector = 2131230958;
+			
+			// aapt resource value: 0x7F0800EF
+			public const int cameralist_item_selector = 2131230959;
+			
+			// aapt resource value: 0x7F0800E4
+			public const int camera_crop_height = 2131230948;
+			
+			// aapt resource value: 0x7F0800E5
+			public const int camera_crop_width = 2131230949;
+			
+			// aapt resource value: 0x7F0800E6
+			public const int camera_focus_ring_fail = 2131230950;
+			
+			// aapt resource value: 0x7F0800E7
+			public const int camera_focus_ring_success = 2131230951;
+			
+			// aapt resource value: 0x7F0800E8
+			public const int camera_list_item = 2131230952;
+			
+			// aapt resource value: 0x7F0800E9
+			public const int camera_list_item_press = 2131230953;
+			
+			// aapt resource value: 0x7F0800EA
+			public const int camera_list_refresh = 2131230954;
 			
 			// aapt resource value: 0x7F0800F0
-			public const int cc_bg_black_round = 2131230960;
-			
-			// aapt resource value: 0x7F0800F2
-			public const int checkbox_btn_addbox_tip_selector = 2131230962;
+			public const int capture = 2131230960;
 			
 			// aapt resource value: 0x7F0800F3
-			public const int checkbox_btn_message_selector = 2131230963;
-			
-			// aapt resource value: 0x7F0800F4
-			public const int checkbox_btn_wifi_selector = 2131230964;
-			
-			// aapt resource value: 0x7F0800F5
-			public const int @checked = 2131230965;
+			public const int capturebtn_selector = 2131230963;
 			
 			// aapt resource value: 0x7F0800F1
-			public const int check_selector = 2131230961;
+			public const int capture_disable = 2131230961;
+			
+			// aapt resource value: 0x7F0800F2
+			public const int capture_press = 2131230962;
+			
+			// aapt resource value: 0x7F0800F4
+			public const int cc_bg_black_round = 2131230964;
 			
 			// aapt resource value: 0x7F0800F6
-			public const int circle_roate_drawable = 2131230966;
+			public const int checkbox_btn_addbox_tip_selector = 2131230966;
 			
 			// aapt resource value: 0x7F0800F7
-			public const int ckb_normal = 2131230967;
+			public const int checkbox_btn_message_selector = 2131230967;
 			
 			// aapt resource value: 0x7F0800F8
-			public const int ckb_selected = 2131230968;
+			public const int checkbox_btn_wifi_selector = 2131230968;
 			
 			// aapt resource value: 0x7F0800F9
-			public const int ckb_selector = 2131230969;
+			public const int @checked = 2131230969;
+			
+			// aapt resource value: 0x7F0800F5
+			public const int check_selector = 2131230965;
 			
 			// aapt resource value: 0x7F0800FA
-			public const int cloud_ad = 2131230970;
+			public const int circle_roate_drawable = 2131230970;
 			
 			// aapt resource value: 0x7F0800FB
-			public const int cloud_connecting = 2131230971;
+			public const int ckb_normal = 2131230971;
 			
 			// aapt resource value: 0x7F0800FC
-			public const int code = 2131230972;
+			public const int ckb_selected = 2131230972;
 			
 			// aapt resource value: 0x7F0800FD
-			public const int collect_btn_selector = 2131230973;
+			public const int ckb_selector = 2131230973;
 			
 			// aapt resource value: 0x7F0800FE
-			public const int collect_loading = 2131230974;
+			public const int cloud_ad = 2131230974;
 			
 			// aapt resource value: 0x7F0800FF
-			public const int common_border_bg = 2131230975;
+			public const int cloud_connecting = 2131230975;
 			
 			// aapt resource value: 0x7F080100
-			public const int common_border_bg_normal = 2131230976;
+			public const int code = 2131230976;
 			
 			// aapt resource value: 0x7F080101
-			public const int common_btn_bg_shape_gray = 2131230977;
+			public const int collect_btn_selector = 2131230977;
 			
 			// aapt resource value: 0x7F080102
-			public const int common_btn_bg_shape_white = 2131230978;
+			public const int collect_loading = 2131230978;
 			
 			// aapt resource value: 0x7F080103
-			public const int common_edit_text_cursor_bg = 2131230979;
+			public const int common_border_bg = 2131230979;
 			
 			// aapt resource value: 0x7F080104
-			public const int common_failhrlp_default = 2131230980;
+			public const int common_border_bg_normal = 2131230980;
 			
 			// aapt resource value: 0x7F080105
-			public const int common_icon_nav_back = 2131230981;
+			public const int common_btn_bg_shape_gray = 2131230981;
 			
 			// aapt resource value: 0x7F080106
-			public const int common_icon_nav_more = 2131230982;
+			public const int common_btn_bg_shape_white = 2131230982;
 			
 			// aapt resource value: 0x7F080107
-			public const int common_image_nav_refresh = 2131230983;
+			public const int common_edit_text_cursor_bg = 2131230983;
 			
 			// aapt resource value: 0x7F080108
-			public const int common_image_nav_refresh_disable = 2131230984;
+			public const int common_failhrlp_default = 2131230984;
 			
 			// aapt resource value: 0x7F080109
-			public const int common_image_nav_refresh_selector = 2131230985;
+			public const int common_icon_nav_back = 2131230985;
 			
 			// aapt resource value: 0x7F08010A
-			public const int common_image_nav_share = 2131230986;
+			public const int common_icon_nav_more = 2131230986;
 			
 			// aapt resource value: 0x7F08010B
-			public const int common_image_nav_title_left = 2131230987;
+			public const int common_image_nav_refresh = 2131230987;
 			
 			// aapt resource value: 0x7F08010C
-			public const int common_image_nav_title_right = 2131230988;
+			public const int common_image_nav_refresh_disable = 2131230988;
 			
 			// aapt resource value: 0x7F08010D
-			public const int common_list_item_bg_h = 2131230989;
+			public const int common_image_nav_refresh_selector = 2131230989;
 			
 			// aapt resource value: 0x7F08010E
-			public const int common_list_item_bg_n = 2131230990;
+			public const int common_image_nav_share = 2131230990;
 			
 			// aapt resource value: 0x7F08010F
-			public const int common_list_item_bg_selector = 2131230991;
+			public const int common_image_nav_title_left = 2131230991;
 			
 			// aapt resource value: 0x7F080110
-			public const int common_loading = 2131230992;
+			public const int common_image_nav_title_right = 2131230992;
 			
 			// aapt resource value: 0x7F080111
-			public const int common_loading_indeterminate = 2131230993;
+			public const int common_list_item_bg_h = 2131230993;
 			
 			// aapt resource value: 0x7F080112
-			public const int common_netsetting_power = 2131230994;
+			public const int common_list_item_bg_n = 2131230994;
 			
 			// aapt resource value: 0x7F080113
-			public const int common_newmessage = 2131230995;
+			public const int common_list_item_bg_selector = 2131230995;
 			
 			// aapt resource value: 0x7F080114
-			public const int common_nullpic_nonetwork = 2131230996;
+			public const int common_loading = 2131230996;
 			
 			// aapt resource value: 0x7F080115
-			public const int common_number_bg = 2131230997;
+			public const int common_loading_indeterminate = 2131230997;
 			
 			// aapt resource value: 0x7F080116
-			public const int common_refresh = 2131230998;
+			public const int common_netsetting_power = 2131230998;
 			
 			// aapt resource value: 0x7F080117
-			public const int common_refresh_indeterminate = 2131230999;
+			public const int common_newmessage = 2131230999;
 			
 			// aapt resource value: 0x7F080118
-			public const int common_switch_btn_selector = 2131231000;
+			public const int common_nullpic_nonetwork = 2131231000;
 			
 			// aapt resource value: 0x7F080119
-			public const int common_title = 2131231001;
+			public const int common_number_bg = 2131231001;
 			
 			// aapt resource value: 0x7F08011A
-			public const int common_title_back = 2131231002;
+			public const int common_refresh = 2131231002;
 			
 			// aapt resource value: 0x7F08011B
-			public const int common_title_back_dark = 2131231003;
+			public const int common_refresh_indeterminate = 2131231003;
 			
 			// aapt resource value: 0x7F08011C
-			public const int common_title_back_sel = 2131231004;
+			public const int common_switch_btn_selector = 2131231004;
 			
 			// aapt resource value: 0x7F08011D
-			public const int common_title_back_selector = 2131231005;
+			public const int common_title = 2131231005;
 			
 			// aapt resource value: 0x7F08011E
-			public const int common_title_cancel = 2131231006;
+			public const int common_title_back = 2131231006;
 			
 			// aapt resource value: 0x7F08011F
-			public const int common_title_cancel_sel = 2131231007;
+			public const int common_title_back_dark = 2131231007;
 			
 			// aapt resource value: 0x7F080120
-			public const int common_title_cancel_selector = 2131231008;
+			public const int common_title_back_sel = 2131231008;
 			
 			// aapt resource value: 0x7F080121
-			public const int common_title_confirm = 2131231009;
+			public const int common_title_back_selector = 2131231009;
 			
 			// aapt resource value: 0x7F080122
-			public const int common_title_confirm_dis = 2131231010;
+			public const int common_title_cancel = 2131231010;
 			
 			// aapt resource value: 0x7F080123
-			public const int common_title_confirm_sel = 2131231011;
+			public const int common_title_cancel_sel = 2131231011;
 			
 			// aapt resource value: 0x7F080124
-			public const int common_title_input = 2131231012;
+			public const int common_title_cancel_selector = 2131231012;
 			
 			// aapt resource value: 0x7F080125
-			public const int common_title_input_sel = 2131231013;
+			public const int common_title_confirm = 2131231013;
 			
 			// aapt resource value: 0x7F080126
-			public const int common_title_input_selector = 2131231014;
+			public const int common_title_confirm_dis = 2131231014;
 			
 			// aapt resource value: 0x7F080127
-			public const int common_title_more = 2131231015;
+			public const int common_title_confirm_sel = 2131231015;
 			
 			// aapt resource value: 0x7F080128
-			public const int common_title_more_sel = 2131231016;
+			public const int common_title_input = 2131231016;
 			
 			// aapt resource value: 0x7F080129
-			public const int common_title_refresh = 2131231017;
+			public const int common_title_input_sel = 2131231017;
 			
 			// aapt resource value: 0x7F08012A
-			public const int common_title_refresh_selector = 2131231018;
+			public const int common_title_input_selector = 2131231018;
 			
 			// aapt resource value: 0x7F08012B
-			public const int common_title_setup = 2131231019;
+			public const int common_title_more = 2131231019;
 			
 			// aapt resource value: 0x7F08012C
-			public const int common_title_setup_dis = 2131231020;
+			public const int common_title_more_sel = 2131231020;
 			
 			// aapt resource value: 0x7F08012D
-			public const int common_title_setup_sel = 2131231021;
+			public const int common_title_refresh = 2131231021;
 			
 			// aapt resource value: 0x7F08012E
-			public const int common_title_setup_selector = 2131231022;
+			public const int common_title_refresh_selector = 2131231022;
 			
 			// aapt resource value: 0x7F08012F
-			public const int common_title_share = 2131231023;
+			public const int common_title_setup = 2131231023;
 			
 			// aapt resource value: 0x7F080130
-			public const int common_title_share_dark = 2131231024;
+			public const int common_title_setup_dis = 2131231024;
 			
 			// aapt resource value: 0x7F080131
-			public const int common_title_share_sel = 2131231025;
+			public const int common_title_setup_sel = 2131231025;
 			
 			// aapt resource value: 0x7F080132
-			public const int common_title_switch = 2131231026;
+			public const int common_title_setup_selector = 2131231026;
 			
 			// aapt resource value: 0x7F080133
-			public const int common_title_vertical_more = 2131231027;
+			public const int common_title_share = 2131231027;
 			
 			// aapt resource value: 0x7F080134
-			public const int common_title_vertical_more_dark = 2131231028;
+			public const int common_title_share_dark = 2131231028;
 			
 			// aapt resource value: 0x7F080135
-			public const int common_title_vertical_more_dark_dis = 2131231029;
+			public const int common_title_share_sel = 2131231029;
 			
 			// aapt resource value: 0x7F080136
-			public const int common_title_vertical_more_dark_selector = 2131231030;
+			public const int common_title_switch = 2131231030;
 			
 			// aapt resource value: 0x7F080137
-			public const int common_title_vertical_more_sel = 2131231031;
+			public const int common_title_vertical_more = 2131231031;
 			
 			// aapt resource value: 0x7F080138
-			public const int connect_img1 = 2131231032;
+			public const int common_title_vertical_more_dark = 2131231032;
 			
 			// aapt resource value: 0x7F080139
-			public const int connect_img2 = 2131231033;
+			public const int common_title_vertical_more_dark_dis = 2131231033;
 			
 			// aapt resource value: 0x7F08013A
-			public const int connect_reset = 2131231034;
+			public const int common_title_vertical_more_dark_selector = 2131231034;
 			
 			// aapt resource value: 0x7F08013B
-			public const int connect_wifi1 = 2131231035;
+			public const int common_title_vertical_more_sel = 2131231035;
 			
 			// aapt resource value: 0x7F08013C
-			public const int connect_wifi2 = 2131231036;
+			public const int connect_img1 = 2131231036;
 			
 			// aapt resource value: 0x7F08013D
-			public const int connect_wifi3 = 2131231037;
+			public const int connect_img2 = 2131231037;
 			
 			// aapt resource value: 0x7F08013E
-			public const int connect_wifi4 = 2131231038;
+			public const int connect_reset = 2131231038;
 			
 			// aapt resource value: 0x7F08013F
-			public const int connect_wifi_bg = 2131231039;
+			public const int connect_wifi1 = 2131231039;
 			
 			// aapt resource value: 0x7F080140
-			public const int control_bar_bg = 2131231040;
+			public const int connect_wifi2 = 2131231040;
 			
 			// aapt resource value: 0x7F080141
-			public const int decode_failed_tip_bg = 2131231041;
+			public const int connect_wifi3 = 2131231041;
 			
 			// aapt resource value: 0x7F080142
-			public const int defalut_alarm = 2131231042;
+			public const int connect_wifi4 = 2131231042;
 			
 			// aapt resource value: 0x7F080143
-			public const int default_cover_02 = 2131231043;
+			public const int connect_wifi_bg = 2131231043;
 			
 			// aapt resource value: 0x7F080144
-			public const int default_cover_small = 2131231044;
+			public const int control_bar_bg = 2131231044;
 			
 			// aapt resource value: 0x7F080145
-			public const int default_figure = 2131231045;
+			public const int decode_failed_tip_bg = 2131231045;
 			
 			// aapt resource value: 0x7F080146
-			public const int default_ptr_flip = 2131231046;
+			public const int defalut_alarm = 2131231046;
 			
 			// aapt resource value: 0x7F080147
-			public const int default_ptr_rotate = 2131231047;
+			public const int default_cover_02 = 2131231047;
 			
 			// aapt resource value: 0x7F080148
-			public const int del_button = 2131231048;
+			public const int default_cover_small = 2131231048;
 			
 			// aapt resource value: 0x7F080149
-			public const int del_button_dis = 2131231049;
+			public const int default_figure = 2131231049;
 			
 			// aapt resource value: 0x7F08014A
-			public const int del_button_sel = 2131231050;
+			public const int default_ptr_flip = 2131231050;
 			
 			// aapt resource value: 0x7F08014B
-			public const int del_button_selector = 2131231051;
-			
-			// aapt resource value: 0x7F08014C
-			public const int design_bottom_navigation_item_background = 2131231052;
-			
-			// aapt resource value: 0x7F08014D
-			public const int design_fab_background = 2131231053;
-			
-			// aapt resource value: 0x7F08014E
-			public const int design_ic_visibility = 2131231054;
-			
-			// aapt resource value: 0x7F08014F
-			public const int design_ic_visibility_off = 2131231055;
+			public const int default_ptr_rotate = 2131231051;
 			
 			// aapt resource value: 0x7F080150
-			public const int design_password_eye = 2131231056;
+			public const int delete_button_bg = 2131231056;
+			
+			// aapt resource value: 0x7F08014C
+			public const int del_button = 2131231052;
+			
+			// aapt resource value: 0x7F08014D
+			public const int del_button_dis = 2131231053;
+			
+			// aapt resource value: 0x7F08014E
+			public const int del_button_sel = 2131231054;
+			
+			// aapt resource value: 0x7F08014F
+			public const int del_button_selector = 2131231055;
 			
 			// aapt resource value: 0x7F080151
-			public const int design_snackbar_background = 2131231057;
-			
-			// aapt resource value: 0x7F0801CB
-			public const int devicedetail_wifi_1singal = 2131231179;
-			
-			// aapt resource value: 0x7F0801CC
-			public const int devicedetail_wifi_1singal_lock = 2131231180;
-			
-			// aapt resource value: 0x7F0801CD
-			public const int devicedetail_wifi_2singal = 2131231181;
-			
-			// aapt resource value: 0x7F0801CE
-			public const int devicedetail_wifi_2singal_lock = 2131231182;
-			
-			// aapt resource value: 0x7F0801CF
-			public const int devicedetail_wifi_3singal = 2131231183;
-			
-			// aapt resource value: 0x7F0801D0
-			public const int devicedetail_wifi_3singal_lock = 2131231184;
-			
-			// aapt resource value: 0x7F0801D1
-			public const int devicedetail_wifi_nosingal = 2131231185;
-			
-			// aapt resource value: 0x7F0801D2
-			public const int devicedetail_wifi_nosingal_lock = 2131231186;
-			
-			// aapt resource value: 0x7F0801D3
-			public const int devicemanage_icon_search = 2131231187;
+			public const int design_bottom_navigation_item_background = 2131231057;
 			
 			// aapt resource value: 0x7F080152
-			public const int device_16_nvr_bg = 2131231058;
+			public const int design_fab_background = 2131231058;
 			
 			// aapt resource value: 0x7F080153
-			public const int device_4_dvr_bg = 2131231059;
+			public const int design_ic_visibility = 2131231059;
 			
 			// aapt resource value: 0x7F080154
-			public const int device_4_nvr_bg = 2131231060;
+			public const int design_ic_visibility_off = 2131231060;
 			
 			// aapt resource value: 0x7F080155
-			public const int device_5k_vr104d = 2131231061;
+			public const int design_password_eye = 2131231061;
 			
 			// aapt resource value: 0x7F080156
-			public const int device_5k_vr104d_bg = 2131231062;
+			public const int design_snackbar_background = 2131231062;
 			
-			// aapt resource value: 0x7F080157
-			public const int device_5k_vr116d = 2131231063;
+			// aapt resource value: 0x7F0801D0
+			public const int devicedetail_wifi_1singal = 2131231184;
 			
-			// aapt resource value: 0x7F080158
-			public const int device_5k_vr116d_bg = 2131231064;
+			// aapt resource value: 0x7F0801D1
+			public const int devicedetail_wifi_1singal_lock = 2131231185;
 			
-			// aapt resource value: 0x7F080159
-			public const int device_8_16dvr_bg = 2131231065;
+			// aapt resource value: 0x7F0801D2
+			public const int devicedetail_wifi_2singal = 2131231186;
 			
-			// aapt resource value: 0x7F08015A
-			public const int device_a1 = 2131231066;
-			
-			// aapt resource value: 0x7F08015C
-			public const int device_a1c = 2131231068;
-			
-			// aapt resource value: 0x7F08015D
-			public const int device_a1c_bg = 2131231069;
-			
-			// aapt resource value: 0x7F08015E
-			public const int device_a1s = 2131231070;
-			
-			// aapt resource value: 0x7F08015F
-			public const int device_a1s_bg = 2131231071;
-			
-			// aapt resource value: 0x7F08015B
-			public const int device_a1_bg = 2131231067;
-			
-			// aapt resource value: 0x7F080160
-			public const int device_alertor = 2131231072;
-			
-			// aapt resource value: 0x7F080161
-			public const int device_baidu_c2s = 2131231073;
-			
-			// aapt resource value: 0x7F080162
-			public const int device_body_wifi_list_lock = 2131231074;
-			
-			// aapt resource value: 0x7F080163
-			public const int device_c1 = 2131231075;
-			
-			// aapt resource value: 0x7F080164
-			public const int device_c1_rotate = 2131231076;
-			
-			// aapt resource value: 0x7F080165
-			public const int device_c2 = 2131231077;
-			
-			// aapt resource value: 0x7F080168
-			public const int device_c2c = 2131231080;
-			
-			// aapt resource value: 0x7F080169
-			public const int device_c2mini = 2131231081;
-			
-			// aapt resource value: 0x7F08016A
-			public const int device_c2mini2 = 2131231082;
-			
-			// aapt resource value: 0x7F08016B
-			public const int device_c2plus = 2131231083;
-			
-			// aapt resource value: 0x7F08016C
-			public const int device_c2plus_bg = 2131231084;
-			
-			// aapt resource value: 0x7F08016D
-			public const int device_c2s = 2131231085;
-			
-			// aapt resource value: 0x7F08016E
-			public const int device_c2w = 2131231086;
-			
-			// aapt resource value: 0x7F080166
-			public const int device_c2_2 = 2131231078;
-			
-			// aapt resource value: 0x7F080167
-			public const int device_c2_usa = 2131231079;
-			
-			// aapt resource value: 0x7F08016F
-			public const int device_c3 = 2131231087;
-			
-			// aapt resource value: 0x7F080170
-			public const int device_c3c = 2131231088;
-			
-			// aapt resource value: 0x7F080171
-			public const int device_c3e = 2131231089;
-			
-			// aapt resource value: 0x7F080172
-			public const int device_c3e_bg = 2131231090;
-			
-			// aapt resource value: 0x7F080173
-			public const int device_c3s = 2131231091;
-			
-			// aapt resource value: 0x7F080174
-			public const int device_c4 = 2131231092;
-			
-			// aapt resource value: 0x7F080175
-			public const int device_c4c = 2131231093;
-			
-			// aapt resource value: 0x7F080176
-			public const int device_c4c_bg = 2131231094;
-			
-			// aapt resource value: 0x7F080177
-			public const int device_c4e = 2131231095;
-			
-			// aapt resource value: 0x7F080178
-			public const int device_c4e_bg = 2131231096;
-			
-			// aapt resource value: 0x7F080179
-			public const int device_c4s = 2131231097;
-			
-			// aapt resource value: 0x7F08017A
-			public const int device_c6 = 2131231098;
-			
-			// aapt resource value: 0x7F08017B
-			public const int device_c6c = 2131231099;
-			
-			// aapt resource value: 0x7F08017C
-			public const int device_c6c_1 = 2131231100;
-			
-			// aapt resource value: 0x7F08017D
-			public const int device_c6c_2 = 2131231101;
-			
-			// aapt resource value: 0x7F08017E
-			public const int device_c6h = 2131231102;
-			
-			// aapt resource value: 0x7F08017F
-			public const int device_c6p = 2131231103;
-			
-			// aapt resource value: 0x7F080180
-			public const int device_c6t_bg = 2131231104;
-			
-			// aapt resource value: 0x7F080181
-			public const int device_callhelp = 2131231105;
-			
-			// aapt resource value: 0x7F080182
-			public const int device_co2 = 2131231106;
-			
-			// aapt resource value: 0x7F080183
-			public const int device_cs_c3w = 2131231107;
-			
-			// aapt resource value: 0x7F080184
-			public const int device_cs_vr104d = 2131231108;
-			
-			// aapt resource value: 0x7F080185
-			public const int device_cs_vr108d = 2131231109;
-			
-			// aapt resource value: 0x7F080186
-			public const int device_cs_vr116d = 2131231110;
-			
-			// aapt resource value: 0x7F080187
-			public const int device_curtain = 2131231111;
-			
-			// aapt resource value: 0x7F080188
-			public const int device_d1 = 2131231112;
-			
-			// aapt resource value: 0x7F080189
-			public const int device_d1_bg = 2131231113;
-			
-			// aapt resource value: 0x7F08018A
-			public const int device_default_details = 2131231114;
-			
-			// aapt resource value: 0x7F08018B
-			public const int device_dh1 = 2131231115;
-			
-			// aapt resource value: 0x7F08018C
-			public const int device_door = 2131231116;
-			
-			// aapt resource value: 0x7F08018D
-			public const int device_doorbell = 2131231117;
-			
-			// aapt resource value: 0x7F08018E
-			public const int device_doorbell_hik = 2131231118;
-			
-			// aapt resource value: 0x7F08018F
-			public const int device_dvr = 2131231119;
-			
-			// aapt resource value: 0x7F080190
-			public const int device_f1 = 2131231120;
-			
-			// aapt resource value: 0x7F080191
-			public const int device_gas = 2131231121;
-			
-			// aapt resource value: 0x7F080192
-			public const int device_h2c = 2131231122;
-			
-			// aapt resource value: 0x7F080193
-			public const int device_h2s = 2131231123;
-			
-			// aapt resource value: 0x7F080194
-			public const int device_infrared = 2131231124;
-			
-			// aapt resource value: 0x7F080195
-			public const int device_ipc_dome = 2131231125;
-			
-			// aapt resource value: 0x7F080196
-			public const int device_keyboard = 2131231126;
-			
-			// aapt resource value: 0x7F080197
-			public const int device_light = 2131231127;
-			
-			// aapt resource value: 0x7F080198
-			public const int device_manager_icon_nextarrow = 2131231128;
-			
-			// aapt resource value: 0x7F080199
-			public const int device_mini_360_plus = 2131231129;
-			
-			// aapt resource value: 0x7F08019A
-			public const int device_mini_trooper = 2131231130;
-			
-			// aapt resource value: 0x7F08019B
-			public const int device_move_magnetometer = 2131231131;
-			
-			// aapt resource value: 0x7F08019C
-			public const int device_n1 = 2131231132;
-			
-			// aapt resource value: 0x7F08019D
-			public const int device_n1w = 2131231133;
-			
-			// aapt resource value: 0x7F08019E
-			public const int device_n1w_bg = 2131231134;
-			
-			// aapt resource value: 0x7F08019F
-			public const int device_normal = 2131231135;
-			
-			// aapt resource value: 0x7F0801A0
-			public const int device_offline = 2131231136;
-			
-			// aapt resource value: 0x7F0801A1
-			public const int device_other = 2131231137;
-			
-			// aapt resource value: 0x7F0801A2
-			public const int device_pic_4_dvr = 2131231138;
-			
-			// aapt resource value: 0x7F0801A3
-			public const int device_pic_4_nvr = 2131231139;
-			
-			// aapt resource value: 0x7F0801A4
-			public const int device_pic_8_16_dvr = 2131231140;
-			
-			// aapt resource value: 0x7F0801A5
-			public const int device_pic_8_16_nvr = 2131231141;
-			
-			// aapt resource value: 0x7F0801A6
-			public const int device_r1 = 2131231142;
-			
-			// aapt resource value: 0x7F0801A7
-			public const int device_r1_bg = 2131231143;
-			
-			// aapt resource value: 0x7F0801A8
-			public const int device_r2 = 2131231144;
-			
-			// aapt resource value: 0x7F0801A9
-			public const int device_r2_bg = 2131231145;
-			
-			// aapt resource value: 0x7F0801AA
-			public const int device_remote = 2131231146;
-			
-			// aapt resource value: 0x7F0801AB
-			public const int device_smoke = 2131231147;
-			
-			// aapt resource value: 0x7F0801AC
-			public const int device_vr104d_bg = 2131231148;
-			
-			// aapt resource value: 0x7F0801AD
-			public const int device_vr108d_bg = 2131231149;
-			
-			// aapt resource value: 0x7F0801AE
-			public const int device_vr116d_bg = 2131231150;
-			
-			// aapt resource value: 0x7F0801AF
-			public const int device_w1 = 2131231151;
-			
-			// aapt resource value: 0x7F0801B0
-			public const int device_w2d = 2131231152;
-			
-			// aapt resource value: 0x7F0801B1
-			public const int device_w2d_bg = 2131231153;
-			
-			// aapt resource value: 0x7F0801B2
-			public const int device_w2s = 2131231154;
-			
-			// aapt resource value: 0x7F0801B3
-			public const int device_w2s_bg = 2131231155;
-			
-			// aapt resource value: 0x7F0801B4
-			public const int device_w3 = 2131231156;
-			
-			// aapt resource value: 0x7F0801B5
-			public const int device_w3_details = 2131231157;
-			
-			// aapt resource value: 0x7F0801B6
-			public const int device_water = 2131231158;
-			
-			// aapt resource value: 0x7F0801B7
-			public const int device_wifi = 2131231159;
-			
-			// aapt resource value: 0x7F0801B8
-			public const int device_wifi2 = 2131231160;
-			
-			// aapt resource value: 0x7F0801B9
-			public const int device_wifi3 = 2131231161;
-			
-			// aapt resource value: 0x7F0801BA
-			public const int device_wlb = 2131231162;
-			
-			// aapt resource value: 0x7F0801BB
-			public const int device_wlb_bg = 2131231163;
-			
-			// aapt resource value: 0x7F0801BC
-			public const int device_x1 = 2131231164;
-			
-			// aapt resource value: 0x7F0801BD
-			public const int device_x1_bg = 2131231165;
-			
-			// aapt resource value: 0x7F0801BE
-			public const int device_x2 = 2131231166;
-			
-			// aapt resource value: 0x7F0801BF
-			public const int device_x2_bg = 2131231167;
-			
-			// aapt resource value: 0x7F0801C0
-			public const int device_x3 = 2131231168;
-			
-			// aapt resource value: 0x7F0801C2
-			public const int device_x3c = 2131231170;
-			
-			// aapt resource value: 0x7F0801C3
-			public const int device_x3c_bg = 2131231171;
-			
-			// aapt resource value: 0x7F0801C1
-			public const int device_x3_bg = 2131231169;
-			
-			// aapt resource value: 0x7F0801C4
-			public const int device_x4 = 2131231172;
-			
-			// aapt resource value: 0x7F0801C5
-			public const int device_x4_bg = 2131231173;
-			
-			// aapt resource value: 0x7F0801C8
-			public const int device_x5c = 2131231176;
-			
-			// aapt resource value: 0x7F0801C9
-			public const int device_x5c_bg = 2131231177;
-			
-			// aapt resource value: 0x7F0801C6
-			public const int device_x5_108tp = 2131231174;
-			
-			// aapt resource value: 0x7F0801C7
-			public const int device_x5_108tp_bg = 2131231175;
-			
-			// aapt resource value: 0x7F0801CA
-			public const int device_z1 = 2131231178;
+			// aapt resource value: 0x7F0801D3
+			public const int devicedetail_wifi_2singal_lock = 2131231187;
 			
 			// aapt resource value: 0x7F0801D4
-			public const int dialog_background = 2131231188;
+			public const int devicedetail_wifi_3singal = 2131231188;
 			
 			// aapt resource value: 0x7F0801D5
-			public const int dialog_background2 = 2131231189;
+			public const int devicedetail_wifi_3singal_lock = 2131231189;
 			
 			// aapt resource value: 0x7F0801D6
-			public const int dialog_cancle_btn_bg = 2131231190;
+			public const int devicedetail_wifi_nosingal = 2131231190;
 			
 			// aapt resource value: 0x7F0801D7
-			public const int dialog_conform_btn_bg = 2131231191;
+			public const int devicedetail_wifi_nosingal_lock = 2131231191;
 			
 			// aapt resource value: 0x7F0801D8
-			public const int display_frame = 2131231192;
+			public const int devicemanage_icon_search = 2131231192;
 			
-			// aapt resource value: 0x7F0801DB
-			public const int download8 = 2131231195;
+			// aapt resource value: 0x7F080157
+			public const int device_16_nvr_bg = 2131231063;
+			
+			// aapt resource value: 0x7F080158
+			public const int device_4_dvr_bg = 2131231064;
+			
+			// aapt resource value: 0x7F080159
+			public const int device_4_nvr_bg = 2131231065;
+			
+			// aapt resource value: 0x7F08015A
+			public const int device_5k_vr104d = 2131231066;
+			
+			// aapt resource value: 0x7F08015B
+			public const int device_5k_vr104d_bg = 2131231067;
+			
+			// aapt resource value: 0x7F08015C
+			public const int device_5k_vr116d = 2131231068;
+			
+			// aapt resource value: 0x7F08015D
+			public const int device_5k_vr116d_bg = 2131231069;
+			
+			// aapt resource value: 0x7F08015E
+			public const int device_8_16dvr_bg = 2131231070;
+			
+			// aapt resource value: 0x7F08015F
+			public const int device_a1 = 2131231071;
+			
+			// aapt resource value: 0x7F080161
+			public const int device_a1c = 2131231073;
+			
+			// aapt resource value: 0x7F080162
+			public const int device_a1c_bg = 2131231074;
+			
+			// aapt resource value: 0x7F080163
+			public const int device_a1s = 2131231075;
+			
+			// aapt resource value: 0x7F080164
+			public const int device_a1s_bg = 2131231076;
+			
+			// aapt resource value: 0x7F080160
+			public const int device_a1_bg = 2131231072;
+			
+			// aapt resource value: 0x7F080165
+			public const int device_alertor = 2131231077;
+			
+			// aapt resource value: 0x7F080166
+			public const int device_baidu_c2s = 2131231078;
+			
+			// aapt resource value: 0x7F080167
+			public const int device_body_wifi_list_lock = 2131231079;
+			
+			// aapt resource value: 0x7F080168
+			public const int device_c1 = 2131231080;
+			
+			// aapt resource value: 0x7F080169
+			public const int device_c1_rotate = 2131231081;
+			
+			// aapt resource value: 0x7F08016A
+			public const int device_c2 = 2131231082;
+			
+			// aapt resource value: 0x7F08016D
+			public const int device_c2c = 2131231085;
+			
+			// aapt resource value: 0x7F08016E
+			public const int device_c2mini = 2131231086;
+			
+			// aapt resource value: 0x7F08016F
+			public const int device_c2mini2 = 2131231087;
+			
+			// aapt resource value: 0x7F080170
+			public const int device_c2plus = 2131231088;
+			
+			// aapt resource value: 0x7F080171
+			public const int device_c2plus_bg = 2131231089;
+			
+			// aapt resource value: 0x7F080172
+			public const int device_c2s = 2131231090;
+			
+			// aapt resource value: 0x7F080173
+			public const int device_c2w = 2131231091;
+			
+			// aapt resource value: 0x7F08016B
+			public const int device_c2_2 = 2131231083;
+			
+			// aapt resource value: 0x7F08016C
+			public const int device_c2_usa = 2131231084;
+			
+			// aapt resource value: 0x7F080174
+			public const int device_c3 = 2131231092;
+			
+			// aapt resource value: 0x7F080175
+			public const int device_c3c = 2131231093;
+			
+			// aapt resource value: 0x7F080176
+			public const int device_c3e = 2131231094;
+			
+			// aapt resource value: 0x7F080177
+			public const int device_c3e_bg = 2131231095;
+			
+			// aapt resource value: 0x7F080178
+			public const int device_c3s = 2131231096;
+			
+			// aapt resource value: 0x7F080179
+			public const int device_c4 = 2131231097;
+			
+			// aapt resource value: 0x7F08017A
+			public const int device_c4c = 2131231098;
+			
+			// aapt resource value: 0x7F08017B
+			public const int device_c4c_bg = 2131231099;
+			
+			// aapt resource value: 0x7F08017C
+			public const int device_c4e = 2131231100;
+			
+			// aapt resource value: 0x7F08017D
+			public const int device_c4e_bg = 2131231101;
+			
+			// aapt resource value: 0x7F08017E
+			public const int device_c4s = 2131231102;
+			
+			// aapt resource value: 0x7F08017F
+			public const int device_c6 = 2131231103;
+			
+			// aapt resource value: 0x7F080180
+			public const int device_c6c = 2131231104;
+			
+			// aapt resource value: 0x7F080181
+			public const int device_c6c_1 = 2131231105;
+			
+			// aapt resource value: 0x7F080182
+			public const int device_c6c_2 = 2131231106;
+			
+			// aapt resource value: 0x7F080183
+			public const int device_c6h = 2131231107;
+			
+			// aapt resource value: 0x7F080184
+			public const int device_c6p = 2131231108;
+			
+			// aapt resource value: 0x7F080185
+			public const int device_c6t_bg = 2131231109;
+			
+			// aapt resource value: 0x7F080186
+			public const int device_callhelp = 2131231110;
+			
+			// aapt resource value: 0x7F080187
+			public const int device_co2 = 2131231111;
+			
+			// aapt resource value: 0x7F080188
+			public const int device_cs_c3w = 2131231112;
+			
+			// aapt resource value: 0x7F080189
+			public const int device_cs_vr104d = 2131231113;
+			
+			// aapt resource value: 0x7F08018A
+			public const int device_cs_vr108d = 2131231114;
+			
+			// aapt resource value: 0x7F08018B
+			public const int device_cs_vr116d = 2131231115;
+			
+			// aapt resource value: 0x7F08018C
+			public const int device_curtain = 2131231116;
+			
+			// aapt resource value: 0x7F08018D
+			public const int device_d1 = 2131231117;
+			
+			// aapt resource value: 0x7F08018E
+			public const int device_d1_bg = 2131231118;
+			
+			// aapt resource value: 0x7F08018F
+			public const int device_default_details = 2131231119;
+			
+			// aapt resource value: 0x7F080190
+			public const int device_dh1 = 2131231120;
+			
+			// aapt resource value: 0x7F080191
+			public const int device_door = 2131231121;
+			
+			// aapt resource value: 0x7F080192
+			public const int device_doorbell = 2131231122;
+			
+			// aapt resource value: 0x7F080193
+			public const int device_doorbell_hik = 2131231123;
+			
+			// aapt resource value: 0x7F080194
+			public const int device_dvr = 2131231124;
+			
+			// aapt resource value: 0x7F080195
+			public const int device_f1 = 2131231125;
+			
+			// aapt resource value: 0x7F080196
+			public const int device_gas = 2131231126;
+			
+			// aapt resource value: 0x7F080197
+			public const int device_h2c = 2131231127;
+			
+			// aapt resource value: 0x7F080198
+			public const int device_h2s = 2131231128;
+			
+			// aapt resource value: 0x7F080199
+			public const int device_infrared = 2131231129;
+			
+			// aapt resource value: 0x7F08019A
+			public const int device_ipc_dome = 2131231130;
+			
+			// aapt resource value: 0x7F08019B
+			public const int device_keyboard = 2131231131;
+			
+			// aapt resource value: 0x7F08019C
+			public const int device_light = 2131231132;
+			
+			// aapt resource value: 0x7F08019D
+			public const int device_manager_icon_nextarrow = 2131231133;
+			
+			// aapt resource value: 0x7F08019E
+			public const int device_mini_360_plus = 2131231134;
+			
+			// aapt resource value: 0x7F08019F
+			public const int device_mini_trooper = 2131231135;
+			
+			// aapt resource value: 0x7F0801A0
+			public const int device_move_magnetometer = 2131231136;
+			
+			// aapt resource value: 0x7F0801A1
+			public const int device_n1 = 2131231137;
+			
+			// aapt resource value: 0x7F0801A2
+			public const int device_n1w = 2131231138;
+			
+			// aapt resource value: 0x7F0801A3
+			public const int device_n1w_bg = 2131231139;
+			
+			// aapt resource value: 0x7F0801A4
+			public const int device_normal = 2131231140;
+			
+			// aapt resource value: 0x7F0801A5
+			public const int device_offline = 2131231141;
+			
+			// aapt resource value: 0x7F0801A6
+			public const int device_other = 2131231142;
+			
+			// aapt resource value: 0x7F0801A7
+			public const int device_pic_4_dvr = 2131231143;
+			
+			// aapt resource value: 0x7F0801A8
+			public const int device_pic_4_nvr = 2131231144;
+			
+			// aapt resource value: 0x7F0801A9
+			public const int device_pic_8_16_dvr = 2131231145;
+			
+			// aapt resource value: 0x7F0801AA
+			public const int device_pic_8_16_nvr = 2131231146;
+			
+			// aapt resource value: 0x7F0801AB
+			public const int device_r1 = 2131231147;
+			
+			// aapt resource value: 0x7F0801AC
+			public const int device_r1_bg = 2131231148;
+			
+			// aapt resource value: 0x7F0801AD
+			public const int device_r2 = 2131231149;
+			
+			// aapt resource value: 0x7F0801AE
+			public const int device_r2_bg = 2131231150;
+			
+			// aapt resource value: 0x7F0801AF
+			public const int device_remote = 2131231151;
+			
+			// aapt resource value: 0x7F0801B0
+			public const int device_smoke = 2131231152;
+			
+			// aapt resource value: 0x7F0801B1
+			public const int device_vr104d_bg = 2131231153;
+			
+			// aapt resource value: 0x7F0801B2
+			public const int device_vr108d_bg = 2131231154;
+			
+			// aapt resource value: 0x7F0801B3
+			public const int device_vr116d_bg = 2131231155;
+			
+			// aapt resource value: 0x7F0801B4
+			public const int device_w1 = 2131231156;
+			
+			// aapt resource value: 0x7F0801B5
+			public const int device_w2d = 2131231157;
+			
+			// aapt resource value: 0x7F0801B6
+			public const int device_w2d_bg = 2131231158;
+			
+			// aapt resource value: 0x7F0801B7
+			public const int device_w2s = 2131231159;
+			
+			// aapt resource value: 0x7F0801B8
+			public const int device_w2s_bg = 2131231160;
+			
+			// aapt resource value: 0x7F0801B9
+			public const int device_w3 = 2131231161;
+			
+			// aapt resource value: 0x7F0801BA
+			public const int device_w3_details = 2131231162;
+			
+			// aapt resource value: 0x7F0801BB
+			public const int device_water = 2131231163;
+			
+			// aapt resource value: 0x7F0801BC
+			public const int device_wifi = 2131231164;
+			
+			// aapt resource value: 0x7F0801BD
+			public const int device_wifi2 = 2131231165;
+			
+			// aapt resource value: 0x7F0801BE
+			public const int device_wifi3 = 2131231166;
+			
+			// aapt resource value: 0x7F0801BF
+			public const int device_wlb = 2131231167;
+			
+			// aapt resource value: 0x7F0801C0
+			public const int device_wlb_bg = 2131231168;
+			
+			// aapt resource value: 0x7F0801C1
+			public const int device_x1 = 2131231169;
+			
+			// aapt resource value: 0x7F0801C2
+			public const int device_x1_bg = 2131231170;
+			
+			// aapt resource value: 0x7F0801C3
+			public const int device_x2 = 2131231171;
+			
+			// aapt resource value: 0x7F0801C4
+			public const int device_x2_bg = 2131231172;
+			
+			// aapt resource value: 0x7F0801C5
+			public const int device_x3 = 2131231173;
+			
+			// aapt resource value: 0x7F0801C7
+			public const int device_x3c = 2131231175;
+			
+			// aapt resource value: 0x7F0801C8
+			public const int device_x3c_bg = 2131231176;
+			
+			// aapt resource value: 0x7F0801C6
+			public const int device_x3_bg = 2131231174;
+			
+			// aapt resource value: 0x7F0801C9
+			public const int device_x4 = 2131231177;
+			
+			// aapt resource value: 0x7F0801CA
+			public const int device_x4_bg = 2131231178;
+			
+			// aapt resource value: 0x7F0801CD
+			public const int device_x5c = 2131231181;
+			
+			// aapt resource value: 0x7F0801CE
+			public const int device_x5c_bg = 2131231182;
+			
+			// aapt resource value: 0x7F0801CB
+			public const int device_x5_108tp = 2131231179;
+			
+			// aapt resource value: 0x7F0801CC
+			public const int device_x5_108tp_bg = 2131231180;
+			
+			// aapt resource value: 0x7F0801CF
+			public const int device_z1 = 2131231183;
 			
 			// aapt resource value: 0x7F0801D9
-			public const int down_horizontal = 2131231193;
+			public const int dialog_background = 2131231193;
 			
 			// aapt resource value: 0x7F0801DA
-			public const int down_twinkle = 2131231194;
+			public const int dialog_background2 = 2131231194;
+			
+			// aapt resource value: 0x7F0801DB
+			public const int dialog_cancel_btn_normal_bg = 2131231195;
 			
 			// aapt resource value: 0x7F0801DC
-			public const int edittext_bg = 2131231196;
+			public const int dialog_cancle_btn_bg = 2131231196;
 			
 			// aapt resource value: 0x7F0801DD
-			public const int edittext_del = 2131231197;
+			public const int dialog_conform_btn_bg = 2131231197;
 			
 			// aapt resource value: 0x7F0801DE
-			public const int edittext_del_sel = 2131231198;
+			public const int dialog_input_password_bg = 2131231198;
 			
 			// aapt resource value: 0x7F0801DF
-			public const int equipment = 2131231199;
+			public const int dialog_ok_btn_normal_bg = 2131231199;
 			
 			// aapt resource value: 0x7F0801E0
-			public const int equipment_sel = 2131231200;
-			
-			// aapt resource value: 0x7F0801E1
-			public const int equipment_selector = 2131231201;
-			
-			// aapt resource value: 0x7F0801E2
-			public const int event_list_fail_pic = 2131231202;
+			public const int display_frame = 2131231200;
 			
 			// aapt resource value: 0x7F0801E3
-			public const int exit = 2131231203;
+			public const int download8 = 2131231203;
+			
+			// aapt resource value: 0x7F0801E1
+			public const int down_horizontal = 2131231201;
+			
+			// aapt resource value: 0x7F0801E2
+			public const int down_twinkle = 2131231202;
 			
 			// aapt resource value: 0x7F0801E4
-			public const int exit_sel = 2131231204;
+			public const int edittext_bg = 2131231204;
 			
 			// aapt resource value: 0x7F0801E5
-			public const int exit_selector = 2131231205;
+			public const int edittext_del = 2131231205;
 			
 			// aapt resource value: 0x7F0801E6
-			public const int expression_del = 2131231206;
+			public const int edittext_del_sel = 2131231206;
 			
 			// aapt resource value: 0x7F0801E7
-			public const int expression_del_sel = 2131231207;
-			
-			// aapt resource value: 0x7F0801F1
-			public const int ezopen_vertical_preview_sound_off_selector = 2131231217;
-			
-			// aapt resource value: 0x7F0801F2
-			public const int ezopen_vertical_preview_sound_selector = 2131231218;
+			public const int equipment = 2131231207;
 			
 			// aapt resource value: 0x7F0801E8
-			public const int ez_border = 2131231208;
+			public const int equipment_sel = 2131231208;
 			
 			// aapt resource value: 0x7F0801E9
-			public const int ez_border_selector = 2131231209;
+			public const int equipment_selector = 2131231209;
 			
 			// aapt resource value: 0x7F0801EA
-			public const int ez_btn_r1_retry_selector = 2131231210;
+			public const int event_list_fail_pic = 2131231210;
 			
 			// aapt resource value: 0x7F0801EB
-			public const int ez_leave_message_play_selector = 2131231211;
+			public const int exit = 2131231211;
 			
 			// aapt resource value: 0x7F0801EC
-			public const int ez_play_video_selector = 2131231212;
+			public const int exit_sel = 2131231212;
 			
 			// aapt resource value: 0x7F0801ED
-			public const int ez_real_play = 2131231213;
+			public const int exit_selector = 2131231213;
 			
 			// aapt resource value: 0x7F0801EE
-			public const int ez_real_play_sel = 2131231214;
+			public const int expression_del = 2131231214;
 			
 			// aapt resource value: 0x7F0801EF
-			public const int ez_reaty_btn_selector = 2131231215;
-			
-			// aapt resource value: 0x7F0801F0
-			public const int ez_remote_list_pause_btn_selector = 2131231216;
-			
-			// aapt resource value: 0x7F0801F3
-			public const int face_image3 = 2131231219;
-			
-			// aapt resource value: 0x7F0801F4
-			public const int face_rect = 2131231220;
-			
-			// aapt resource value: 0x7F0801F5
-			public const int failure_account = 2131231221;
-			
-			// aapt resource value: 0x7F0801F6
-			public const int failure_server = 2131231222;
-			
-			// aapt resource value: 0x7F0801F7
-			public const int failure_wifi = 2131231223;
-			
-			// aapt resource value: 0x7F0801F8
-			public const int fingerprint_draw_off = 2131231224;
-			
-			// aapt resource value: 0x7F0801F9
-			public const int fingerprint_draw_off_animation = 2131231225;
-			
-			// aapt resource value: 0x7F0801FA
-			public const int fingerprint_draw_on = 2131231226;
-			
-			// aapt resource value: 0x7F0801FB
-			public const int fingerprint_draw_on_animation = 2131231227;
-			
-			// aapt resource value: 0x7F0801FC
-			public const int fingerprint_error = 2131231228;
+			public const int expression_del_sel = 2131231215;
 			
 			// aapt resource value: 0x7F0801FD
-			public const int fingerprint_error_off = 2131231229;
+			public const int ezopen_vertical_preview_sound_off_selector = 2131231229;
 			
 			// aapt resource value: 0x7F0801FE
-			public const int fingerprint_error_off_animation = 2131231230;
+			public const int ezopen_vertical_preview_sound_selector = 2131231230;
+			
+			// aapt resource value: 0x7F0801F0
+			public const int ez_border = 2131231216;
+			
+			// aapt resource value: 0x7F0801F1
+			public const int ez_border_selector = 2131231217;
+			
+			// aapt resource value: 0x7F0801F2
+			public const int ez_btn_r1_retry_selector = 2131231218;
+			
+			// aapt resource value: 0x7F0801F3
+			public const int ez_connect_num1 = 2131231219;
+			
+			// aapt resource value: 0x7F0801F4
+			public const int ez_connect_num2 = 2131231220;
+			
+			// aapt resource value: 0x7F0801F5
+			public const int ez_connect_step1 = 2131231221;
+			
+			// aapt resource value: 0x7F0801F6
+			public const int ez_connect_step2 = 2131231222;
+			
+			// aapt resource value: 0x7F0801F7
+			public const int ez_leave_message_play_selector = 2131231223;
+			
+			// aapt resource value: 0x7F0801F8
+			public const int ez_play_video_selector = 2131231224;
+			
+			// aapt resource value: 0x7F0801F9
+			public const int ez_real_play = 2131231225;
+			
+			// aapt resource value: 0x7F0801FA
+			public const int ez_real_play_sel = 2131231226;
+			
+			// aapt resource value: 0x7F0801FB
+			public const int ez_reaty_btn_selector = 2131231227;
+			
+			// aapt resource value: 0x7F0801FC
+			public const int ez_remote_list_pause_btn_selector = 2131231228;
 			
 			// aapt resource value: 0x7F0801FF
-			public const int fingerprint_error_on = 2131231231;
+			public const int face_image3 = 2131231231;
 			
 			// aapt resource value: 0x7F080200
-			public const int fingerprint_error_on_animation = 2131231232;
+			public const int face_rect = 2131231232;
 			
 			// aapt resource value: 0x7F080201
-			public const int fingerprint_error_state_to_fp = 2131231233;
+			public const int failure_account = 2131231233;
 			
 			// aapt resource value: 0x7F080202
-			public const int fingerprint_error_state_to_fp_animation = 2131231234;
+			public const int failure_server = 2131231234;
 			
 			// aapt resource value: 0x7F080203
-			public const int fingerprint_fingerprint = 2131231235;
+			public const int failure_wifi = 2131231235;
 			
 			// aapt resource value: 0x7F080204
-			public const int fingerprint_fp_to_error_state = 2131231236;
+			public const int fingerprint_draw_off = 2131231236;
 			
 			// aapt resource value: 0x7F080205
-			public const int fingerprint_fp_to_error_state_animation = 2131231237;
+			public const int fingerprint_draw_off_animation = 2131231237;
 			
 			// aapt resource value: 0x7F080206
-			public const int flashlight = 2131231238;
+			public const int fingerprint_draw_on = 2131231238;
 			
 			// aapt resource value: 0x7F080207
-			public const int flashlight_closed = 2131231239;
+			public const int fingerprint_draw_on_animation = 2131231239;
 			
 			// aapt resource value: 0x7F080208
-			public const int flashlight_selector = 2131231240;
+			public const int fingerprint_error = 2131231240;
 			
 			// aapt resource value: 0x7F080209
-			public const int fullscreen_button_selector = 2131231241;
+			public const int fingerprint_error_off = 2131231241;
 			
 			// aapt resource value: 0x7F08020A
-			public const int gd_btn_shape_app_b = 2131231242;
+			public const int fingerprint_error_off_animation = 2131231242;
 			
 			// aapt resource value: 0x7F08020B
-			public const int gd_btn_shape_app_g = 2131231243;
+			public const int fingerprint_error_on = 2131231243;
 			
 			// aapt resource value: 0x7F08020C
-			public const int gd_btn_shape_app_w = 2131231244;
+			public const int fingerprint_error_on_animation = 2131231244;
 			
 			// aapt resource value: 0x7F08020D
-			public const int gd_btn_shape_shadow_w = 2131231245;
+			public const int fingerprint_error_state_to_fp = 2131231245;
 			
 			// aapt resource value: 0x7F08020E
-			public const int gd_click_effect_select = 2131231246;
+			public const int fingerprint_error_state_to_fp_animation = 2131231246;
 			
 			// aapt resource value: 0x7F08020F
-			public const int goback = 2131231247;
+			public const int fingerprint_fingerprint = 2131231247;
 			
 			// aapt resource value: 0x7F080210
-			public const int goback_dis = 2131231248;
+			public const int fingerprint_fp_to_error_state = 2131231248;
 			
 			// aapt resource value: 0x7F080211
-			public const int goback_sel = 2131231249;
+			public const int fingerprint_fp_to_error_state_animation = 2131231249;
 			
 			// aapt resource value: 0x7F080212
-			public const int gohead = 2131231250;
+			public const int flashlight = 2131231250;
 			
 			// aapt resource value: 0x7F080213
-			public const int gohead_dis = 2131231251;
+			public const int flashlight_closed = 2131231251;
 			
 			// aapt resource value: 0x7F080214
-			public const int gohead_sel = 2131231252;
+			public const int flashlight_selector = 2131231252;
 			
 			// aapt resource value: 0x7F080215
-			public const int graybtn = 2131231253;
+			public const int fullscreen_button_selector = 2131231253;
 			
 			// aapt resource value: 0x7F080216
-			public const int graybtn_press = 2131231254;
+			public const int gd_btn_shape_app_b = 2131231254;
 			
 			// aapt resource value: 0x7F080217
-			public const int graybtn_secetor = 2131231255;
+			public const int gd_btn_shape_app_g = 2131231255;
 			
 			// aapt resource value: 0x7F080218
-			public const int grouplayout_item_bg_selector = 2131231256;
-			
-			// aapt resource value: 0x7F08021D
-			public const int hangup = 2131231261;
-			
-			// aapt resource value: 0x7F08021E
-			public const int hide_bg2_1 = 2131231262;
-			
-			// aapt resource value: 0x7F08021F
-			public const int hide_bg2_2 = 2131231263;
-			
-			// aapt resource value: 0x7F080220
-			public const int hide_bg2_3 = 2131231264;
-			
-			// aapt resource value: 0x7F080221
-			public const int hide_bg2_4 = 2131231265;
-			
-			// aapt resource value: 0x7F080222
-			public const int hide_bg2_5 = 2131231266;
-			
-			// aapt resource value: 0x7F080223
-			public const int hide_bg2_6 = 2131231267;
-			
-			// aapt resource value: 0x7F080224
-			public const int hide_bg2_7 = 2131231268;
-			
-			// aapt resource value: 0x7F080225
-			public const int hide_bg2_8 = 2131231269;
-			
-			// aapt resource value: 0x7F080226
-			public const int hide_bg2_9 = 2131231270;
-			
-			// aapt resource value: 0x7F080227
-			public const int history_video = 2131231271;
-			
-			// aapt resource value: 0x7F080228
-			public const int history_video_dis = 2131231272;
-			
-			// aapt resource value: 0x7F080229
-			public const int history_video_sel = 2131231273;
-			
-			// aapt resource value: 0x7F08022A
-			public const int horizontal_fullscreen_button_selector = 2131231274;
-			
-			// aapt resource value: 0x7F08022B
-			public const int horizontal_shrink_screen_normal = 2131231275;
-			
-			// aapt resource value: 0x7F08022C
-			public const int horizontal_shrink_screen_pressed = 2131231276;
+			public const int gd_btn_shape_app_w = 2131231256;
 			
 			// aapt resource value: 0x7F080219
-			public const int h_bg = 2131231257;
+			public const int gd_btn_shape_shadow_w = 2131231257;
 			
 			// aapt resource value: 0x7F08021A
-			public const int h_bg_sel = 2131231258;
+			public const int gd_click_effect_select = 2131231258;
 			
 			// aapt resource value: 0x7F08021B
-			public const int h_talk = 2131231259;
+			public const int goback = 2131231259;
 			
 			// aapt resource value: 0x7F08021C
-			public const int h_talk_sel = 2131231260;
+			public const int goback_dis = 2131231260;
 			
-			// aapt resource value: 0x7F08025A
-			public const int icn_btn_bg_plus = 2131231322;
+			// aapt resource value: 0x7F08021D
+			public const int goback_sel = 2131231261;
 			
-			// aapt resource value: 0x7F08025B
-			public const int Icon = 2131231323;
+			// aapt resource value: 0x7F08021E
+			public const int gohead = 2131231262;
 			
-			// aapt resource value: 0x7F08025C
-			public const int icon_multi_screen_preview = 2131231324;
+			// aapt resource value: 0x7F08021F
+			public const int gohead_dis = 2131231263;
 			
-			// aapt resource value: 0x7F08025D
-			public const int icon_wifipassword_nosupport5g = 2131231325;
+			// aapt resource value: 0x7F080220
+			public const int gohead_sel = 2131231264;
+			
+			// aapt resource value: 0x7F080221
+			public const int graybtn = 2131231265;
+			
+			// aapt resource value: 0x7F080222
+			public const int graybtn_press = 2131231266;
+			
+			// aapt resource value: 0x7F080223
+			public const int graybtn_secetor = 2131231267;
+			
+			// aapt resource value: 0x7F080224
+			public const int grouplayout_item_bg_selector = 2131231268;
+			
+			// aapt resource value: 0x7F080229
+			public const int hangup = 2131231273;
+			
+			// aapt resource value: 0x7F08022A
+			public const int hide_bg2_1 = 2131231274;
+			
+			// aapt resource value: 0x7F08022B
+			public const int hide_bg2_2 = 2131231275;
+			
+			// aapt resource value: 0x7F08022C
+			public const int hide_bg2_3 = 2131231276;
 			
 			// aapt resource value: 0x7F08022D
-			public const int ic_action_search = 2131231277;
+			public const int hide_bg2_4 = 2131231277;
 			
 			// aapt resource value: 0x7F08022E
-			public const int ic_esvideo_on_answer = 2131231278;
+			public const int hide_bg2_5 = 2131231278;
 			
 			// aapt resource value: 0x7F08022F
-			public const int ic_esvideo_on_back = 2131231279;
+			public const int hide_bg2_6 = 2131231279;
 			
 			// aapt resource value: 0x7F080230
-			public const int ic_esvideo_on_hangup = 2131231280;
+			public const int hide_bg2_7 = 2131231280;
 			
 			// aapt resource value: 0x7F080231
-			public const int ic_esvideo_on_takephoto_select = 2131231281;
+			public const int hide_bg2_8 = 2131231281;
 			
 			// aapt resource value: 0x7F080232
-			public const int ic_esvideo_on_takephoto_unselect = 2131231282;
+			public const int hide_bg2_9 = 2131231282;
 			
 			// aapt resource value: 0x7F080233
-			public const int ic_esvideo_on_unlock_select = 2131231283;
+			public const int history_video = 2131231283;
 			
 			// aapt resource value: 0x7F080234
-			public const int ic_esvideo_on_unlock_unselect = 2131231284;
+			public const int history_video_dis = 2131231284;
 			
 			// aapt resource value: 0x7F080235
-			public const int ic_gdmap_add = 2131231285;
+			public const int history_video_sel = 2131231285;
 			
 			// aapt resource value: 0x7F080236
-			public const int ic_gdmap_back = 2131231286;
+			public const int horizontal_fullscreen_button_selector = 2131231286;
 			
 			// aapt resource value: 0x7F080237
-			public const int ic_gdmap_delete = 2131231287;
+			public const int horizontal_shrink_screen_normal = 2131231287;
 			
 			// aapt resource value: 0x7F080238
-			public const int ic_gdmap_home = 2131231288;
+			public const int horizontal_shrink_screen_pressed = 2131231288;
 			
-			// aapt resource value: 0x7F080239
-			public const int ic_gdmap_mylocation = 2131231289;
+			// aapt resource value: 0x7F080225
+			public const int h_bg = 2131231269;
 			
-			// aapt resource value: 0x7F08023A
-			public const int ic_gdmap_now = 2131231290;
+			// aapt resource value: 0x7F080226
+			public const int h_bg_sel = 2131231270;
 			
-			// aapt resource value: 0x7F08023B
-			public const int ic_gdmap_search = 2131231291;
+			// aapt resource value: 0x7F080227
+			public const int h_talk = 2131231271;
 			
-			// aapt resource value: 0x7F08023C
-			public const int ic_gdmap_zoom_out = 2131231292;
-			
-			// aapt resource value: 0x7F08023D
-			public const int ic_gps_point = 2131231293;
-			
-			// aapt resource value: 0x7F08023E
-			public const int ic_launcher_background = 2131231294;
-			
-			// aapt resource value: 0x7F08023F
-			public const int ic_launcher_foreground = 2131231295;
-			
-			// aapt resource value: 0x7F080240
-			public const int ic_password_clear = 2131231296;
-			
-			// aapt resource value: 0x7F080241
-			public const int ic_password_invisible = 2131231297;
-			
-			// aapt resource value: 0x7F080242
-			public const int ic_password_visible = 2131231298;
-			
-			// aapt resource value: 0x7F080243
-			public const int ic_shadow = 2131231299;
-			
-			// aapt resource value: 0x7F080244
-			public const int ic_ss_arrow_back = 2131231300;
-			
-			// aapt resource value: 0x7F080245
-			public const int ic_wd_arc_scale_bg = 2131231301;
-			
-			// aapt resource value: 0x7F080246
-			public const int ic_wd_curtain_bg_top = 2131231302;
-			
-			// aapt resource value: 0x7F080247
-			public const int ic_wd_curtain_h_bg = 2131231303;
-			
-			// aapt resource value: 0x7F080248
-			public const int ic_wd_curtain_h_open = 2131231304;
-			
-			// aapt resource value: 0x7F080249
-			public const int ic_wd_curtain_h_progress = 2131231305;
-			
-			// aapt resource value: 0x7F08024A
-			public const int ic_wd_curtain_h_top = 2131231306;
-			
-			// aapt resource value: 0x7F08024B
-			public const int ic_wd_curtain_open = 2131231307;
-			
-			// aapt resource value: 0x7F08024C
-			public const int ic_wd_curtain_roll_bg = 2131231308;
-			
-			// aapt resource value: 0x7F08024D
-			public const int ic_wd_curtain_roll_progress = 2131231309;
-			
-			// aapt resource value: 0x7F08024E
-			public const int ic_wd_on_curtain_blinds_progress = 2131231310;
-			
-			// aapt resource value: 0x7F08024F
-			public const int ic_wd_on_curtain_blinds_progress2 = 2131231311;
-			
-			// aapt resource value: 0x7F080250
-			public const int ic_wd_on_curtain_blinds_progress_close = 2131231312;
-			
-			// aapt resource value: 0x7F080251
-			public const int ic_wd_on_curtain_blinds_progress_close2 = 2131231313;
-			
-			// aapt resource value: 0x7F080252
-			public const int ic_wd_on_curtain_h_bg = 2131231314;
-			
-			// aapt resource value: 0x7F080253
-			public const int ic_wd_on_curtain_h_open = 2131231315;
-			
-			// aapt resource value: 0x7F080254
-			public const int ic_wd_on_curtain_h_progress = 2131231316;
-			
-			// aapt resource value: 0x7F080255
-			public const int ic_wd_on_curtain_h_progress_close = 2131231317;
-			
-			// aapt resource value: 0x7F080256
-			public const int ic_wd_on_curtain_open = 2131231318;
-			
-			// aapt resource value: 0x7F080257
-			public const int ic_wd_on_curtain_roll_bg = 2131231319;
-			
-			// aapt resource value: 0x7F080258
-			public const int ic_wd_on_curtain_roll_progress = 2131231320;
-			
-			// aapt resource value: 0x7F080259
-			public const int ic_wd_on_curtain_roll_progress_close = 2131231321;
-			
-			// aapt resource value: 0x7F08025E
-			public const int image_a1 = 2131231326;
-			
-			// aapt resource value: 0x7F08025F
-			public const int image_crispr = 2131231327;
-			
-			// aapt resource value: 0x7F080260
-			public const int image_everyday_1080p = 2131231328;
-			
-			// aapt resource value: 0x7F080261
-			public const int image_everyday_3mp = 2131231329;
-			
-			// aapt resource value: 0x7F080262
-			public const int image_everyday_4mp_ip = 2131231330;
-			
-			// aapt resource value: 0x7F080263
-			public const int image_everyday_720p = 2131231331;
-			
-			// aapt resource value: 0x7F080264
-			public const int image_everyday_ip_1080p = 2131231332;
-			
-			// aapt resource value: 0x7F080265
-			public const int image_husky = 2131231333;
-			
-			// aapt resource value: 0x7F080266
-			public const int image_husky_c = 2131231334;
-			
-			// aapt resource value: 0x7F080267
-			public const int image_husky_dome = 2131231335;
-			
-			// aapt resource value: 0x7F080268
-			public const int image_mini = 2131231336;
-			
-			// aapt resource value: 0x7F08026E
-			public const int image_minio = 2131231342;
-			
-			// aapt resource value: 0x7F080269
-			public const int image_mini_360 = 2131231337;
-			
-			// aapt resource value: 0x7F08026A
-			public const int image_mini_360_plus = 2131231338;
+			// aapt resource value: 0x7F080228
+			public const int h_talk_sel = 2131231272;
 			
 			// aapt resource value: 0x7F08026B
-			public const int image_mini_o = 2131231339;
+			public const int icn_btn_bg_plus = 2131231339;
 			
 			// aapt resource value: 0x7F08026C
-			public const int image_mini_plus = 2131231340;
+			public const int Icon = 2131231340;
 			
 			// aapt resource value: 0x7F08026D
-			public const int image_mini_trooper = 2131231341;
+			public const int icon_multi_screen_preview = 2131231341;
+			
+			// aapt resource value: 0x7F08026E
+			public const int icon_wifipassword_nosupport5g = 2131231342;
+			
+			// aapt resource value: 0x7F080239
+			public const int ic_action_search = 2131231289;
+			
+			// aapt resource value: 0x7F08023A
+			public const int ic_esvideo_on_answer = 2131231290;
+			
+			// aapt resource value: 0x7F08023B
+			public const int ic_esvideo_on_back = 2131231291;
+			
+			// aapt resource value: 0x7F08023C
+			public const int ic_esvideo_on_hangup = 2131231292;
+			
+			// aapt resource value: 0x7F08023D
+			public const int ic_esvideo_on_takephoto_select = 2131231293;
+			
+			// aapt resource value: 0x7F08023E
+			public const int ic_esvideo_on_takephoto_unselect = 2131231294;
+			
+			// aapt resource value: 0x7F08023F
+			public const int ic_esvideo_on_unlock_select = 2131231295;
+			
+			// aapt resource value: 0x7F080240
+			public const int ic_esvideo_on_unlock_unselect = 2131231296;
+			
+			// aapt resource value: 0x7F080241
+			public const int ic_gdmap_add = 2131231297;
+			
+			// aapt resource value: 0x7F080242
+			public const int ic_gdmap_back = 2131231298;
+			
+			// aapt resource value: 0x7F080243
+			public const int ic_gdmap_delete = 2131231299;
+			
+			// aapt resource value: 0x7F080244
+			public const int ic_gdmap_home = 2131231300;
+			
+			// aapt resource value: 0x7F080245
+			public const int ic_gdmap_mylocation = 2131231301;
+			
+			// aapt resource value: 0x7F080246
+			public const int ic_gdmap_now = 2131231302;
+			
+			// aapt resource value: 0x7F080247
+			public const int ic_gdmap_search = 2131231303;
+			
+			// aapt resource value: 0x7F080248
+			public const int ic_gdmap_zoom_out = 2131231304;
+			
+			// aapt resource value: 0x7F080249
+			public const int ic_gps_point = 2131231305;
+			
+			// aapt resource value: 0x7F08024A
+			public const int ic_item_right = 2131231306;
+			
+			// aapt resource value: 0x7F08024B
+			public const int ic_launcher_background = 2131231307;
+			
+			// aapt resource value: 0x7F08024C
+			public const int ic_launcher_foreground = 2131231308;
+			
+			// aapt resource value: 0x7F08024D
+			public const int ic_loading_rotate = 2131231309;
+			
+			// aapt resource value: 0x7F08024E
+			public const int ic_password_clear = 2131231310;
+			
+			// aapt resource value: 0x7F08024F
+			public const int ic_password_invisible = 2131231311;
+			
+			// aapt resource value: 0x7F080250
+			public const int ic_password_visible = 2131231312;
+			
+			// aapt resource value: 0x7F080251
+			public const int ic_pulltorefresh_arrow = 2131231313;
+			
+			// aapt resource value: 0x7F080252
+			public const int ic_shadow = 2131231314;
+			
+			// aapt resource value: 0x7F080253
+			public const int ic_ss_arrow_back = 2131231315;
+			
+			// aapt resource value: 0x7F080254
+			public const int ic_text_clear = 2131231316;
+			
+			// aapt resource value: 0x7F080255
+			public const int ic_tip = 2131231317;
+			
+			// aapt resource value: 0x7F080256
+			public const int ic_wd_arc_scale_bg = 2131231318;
+			
+			// aapt resource value: 0x7F080257
+			public const int ic_wd_curtain_bg_top = 2131231319;
+			
+			// aapt resource value: 0x7F080258
+			public const int ic_wd_curtain_h_bg = 2131231320;
+			
+			// aapt resource value: 0x7F080259
+			public const int ic_wd_curtain_h_open = 2131231321;
+			
+			// aapt resource value: 0x7F08025A
+			public const int ic_wd_curtain_h_progress = 2131231322;
+			
+			// aapt resource value: 0x7F08025B
+			public const int ic_wd_curtain_h_top = 2131231323;
+			
+			// aapt resource value: 0x7F08025C
+			public const int ic_wd_curtain_open = 2131231324;
+			
+			// aapt resource value: 0x7F08025D
+			public const int ic_wd_curtain_roll_bg = 2131231325;
+			
+			// aapt resource value: 0x7F08025E
+			public const int ic_wd_curtain_roll_progress = 2131231326;
+			
+			// aapt resource value: 0x7F08025F
+			public const int ic_wd_on_curtain_blinds_progress = 2131231327;
+			
+			// aapt resource value: 0x7F080260
+			public const int ic_wd_on_curtain_blinds_progress2 = 2131231328;
+			
+			// aapt resource value: 0x7F080261
+			public const int ic_wd_on_curtain_blinds_progress_close = 2131231329;
+			
+			// aapt resource value: 0x7F080262
+			public const int ic_wd_on_curtain_blinds_progress_close2 = 2131231330;
+			
+			// aapt resource value: 0x7F080263
+			public const int ic_wd_on_curtain_h_bg = 2131231331;
+			
+			// aapt resource value: 0x7F080264
+			public const int ic_wd_on_curtain_h_open = 2131231332;
+			
+			// aapt resource value: 0x7F080265
+			public const int ic_wd_on_curtain_h_progress = 2131231333;
+			
+			// aapt resource value: 0x7F080266
+			public const int ic_wd_on_curtain_h_progress_close = 2131231334;
+			
+			// aapt resource value: 0x7F080267
+			public const int ic_wd_on_curtain_open = 2131231335;
+			
+			// aapt resource value: 0x7F080268
+			public const int ic_wd_on_curtain_roll_bg = 2131231336;
+			
+			// aapt resource value: 0x7F080269
+			public const int ic_wd_on_curtain_roll_progress = 2131231337;
+			
+			// aapt resource value: 0x7F08026A
+			public const int ic_wd_on_curtain_roll_progress_close = 2131231338;
 			
 			// aapt resource value: 0x7F08026F
-			public const int img_slider_handle = 2131231343;
+			public const int image_a1 = 2131231343;
 			
 			// aapt resource value: 0x7F080270
-			public const int indicator_arrow = 2131231344;
+			public const int image_crispr = 2131231344;
 			
 			// aapt resource value: 0x7F080271
-			public const int indicator_autocrop = 2131231345;
+			public const int image_everyday_1080p = 2131231345;
 			
 			// aapt resource value: 0x7F080272
-			public const int indicator_bg_bottom = 2131231346;
+			public const int image_everyday_3mp = 2131231346;
 			
 			// aapt resource value: 0x7F080273
-			public const int indicator_bg_top = 2131231347;
-			
-			// aapt resource value: 0x7F080275
-			public const int inputlayout_bg = 2131231349;
+			public const int image_everyday_4mp_ip = 2131231347;
 			
 			// aapt resource value: 0x7F080274
-			public const int input_shade = 2131231348;
+			public const int image_everyday_720p = 2131231348;
+			
+			// aapt resource value: 0x7F080275
+			public const int image_everyday_ip_1080p = 2131231349;
 			
 			// aapt resource value: 0x7F080276
-			public const int interface_call_btn_selector = 2131231350;
+			public const int image_husky = 2131231350;
 			
 			// aapt resource value: 0x7F080277
-			public const int join_qq_group = 2131231351;
+			public const int image_husky_c = 2131231351;
 			
 			// aapt resource value: 0x7F080278
-			public const int label_bg_line = 2131231352;
+			public const int image_husky_dome = 2131231352;
 			
 			// aapt resource value: 0x7F080279
-			public const int label_bg_sel = 2131231353;
-			
-			// aapt resource value: 0x7F08027A
-			public const int launchImage = 2131231354;
-			
-			// aapt resource value: 0x7F08027B
-			public const int lc_demo_bg_selector = 2131231355;
-			
-			// aapt resource value: 0x7F08027C
-			public const int lc_demo_border_100r_shape = 2131231356;
-			
-			// aapt resource value: 0x7F08027D
-			public const int lc_demo_border_gray_4r_shape = 2131231357;
-			
-			// aapt resource value: 0x7F08027E
-			public const int lc_demo_border_org_4r_shape = 2131231358;
+			public const int image_mini = 2131231353;
 			
 			// aapt resource value: 0x7F08027F
-			public const int lc_demo_cursor_drawable = 2131231359;
+			public const int image_minio = 2131231359;
+			
+			// aapt resource value: 0x7F08027A
+			public const int image_mini_360 = 2131231354;
+			
+			// aapt resource value: 0x7F08027B
+			public const int image_mini_360_plus = 2131231355;
+			
+			// aapt resource value: 0x7F08027C
+			public const int image_mini_o = 2131231356;
+			
+			// aapt resource value: 0x7F08027D
+			public const int image_mini_plus = 2131231357;
+			
+			// aapt resource value: 0x7F08027E
+			public const int image_mini_trooper = 2131231358;
 			
 			// aapt resource value: 0x7F080280
-			public const int lc_demo_org_progress_style = 2131231360;
+			public const int img_slider_handle = 2131231360;
 			
 			// aapt resource value: 0x7F080281
-			public const int lc_demo_pg_background = 2131231361;
+			public const int indicator_arrow = 2131231361;
 			
 			// aapt resource value: 0x7F080282
-			public const int lc_demo_photo_capture_selector = 2131231362;
+			public const int indicator_autocrop = 2131231362;
 			
 			// aapt resource value: 0x7F080283
-			public const int lc_demo_pic_color_cloud_video_selector = 2131231363;
+			public const int indicator_bg_bottom = 2131231363;
 			
 			// aapt resource value: 0x7F080284
-			public const int lc_demo_pic_color_local_video_selector = 2131231364;
-			
-			// aapt resource value: 0x7F080285
-			public const int lc_demo_point = 2131231365;
+			public const int indicator_bg_top = 2131231364;
 			
 			// aapt resource value: 0x7F080286
-			public const int lc_demo_progress_style = 2131231366;
+			public const int inputlayout_bg = 2131231366;
+			
+			// aapt resource value: 0x7F080285
+			public const int input_shade = 2131231365;
 			
 			// aapt resource value: 0x7F080287
-			public const int lc_demo_soild_100r_org_shape = 2131231367;
+			public const int interface_call_btn_selector = 2131231367;
 			
 			// aapt resource value: 0x7F080288
-			public const int lc_demo_soild_100r_tra_shape = 2131231368;
+			public const int join_qq_group = 2131231368;
 			
 			// aapt resource value: 0x7F080289
-			public const int lc_demo_soild_10r_org_shape = 2131231369;
+			public const int jpush_btn_bg_green_playable = 2131231369;
 			
 			// aapt resource value: 0x7F08028A
-			public const int lc_demo_soild_10r_white_shape = 2131231370;
+			public const int jpush_ic_action_cancle = 2131231370;
 			
 			// aapt resource value: 0x7F08028B
-			public const int lc_demo_txt_color_selector = 2131231371;
+			public const int jpush_ic_action_close = 2131231371;
 			
 			// aapt resource value: 0x7F08028C
-			public const int lc_demo_txt_color_video_selector = 2131231372;
+			public const int jpush_ic_action_close2 = 2131231372;
 			
 			// aapt resource value: 0x7F08028D
-			public const int lc_demo_txt_pixel_shape = 2131231373;
+			public const int jpush_ic_richpush_actionbar_back = 2131231373;
 			
 			// aapt resource value: 0x7F08028E
-			public const int lc_operation_step = 2131231374;
+			public const int jpush_ic_richpush_actionbar_divider = 2131231374;
 			
 			// aapt resource value: 0x7F08028F
-			public const int lc_standard_big_btn_disabled_bg = 2131231375;
+			public const int jpush_richpush_btn_selector = 2131231375;
 			
 			// aapt resource value: 0x7F080290
-			public const int lc_standard_big_btn_normal_bg = 2131231376;
+			public const int jpush_richpush_progressbar = 2131231376;
 			
 			// aapt resource value: 0x7F080291
-			public const int lc_standard_big_btn_pressed_bg = 2131231377;
+			public const int label_bg_line = 2131231377;
 			
 			// aapt resource value: 0x7F080292
-			public const int lc_standard_big_btn_selector = 2131231378;
+			public const int label_bg_sel = 2131231378;
 			
 			// aapt resource value: 0x7F080293
-			public const int lc_standard_next_btn_disable_bg = 2131231379;
+			public const int launchImage = 2131231379;
 			
 			// aapt resource value: 0x7F080294
-			public const int lc_standard_next_btn_normal_bg = 2131231380;
+			public const int lc_demo_bg_selector = 2131231380;
 			
 			// aapt resource value: 0x7F080295
-			public const int lc_standard_next_btn_pressed_bg = 2131231381;
+			public const int lc_demo_border_100r_shape = 2131231381;
 			
 			// aapt resource value: 0x7F080296
-			public const int leave_message_play = 2131231382;
+			public const int lc_demo_border_gray_4r_shape = 2131231382;
 			
 			// aapt resource value: 0x7F080297
-			public const int leave_message_play_sel = 2131231383;
+			public const int lc_demo_border_org_4r_shape = 2131231383;
 			
 			// aapt resource value: 0x7F080298
-			public const int leave_message_play_selector = 2131231384;
+			public const int lc_demo_cursor_drawable = 2131231384;
 			
 			// aapt resource value: 0x7F080299
-			public const int leba_bg_single_unselected = 2131231385;
+			public const int lc_demo_org_progress_style = 2131231385;
 			
 			// aapt resource value: 0x7F08029A
-			public const int left_horizontal = 2131231386;
+			public const int lc_demo_pg_background = 2131231386;
 			
 			// aapt resource value: 0x7F08029B
-			public const int left_twinkle = 2131231387;
+			public const int lc_demo_photo_capture_selector = 2131231387;
 			
 			// aapt resource value: 0x7F08029C
-			public const int link_account1 = 2131231388;
+			public const int lc_demo_pic_color_cloud_video_selector = 2131231388;
 			
 			// aapt resource value: 0x7F08029D
-			public const int link_account2 = 2131231389;
+			public const int lc_demo_pic_color_local_video_selector = 2131231389;
 			
 			// aapt resource value: 0x7F08029E
-			public const int link_account3 = 2131231390;
+			public const int lc_demo_point = 2131231390;
 			
 			// aapt resource value: 0x7F08029F
-			public const int link_account4 = 2131231391;
-			
-			// aapt resource value: 0x7F0802A1
-			public const int Loading = 2131231393;
+			public const int lc_demo_progress_style = 2131231391;
 			
 			// aapt resource value: 0x7F0802A0
-			public const int load_failed_bg = 2131231392;
+			public const int lc_demo_soild_100r_org_shape = 2131231392;
+			
+			// aapt resource value: 0x7F0802A1
+			public const int lc_demo_soild_100r_tra_shape = 2131231393;
 			
 			// aapt resource value: 0x7F0802A2
-			public const int lock_bg = 2131231394;
+			public const int lc_demo_soild_10r_org_shape = 2131231394;
 			
 			// aapt resource value: 0x7F0802A3
-			public const int login_btn_selector = 2131231395;
+			public const int lc_demo_soild_10r_white_shape = 2131231395;
 			
 			// aapt resource value: 0x7F0802A4
-			public const int login_logo = 2131231396;
+			public const int lc_demo_txt_color_selector = 2131231396;
 			
 			// aapt resource value: 0x7F0802A5
-			public const int login_logo_button = 2131231397;
+			public const int lc_demo_txt_color_video_selector = 2131231397;
 			
 			// aapt resource value: 0x7F0802A6
-			public const int login_logo_button_sel = 2131231398;
+			public const int lc_demo_txt_pixel_shape = 2131231398;
 			
 			// aapt resource value: 0x7F0802A7
-			public const int logo_loading_1 = 2131231399;
+			public const int lc_operation_step = 2131231399;
 			
 			// aapt resource value: 0x7F0802A8
-			public const int logo_loading_2 = 2131231400;
+			public const int lc_standard_big_btn_disabled_bg = 2131231400;
 			
 			// aapt resource value: 0x7F0802A9
-			public const int logo_loading_3 = 2131231401;
+			public const int lc_standard_big_btn_normal_bg = 2131231401;
 			
 			// aapt resource value: 0x7F0802AA
-			public const int logo_loading_4 = 2131231402;
+			public const int lc_standard_big_btn_pressed_bg = 2131231402;
 			
 			// aapt resource value: 0x7F0802AB
-			public const int lp_calltime_shape = 2131231403;
+			public const int lc_standard_big_btn_selector = 2131231403;
 			
 			// aapt resource value: 0x7F0802AC
-			public const int lp_calltime_shape_gray = 2131231404;
+			public const int lc_standard_next_btn_disable_bg = 2131231404;
 			
 			// aapt resource value: 0x7F0802AD
-			public const int lp_dialog_background = 2131231405;
+			public const int lc_standard_next_btn_normal_bg = 2131231405;
 			
 			// aapt resource value: 0x7F0802AE
-			public const int lp_dialog_cancel_background = 2131231406;
+			public const int lc_standard_next_btn_pressed_bg = 2131231406;
 			
 			// aapt resource value: 0x7F0802AF
-			public const int lp_dialog_confirm_background = 2131231407;
+			public const int leave_message_play = 2131231407;
 			
 			// aapt resource value: 0x7F0802B0
-			public const int lp_line_shape = 2131231408;
+			public const int leave_message_play_sel = 2131231408;
 			
 			// aapt resource value: 0x7F0802B1
-			public const int mesage_details_callhelp = 2131231409;
+			public const int leave_message_play_selector = 2131231409;
 			
 			// aapt resource value: 0x7F0802B2
-			public const int mesage_details_curtain = 2131231410;
+			public const int leba_bg_single_unselected = 2131231410;
 			
 			// aapt resource value: 0x7F0802B3
-			public const int mesage_details_data = 2131231411;
+			public const int left_horizontal = 2131231411;
 			
 			// aapt resource value: 0x7F0802B4
-			public const int mesage_details_door = 2131231412;
+			public const int left_twinkle = 2131231412;
 			
 			// aapt resource value: 0x7F0802B5
-			public const int mesage_details_gas = 2131231413;
+			public const int link_account1 = 2131231413;
 			
 			// aapt resource value: 0x7F0802B6
-			public const int mesage_details_hdd = 2131231414;
+			public const int link_account2 = 2131231414;
 			
 			// aapt resource value: 0x7F0802B7
-			public const int mesage_details_infrared = 2131231415;
+			public const int link_account3 = 2131231415;
 			
 			// aapt resource value: 0x7F0802B8
-			public const int mesage_details_keyboard = 2131231416;
-			
-			// aapt resource value: 0x7F0802B9
-			public const int mesage_details_loss = 2131231417;
+			public const int link_account4 = 2131231416;
 			
 			// aapt resource value: 0x7F0802BA
-			public const int mesage_details_low_battery = 2131231418;
+			public const int Loading = 2131231418;
 			
 			// aapt resource value: 0x7F0802BB
-			public const int mesage_details_offline = 2131231419;
+			public const int loading_01 = 2131231419;
 			
 			// aapt resource value: 0x7F0802BC
-			public const int mesage_details_power = 2131231420;
+			public const int loading_02 = 2131231420;
 			
 			// aapt resource value: 0x7F0802BD
-			public const int mesage_details_smoke = 2131231421;
+			public const int loading_03 = 2131231421;
 			
 			// aapt resource value: 0x7F0802BE
-			public const int mesage_details_tampering = 2131231422;
+			public const int loading_04 = 2131231422;
 			
 			// aapt resource value: 0x7F0802BF
-			public const int mesage_details_video_loss = 2131231423;
+			public const int loading_05 = 2131231423;
 			
 			// aapt resource value: 0x7F0802C0
-			public const int mesage_details_water = 2131231424;
+			public const int loading_06 = 2131231424;
 			
 			// aapt resource value: 0x7F0802C1
-			public const int message = 2131231425;
+			public const int loading_07 = 2131231425;
 			
 			// aapt resource value: 0x7F0802C2
-			public const int message_a1_bg = 2131231426;
+			public const int loading_08 = 2131231426;
 			
 			// aapt resource value: 0x7F0802C3
-			public const int message_back = 2131231427;
+			public const int loading_09 = 2131231427;
 			
 			// aapt resource value: 0x7F0802C4
-			public const int message_back_sel = 2131231428;
+			public const int loading_10 = 2131231428;
 			
 			// aapt resource value: 0x7F0802C5
-			public const int message_back_selector = 2131231429;
+			public const int loading_11 = 2131231429;
 			
 			// aapt resource value: 0x7F0802C6
-			public const int message_border_bg = 2131231430;
+			public const int loading_12 = 2131231430;
+			
+			// aapt resource value: 0x7F0802B9
+			public const int load_failed_bg = 2131231417;
 			
 			// aapt resource value: 0x7F0802C7
-			public const int message_callhelp = 2131231431;
+			public const int lock_bg = 2131231431;
 			
 			// aapt resource value: 0x7F0802C8
-			public const int message_curtain = 2131231432;
+			public const int login_btn_selector = 2131231432;
 			
 			// aapt resource value: 0x7F0802C9
-			public const int message_data = 2131231433;
+			public const int login_logo = 2131231433;
 			
 			// aapt resource value: 0x7F0802CA
-			public const int message_door = 2131231434;
+			public const int login_logo_button = 2131231434;
 			
 			// aapt resource value: 0x7F0802CB
-			public const int message_gas = 2131231435;
+			public const int login_logo_button_sel = 2131231435;
 			
 			// aapt resource value: 0x7F0802CC
-			public const int message_hdd = 2131231436;
+			public const int logo_loading_1 = 2131231436;
 			
 			// aapt resource value: 0x7F0802CD
-			public const int message_infrared = 2131231437;
+			public const int logo_loading_2 = 2131231437;
 			
 			// aapt resource value: 0x7F0802CE
-			public const int message_item_bg_selector = 2131231438;
+			public const int logo_loading_3 = 2131231438;
 			
 			// aapt resource value: 0x7F0802CF
-			public const int message_keyboard = 2131231439;
+			public const int logo_loading_4 = 2131231439;
 			
 			// aapt resource value: 0x7F0802D0
-			public const int message_loss = 2131231440;
+			public const int lp_calltime_shape = 2131231440;
 			
 			// aapt resource value: 0x7F0802D1
-			public const int message_low_battery = 2131231441;
+			public const int lp_calltime_shape_gray = 2131231441;
 			
 			// aapt resource value: 0x7F0802D2
-			public const int message_move_magnetometer = 2131231442;
+			public const int lp_dialog_background = 2131231442;
 			
 			// aapt resource value: 0x7F0802D3
-			public const int message_offline = 2131231443;
+			public const int lp_dialog_cancel_background = 2131231443;
 			
 			// aapt resource value: 0x7F0802D4
-			public const int message_play = 2131231444;
+			public const int lp_dialog_confirm_background = 2131231444;
 			
 			// aapt resource value: 0x7F0802D5
-			public const int message_play_dis = 2131231445;
+			public const int lp_line_shape = 2131231445;
 			
 			// aapt resource value: 0x7F0802D6
-			public const int message_play_sel = 2131231446;
+			public const int mesage_details_callhelp = 2131231446;
 			
 			// aapt resource value: 0x7F0802D7
-			public const int message_play_selector = 2131231447;
+			public const int mesage_details_curtain = 2131231447;
 			
 			// aapt resource value: 0x7F0802D8
-			public const int message_power = 2131231448;
+			public const int mesage_details_data = 2131231448;
 			
 			// aapt resource value: 0x7F0802D9
-			public const int message_sel = 2131231449;
+			public const int mesage_details_door = 2131231449;
 			
 			// aapt resource value: 0x7F0802DA
-			public const int message_smoke = 2131231450;
+			public const int mesage_details_gas = 2131231450;
 			
 			// aapt resource value: 0x7F0802DB
-			public const int message_system_list_item_divider = 2131231451;
+			public const int mesage_details_hdd = 2131231451;
 			
 			// aapt resource value: 0x7F0802DC
-			public const int message_tampering = 2131231452;
+			public const int mesage_details_infrared = 2131231452;
 			
 			// aapt resource value: 0x7F0802DD
-			public const int message_video = 2131231453;
+			public const int mesage_details_keyboard = 2131231453;
 			
 			// aapt resource value: 0x7F0802DE
-			public const int message_video_dis = 2131231454;
+			public const int mesage_details_loss = 2131231454;
 			
 			// aapt resource value: 0x7F0802DF
-			public const int message_video_loss = 2131231455;
+			public const int mesage_details_low_battery = 2131231455;
 			
 			// aapt resource value: 0x7F0802E0
-			public const int message_video_sel = 2131231456;
+			public const int mesage_details_offline = 2131231456;
 			
 			// aapt resource value: 0x7F0802E1
-			public const int message_video_selector = 2131231457;
+			public const int mesage_details_power = 2131231457;
 			
 			// aapt resource value: 0x7F0802E2
-			public const int message_water = 2131231458;
+			public const int mesage_details_smoke = 2131231458;
 			
 			// aapt resource value: 0x7F0802E3
-			public const int mic = 2131231459;
+			public const int mesage_details_tampering = 2131231459;
 			
 			// aapt resource value: 0x7F0802E4
-			public const int mm_trans = 2131231460;
+			public const int mesage_details_video_loss = 2131231460;
 			
 			// aapt resource value: 0x7F0802E5
-			public const int mobile_common_bg_btn_border_shape = 2131231461;
-			
-			// aapt resource value: 0x7F0802E7
-			public const int mobile_common_checkbox_small_checked = 2131231463;
-			
-			// aapt resource value: 0x7F0802E8
-			public const int mobile_common_checkbox_small_default = 2131231464;
+			public const int mesage_details_water = 2131231461;
 			
 			// aapt resource value: 0x7F0802E6
-			public const int mobile_common_check_box_selector = 2131231462;
+			public const int message = 2131231462;
+			
+			// aapt resource value: 0x7F0802E7
+			public const int message_a1_bg = 2131231463;
+			
+			// aapt resource value: 0x7F0802E8
+			public const int message_back = 2131231464;
 			
 			// aapt resource value: 0x7F0802E9
-			public const int mobile_common_common_pic_nointernet = 2131231465;
+			public const int message_back_sel = 2131231465;
 			
 			// aapt resource value: 0x7F0802EA
-			public const int mobile_common_dialog_bg = 2131231466;
+			public const int message_back_selector = 2131231466;
 			
 			// aapt resource value: 0x7F0802EB
-			public const int mobile_common_dialog_tips_bg = 2131231467;
+			public const int message_border_bg = 2131231467;
 			
 			// aapt resource value: 0x7F0802EC
-			public const int mobile_common_icon_deleteinput = 2131231468;
+			public const int message_callhelp = 2131231468;
 			
 			// aapt resource value: 0x7F0802ED
-			public const int mobile_common_icon_nextarrow = 2131231469;
+			public const int message_curtain = 2131231469;
 			
 			// aapt resource value: 0x7F0802EE
-			public const int mobile_common_leba_bg_single_selected = 2131231470;
+			public const int message_data = 2131231470;
 			
 			// aapt resource value: 0x7F0802EF
-			public const int mobile_common_leba_bg_single_unselected = 2131231471;
+			public const int message_door = 2131231471;
 			
 			// aapt resource value: 0x7F0802F0
-			public const int mobile_common_my_menu_selector_bg = 2131231472;
+			public const int message_gas = 2131231472;
 			
 			// aapt resource value: 0x7F0802F1
-			public const int mobile_common_next_btn_selector = 2131231473;
+			public const int message_hdd = 2131231473;
 			
 			// aapt resource value: 0x7F0802F2
-			public const int mobile_common_progress_loading_img = 2131231474;
+			public const int message_infrared = 2131231474;
 			
 			// aapt resource value: 0x7F0802F3
-			public const int mobile_common_progress_style = 2131231475;
+			public const int message_item_bg_selector = 2131231475;
 			
 			// aapt resource value: 0x7F0802F4
-			public const int mobile_common_radius_5dp_white_bg = 2131231476;
+			public const int message_keyboard = 2131231476;
 			
 			// aapt resource value: 0x7F0802F5
-			public const int mobile_common_shape_round_bg = 2131231477;
+			public const int message_loss = 2131231477;
 			
 			// aapt resource value: 0x7F0802F6
-			public const int mobile_common_share_selector = 2131231478;
+			public const int message_low_battery = 2131231478;
 			
 			// aapt resource value: 0x7F0802F7
-			public const int mobile_common_title_back = 2131231479;
+			public const int message_move_magnetometer = 2131231479;
 			
 			// aapt resource value: 0x7F0802F8
-			public const int more = 2131231480;
+			public const int message_offline = 2131231480;
 			
 			// aapt resource value: 0x7F0802F9
-			public const int my_5k_vr = 2131231481;
+			public const int message_play = 2131231481;
 			
 			// aapt resource value: 0x7F0802FA
-			public const int my_5k_vr116 = 2131231482;
+			public const int message_play_dis = 2131231482;
 			
 			// aapt resource value: 0x7F0802FB
-			public const int my_a1 = 2131231483;
+			public const int message_play_sel = 2131231483;
 			
 			// aapt resource value: 0x7F0802FC
-			public const int my_a1c = 2131231484;
+			public const int message_play_selector = 2131231484;
 			
 			// aapt resource value: 0x7F0802FD
-			public const int my_a1s = 2131231485;
+			public const int message_power = 2131231485;
 			
 			// aapt resource value: 0x7F0802FE
-			public const int my_add = 2131231486;
+			public const int message_sel = 2131231486;
 			
 			// aapt resource value: 0x7F0802FF
-			public const int my_c6p = 2131231487;
+			public const int message_smoke = 2131231487;
 			
 			// aapt resource value: 0x7F080300
-			public const int my_c6t = 2131231488;
+			public const int message_system_list_item_divider = 2131231488;
 			
 			// aapt resource value: 0x7F080301
-			public const int my_cover = 2131231489;
+			public const int message_tampering = 2131231489;
 			
 			// aapt resource value: 0x7F080302
-			public const int my_cover620 = 2131231490;
+			public const int message_video = 2131231490;
 			
 			// aapt resource value: 0x7F080303
-			public const int my_db1 = 2131231491;
+			public const int message_video_dis = 2131231491;
 			
 			// aapt resource value: 0x7F080304
-			public const int my_doorbell = 2131231492;
+			public const int message_video_loss = 2131231492;
 			
 			// aapt resource value: 0x7F080305
-			public const int my_doorbell_hik = 2131231493;
+			public const int message_video_sel = 2131231493;
 			
 			// aapt resource value: 0x7F080306
-			public const int my_n1 = 2131231494;
+			public const int message_video_selector = 2131231494;
 			
 			// aapt resource value: 0x7F080307
-			public const int my_no_video = 2131231495;
+			public const int message_water = 2131231495;
 			
 			// aapt resource value: 0x7F080308
-			public const int my_progress_drawable = 2131231496;
+			public const int mic = 2131231496;
 			
 			// aapt resource value: 0x7F080309
-			public const int my_r1 = 2131231497;
+			public const int mm_trans = 2131231497;
 			
 			// aapt resource value: 0x7F08030A
-			public const int my_r2 = 2131231498;
-			
-			// aapt resource value: 0x7F08030B
-			public const int my_shoping = 2131231499;
+			public const int mobile_common_bg_btn_border_shape = 2131231498;
 			
 			// aapt resource value: 0x7F08030C
-			public const int my_switch_off = 2131231500;
+			public const int mobile_common_checkbox_small_checked = 2131231500;
 			
 			// aapt resource value: 0x7F08030D
-			public const int my_switch_on = 2131231501;
+			public const int mobile_common_checkbox_small_default = 2131231501;
+			
+			// aapt resource value: 0x7F08030B
+			public const int mobile_common_check_box_selector = 2131231499;
 			
 			// aapt resource value: 0x7F08030E
-			public const int my_switch_selector = 2131231502;
+			public const int mobile_common_common_pic_nointernet = 2131231502;
 			
 			// aapt resource value: 0x7F08030F
-			public const int my_vr104d = 2131231503;
+			public const int mobile_common_dialog_bg = 2131231503;
 			
 			// aapt resource value: 0x7F080310
-			public const int my_w1 = 2131231504;
+			public const int mobile_common_dialog_tips_bg = 2131231504;
 			
 			// aapt resource value: 0x7F080311
-			public const int my_w2d = 2131231505;
+			public const int mobile_common_icon_deleteinput = 2131231505;
 			
 			// aapt resource value: 0x7F080312
-			public const int my_w2s = 2131231506;
+			public const int mobile_common_icon_nextarrow = 2131231506;
 			
 			// aapt resource value: 0x7F080313
-			public const int my_w3 = 2131231507;
+			public const int mobile_common_leba_bg_single_selected = 2131231507;
 			
 			// aapt resource value: 0x7F080314
-			public const int my_wlb = 2131231508;
+			public const int mobile_common_leba_bg_single_unselected = 2131231508;
 			
 			// aapt resource value: 0x7F080315
-			public const int my_x1 = 2131231509;
+			public const int mobile_common_my_menu_selector_bg = 2131231509;
 			
 			// aapt resource value: 0x7F080316
-			public const int my_x2 = 2131231510;
+			public const int mobile_common_next_btn_selector = 2131231510;
 			
 			// aapt resource value: 0x7F080317
-			public const int my_x3 = 2131231511;
+			public const int mobile_common_progress_loading_img = 2131231511;
 			
 			// aapt resource value: 0x7F080318
-			public const int my_x3c = 2131231512;
+			public const int mobile_common_progress_style = 2131231512;
 			
 			// aapt resource value: 0x7F080319
-			public const int my_x4 = 2131231513;
+			public const int mobile_common_radius_5dp_white_bg = 2131231513;
 			
 			// aapt resource value: 0x7F08031A
-			public const int my_x5c = 2131231514;
+			public const int mobile_common_shape_round_bg = 2131231514;
 			
 			// aapt resource value: 0x7F08031B
-			public const int name_del = 2131231515;
+			public const int mobile_common_share_selector = 2131231515;
 			
 			// aapt resource value: 0x7F08031C
-			public const int name_del_sel = 2131231516;
+			public const int mobile_common_title_back = 2131231516;
 			
 			// aapt resource value: 0x7F08031D
-			public const int name_del_selector = 2131231517;
-			
-			// aapt resource value: 0x7F08031F
-			public const int navigation_empty_icon = 2131231519;
+			public const int more = 2131231517;
 			
 			// aapt resource value: 0x7F08031E
-			public const int nav_back = 2131231518;
+			public const int my_5k_vr = 2131231518;
 			
-			// aapt resource value: 0x7F080322
-			public const int nomessage = 2131231522;
-			
-			// aapt resource value: 0x7F080323
-			public const int notification_action_background = 2131231523;
-			
-			// aapt resource value: 0x7F080324
-			public const int notification_bg = 2131231524;
-			
-			// aapt resource value: 0x7F080325
-			public const int notification_bg_low = 2131231525;
-			
-			// aapt resource value: 0x7F080326
-			public const int notification_bg_low_normal = 2131231526;
-			
-			// aapt resource value: 0x7F080327
-			public const int notification_bg_low_pressed = 2131231527;
-			
-			// aapt resource value: 0x7F080328
-			public const int notification_bg_normal = 2131231528;
-			
-			// aapt resource value: 0x7F080329
-			public const int notification_bg_normal_pressed = 2131231529;
-			
-			// aapt resource value: 0x7F08032A
-			public const int notification_icon_background = 2131231530;
-			
-			// aapt resource value: 0x7F08032B
-			public const int notification_template_icon_bg = 2131231531;
-			
-			// aapt resource value: 0x7F08032C
-			public const int notification_template_icon_low_bg = 2131231532;
-			
-			// aapt resource value: 0x7F08032D
-			public const int notification_tile_bg = 2131231533;
-			
-			// aapt resource value: 0x7F08032E
-			public const int notify_bg = 2131231534;
-			
-			// aapt resource value: 0x7F08032F
-			public const int notify_panel_notification_icon_bg = 2131231535;
+			// aapt resource value: 0x7F08031F
+			public const int my_5k_vr116 = 2131231519;
 			
 			// aapt resource value: 0x7F080320
-			public const int no_message = 2131231520;
+			public const int my_a1 = 2131231520;
 			
 			// aapt resource value: 0x7F080321
-			public const int no_read = 2131231521;
+			public const int my_a1c = 2131231521;
+			
+			// aapt resource value: 0x7F080322
+			public const int my_a1s = 2131231522;
+			
+			// aapt resource value: 0x7F080323
+			public const int my_add = 2131231523;
+			
+			// aapt resource value: 0x7F080324
+			public const int my_c6p = 2131231524;
+			
+			// aapt resource value: 0x7F080325
+			public const int my_c6t = 2131231525;
+			
+			// aapt resource value: 0x7F080326
+			public const int my_cover = 2131231526;
+			
+			// aapt resource value: 0x7F080327
+			public const int my_cover620 = 2131231527;
+			
+			// aapt resource value: 0x7F080328
+			public const int my_db1 = 2131231528;
+			
+			// aapt resource value: 0x7F080329
+			public const int my_doorbell = 2131231529;
+			
+			// aapt resource value: 0x7F08032A
+			public const int my_doorbell_hik = 2131231530;
+			
+			// aapt resource value: 0x7F08032B
+			public const int my_n1 = 2131231531;
+			
+			// aapt resource value: 0x7F08032C
+			public const int my_no_video = 2131231532;
+			
+			// aapt resource value: 0x7F08032D
+			public const int my_progress_drawable = 2131231533;
+			
+			// aapt resource value: 0x7F08032E
+			public const int my_r1 = 2131231534;
+			
+			// aapt resource value: 0x7F08032F
+			public const int my_r2 = 2131231535;
 			
 			// aapt resource value: 0x7F080330
-			public const int number_bg = 2131231536;
+			public const int my_shoping = 2131231536;
 			
 			// aapt resource value: 0x7F080331
-			public const int offline = 2131231537;
+			public const int my_switch_off = 2131231537;
 			
 			// aapt resource value: 0x7F080332
-			public const int open_cameralist_alarmlist_selector = 2131231538;
+			public const int my_switch_on = 2131231538;
 			
 			// aapt resource value: 0x7F080333
-			public const int open_cameralist_button_selector = 2131231539;
+			public const int my_switch_selector = 2131231539;
 			
 			// aapt resource value: 0x7F080334
-			public const int open_cameralist_remotepb_selector = 2131231540;
+			public const int my_vr104d = 2131231540;
 			
 			// aapt resource value: 0x7F080335
-			public const int open_cameralist_setup_selector = 2131231541;
+			public const int my_w1 = 2131231541;
 			
 			// aapt resource value: 0x7F080336
-			public const int opinion = 2131231542;
+			public const int my_w2d = 2131231542;
 			
 			// aapt resource value: 0x7F080337
-			public const int palyback_alarm_icon2 = 2131231543;
+			public const int my_w2s = 2131231543;
 			
 			// aapt resource value: 0x7F080338
-			public const int palyback_close = 2131231544;
+			public const int my_w3 = 2131231544;
 			
 			// aapt resource value: 0x7F080339
-			public const int palyback_close_sel = 2131231545;
+			public const int my_wlb = 2131231545;
 			
 			// aapt resource value: 0x7F08033A
-			public const int palyback_close_selector = 2131231546;
+			public const int my_x1 = 2131231546;
 			
 			// aapt resource value: 0x7F08033B
-			public const int palyback_date_down = 2131231547;
+			public const int my_x2 = 2131231547;
 			
 			// aapt resource value: 0x7F08033C
-			public const int palyback_date_down_sel = 2131231548;
+			public const int my_x3 = 2131231548;
 			
 			// aapt resource value: 0x7F08033D
-			public const int palyback_full_down = 2131231549;
+			public const int my_x3c = 2131231549;
 			
 			// aapt resource value: 0x7F08033E
-			public const int palyback_full_up = 2131231550;
+			public const int my_x4 = 2131231550;
 			
 			// aapt resource value: 0x7F08033F
-			public const int palyback_nest = 2131231551;
+			public const int my_x5c = 2131231551;
 			
 			// aapt resource value: 0x7F080340
-			public const int palyback_pause = 2131231552;
+			public const int name_del = 2131231552;
 			
 			// aapt resource value: 0x7F080341
-			public const int palyback_pause_sel = 2131231553;
+			public const int name_del_sel = 2131231553;
 			
 			// aapt resource value: 0x7F080342
-			public const int palyback_previously = 2131231554;
-			
-			// aapt resource value: 0x7F080343
-			public const int palyback_previously_sel = 2131231555;
+			public const int name_del_selector = 2131231554;
 			
 			// aapt resource value: 0x7F080344
-			public const int palyback_previously_selector = 2131231556;
+			public const int navigation_empty_icon = 2131231556;
 			
-			// aapt resource value: 0x7F080345
-			public const int palyback_replay = 2131231557;
-			
-			// aapt resource value: 0x7F080346
-			public const int palyback_retry = 2131231558;
+			// aapt resource value: 0x7F080343
+			public const int nav_back = 2131231555;
 			
 			// aapt resource value: 0x7F080347
-			public const int palyback_time_bg = 2131231559;
+			public const int nomessage = 2131231559;
 			
 			// aapt resource value: 0x7F080348
-			public const int palyback_video = 2131231560;
+			public const int notification_action_background = 2131231560;
 			
 			// aapt resource value: 0x7F080349
-			public const int palyback_video_now = 2131231561;
+			public const int notification_bg = 2131231561;
 			
 			// aapt resource value: 0x7F08034A
-			public const int palyback_video_now_sel = 2131231562;
+			public const int notification_bg_low = 2131231562;
 			
 			// aapt resource value: 0x7F08034B
-			public const int palyback_video_now_selector = 2131231563;
+			public const int notification_bg_low_normal = 2131231563;
 			
 			// aapt resource value: 0x7F08034C
-			public const int palyback_video_sel = 2131231564;
+			public const int notification_bg_low_pressed = 2131231564;
 			
 			// aapt resource value: 0x7F08034D
-			public const int palyback_video_selector = 2131231565;
+			public const int notification_bg_normal = 2131231565;
 			
 			// aapt resource value: 0x7F08034E
-			public const int pause = 2131231566;
+			public const int notification_bg_normal_pressed = 2131231566;
 			
 			// aapt resource value: 0x7F08034F
-			public const int pause_sel = 2131231567;
+			public const int notification_icon_background = 2131231567;
 			
 			// aapt resource value: 0x7F080350
-			public const int pic_bg = 2131231568;
+			public const int notification_template_icon_bg = 2131231568;
 			
 			// aapt resource value: 0x7F080351
-			public const int play = 2131231569;
-			
-			// aapt resource value: 0x7F0803B4
-			public const int playback = 2131231668;
-			
-			// aapt resource value: 0x7F0803C4
-			public const int playbackslider = 2131231684;
-			
-			// aapt resource value: 0x7F0803C5
-			public const int playbackslider_sel = 2131231685;
-			
-			// aapt resource value: 0x7F0803B5
-			public const int playback_button = 2131231669;
-			
-			// aapt resource value: 0x7F0803B6
-			public const int playback_cancel = 2131231670;
-			
-			// aapt resource value: 0x7F0803B7
-			public const int playback_check_selector = 2131231671;
-			
-			// aapt resource value: 0x7F0803B8
-			public const int playback_cover2 = 2131231672;
-			
-			// aapt resource value: 0x7F0803B9
-			public const int playback_cut = 2131231673;
-			
-			// aapt resource value: 0x7F0803BA
-			public const int playback_cut_btn_selector = 2131231674;
-			
-			// aapt resource value: 0x7F0803BB
-			public const int playback_cut_disable = 2131231675;
-			
-			// aapt resource value: 0x7F0803BC
-			public const int playback_cut_sel = 2131231676;
-			
-			// aapt resource value: 0x7F0803BD
-			public const int playback_matte = 2131231677;
-			
-			// aapt resource value: 0x7F0803BE
-			public const int playback_more_down = 2131231678;
-			
-			// aapt resource value: 0x7F0803BF
-			public const int playback_more_down1 = 2131231679;
-			
-			// aapt resource value: 0x7F0803C0
-			public const int playback_more_up1 = 2131231680;
-			
-			// aapt resource value: 0x7F0803C1
-			public const int playback_play = 2131231681;
-			
-			// aapt resource value: 0x7F0803C2
-			public const int playback_play_sel = 2131231682;
-			
-			// aapt resource value: 0x7F0803C3
-			public const int playback_sel = 2131231683;
-			
-			// aapt resource value: 0x7F0803C6
-			public const int playbtn_selector = 2131231686;
+			public const int notification_template_icon_low_bg = 2131231569;
 			
 			// aapt resource value: 0x7F080352
-			public const int play_balanced = 2131231570;
+			public const int notification_tile_bg = 2131231570;
 			
 			// aapt resource value: 0x7F080353
-			public const int play_balanced_disabel = 2131231571;
+			public const int notify_bg = 2131231571;
 			
 			// aapt resource value: 0x7F080354
-			public const int play_balanced_sel = 2131231572;
+			public const int notify_panel_notification_icon_bg = 2131231572;
+			
+			// aapt resource value: 0x7F080345
+			public const int no_message = 2131231557;
+			
+			// aapt resource value: 0x7F080346
+			public const int no_read = 2131231558;
 			
 			// aapt resource value: 0x7F080355
-			public const int play_balanced_selector = 2131231573;
+			public const int number_bg = 2131231573;
 			
 			// aapt resource value: 0x7F080356
-			public const int play_big = 2131231574;
-			
-			// aapt resource value: 0x7F080358
-			public const int play_bigbtn_selector = 2131231576;
+			public const int offline = 2131231574;
 			
 			// aapt resource value: 0x7F080357
-			public const int play_big_press = 2131231575;
+			public const int open_cameralist_alarmlist_selector = 2131231575;
+			
+			// aapt resource value: 0x7F080358
+			public const int open_cameralist_button_selector = 2131231576;
 			
 			// aapt resource value: 0x7F080359
-			public const int play_button_bg = 2131231577;
+			public const int open_cameralist_remotepb_selector = 2131231577;
 			
 			// aapt resource value: 0x7F08035A
-			public const int play_button_sel = 2131231578;
+			public const int open_cameralist_setup_selector = 2131231578;
 			
 			// aapt resource value: 0x7F08035B
-			public const int play_button_selector = 2131231579;
+			public const int opinion = 2131231579;
 			
 			// aapt resource value: 0x7F08035C
-			public const int play_close = 2131231580;
+			public const int oval_color_white_18 = 2131231580;
 			
 			// aapt resource value: 0x7F08035D
-			public const int play_close_sel = 2131231581;
+			public const int palyback_alarm_icon2 = 2131231581;
 			
 			// aapt resource value: 0x7F08035E
-			public const int play_close_selector = 2131231582;
+			public const int palyback_close = 2131231582;
 			
 			// aapt resource value: 0x7F08035F
-			public const int play_disable = 2131231583;
+			public const int palyback_close_sel = 2131231583;
 			
 			// aapt resource value: 0x7F080360
-			public const int play_flunet = 2131231584;
+			public const int palyback_close_selector = 2131231584;
 			
 			// aapt resource value: 0x7F080361
-			public const int play_flunet_disabel = 2131231585;
+			public const int palyback_date_down = 2131231585;
 			
 			// aapt resource value: 0x7F080362
-			public const int play_flunet_sel = 2131231586;
+			public const int palyback_date_down_sel = 2131231586;
 			
 			// aapt resource value: 0x7F080363
-			public const int play_flunet_selector = 2131231587;
+			public const int palyback_full_down = 2131231587;
 			
 			// aapt resource value: 0x7F080364
-			public const int play_full_loding_logo = 2131231588;
+			public const int palyback_full_up = 2131231588;
 			
 			// aapt resource value: 0x7F080365
-			public const int play_full_multiple = 2131231589;
+			public const int palyback_nest = 2131231589;
 			
 			// aapt resource value: 0x7F080366
-			public const int play_full_multiple2 = 2131231590;
+			public const int palyback_pause = 2131231590;
 			
 			// aapt resource value: 0x7F080367
-			public const int play_full_multiple3 = 2131231591;
+			public const int palyback_pause_sel = 2131231591;
 			
 			// aapt resource value: 0x7F080368
-			public const int play_full_multiple4 = 2131231592;
+			public const int palyback_previously = 2131231592;
 			
 			// aapt resource value: 0x7F080369
-			public const int play_full_multiple5 = 2131231593;
+			public const int palyback_previously_sel = 2131231593;
 			
 			// aapt resource value: 0x7F08036A
-			public const int play_full_pause = 2131231594;
+			public const int palyback_previously_selector = 2131231594;
 			
 			// aapt resource value: 0x7F08036B
-			public const int play_full_pause_sel = 2131231595;
+			public const int palyback_replay = 2131231595;
 			
 			// aapt resource value: 0x7F08036C
-			public const int play_full_pause_selector = 2131231596;
+			public const int palyback_retry = 2131231596;
 			
 			// aapt resource value: 0x7F08036D
-			public const int play_full_play = 2131231597;
+			public const int palyback_time_bg = 2131231597;
 			
 			// aapt resource value: 0x7F08036E
-			public const int play_full_play_sel = 2131231598;
+			public const int palyback_video = 2131231598;
 			
 			// aapt resource value: 0x7F08036F
-			public const int play_full_play_selector = 2131231599;
+			public const int palyback_video_now = 2131231599;
 			
 			// aapt resource value: 0x7F080370
-			public const int play_full_previously = 2131231600;
+			public const int palyback_video_now_sel = 2131231600;
 			
 			// aapt resource value: 0x7F080371
-			public const int play_full_previously_sel = 2131231601;
+			public const int palyback_video_now_selector = 2131231601;
 			
 			// aapt resource value: 0x7F080372
-			public const int play_full_previously_selector = 2131231602;
+			public const int palyback_video_sel = 2131231602;
 			
 			// aapt resource value: 0x7F080373
-			public const int play_full_ptz_selector = 2131231603;
+			public const int palyback_video_selector = 2131231603;
 			
 			// aapt resource value: 0x7F080374
-			public const int play_full_quality_color_selector = 2131231604;
+			public const int pause = 2131231604;
 			
 			// aapt resource value: 0x7F080375
-			public const int play_full_quality_selector = 2131231605;
+			public const int pause_sel = 2131231605;
 			
 			// aapt resource value: 0x7F080376
-			public const int play_full_soundoff_btn_selector = 2131231606;
+			public const int pic_bg = 2131231606;
 			
 			// aapt resource value: 0x7F080377
-			public const int play_full_soundon_btn_selector = 2131231607;
-			
-			// aapt resource value: 0x7F080378
-			public const int play_full_stop = 2131231608;
-			
-			// aapt resource value: 0x7F080379
-			public const int play_full_stop_sel = 2131231609;
-			
-			// aapt resource value: 0x7F08037A
-			public const int play_full_stop_selector = 2131231610;
-			
-			// aapt resource value: 0x7F08037B
-			public const int play_full_talk_selector = 2131231611;
-			
-			// aapt resource value: 0x7F08037C
-			public const int play_full_video = 2131231612;
-			
-			// aapt resource value: 0x7F08037D
-			public const int play_full_video_now = 2131231613;
-			
-			// aapt resource value: 0x7F08037E
-			public const int play_full_video_now_sel = 2131231614;
-			
-			// aapt resource value: 0x7F08037F
-			public const int play_full_video_now_selector = 2131231615;
-			
-			// aapt resource value: 0x7F080380
-			public const int play_full_video_sel = 2131231616;
-			
-			// aapt resource value: 0x7F080381
-			public const int play_full_video_selector = 2131231617;
-			
-			// aapt resource value: 0x7F080382
-			public const int play_hd = 2131231618;
-			
-			// aapt resource value: 0x7F080383
-			public const int play_hd_disabel = 2131231619;
-			
-			// aapt resource value: 0x7F080384
-			public const int play_hd_sel = 2131231620;
-			
-			// aapt resource value: 0x7F080385
-			public const int play_hd_selector = 2131231621;
-			
-			// aapt resource value: 0x7F080386
-			public const int play_module_video_cloudstage_direction_limit_down = 2131231622;
-			
-			// aapt resource value: 0x7F080387
-			public const int play_module_video_cloudstage_direction_limit_left = 2131231623;
-			
-			// aapt resource value: 0x7F080388
-			public const int play_module_video_cloudstage_direction_limit_right = 2131231624;
-			
-			// aapt resource value: 0x7F080389
-			public const int play_module_video_cloudstage_direction_limit_up = 2131231625;
-			
-			// aapt resource value: 0x7F08038A
-			public const int play_play = 2131231626;
-			
-			// aapt resource value: 0x7F08038B
-			public const int play_play_dis = 2131231627;
-			
-			// aapt resource value: 0x7F08038C
-			public const int play_play_sel = 2131231628;
-			
-			// aapt resource value: 0x7F08038D
-			public const int play_play_selector = 2131231629;
-			
-			// aapt resource value: 0x7F08038E
-			public const int play_press = 2131231630;
-			
-			// aapt resource value: 0x7F08038F
-			public const int play_previously = 2131231631;
-			
-			// aapt resource value: 0x7F080390
-			public const int play_previously_dis = 2131231632;
-			
-			// aapt resource value: 0x7F080391
-			public const int play_previously_sel = 2131231633;
-			
-			// aapt resource value: 0x7F080392
-			public const int play_previously_selector = 2131231634;
-			
-			// aapt resource value: 0x7F080393
-			public const int play_privacy_selector = 2131231635;
-			
-			// aapt resource value: 0x7F080394
-			public const int play_ptz = 2131231636;
-			
-			// aapt resource value: 0x7F080395
-			public const int play_ptz_dis = 2131231637;
-			
-			// aapt resource value: 0x7F080396
-			public const int play_ptz_sel = 2131231638;
-			
-			// aapt resource value: 0x7F080397
-			public const int play_ptz_selector = 2131231639;
-			
-			// aapt resource value: 0x7F080398
-			public const int play_small = 2131231640;
-			
-			// aapt resource value: 0x7F08039A
-			public const int play_smallbtn_selector = 2131231642;
-			
-			// aapt resource value: 0x7F080399
-			public const int play_small_press = 2131231641;
-			
-			// aapt resource value: 0x7F08039B
-			public const int play_speech = 2131231643;
-			
-			// aapt resource value: 0x7F08039C
-			public const int play_speech_dis = 2131231644;
-			
-			// aapt resource value: 0x7F08039D
-			public const int play_speech_sel = 2131231645;
-			
-			// aapt resource value: 0x7F08039E
-			public const int play_speech_selector = 2131231646;
-			
-			// aapt resource value: 0x7F08039F
-			public const int play_stop = 2131231647;
-			
-			// aapt resource value: 0x7F0803A0
-			public const int play_stop_sel = 2131231648;
-			
-			// aapt resource value: 0x7F0803A1
-			public const int play_stop_selector = 2131231649;
-			
-			// aapt resource value: 0x7F0803A2
-			public const int play_talk = 2131231650;
-			
-			// aapt resource value: 0x7F0803A6
-			public const int play_talkback = 2131231654;
-			
-			// aapt resource value: 0x7F0803A7
-			public const int play_talkback_sel = 2131231655;
-			
-			// aapt resource value: 0x7F0803A8
-			public const int play_talkback_selector = 2131231656;
-			
-			// aapt resource value: 0x7F0803A3
-			public const int play_talk_dis = 2131231651;
-			
-			// aapt resource value: 0x7F0803A4
-			public const int play_talk_sel = 2131231652;
-			
-			// aapt resource value: 0x7F0803A5
-			public const int play_talk_selector = 2131231653;
-			
-			// aapt resource value: 0x7F0803A9
-			public const int play_video = 2131231657;
-			
-			// aapt resource value: 0x7F0803AA
-			public const int play_video_dis = 2131231658;
-			
-			// aapt resource value: 0x7F0803AB
-			public const int play_video_record = 2131231659;
-			
-			// aapt resource value: 0x7F0803AC
-			public const int play_video_sel = 2131231660;
-			
-			// aapt resource value: 0x7F0803AD
-			public const int play_video_selector = 2131231661;
-			
-			// aapt resource value: 0x7F0803AE
-			public const int play_video_start = 2131231662;
-			
-			// aapt resource value: 0x7F0803AF
-			public const int play_video_time_bg = 2131231663;
-			
-			// aapt resource value: 0x7F0803B0
-			public const int play_voice = 2131231664;
-			
-			// aapt resource value: 0x7F0803B1
-			public const int play_voice_dis = 2131231665;
-			
-			// aapt resource value: 0x7F0803B2
-			public const int play_voice_sel = 2131231666;
-			
-			// aapt resource value: 0x7F0803B3
-			public const int play_voice_selector = 2131231667;
-			
-			// aapt resource value: 0x7F0803C7
-			public const int popdialogbg = 2131231687;
-			
-			// aapt resource value: 0x7F0803C8
-			public const int prepare_device = 2131231688;
-			
-			// aapt resource value: 0x7F0803C9
-			public const int preview_close1_video_ico = 2131231689;
-			
-			// aapt resource value: 0x7F0803CA
-			public const int preview_close_video = 2131231690;
-			
-			// aapt resource value: 0x7F0803CB
-			public const int preview_close_video_dis = 2131231691;
-			
-			// aapt resource value: 0x7F0803CC
-			public const int preview_close_video_sel = 2131231692;
-			
-			// aapt resource value: 0x7F0803CD
-			public const int preview_down_bg_normal = 2131231693;
-			
-			// aapt resource value: 0x7F0803CE
-			public const int preview_down_bg_pressed = 2131231694;
-			
-			// aapt resource value: 0x7F0803CF
-			public const int preview_down_ico = 2131231695;
-			
-			// aapt resource value: 0x7F0803D0
-			public const int preview_down_selector = 2131231696;
-			
-			// aapt resource value: 0x7F0803D1
-			public const int preview_enlarge = 2131231697;
-			
-			// aapt resource value: 0x7F0803D2
-			public const int preview_enlarge_btn_sel = 2131231698;
-			
-			// aapt resource value: 0x7F0803D3
-			public const int preview_enlarge_dis = 2131231699;
-			
-			// aapt resource value: 0x7F0803D4
-			public const int preview_enlarge_selector = 2131231700;
-			
-			// aapt resource value: 0x7F0803D5
-			public const int preview_play_btn = 2131231701;
-			
-			// aapt resource value: 0x7F0803D6
-			public const int preview_play_btn_dis = 2131231702;
-			
-			// aapt resource value: 0x7F0803D7
-			public const int preview_play_btn_sel = 2131231703;
-			
-			// aapt resource value: 0x7F0803D8
-			public const int preview_recording = 2131231704;
-			
-			// aapt resource value: 0x7F0803D9
-			public const int preview_recording_dis = 2131231705;
-			
-			// aapt resource value: 0x7F0803DA
-			public const int preview_recording_sel = 2131231706;
-			
-			// aapt resource value: 0x7F0803DB
-			public const int preview_selection_bg = 2131231707;
-			
-			// aapt resource value: 0x7F0803DC
-			public const int preview_stopplay_btn_dis = 2131231708;
+			public const int play = 2131231607;
 			
 			// aapt resource value: 0x7F0803DD
-			public const int preview_unvoice_btn = 2131231709;
-			
-			// aapt resource value: 0x7F0803DE
-			public const int preview_unvoice_btn_sel = 2131231710;
-			
-			// aapt resource value: 0x7F0803DF
-			public const int preview_video_selection = 2131231711;
-			
-			// aapt resource value: 0x7F0803E0
-			public const int preview_video_selection_hover = 2131231712;
-			
-			// aapt resource value: 0x7F0803E1
-			public const int preview_voice_btn = 2131231713;
-			
-			// aapt resource value: 0x7F0803E2
-			public const int preview_voice_btn_dis = 2131231714;
-			
-			// aapt resource value: 0x7F0803E3
-			public const int preview_voice_btn_sel = 2131231715;
-			
-			// aapt resource value: 0x7F0803E4
-			public const int previously = 2131231716;
-			
-			// aapt resource value: 0x7F0803E5
-			public const int previously_dis = 2131231717;
-			
-			// aapt resource value: 0x7F0803E6
-			public const int previously_sel = 2131231718;
-			
-			// aapt resource value: 0x7F0803E7
-			public const int progress_style = 2131231719;
-			
-			// aapt resource value: 0x7F0803E8
-			public const int ptz_bg = 2131231720;
-			
-			// aapt resource value: 0x7F0803E9
-			public const int ptz_bottom_limit = 2131231721;
-			
-			// aapt resource value: 0x7F0803EA
-			public const int ptz_bottom_sel = 2131231722;
-			
-			// aapt resource value: 0x7F0803EB
-			public const int ptz_left_limit = 2131231723;
-			
-			// aapt resource value: 0x7F0803EC
-			public const int ptz_left_sel = 2131231724;
+			public const int playback = 2131231709;
 			
 			// aapt resource value: 0x7F0803ED
-			public const int ptz_prompt = 2131231725;
+			public const int playbackslider = 2131231725;
 			
 			// aapt resource value: 0x7F0803EE
-			public const int ptz_right_limit = 2131231726;
+			public const int playbackslider_sel = 2131231726;
+			
+			// aapt resource value: 0x7F0803DE
+			public const int playback_button = 2131231710;
+			
+			// aapt resource value: 0x7F0803DF
+			public const int playback_cancel = 2131231711;
+			
+			// aapt resource value: 0x7F0803E0
+			public const int playback_check_selector = 2131231712;
+			
+			// aapt resource value: 0x7F0803E1
+			public const int playback_cover2 = 2131231713;
+			
+			// aapt resource value: 0x7F0803E2
+			public const int playback_cut = 2131231714;
+			
+			// aapt resource value: 0x7F0803E3
+			public const int playback_cut_btn_selector = 2131231715;
+			
+			// aapt resource value: 0x7F0803E4
+			public const int playback_cut_disable = 2131231716;
+			
+			// aapt resource value: 0x7F0803E5
+			public const int playback_cut_sel = 2131231717;
+			
+			// aapt resource value: 0x7F0803E6
+			public const int playback_matte = 2131231718;
+			
+			// aapt resource value: 0x7F0803E7
+			public const int playback_more_down = 2131231719;
+			
+			// aapt resource value: 0x7F0803E8
+			public const int playback_more_down1 = 2131231720;
+			
+			// aapt resource value: 0x7F0803E9
+			public const int playback_more_up1 = 2131231721;
+			
+			// aapt resource value: 0x7F0803EA
+			public const int playback_play = 2131231722;
+			
+			// aapt resource value: 0x7F0803EB
+			public const int playback_play_sel = 2131231723;
+			
+			// aapt resource value: 0x7F0803EC
+			public const int playback_sel = 2131231724;
 			
 			// aapt resource value: 0x7F0803EF
-			public const int ptz_right_sel = 2131231727;
+			public const int playbtn_selector = 2131231727;
+			
+			// aapt resource value: 0x7F080378
+			public const int play_balanced = 2131231608;
+			
+			// aapt resource value: 0x7F080379
+			public const int play_balanced_disabel = 2131231609;
+			
+			// aapt resource value: 0x7F08037A
+			public const int play_balanced_sel = 2131231610;
+			
+			// aapt resource value: 0x7F08037B
+			public const int play_balanced_selector = 2131231611;
+			
+			// aapt resource value: 0x7F08037C
+			public const int play_big = 2131231612;
+			
+			// aapt resource value: 0x7F08037E
+			public const int play_bigbtn_selector = 2131231614;
+			
+			// aapt resource value: 0x7F08037D
+			public const int play_big_press = 2131231613;
+			
+			// aapt resource value: 0x7F08037F
+			public const int play_button_bg = 2131231615;
+			
+			// aapt resource value: 0x7F080380
+			public const int play_button_sel = 2131231616;
+			
+			// aapt resource value: 0x7F080381
+			public const int play_button_selector = 2131231617;
+			
+			// aapt resource value: 0x7F080382
+			public const int play_close = 2131231618;
+			
+			// aapt resource value: 0x7F080383
+			public const int play_close_sel = 2131231619;
+			
+			// aapt resource value: 0x7F080384
+			public const int play_close_selector = 2131231620;
+			
+			// aapt resource value: 0x7F080385
+			public const int play_disable = 2131231621;
+			
+			// aapt resource value: 0x7F080386
+			public const int play_flunet = 2131231622;
+			
+			// aapt resource value: 0x7F080387
+			public const int play_flunet_disabel = 2131231623;
+			
+			// aapt resource value: 0x7F080388
+			public const int play_flunet_sel = 2131231624;
+			
+			// aapt resource value: 0x7F080389
+			public const int play_flunet_selector = 2131231625;
+			
+			// aapt resource value: 0x7F08038A
+			public const int play_full_loding_logo = 2131231626;
+			
+			// aapt resource value: 0x7F08038B
+			public const int play_full_multiple = 2131231627;
+			
+			// aapt resource value: 0x7F08038C
+			public const int play_full_multiple2 = 2131231628;
+			
+			// aapt resource value: 0x7F08038D
+			public const int play_full_multiple3 = 2131231629;
+			
+			// aapt resource value: 0x7F08038E
+			public const int play_full_multiple4 = 2131231630;
+			
+			// aapt resource value: 0x7F08038F
+			public const int play_full_multiple5 = 2131231631;
+			
+			// aapt resource value: 0x7F080390
+			public const int play_full_pause = 2131231632;
+			
+			// aapt resource value: 0x7F080391
+			public const int play_full_pause_sel = 2131231633;
+			
+			// aapt resource value: 0x7F080392
+			public const int play_full_pause_selector = 2131231634;
+			
+			// aapt resource value: 0x7F080393
+			public const int play_full_play = 2131231635;
+			
+			// aapt resource value: 0x7F080394
+			public const int play_full_play_sel = 2131231636;
+			
+			// aapt resource value: 0x7F080395
+			public const int play_full_play_selector = 2131231637;
+			
+			// aapt resource value: 0x7F080396
+			public const int play_full_previously = 2131231638;
+			
+			// aapt resource value: 0x7F080397
+			public const int play_full_previously_sel = 2131231639;
+			
+			// aapt resource value: 0x7F080398
+			public const int play_full_previously_selector = 2131231640;
+			
+			// aapt resource value: 0x7F080399
+			public const int play_full_ptz_selector = 2131231641;
+			
+			// aapt resource value: 0x7F08039A
+			public const int play_full_quality_color_selector = 2131231642;
+			
+			// aapt resource value: 0x7F08039B
+			public const int play_full_quality_selector = 2131231643;
+			
+			// aapt resource value: 0x7F08039C
+			public const int play_full_soundoff_btn_selector = 2131231644;
+			
+			// aapt resource value: 0x7F08039D
+			public const int play_full_soundon_btn_selector = 2131231645;
+			
+			// aapt resource value: 0x7F08039E
+			public const int play_full_stop = 2131231646;
+			
+			// aapt resource value: 0x7F08039F
+			public const int play_full_stop_sel = 2131231647;
+			
+			// aapt resource value: 0x7F0803A0
+			public const int play_full_stop_selector = 2131231648;
+			
+			// aapt resource value: 0x7F0803A1
+			public const int play_full_talk_selector = 2131231649;
+			
+			// aapt resource value: 0x7F0803A2
+			public const int play_full_video = 2131231650;
+			
+			// aapt resource value: 0x7F0803A3
+			public const int play_full_video_now = 2131231651;
+			
+			// aapt resource value: 0x7F0803A4
+			public const int play_full_video_now_sel = 2131231652;
+			
+			// aapt resource value: 0x7F0803A5
+			public const int play_full_video_now_selector = 2131231653;
+			
+			// aapt resource value: 0x7F0803A6
+			public const int play_full_video_sel = 2131231654;
+			
+			// aapt resource value: 0x7F0803A7
+			public const int play_full_video_selector = 2131231655;
+			
+			// aapt resource value: 0x7F0803A8
+			public const int play_hd = 2131231656;
+			
+			// aapt resource value: 0x7F0803A9
+			public const int play_hd_disabel = 2131231657;
+			
+			// aapt resource value: 0x7F0803AA
+			public const int play_hd_sel = 2131231658;
+			
+			// aapt resource value: 0x7F0803AB
+			public const int play_hd_selector = 2131231659;
+			
+			// aapt resource value: 0x7F0803AC
+			public const int play_lock = 2131231660;
+			
+			// aapt resource value: 0x7F0803AD
+			public const int play_lock_dis = 2131231661;
+			
+			// aapt resource value: 0x7F0803AE
+			public const int play_lock_selector = 2131231662;
+			
+			// aapt resource value: 0x7F0803AF
+			public const int play_module_video_cloudstage_direction_limit_down = 2131231663;
+			
+			// aapt resource value: 0x7F0803B0
+			public const int play_module_video_cloudstage_direction_limit_left = 2131231664;
+			
+			// aapt resource value: 0x7F0803B1
+			public const int play_module_video_cloudstage_direction_limit_right = 2131231665;
+			
+			// aapt resource value: 0x7F0803B2
+			public const int play_module_video_cloudstage_direction_limit_up = 2131231666;
+			
+			// aapt resource value: 0x7F0803B3
+			public const int play_play = 2131231667;
+			
+			// aapt resource value: 0x7F0803B4
+			public const int play_play_dis = 2131231668;
+			
+			// aapt resource value: 0x7F0803B5
+			public const int play_play_sel = 2131231669;
+			
+			// aapt resource value: 0x7F0803B6
+			public const int play_play_selector = 2131231670;
+			
+			// aapt resource value: 0x7F0803B7
+			public const int play_press = 2131231671;
+			
+			// aapt resource value: 0x7F0803B8
+			public const int play_previously = 2131231672;
+			
+			// aapt resource value: 0x7F0803B9
+			public const int play_previously_dis = 2131231673;
+			
+			// aapt resource value: 0x7F0803BA
+			public const int play_previously_sel = 2131231674;
+			
+			// aapt resource value: 0x7F0803BB
+			public const int play_previously_selector = 2131231675;
+			
+			// aapt resource value: 0x7F0803BC
+			public const int play_privacy_selector = 2131231676;
+			
+			// aapt resource value: 0x7F0803BD
+			public const int play_ptz = 2131231677;
+			
+			// aapt resource value: 0x7F0803BE
+			public const int play_ptz_dis = 2131231678;
+			
+			// aapt resource value: 0x7F0803BF
+			public const int play_ptz_sel = 2131231679;
+			
+			// aapt resource value: 0x7F0803C0
+			public const int play_ptz_selector = 2131231680;
+			
+			// aapt resource value: 0x7F0803C1
+			public const int play_small = 2131231681;
+			
+			// aapt resource value: 0x7F0803C3
+			public const int play_smallbtn_selector = 2131231683;
+			
+			// aapt resource value: 0x7F0803C2
+			public const int play_small_press = 2131231682;
+			
+			// aapt resource value: 0x7F0803C4
+			public const int play_speech = 2131231684;
+			
+			// aapt resource value: 0x7F0803C5
+			public const int play_speech_dis = 2131231685;
+			
+			// aapt resource value: 0x7F0803C6
+			public const int play_speech_sel = 2131231686;
+			
+			// aapt resource value: 0x7F0803C7
+			public const int play_speech_selector = 2131231687;
+			
+			// aapt resource value: 0x7F0803C8
+			public const int play_stop = 2131231688;
+			
+			// aapt resource value: 0x7F0803C9
+			public const int play_stop_sel = 2131231689;
+			
+			// aapt resource value: 0x7F0803CA
+			public const int play_stop_selector = 2131231690;
+			
+			// aapt resource value: 0x7F0803CB
+			public const int play_talk = 2131231691;
+			
+			// aapt resource value: 0x7F0803CF
+			public const int play_talkback = 2131231695;
+			
+			// aapt resource value: 0x7F0803D0
+			public const int play_talkback_sel = 2131231696;
+			
+			// aapt resource value: 0x7F0803D1
+			public const int play_talkback_selector = 2131231697;
+			
+			// aapt resource value: 0x7F0803CC
+			public const int play_talk_dis = 2131231692;
+			
+			// aapt resource value: 0x7F0803CD
+			public const int play_talk_sel = 2131231693;
+			
+			// aapt resource value: 0x7F0803CE
+			public const int play_talk_selector = 2131231694;
+			
+			// aapt resource value: 0x7F0803D2
+			public const int play_video = 2131231698;
+			
+			// aapt resource value: 0x7F0803D3
+			public const int play_video_dis = 2131231699;
+			
+			// aapt resource value: 0x7F0803D4
+			public const int play_video_record = 2131231700;
+			
+			// aapt resource value: 0x7F0803D5
+			public const int play_video_sel = 2131231701;
+			
+			// aapt resource value: 0x7F0803D6
+			public const int play_video_selector = 2131231702;
+			
+			// aapt resource value: 0x7F0803D7
+			public const int play_video_start = 2131231703;
+			
+			// aapt resource value: 0x7F0803D8
+			public const int play_video_time_bg = 2131231704;
+			
+			// aapt resource value: 0x7F0803D9
+			public const int play_voice = 2131231705;
+			
+			// aapt resource value: 0x7F0803DA
+			public const int play_voice_dis = 2131231706;
+			
+			// aapt resource value: 0x7F0803DB
+			public const int play_voice_sel = 2131231707;
+			
+			// aapt resource value: 0x7F0803DC
+			public const int play_voice_selector = 2131231708;
 			
 			// aapt resource value: 0x7F0803F0
-			public const int ptz_top_limit = 2131231728;
+			public const int popdialogbg = 2131231728;
 			
 			// aapt resource value: 0x7F0803F1
-			public const int ptz_turn = 2131231729;
+			public const int prepare_device = 2131231729;
 			
 			// aapt resource value: 0x7F0803F2
-			public const int ptz_turn_sel = 2131231730;
+			public const int preview_close1_video_ico = 2131231730;
 			
 			// aapt resource value: 0x7F0803F3
-			public const int ptz_turn_selector = 2131231731;
+			public const int preview_close_video = 2131231731;
 			
 			// aapt resource value: 0x7F0803F4
-			public const int ptz_up_sel = 2131231732;
+			public const int preview_close_video_dis = 2131231732;
 			
 			// aapt resource value: 0x7F0803F5
-			public const int push_close = 2131231733;
+			public const int preview_close_video_sel = 2131231733;
 			
 			// aapt resource value: 0x7F0803F6
-			public const int push_close_sel = 2131231734;
+			public const int preview_down_bg_normal = 2131231734;
 			
 			// aapt resource value: 0x7F0803F7
-			public const int push_close_selector = 2131231735;
+			public const int preview_down_bg_pressed = 2131231735;
 			
 			// aapt resource value: 0x7F0803F8
-			public const int put_ico = 2131231736;
+			public const int preview_down_ico = 2131231736;
 			
 			// aapt resource value: 0x7F0803F9
-			public const int query_loding1 = 2131231737;
+			public const int preview_down_selector = 2131231737;
 			
 			// aapt resource value: 0x7F0803FA
-			public const int query_loding2 = 2131231738;
+			public const int preview_enlarge = 2131231738;
 			
 			// aapt resource value: 0x7F0803FB
-			public const int query_loding3 = 2131231739;
+			public const int preview_enlarge_btn_sel = 2131231739;
 			
 			// aapt resource value: 0x7F0803FC
-			public const int query_loding4 = 2131231740;
+			public const int preview_enlarge_dis = 2131231740;
 			
 			// aapt resource value: 0x7F0803FD
-			public const int query_loding5 = 2131231741;
+			public const int preview_enlarge_selector = 2131231741;
 			
 			// aapt resource value: 0x7F0803FE
-			public const int radius_rect_bg_qq_group = 2131231742;
+			public const int preview_play_btn = 2131231742;
 			
 			// aapt resource value: 0x7F0803FF
-			public const int read_button = 2131231743;
+			public const int preview_play_btn_dis = 2131231743;
 			
 			// aapt resource value: 0x7F080400
-			public const int read_button_sel = 2131231744;
+			public const int preview_play_btn_sel = 2131231744;
 			
 			// aapt resource value: 0x7F080401
-			public const int read_button_selector = 2131231745;
+			public const int preview_recording = 2131231745;
 			
 			// aapt resource value: 0x7F080402
-			public const int refresh_selector = 2131231746;
+			public const int preview_recording_dis = 2131231746;
 			
 			// aapt resource value: 0x7F080403
-			public const int register_server_bg = 2131231747;
+			public const int preview_recording_sel = 2131231747;
 			
 			// aapt resource value: 0x7F080404
-			public const int remote_cal_selector = 2131231748;
+			public const int preview_selection_bg = 2131231748;
 			
 			// aapt resource value: 0x7F080405
-			public const int remote_exit_btn_selector = 2131231749;
+			public const int preview_stopplay_btn_dis = 2131231749;
 			
 			// aapt resource value: 0x7F080406
-			public const int remote_list_pause_btn_selector = 2131231750;
+			public const int preview_unvoice_btn = 2131231750;
 			
 			// aapt resource value: 0x7F080407
-			public const int remote_list_play_btn_selector = 2131231751;
+			public const int preview_unvoice_btn_sel = 2131231751;
 			
 			// aapt resource value: 0x7F080408
-			public const int remote_list_soundoff_btn_selector = 2131231752;
+			public const int preview_video_selection = 2131231752;
 			
 			// aapt resource value: 0x7F080409
-			public const int remote_list_soundon_btn_selector = 2131231753;
+			public const int preview_video_selection_hover = 2131231753;
 			
 			// aapt resource value: 0x7F08040A
-			public const int remote_play = 2131231754;
+			public const int preview_voice_btn = 2131231754;
 			
 			// aapt resource value: 0x7F08040B
-			public const int remote_play_sel = 2131231755;
+			public const int preview_voice_btn_dis = 2131231755;
 			
 			// aapt resource value: 0x7F08040C
-			public const int remote_seekbar_style = 2131231756;
+			public const int preview_voice_btn_sel = 2131231756;
 			
 			// aapt resource value: 0x7F08040D
-			public const int remote_seekbar_thumb = 2131231757;
+			public const int previously = 2131231757;
 			
 			// aapt resource value: 0x7F08040E
-			public const int reset_deivce = 2131231758;
-			
-			// aapt resource value: 0x7F08041B
-			public const int results_4_dvr = 2131231771;
-			
-			// aapt resource value: 0x7F08041C
-			public const int results_8_16_nvr = 2131231772;
-			
-			// aapt resource value: 0x7F08041D
-			public const int results_8_nvr = 2131231773;
-			
-			// aapt resource value: 0x7F08041E
-			public const int results_c6p = 2131231774;
-			
-			// aapt resource value: 0x7F08041F
-			public const int results_mini_360_plus = 2131231775;
-			
-			// aapt resource value: 0x7F080420
-			public const int results_mini_trooper = 2131231776;
-			
-			// aapt resource value: 0x7F080421
-			public const int results_pic_a1 = 2131231777;
-			
-			// aapt resource value: 0x7F080422
-			public const int results_pic_a1c = 2131231778;
-			
-			// aapt resource value: 0x7F080423
-			public const int results_pic_a1s = 2131231779;
-			
-			// aapt resource value: 0x7F080424
-			public const int results_pic_baidu_c2s = 2131231780;
-			
-			// aapt resource value: 0x7F080425
-			public const int results_pic_bg = 2131231781;
-			
-			// aapt resource value: 0x7F080426
-			public const int results_pic_c1 = 2131231782;
-			
-			// aapt resource value: 0x7F080427
-			public const int results_pic_c2 = 2131231783;
-			
-			// aapt resource value: 0x7F08042A
-			public const int results_pic_c2c = 2131231786;
-			
-			// aapt resource value: 0x7F08042B
-			public const int results_pic_c2mini = 2131231787;
-			
-			// aapt resource value: 0x7F08042C
-			public const int results_pic_c2mini2 = 2131231788;
-			
-			// aapt resource value: 0x7F08042D
-			public const int results_pic_c2plus = 2131231789;
-			
-			// aapt resource value: 0x7F08042E
-			public const int results_pic_c2s = 2131231790;
-			
-			// aapt resource value: 0x7F08042F
-			public const int results_pic_c2w = 2131231791;
-			
-			// aapt resource value: 0x7F080428
-			public const int results_pic_c2_2 = 2131231784;
-			
-			// aapt resource value: 0x7F080429
-			public const int results_pic_c2_usa = 2131231785;
-			
-			// aapt resource value: 0x7F080430
-			public const int results_pic_c3 = 2131231792;
-			
-			// aapt resource value: 0x7F080431
-			public const int results_pic_c3c = 2131231793;
-			
-			// aapt resource value: 0x7F080432
-			public const int results_pic_c3e = 2131231794;
-			
-			// aapt resource value: 0x7F080433
-			public const int results_pic_c3s = 2131231795;
-			
-			// aapt resource value: 0x7F080434
-			public const int results_pic_c4 = 2131231796;
-			
-			// aapt resource value: 0x7F080435
-			public const int results_pic_c4c = 2131231797;
-			
-			// aapt resource value: 0x7F080436
-			public const int results_pic_c4e = 2131231798;
-			
-			// aapt resource value: 0x7F080437
-			public const int results_pic_c4s = 2131231799;
-			
-			// aapt resource value: 0x7F080438
-			public const int results_pic_c6 = 2131231800;
-			
-			// aapt resource value: 0x7F080439
-			public const int results_pic_c6c = 2131231801;
-			
-			// aapt resource value: 0x7F08043A
-			public const int results_pic_c6c_1 = 2131231802;
-			
-			// aapt resource value: 0x7F08043B
-			public const int results_pic_c6c_2 = 2131231803;
-			
-			// aapt resource value: 0x7F08043C
-			public const int results_pic_c6h = 2131231804;
-			
-			// aapt resource value: 0x7F08043D
-			public const int results_pic_co2 = 2131231805;
-			
-			// aapt resource value: 0x7F08043E
-			public const int results_pic_d1 = 2131231806;
-			
-			// aapt resource value: 0x7F08043F
-			public const int results_pic_default = 2131231807;
-			
-			// aapt resource value: 0x7F080440
-			public const int results_pic_f1 = 2131231808;
-			
-			// aapt resource value: 0x7F080441
-			public const int results_pic_h2c = 2131231809;
-			
-			// aapt resource value: 0x7F080442
-			public const int results_pic_h2s = 2131231810;
-			
-			// aapt resource value: 0x7F080443
-			public const int results_pic_n1 = 2131231811;
-			
-			// aapt resource value: 0x7F080444
-			public const int results_pic_n1w = 2131231812;
-			
-			// aapt resource value: 0x7F080445
-			public const int results_pic_r1 = 2131231813;
-			
-			// aapt resource value: 0x7F080446
-			public const int results_pic_r2 = 2131231814;
-			
-			// aapt resource value: 0x7F080447
-			public const int results_pic_w1 = 2131231815;
-			
-			// aapt resource value: 0x7F080448
-			public const int results_pic_w3 = 2131231816;
-			
-			// aapt resource value: 0x7F080449
-			public const int results_pic_x1 = 2131231817;
-			
-			// aapt resource value: 0x7F08044A
-			public const int results_pic_x2 = 2131231818;
-			
-			// aapt resource value: 0x7F08044B
-			public const int results_pic_x3 = 2131231819;
-			
-			// aapt resource value: 0x7F08044C
-			public const int results_pic_x3c = 2131231820;
-			
-			// aapt resource value: 0x7F08044D
-			public const int results_pic_x4 = 2131231821;
-			
-			// aapt resource value: 0x7F08044E
-			public const int results_pic_z1 = 2131231822;
-			
-			// aapt resource value: 0x7F08044F
-			public const int results_w2d = 2131231823;
-			
-			// aapt resource value: 0x7F080450
-			public const int results_w2s = 2131231824;
-			
-			// aapt resource value: 0x7F080451
-			public const int results_wlb = 2131231825;
-			
-			// aapt resource value: 0x7F080452
-			public const int results_x5_108tp = 2131231826;
+			public const int previously_dis = 2131231758;
 			
 			// aapt resource value: 0x7F08040F
-			public const int result_5k_vr104d = 2131231759;
-			
-			// aapt resource value: 0x7F080410
-			public const int result_5k_vr116d = 2131231760;
+			public const int previously_sel = 2131231759;
 			
 			// aapt resource value: 0x7F080411
-			public const int result_8_16dvr = 2131231761;
+			public const int progressbar = 2131231761;
 			
 			// aapt resource value: 0x7F080412
-			public const int result_cs_c3w = 2131231762;
+			public const int progressloading = 2131231762;
+			
+			// aapt resource value: 0x7F080410
+			public const int progress_style = 2131231760;
 			
 			// aapt resource value: 0x7F080413
-			public const int result_cs_vr104d = 2131231763;
+			public const int ptz_bg = 2131231763;
 			
 			// aapt resource value: 0x7F080414
-			public const int result_cs_vr108d = 2131231764;
+			public const int ptz_bottom_limit = 2131231764;
 			
 			// aapt resource value: 0x7F080415
-			public const int result_cs_vr116d = 2131231765;
+			public const int ptz_bottom_sel = 2131231765;
 			
 			// aapt resource value: 0x7F080416
-			public const int result_pic_dh1 = 2131231766;
+			public const int ptz_left_limit = 2131231766;
 			
 			// aapt resource value: 0x7F080417
-			public const int result_pic_doorbell = 2131231767;
+			public const int ptz_left_sel = 2131231767;
 			
 			// aapt resource value: 0x7F080418
-			public const int result_pic_doorbell_hik = 2131231768;
+			public const int ptz_prompt = 2131231768;
 			
 			// aapt resource value: 0x7F080419
-			public const int result_pic_light = 2131231769;
+			public const int ptz_right_limit = 2131231769;
 			
 			// aapt resource value: 0x7F08041A
-			public const int result_x5c = 2131231770;
+			public const int ptz_right_sel = 2131231770;
+			
+			// aapt resource value: 0x7F08041B
+			public const int ptz_top_limit = 2131231771;
+			
+			// aapt resource value: 0x7F08041C
+			public const int ptz_turn = 2131231772;
+			
+			// aapt resource value: 0x7F08041D
+			public const int ptz_turn_sel = 2131231773;
+			
+			// aapt resource value: 0x7F08041E
+			public const int ptz_turn_selector = 2131231774;
+			
+			// aapt resource value: 0x7F08041F
+			public const int ptz_up_sel = 2131231775;
+			
+			// aapt resource value: 0x7F080420
+			public const int push_close = 2131231776;
+			
+			// aapt resource value: 0x7F080421
+			public const int push_close_sel = 2131231777;
+			
+			// aapt resource value: 0x7F080422
+			public const int push_close_selector = 2131231778;
+			
+			// aapt resource value: 0x7F080423
+			public const int push_pure_close = 2131231779;
+			
+			// aapt resource value: 0x7F080424
+			public const int put_ico = 2131231780;
+			
+			// aapt resource value: 0x7F080425
+			public const int query_loding1 = 2131231781;
+			
+			// aapt resource value: 0x7F080426
+			public const int query_loding2 = 2131231782;
+			
+			// aapt resource value: 0x7F080427
+			public const int query_loding3 = 2131231783;
+			
+			// aapt resource value: 0x7F080428
+			public const int query_loding4 = 2131231784;
+			
+			// aapt resource value: 0x7F080429
+			public const int query_loding5 = 2131231785;
+			
+			// aapt resource value: 0x7F08042A
+			public const int radius_rect_bg_qq_group = 2131231786;
+			
+			// aapt resource value: 0x7F08042B
+			public const int read_button = 2131231787;
+			
+			// aapt resource value: 0x7F08042C
+			public const int read_button_sel = 2131231788;
+			
+			// aapt resource value: 0x7F08042D
+			public const int read_button_selector = 2131231789;
+			
+			// aapt resource value: 0x7F08042E
+			public const int refresh_selector = 2131231790;
+			
+			// aapt resource value: 0x7F08042F
+			public const int register_server_bg = 2131231791;
+			
+			// aapt resource value: 0x7F080430
+			public const int remote_cal_selector = 2131231792;
+			
+			// aapt resource value: 0x7F080431
+			public const int remote_exit_btn_selector = 2131231793;
+			
+			// aapt resource value: 0x7F080432
+			public const int remote_list_pause_btn_selector = 2131231794;
+			
+			// aapt resource value: 0x7F080433
+			public const int remote_list_play_btn_selector = 2131231795;
+			
+			// aapt resource value: 0x7F080434
+			public const int remote_list_soundoff_btn_selector = 2131231796;
+			
+			// aapt resource value: 0x7F080435
+			public const int remote_list_soundon_btn_selector = 2131231797;
+			
+			// aapt resource value: 0x7F080436
+			public const int remote_play = 2131231798;
+			
+			// aapt resource value: 0x7F080437
+			public const int remote_play_sel = 2131231799;
+			
+			// aapt resource value: 0x7F080438
+			public const int remote_seekbar_style = 2131231800;
+			
+			// aapt resource value: 0x7F080439
+			public const int remote_seekbar_thumb = 2131231801;
+			
+			// aapt resource value: 0x7F08043A
+			public const int reset_deivce = 2131231802;
+			
+			// aapt resource value: 0x7F080447
+			public const int results_4_dvr = 2131231815;
+			
+			// aapt resource value: 0x7F080448
+			public const int results_8_16_nvr = 2131231816;
+			
+			// aapt resource value: 0x7F080449
+			public const int results_8_nvr = 2131231817;
+			
+			// aapt resource value: 0x7F08044A
+			public const int results_c6p = 2131231818;
+			
+			// aapt resource value: 0x7F08044B
+			public const int results_mini_360_plus = 2131231819;
+			
+			// aapt resource value: 0x7F08044C
+			public const int results_mini_trooper = 2131231820;
+			
+			// aapt resource value: 0x7F08044D
+			public const int results_pic_a1 = 2131231821;
+			
+			// aapt resource value: 0x7F08044E
+			public const int results_pic_a1c = 2131231822;
+			
+			// aapt resource value: 0x7F08044F
+			public const int results_pic_a1s = 2131231823;
+			
+			// aapt resource value: 0x7F080450
+			public const int results_pic_baidu_c2s = 2131231824;
+			
+			// aapt resource value: 0x7F080451
+			public const int results_pic_bg = 2131231825;
+			
+			// aapt resource value: 0x7F080452
+			public const int results_pic_c1 = 2131231826;
 			
 			// aapt resource value: 0x7F080453
-			public const int right_horizontal = 2131231827;
-			
-			// aapt resource value: 0x7F080454
-			public const int right_twinkle = 2131231828;
-			
-			// aapt resource value: 0x7F080455
-			public const int ring_off = 2131231829;
+			public const int results_pic_c2 = 2131231827;
 			
 			// aapt resource value: 0x7F080456
-			public const int say_bg = 2131231830;
+			public const int results_pic_c2c = 2131231830;
 			
 			// aapt resource value: 0x7F080457
-			public const int scan_capture = 2131231831;
+			public const int results_pic_c2mini = 2131231831;
 			
 			// aapt resource value: 0x7F080458
-			public const int scan_line = 2131231832;
+			public const int results_pic_c2mini2 = 2131231832;
 			
 			// aapt resource value: 0x7F080459
-			public const int screenshot = 2131231833;
+			public const int results_pic_c2plus = 2131231833;
 			
 			// aapt resource value: 0x7F08045A
-			public const int screenshot_def = 2131231834;
+			public const int results_pic_c2s = 2131231834;
 			
 			// aapt resource value: 0x7F08045B
-			public const int screenshot_sel = 2131231835;
+			public const int results_pic_c2w = 2131231835;
+			
+			// aapt resource value: 0x7F080454
+			public const int results_pic_c2_2 = 2131231828;
+			
+			// aapt resource value: 0x7F080455
+			public const int results_pic_c2_usa = 2131231829;
 			
 			// aapt resource value: 0x7F08045C
-			public const int search = 2131231836;
+			public const int results_pic_c3 = 2131231836;
 			
 			// aapt resource value: 0x7F08045D
-			public const int search_bnt = 2131231837;
+			public const int results_pic_c3c = 2131231837;
 			
 			// aapt resource value: 0x7F08045E
-			public const int search_bnt_sel = 2131231838;
+			public const int results_pic_c3e = 2131231838;
 			
 			// aapt resource value: 0x7F08045F
-			public const int search_button_selector = 2131231839;
+			public const int results_pic_c3s = 2131231839;
 			
 			// aapt resource value: 0x7F080460
-			public const int search_input = 2131231840;
+			public const int results_pic_c4 = 2131231840;
 			
 			// aapt resource value: 0x7F080461
-			public const int seekbar_thumb = 2131231841;
-			
-			// aapt resource value: 0x7F080463
-			public const int selected_icon = 2131231843;
-			
-			// aapt resource value: 0x7F080464
-			public const int selector_orange_textview = 2131231844;
-			
-			// aapt resource value: 0x7F080465
-			public const int selector_pickerview_btn = 2131231845;
+			public const int results_pic_c4c = 2131231841;
 			
 			// aapt resource value: 0x7F080462
-			public const int select_icon = 2131231842;
+			public const int results_pic_c4e = 2131231842;
+			
+			// aapt resource value: 0x7F080463
+			public const int results_pic_c4s = 2131231843;
+			
+			// aapt resource value: 0x7F080464
+			public const int results_pic_c6 = 2131231844;
+			
+			// aapt resource value: 0x7F080465
+			public const int results_pic_c6c = 2131231845;
 			
 			// aapt resource value: 0x7F080466
-			public const int server1 = 2131231846;
+			public const int results_pic_c6c_1 = 2131231846;
 			
 			// aapt resource value: 0x7F080467
-			public const int server2 = 2131231847;
+			public const int results_pic_c6c_2 = 2131231847;
 			
 			// aapt resource value: 0x7F080468
-			public const int server3 = 2131231848;
+			public const int results_pic_c6h = 2131231848;
 			
 			// aapt resource value: 0x7F080469
-			public const int server4 = 2131231849;
+			public const int results_pic_co2 = 2131231849;
 			
 			// aapt resource value: 0x7F08046A
-			public const int setting_icon_check = 2131231850;
+			public const int results_pic_d1 = 2131231850;
 			
 			// aapt resource value: 0x7F08046B
-			public const int setup = 2131231851;
+			public const int results_pic_default = 2131231851;
 			
 			// aapt resource value: 0x7F08046C
-			public const int setup_sel = 2131231852;
+			public const int results_pic_f1 = 2131231852;
 			
 			// aapt resource value: 0x7F08046D
-			public const int setup_wechat = 2131231853;
+			public const int results_pic_h2c = 2131231853;
 			
 			// aapt resource value: 0x7F08046E
-			public const int shape_corners_edittext_1dp_normal = 2131231854;
+			public const int results_pic_h2s = 2131231854;
 			
 			// aapt resource value: 0x7F08046F
-			public const int share_management_label_button = 2131231855;
+			public const int results_pic_n1 = 2131231855;
 			
 			// aapt resource value: 0x7F080470
-			public const int share_management_label_button_sel = 2131231856;
+			public const int results_pic_n1w = 2131231856;
 			
 			// aapt resource value: 0x7F080471
-			public const int shipin7_alarm_msg_new = 2131231857;
+			public const int results_pic_r1 = 2131231857;
 			
 			// aapt resource value: 0x7F080472
-			public const int shrink_screen_normal = 2131231858;
+			public const int results_pic_r2 = 2131231858;
 			
 			// aapt resource value: 0x7F080473
-			public const int shrink_screen_pressed = 2131231859;
+			public const int results_pic_w1 = 2131231859;
 			
 			// aapt resource value: 0x7F080474
-			public const int small_button_cameralist = 2131231860;
+			public const int results_pic_w3 = 2131231860;
 			
 			// aapt resource value: 0x7F080475
-			public const int small_icon = 2131231861;
+			public const int results_pic_x1 = 2131231861;
 			
 			// aapt resource value: 0x7F080476
-			public const int sound_off = 2131231862;
+			public const int results_pic_x2 = 2131231862;
 			
 			// aapt resource value: 0x7F080477
-			public const int sound_off_blue = 2131231863;
+			public const int results_pic_x3 = 2131231863;
 			
 			// aapt resource value: 0x7F080478
-			public const int sound_off_sel = 2131231864;
+			public const int results_pic_x3c = 2131231864;
 			
 			// aapt resource value: 0x7F080479
-			public const int sound_off_sel_blue = 2131231865;
+			public const int results_pic_x4 = 2131231865;
 			
 			// aapt resource value: 0x7F08047A
-			public const int sound_on = 2131231866;
+			public const int results_pic_z1 = 2131231866;
 			
 			// aapt resource value: 0x7F08047B
-			public const int sound_on_blue = 2131231867;
+			public const int results_w2d = 2131231867;
 			
 			// aapt resource value: 0x7F08047C
-			public const int sound_on_sel = 2131231868;
+			public const int results_w2s = 2131231868;
 			
 			// aapt resource value: 0x7F08047D
-			public const int sound_on_sel_blue = 2131231869;
+			public const int results_wlb = 2131231869;
 			
 			// aapt resource value: 0x7F08047E
-			public const int sound_source = 2131231870;
+			public const int results_x5_108tp = 2131231870;
+			
+			// aapt resource value: 0x7F08043B
+			public const int result_5k_vr104d = 2131231803;
+			
+			// aapt resource value: 0x7F08043C
+			public const int result_5k_vr116d = 2131231804;
+			
+			// aapt resource value: 0x7F08043D
+			public const int result_8_16dvr = 2131231805;
+			
+			// aapt resource value: 0x7F08043E
+			public const int result_cs_c3w = 2131231806;
+			
+			// aapt resource value: 0x7F08043F
+			public const int result_cs_vr104d = 2131231807;
+			
+			// aapt resource value: 0x7F080440
+			public const int result_cs_vr108d = 2131231808;
+			
+			// aapt resource value: 0x7F080441
+			public const int result_cs_vr116d = 2131231809;
+			
+			// aapt resource value: 0x7F080442
+			public const int result_pic_dh1 = 2131231810;
+			
+			// aapt resource value: 0x7F080443
+			public const int result_pic_doorbell = 2131231811;
+			
+			// aapt resource value: 0x7F080444
+			public const int result_pic_doorbell_hik = 2131231812;
+			
+			// aapt resource value: 0x7F080445
+			public const int result_pic_light = 2131231813;
+			
+			// aapt resource value: 0x7F080446
+			public const int result_x5c = 2131231814;
 			
 			// aapt resource value: 0x7F08047F
-			public const int sound_source_sel = 2131231871;
+			public const int right_horizontal = 2131231871;
 			
 			// aapt resource value: 0x7F080480
-			public const int speech = 2131231872;
+			public const int right_twinkle = 2131231872;
 			
 			// aapt resource value: 0x7F080481
-			public const int speech_0 = 2131231873;
+			public const int ring_off = 2131231873;
 			
 			// aapt resource value: 0x7F080482
-			public const int speech_1 = 2131231874;
+			public const int say_bg = 2131231874;
 			
 			// aapt resource value: 0x7F080483
-			public const int speech_2 = 2131231875;
+			public const int scan_capture = 2131231875;
 			
 			// aapt resource value: 0x7F080484
-			public const int speech_3 = 2131231876;
+			public const int scan_line = 2131231876;
 			
 			// aapt resource value: 0x7F080485
-			public const int speech_4 = 2131231877;
+			public const int screenshot = 2131231877;
 			
 			// aapt resource value: 0x7F080486
-			public const int speech_5 = 2131231878;
+			public const int screenshot_def = 2131231878;
 			
 			// aapt resource value: 0x7F080487
-			public const int speech_full_selector = 2131231879;
+			public const int screenshot_sel = 2131231879;
 			
 			// aapt resource value: 0x7F080488
-			public const int stop = 2131231880;
-			
-			// aapt resource value: 0x7F08048B
-			public const int stopbtn_selector = 2131231883;
-			
-			// aapt resource value: 0x7F08048C
-			public const int stoplay_btn = 2131231884;
-			
-			// aapt resource value: 0x7F08048D
-			public const int stoplay_btn_sel = 2131231885;
+			public const int search = 2131231880;
 			
 			// aapt resource value: 0x7F080489
-			public const int stop_disable = 2131231881;
+			public const int search_bnt = 2131231881;
 			
 			// aapt resource value: 0x7F08048A
-			public const int stop_press = 2131231882;
+			public const int search_bnt_sel = 2131231882;
 			
-			// aapt resource value: 0x7F08048E
-			public const int success = 2131231886;
+			// aapt resource value: 0x7F08048B
+			public const int search_button_selector = 2131231883;
+			
+			// aapt resource value: 0x7F08048C
+			public const int search_input = 2131231884;
+			
+			// aapt resource value: 0x7F08048D
+			public const int seekbar_thumb = 2131231885;
 			
 			// aapt resource value: 0x7F08048F
-			public const int success_icon = 2131231887;
+			public const int selected_icon = 2131231887;
 			
 			// aapt resource value: 0x7F080490
-			public const int success_img = 2131231888;
+			public const int selector_orange_textview = 2131231888;
 			
 			// aapt resource value: 0x7F080491
-			public const int sure_background_def = 2131231889;
+			public const int selector_pickerview_btn = 2131231889;
+			
+			// aapt resource value: 0x7F08048E
+			public const int select_icon = 2131231886;
 			
 			// aapt resource value: 0x7F080492
-			public const int sure_background_sel = 2131231890;
+			public const int server1 = 2131231890;
 			
 			// aapt resource value: 0x7F080493
-			public const int switch_camera = 2131231891;
+			public const int server2 = 2131231891;
 			
 			// aapt resource value: 0x7F080494
-			public const int switch_off = 2131231892;
+			public const int server3 = 2131231892;
 			
 			// aapt resource value: 0x7F080495
-			public const int switch_off_disable = 2131231893;
+			public const int server4 = 2131231893;
 			
 			// aapt resource value: 0x7F080496
-			public const int switch_on = 2131231894;
+			public const int setting_icon_check = 2131231894;
 			
 			// aapt resource value: 0x7F080497
-			public const int switch_on_disable = 2131231895;
+			public const int setup = 2131231895;
 			
 			// aapt resource value: 0x7F080498
-			public const int tab_left = 2131231896;
+			public const int setup_sel = 2131231896;
 			
 			// aapt resource value: 0x7F080499
-			public const int tab_left_sel = 2131231897;
+			public const int setup_wechat = 2131231897;
 			
 			// aapt resource value: 0x7F08049A
-			public const int tab_right = 2131231898;
+			public const int shape_corners_edittext_1dp_normal = 2131231898;
 			
 			// aapt resource value: 0x7F08049B
-			public const int tab_right_sel = 2131231899;
+			public const int share_management_label_button = 2131231899;
 			
 			// aapt resource value: 0x7F08049C
-			public const int text_cursor_drawable = 2131231900;
+			public const int share_management_label_button_sel = 2131231900;
 			
 			// aapt resource value: 0x7F08049D
-			public const int tiltle_button_selector = 2131231901;
+			public const int shipin7_alarm_msg_new = 2131231901;
 			
 			// aapt resource value: 0x7F08049E
-			public const int timeline = 2131231902;
+			public const int shrink_screen_normal = 2131231902;
 			
 			// aapt resource value: 0x7F08049F
-			public const int timeline_sel = 2131231903;
+			public const int shrink_screen_pressed = 2131231903;
 			
 			// aapt resource value: 0x7F0804A0
-			public const int tip_background = 2131231904;
+			public const int small_button_cameralist = 2131231904;
 			
 			// aapt resource value: 0x7F0804A1
-			public const int tip_textview_bg = 2131231905;
+			public const int small_icon = 2131231905;
 			
 			// aapt resource value: 0x7F0804A2
-			public const int title_down_bg = 2131231906;
+			public const int sound_off = 2131231906;
 			
 			// aapt resource value: 0x7F0804A3
-			public const int title_down_play = 2131231907;
+			public const int sound_off_blue = 2131231907;
 			
 			// aapt resource value: 0x7F0804A4
-			public const int title_down_play_sel = 2131231908;
+			public const int sound_off_sel = 2131231908;
 			
 			// aapt resource value: 0x7F0804A5
-			public const int title_down_play_selector = 2131231909;
+			public const int sound_off_sel_blue = 2131231909;
 			
 			// aapt resource value: 0x7F0804A6
-			public const int title_menu_bg = 2131231910;
+			public const int sound_on = 2131231910;
 			
 			// aapt resource value: 0x7F0804A7
-			public const int tittel_button_bg = 2131231911;
+			public const int sound_on_blue = 2131231911;
 			
 			// aapt resource value: 0x7F0804A8
-			public const int tittel_button_press_bg = 2131231912;
+			public const int sound_on_sel = 2131231912;
 			
 			// aapt resource value: 0x7F0804A9
-			public const int tooltip_frame_dark = 2131231913;
+			public const int sound_on_sel_blue = 2131231913;
 			
 			// aapt resource value: 0x7F0804AA
-			public const int tooltip_frame_light = 2131231914;
+			public const int sound_source = 2131231914;
 			
 			// aapt resource value: 0x7F0804AB
-			public const int top_bar_bg = 2131231915;
+			public const int sound_source_sel = 2131231915;
 			
 			// aapt resource value: 0x7F0804AC
-			public const int track_bar_bg = 2131231916;
+			public const int speech = 2131231916;
 			
 			// aapt resource value: 0x7F0804AD
-			public const int translucent = 2131231917;
+			public const int speech_0 = 2131231917;
 			
 			// aapt resource value: 0x7F0804AE
-			public const int transparent_divider = 2131231918;
+			public const int speech_1 = 2131231918;
 			
 			// aapt resource value: 0x7F0804AF
-			public const int @unchecked = 2131231919;
+			public const int speech_2 = 2131231919;
 			
 			// aapt resource value: 0x7F0804B0
-			public const int unlock = 2131231920;
+			public const int speech_3 = 2131231920;
 			
 			// aapt resource value: 0x7F0804B1
-			public const int unlock_def = 2131231921;
+			public const int speech_4 = 2131231921;
 			
 			// aapt resource value: 0x7F0804B2
-			public const int unlock_sel = 2131231922;
-			
-			// aapt resource value: 0x7F0804B5
-			public const int upgrade = 2131231925;
-			
-			// aapt resource value: 0x7F0804B6
-			public const int upsdk_cancel_bg = 2131231926;
-			
-			// aapt resource value: 0x7F0804B7
-			public const int upsdk_cancel_normal = 2131231927;
-			
-			// aapt resource value: 0x7F0804B8
-			public const int upsdk_cancel_pressed_bg = 2131231928;
-			
-			// aapt resource value: 0x7F0804B9
-			public const int upsdk_third_download_bg = 2131231929;
+			public const int speech_5 = 2131231922;
 			
 			// aapt resource value: 0x7F0804B3
-			public const int up_horizontal = 2131231923;
+			public const int speech_full_selector = 2131231923;
 			
 			// aapt resource value: 0x7F0804B4
-			public const int up_twinkle = 2131231924;
+			public const int stat_sys_third_app_notify = 2131231924;
+			
+			// aapt resource value: 0x7F0804B5
+			public const int stop = 2131231925;
+			
+			// aapt resource value: 0x7F0804B8
+			public const int stopbtn_selector = 2131231928;
+			
+			// aapt resource value: 0x7F0804B9
+			public const int stoplay_btn = 2131231929;
 			
 			// aapt resource value: 0x7F0804BA
-			public const int user = 2131231930;
+			public const int stoplay_btn_sel = 2131231930;
+			
+			// aapt resource value: 0x7F0804B6
+			public const int stop_disable = 2131231926;
+			
+			// aapt resource value: 0x7F0804B7
+			public const int stop_press = 2131231927;
 			
 			// aapt resource value: 0x7F0804BB
-			public const int user_module_bg_commit_button = 2131231931;
+			public const int success = 2131231931;
 			
 			// aapt resource value: 0x7F0804BC
-			public const int user_module_bg_commit_button_press = 2131231932;
+			public const int success_icon = 2131231932;
 			
 			// aapt resource value: 0x7F0804BD
-			public const int user_module_bg_commit_button_selector = 2131231933;
+			public const int success_img = 2131231933;
 			
 			// aapt resource value: 0x7F0804BE
-			public const int user_module_icon_login_account = 2131231934;
+			public const int sure_background_def = 2131231934;
 			
 			// aapt resource value: 0x7F0804BF
-			public const int vertical_preview_sound_selector = 2131231935;
+			public const int sure_background_sel = 2131231935;
 			
 			// aapt resource value: 0x7F0804C0
-			public const int vertical_preview_stop_selector = 2131231936;
-			
-			// aapt resource value: 0x7F0804D0
-			public const int videogo_icon = 2131231952;
+			public const int switch_camera = 2131231936;
 			
 			// aapt resource value: 0x7F0804C1
-			public const int video_background = 2131231937;
+			public const int switch_off = 2131231937;
 			
 			// aapt resource value: 0x7F0804C2
-			public const int video_camera1_1 = 2131231938;
+			public const int switch_off_disable = 2131231938;
 			
 			// aapt resource value: 0x7F0804C3
-			public const int video_camera1_2 = 2131231939;
+			public const int switch_on = 2131231939;
 			
 			// aapt resource value: 0x7F0804C4
-			public const int video_camera1_3 = 2131231940;
+			public const int switch_on_disable = 2131231940;
 			
 			// aapt resource value: 0x7F0804C5
-			public const int video_file_watermark = 2131231941;
+			public const int tab_left = 2131231941;
 			
 			// aapt resource value: 0x7F0804C6
-			public const int video_quality_selector = 2131231942;
+			public const int tab_left_sel = 2131231942;
 			
 			// aapt resource value: 0x7F0804C7
-			public const int video_talk_sdk_icn_watch = 2131231943;
+			public const int tab_right = 2131231943;
 			
 			// aapt resource value: 0x7F0804C8
-			public const int video_talk_sdk_placeholder_images_user = 2131231944;
+			public const int tab_right_sel = 2131231944;
 			
 			// aapt resource value: 0x7F0804C9
-			public const int video_talk_sdk_video_answer = 2131231945;
+			public const int text_cursor_drawable = 2131231945;
 			
 			// aapt resource value: 0x7F0804CA
-			public const int video_talk_sdk_video_hangup = 2131231946;
+			public const int tiltle_button_selector = 2131231946;
 			
 			// aapt resource value: 0x7F0804CB
-			public const int video_talk_sdk_video_record_off = 2131231947;
+			public const int timeline = 2131231947;
 			
 			// aapt resource value: 0x7F0804CC
-			public const int video_talk_sdk_video_record_on = 2131231948;
+			public const int timeline_sel = 2131231948;
 			
 			// aapt resource value: 0x7F0804CD
-			public const int video_talk_sdk_video_snap = 2131231949;
+			public const int tip_background = 2131231949;
 			
 			// aapt resource value: 0x7F0804CE
-			public const int video_talk_sdk_video_stop = 2131231950;
+			public const int tip_textview_bg = 2131231950;
 			
 			// aapt resource value: 0x7F0804CF
-			public const int video_talk_sdk_video_switch_camera = 2131231951;
+			public const int title_down_bg = 2131231951;
 			
-			// aapt resource value: 0x7F0804DA
-			public const int waiting_bg = 2131231962;
-			
-			// aapt resource value: 0x7F0804DB
-			public const int waiting_progressbar_bg = 2131231963;
+			// aapt resource value: 0x7F0804D0
+			public const int title_down_play = 2131231952;
 			
 			// aapt resource value: 0x7F0804D1
-			public const int wait_1 = 2131231953;
+			public const int title_down_play_sel = 2131231953;
 			
 			// aapt resource value: 0x7F0804D2
-			public const int wait_2 = 2131231954;
+			public const int title_down_play_selector = 2131231954;
 			
 			// aapt resource value: 0x7F0804D3
-			public const int wait_3 = 2131231955;
+			public const int title_menu_bg = 2131231955;
 			
 			// aapt resource value: 0x7F0804D4
-			public const int wait_4 = 2131231956;
+			public const int tittel_button_bg = 2131231956;
 			
 			// aapt resource value: 0x7F0804D5
-			public const int wait_5 = 2131231957;
+			public const int tittel_button_press_bg = 2131231957;
 			
 			// aapt resource value: 0x7F0804D6
-			public const int wait_6 = 2131231958;
+			public const int tooltip_frame_dark = 2131231958;
 			
 			// aapt resource value: 0x7F0804D7
-			public const int wait_7 = 2131231959;
+			public const int tooltip_frame_light = 2131231959;
 			
 			// aapt resource value: 0x7F0804D8
-			public const int wait_8 = 2131231960;
+			public const int top_bar_bg = 2131231960;
 			
 			// aapt resource value: 0x7F0804D9
-			public const int wait_upload_img = 2131231961;
+			public const int track_bar_bg = 2131231961;
+			
+			// aapt resource value: 0x7F0804DA
+			public const int translucent = 2131231962;
+			
+			// aapt resource value: 0x7F0804DB
+			public const int transparent_divider = 2131231963;
 			
 			// aapt resource value: 0x7F0804DC
-			public const int water_alarm = 2131231964;
+			public const int @unchecked = 2131231964;
 			
 			// aapt resource value: 0x7F0804DD
-			public const int wifi_config_bg = 2131231965;
-			
-			// aapt resource value: 0x7F0804DF
-			public const int wifi_connecting = 2131231967;
+			public const int unlock = 2131231965;
 			
 			// aapt resource value: 0x7F0804DE
-			public const int wifi_connect_tip = 2131231966;
+			public const int unlock_def = 2131231966;
 			
-			// aapt resource value: 0x7F0804E0
-			public const int yuntai_normal = 2131231968;
-			
-			// aapt resource value: 0x7F0804E1
-			public const int yuntai_pressed = 2131231969;
+			// aapt resource value: 0x7F0804DF
+			public const int unlock_sel = 2131231967;
 			
 			// aapt resource value: 0x7F0804E2
-			public const int yxs_head = 2131231970;
+			public const int upgrade = 2131231970;
+			
+			// aapt resource value: 0x7F0804E0
+			public const int up_horizontal = 2131231968;
+			
+			// aapt resource value: 0x7F0804E1
+			public const int up_twinkle = 2131231969;
 			
 			// aapt resource value: 0x7F0804E3
-			public const int z1_bg = 2131231971;
+			public const int user = 2131231971;
+			
+			// aapt resource value: 0x7F0804E4
+			public const int user_module_bg_commit_button = 2131231972;
+			
+			// aapt resource value: 0x7F0804E5
+			public const int user_module_bg_commit_button_press = 2131231973;
+			
+			// aapt resource value: 0x7F0804E6
+			public const int user_module_bg_commit_button_selector = 2131231974;
+			
+			// aapt resource value: 0x7F0804E7
+			public const int user_module_icon_login_account = 2131231975;
+			
+			// aapt resource value: 0x7F0804E8
+			public const int vertical_preview_sound_selector = 2131231976;
+			
+			// aapt resource value: 0x7F0804E9
+			public const int vertical_preview_stop_selector = 2131231977;
+			
+			// aapt resource value: 0x7F0804F9
+			public const int videogo_icon = 2131231993;
+			
+			// aapt resource value: 0x7F0804EA
+			public const int video_background = 2131231978;
+			
+			// aapt resource value: 0x7F0804EB
+			public const int video_camera1_1 = 2131231979;
+			
+			// aapt resource value: 0x7F0804EC
+			public const int video_camera1_2 = 2131231980;
+			
+			// aapt resource value: 0x7F0804ED
+			public const int video_camera1_3 = 2131231981;
+			
+			// aapt resource value: 0x7F0804EE
+			public const int video_file_watermark = 2131231982;
+			
+			// aapt resource value: 0x7F0804EF
+			public const int video_quality_selector = 2131231983;
+			
+			// aapt resource value: 0x7F0804F0
+			public const int video_talk_sdk_icn_watch = 2131231984;
+			
+			// aapt resource value: 0x7F0804F1
+			public const int video_talk_sdk_placeholder_images_user = 2131231985;
+			
+			// aapt resource value: 0x7F0804F2
+			public const int video_talk_sdk_video_answer = 2131231986;
+			
+			// aapt resource value: 0x7F0804F3
+			public const int video_talk_sdk_video_hangup = 2131231987;
+			
+			// aapt resource value: 0x7F0804F4
+			public const int video_talk_sdk_video_record_off = 2131231988;
+			
+			// aapt resource value: 0x7F0804F5
+			public const int video_talk_sdk_video_record_on = 2131231989;
+			
+			// aapt resource value: 0x7F0804F6
+			public const int video_talk_sdk_video_snap = 2131231990;
+			
+			// aapt resource value: 0x7F0804F7
+			public const int video_talk_sdk_video_stop = 2131231991;
+			
+			// aapt resource value: 0x7F0804F8
+			public const int video_talk_sdk_video_switch_camera = 2131231992;
+			
+			// aapt resource value: 0x7F080503
+			public const int waiting_bg = 2131232003;
+			
+			// aapt resource value: 0x7F080504
+			public const int waiting_progressbar_bg = 2131232004;
+			
+			// aapt resource value: 0x7F0804FA
+			public const int wait_1 = 2131231994;
+			
+			// aapt resource value: 0x7F0804FB
+			public const int wait_2 = 2131231995;
+			
+			// aapt resource value: 0x7F0804FC
+			public const int wait_3 = 2131231996;
+			
+			// aapt resource value: 0x7F0804FD
+			public const int wait_4 = 2131231997;
+			
+			// aapt resource value: 0x7F0804FE
+			public const int wait_5 = 2131231998;
+			
+			// aapt resource value: 0x7F0804FF
+			public const int wait_6 = 2131231999;
+			
+			// aapt resource value: 0x7F080500
+			public const int wait_7 = 2131232000;
+			
+			// aapt resource value: 0x7F080501
+			public const int wait_8 = 2131232001;
+			
+			// aapt resource value: 0x7F080502
+			public const int wait_upload_img = 2131232002;
+			
+			// aapt resource value: 0x7F080505
+			public const int water_alarm = 2131232005;
+			
+			// aapt resource value: 0x7F080506
+			public const int wifi_config_bg = 2131232006;
+			
+			// aapt resource value: 0x7F080508
+			public const int wifi_connecting = 2131232008;
+			
+			// aapt resource value: 0x7F080507
+			public const int wifi_connect_tip = 2131232007;
+			
+			// aapt resource value: 0x7F080509
+			public const int yuntai_normal = 2131232009;
+			
+			// aapt resource value: 0x7F08050A
+			public const int yuntai_pressed = 2131232010;
+			
+			// aapt resource value: 0x7F08050B
+			public const int yxs_head = 2131232011;
+			
+			// aapt resource value: 0x7F08050C
+			public const int z1_bg = 2131232012;
 			
 			static Drawable()
 			{
@@ -11261,70 +11465,70 @@
 			public const int account_username_icon = 2131296274;
 			
 			// aapt resource value: 0x7F090013
-			public const int action = 2131296275;
+			public const int action0 = 2131296275;
 			
 			// aapt resource value: 0x7F090014
-			public const int action0 = 2131296276;
+			public const int actionArea = 2131296276;
 			
-			// aapt resource value: 0x7F090015
-			public const int actionArea = 2131296277;
+			// aapt resource value: 0x7F090027
+			public const int actionbarLayoutId = 2131296295;
 			
 			// aapt resource value: 0x7F090028
 			public const int actions = 2131296296;
 			
+			// aapt resource value: 0x7F090015
+			public const int action_bar = 2131296277;
+			
 			// aapt resource value: 0x7F090016
-			public const int action_bar = 2131296278;
+			public const int action_bar_activity_content = 2131296278;
 			
 			// aapt resource value: 0x7F090017
-			public const int action_bar_activity_content = 2131296279;
+			public const int action_bar_container = 2131296279;
 			
 			// aapt resource value: 0x7F090018
-			public const int action_bar_container = 2131296280;
+			public const int action_bar_root = 2131296280;
 			
 			// aapt resource value: 0x7F090019
-			public const int action_bar_root = 2131296281;
+			public const int action_bar_spinner = 2131296281;
 			
 			// aapt resource value: 0x7F09001A
-			public const int action_bar_spinner = 2131296282;
+			public const int action_bar_subtitle = 2131296282;
 			
 			// aapt resource value: 0x7F09001B
-			public const int action_bar_subtitle = 2131296283;
+			public const int action_bar_title = 2131296283;
 			
 			// aapt resource value: 0x7F09001C
-			public const int action_bar_title = 2131296284;
+			public const int action_container = 2131296284;
 			
 			// aapt resource value: 0x7F09001D
-			public const int action_container = 2131296285;
+			public const int action_context_bar = 2131296285;
 			
 			// aapt resource value: 0x7F09001E
-			public const int action_context_bar = 2131296286;
+			public const int action_divider = 2131296286;
 			
 			// aapt resource value: 0x7F09001F
-			public const int action_divider = 2131296287;
+			public const int action_image = 2131296287;
 			
 			// aapt resource value: 0x7F090020
-			public const int action_image = 2131296288;
+			public const int action_menu_divider = 2131296288;
 			
 			// aapt resource value: 0x7F090021
-			public const int action_menu_divider = 2131296289;
+			public const int action_menu_presenter = 2131296289;
 			
 			// aapt resource value: 0x7F090022
-			public const int action_menu_presenter = 2131296290;
+			public const int action_mode_bar = 2131296290;
 			
 			// aapt resource value: 0x7F090023
-			public const int action_mode_bar = 2131296291;
+			public const int action_mode_bar_stub = 2131296291;
 			
 			// aapt resource value: 0x7F090024
-			public const int action_mode_bar_stub = 2131296292;
+			public const int action_mode_close_button = 2131296292;
 			
 			// aapt resource value: 0x7F090025
-			public const int action_mode_close_button = 2131296293;
+			public const int action_settings = 2131296293;
 			
 			// aapt resource value: 0x7F090026
-			public const int action_settings = 2131296294;
-			
-			// aapt resource value: 0x7F090027
-			public const int action_text = 2131296295;
+			public const int action_text = 2131296294;
 			
 			// aapt resource value: 0x7F090029
 			public const int activateBtn = 2131296297;
@@ -11371,1025 +11575,1049 @@
 			// aapt resource value: 0x7F090037
 			public const int all = 2131296311;
 			
-			// aapt resource value: 0x7F090038
-			public const int allsize_textview = 2131296312;
-			
 			// aapt resource value: 0x7F090000
 			public const int ALT = 2131296256;
 			
+			// aapt resource value: 0x7F090038
+			public const int always = 2131296312;
+			
 			// aapt resource value: 0x7F090039
-			public const int always = 2131296313;
-			
-			// aapt resource value: 0x7F09003A
-			public const int anchored = 2131296314;
-			
-			// aapt resource value: 0x7F090045
-			public const int appsize_textview = 2131296325;
-			
-			// aapt resource value: 0x7F09003C
-			public const int app_common_all_config_error_info = 2131296316;
-			
-			// aapt resource value: 0x7F09003D
-			public const int app_common_config_result_fail = 2131296317;
-			
-			// aapt resource value: 0x7F09003E
-			public const int app_common_config_result_success = 2131296318;
-			
-			// aapt resource value: 0x7F09003F
-			public const int app_common_device_hotspot_name = 2131296319;
-			
-			// aapt resource value: 0x7F090040
-			public const int app_common_device_hotspot_pwd = 2131296320;
-			
-			// aapt resource value: 0x7F090041
-			public const int app_common_tv_title = 2131296321;
-			
-			// aapt resource value: 0x7F090042
-			public const int app_common_vg_config_result = 2131296322;
-			
-			// aapt resource value: 0x7F090043
-			public const int app_progress_bar_add_device = 2131296323;
-			
-			// aapt resource value: 0x7F090044
-			public const int app_vg_failed_to_add_device = 2131296324;
+			public const int anchored = 2131296313;
 			
 			// aapt resource value: 0x7F09003B
-			public const int ap_name_input = 2131296315;
+			public const int app_common_all_config_error_info = 2131296315;
+			
+			// aapt resource value: 0x7F09003C
+			public const int app_common_config_result_fail = 2131296316;
+			
+			// aapt resource value: 0x7F09003D
+			public const int app_common_config_result_success = 2131296317;
+			
+			// aapt resource value: 0x7F09003E
+			public const int app_common_device_hotspot_name = 2131296318;
+			
+			// aapt resource value: 0x7F09003F
+			public const int app_common_device_hotspot_pwd = 2131296319;
+			
+			// aapt resource value: 0x7F090040
+			public const int app_common_tv_title = 2131296320;
+			
+			// aapt resource value: 0x7F090041
+			public const int app_common_vg_config_result = 2131296321;
+			
+			// aapt resource value: 0x7F090042
+			public const int app_progress_bar_add_device = 2131296322;
+			
+			// aapt resource value: 0x7F090043
+			public const int app_vg_failed_to_add_device = 2131296323;
+			
+			// aapt resource value: 0x7F09003A
+			public const int ap_name_input = 2131296314;
+			
+			// aapt resource value: 0x7F090044
+			public const int async = 2131296324;
+			
+			// aapt resource value: 0x7F090045
+			public const int auto = 2131296325;
 			
 			// aapt resource value: 0x7F090046
-			public const int async = 2131296326;
+			public const int autoAccept = 2131296326;
 			
 			// aapt resource value: 0x7F090047
-			public const int auto = 2131296327;
+			public const int autoTest = 2131296327;
 			
 			// aapt resource value: 0x7F090048
-			public const int autoAccept = 2131296328;
+			public const int auto_focus = 2131296328;
 			
 			// aapt resource value: 0x7F090049
-			public const int autoTest = 2131296329;
+			public const int auto_play_layout = 2131296329;
 			
 			// aapt resource value: 0x7F09004A
-			public const int auto_focus = 2131296330;
+			public const int av_anim = 2131296330;
 			
 			// aapt resource value: 0x7F09004B
-			public const int auto_play_layout = 2131296331;
+			public const int back_img = 2131296331;
 			
 			// aapt resource value: 0x7F09004C
-			public const int av_anim = 2131296332;
+			public const int banner_body = 2131296332;
 			
 			// aapt resource value: 0x7F09004D
-			public const int back_img = 2131296333;
+			public const int banner_content_root = 2131296333;
 			
 			// aapt resource value: 0x7F09004E
-			public const int barrier = 2131296334;
-			
-			// aapt resource value: 0x7F090050
-			public const int beginning = 2131296336;
+			public const int banner_image = 2131296334;
 			
 			// aapt resource value: 0x7F09004F
-			public const int begin_time_tv = 2131296335;
+			public const int banner_image_only = 2131296335;
+			
+			// aapt resource value: 0x7F090050
+			public const int banner_root = 2131296336;
 			
 			// aapt resource value: 0x7F090051
-			public const int belongType = 2131296337;
+			public const int banner_text_container = 2131296337;
 			
 			// aapt resource value: 0x7F090052
-			public const int bg = 2131296338;
+			public const int banner_title = 2131296338;
 			
 			// aapt resource value: 0x7F090053
-			public const int bind_success_rl = 2131296339;
-			
-			// aapt resource value: 0x7F090054
-			public const int bind_success_sv = 2131296340;
+			public const int barrier = 2131296339;
 			
 			// aapt resource value: 0x7F090055
-			public const int blocking = 2131296341;
+			public const int beginning = 2131296341;
+			
+			// aapt resource value: 0x7F090054
+			public const int begin_time_tv = 2131296340;
 			
 			// aapt resource value: 0x7F090056
-			public const int both = 2131296342;
+			public const int belongType = 2131296342;
 			
 			// aapt resource value: 0x7F090057
-			public const int bottom = 2131296343;
+			public const int bg = 2131296343;
 			
 			// aapt resource value: 0x7F090058
-			public const int bottom_bar = 2131296344;
+			public const int bind_success_rl = 2131296344;
 			
 			// aapt resource value: 0x7F090059
-			public const int bottom_divider = 2131296345;
+			public const int bind_success_sv = 2131296345;
 			
 			// aapt resource value: 0x7F09005A
-			public const int bottom_line = 2131296346;
+			public const int blocking = 2131296346;
 			
 			// aapt resource value: 0x7F09005B
-			public const int bottom_tip_title = 2131296347;
+			public const int both = 2131296347;
 			
 			// aapt resource value: 0x7F09005C
-			public const int btnAddCameraSuccess = 2131296348;
+			public const int bottom = 2131296348;
 			
 			// aapt resource value: 0x7F09005D
-			public const int btnBack = 2131296349;
+			public const int bottom_bar = 2131296349;
 			
 			// aapt resource value: 0x7F09005E
-			public const int btnCancel = 2131296350;
+			public const int bottom_divider = 2131296350;
 			
 			// aapt resource value: 0x7F09005F
-			public const int btnFinish = 2131296351;
+			public const int bottom_line = 2131296351;
 			
 			// aapt resource value: 0x7F090060
-			public const int btnIntroduce = 2131296352;
+			public const int bottom_tip_title = 2131296352;
 			
 			// aapt resource value: 0x7F090061
-			public const int btnLineConnet = 2131296353;
+			public const int btnAddCameraSuccess = 2131296353;
 			
 			// aapt resource value: 0x7F090062
-			public const int btnLineConnetOk = 2131296354;
+			public const int btnBack = 2131296354;
 			
 			// aapt resource value: 0x7F090063
-			public const int btnNext = 2131296355;
+			public const int btnCancel = 2131296355;
 			
 			// aapt resource value: 0x7F090064
-			public const int btnReset = 2131296356;
+			public const int btnConnect = 2131296356;
 			
 			// aapt resource value: 0x7F090065
-			public const int btnRetry = 2131296357;
+			public const int btnFinish = 2131296357;
 			
 			// aapt resource value: 0x7F090066
-			public const int btnSubmit = 2131296358;
+			public const int btnIntroduce = 2131296358;
 			
 			// aapt resource value: 0x7F090067
-			public const int btn_add = 2131296359;
+			public const int btnLineConnet = 2131296359;
 			
 			// aapt resource value: 0x7F090068
-			public const int btn_cancel = 2131296360;
+			public const int btnLineConnetOk = 2131296360;
 			
 			// aapt resource value: 0x7F090069
-			public const int btn_capture = 2131296361;
+			public const int btnNext = 2131296361;
 			
 			// aapt resource value: 0x7F09006A
-			public const int btn_change_playback_rate = 2131296362;
+			public const int btnReset = 2131296362;
 			
 			// aapt resource value: 0x7F09006B
-			public const int btn_ddns = 2131296363;
+			public const int btnRetry = 2131296363;
 			
 			// aapt resource value: 0x7F09006C
-			public const int btn_ezviz_login = 2131296364;
+			public const int btnSubmit = 2131296364;
 			
 			// aapt resource value: 0x7F09006D
-			public const int btn_get_device_list = 2131296365;
+			public const int btn_add = 2131296365;
 			
 			// aapt resource value: 0x7F09006E
-			public const int btn_hat_audio_caller = 2131296366;
+			public const int btn_cancel = 2131296366;
 			
 			// aapt resource value: 0x7F09006F
-			public const int btn_hat_video_caller = 2131296367;
+			public const int btn_capture = 2131296367;
 			
 			// aapt resource value: 0x7F090070
-			public const int btn_id_save_name = 2131296368;
+			public const int btn_change_playback_rate = 2131296368;
 			
 			// aapt resource value: 0x7F090071
-			public const int btn_landevice = 2131296369;
+			public const int btn_ddns = 2131296369;
 			
 			// aapt resource value: 0x7F090072
-			public const int btn_logout = 2131296370;
+			public const int btn_ezviz_devicelist = 2131296370;
 			
 			// aapt resource value: 0x7F090073
-			public const int btn_multi_screen_preview = 2131296371;
+			public const int btn_ezviz_historylist = 2131296371;
 			
 			// aapt resource value: 0x7F090074
-			public const int btn_ok = 2131296372;
+			public const int btn_ezviz_realplay = 2131296372;
 			
 			// aapt resource value: 0x7F090075
-			public const int btn_online_device = 2131296373;
+			public const int btn_ezviz_scan = 2131296373;
 			
 			// aapt resource value: 0x7F090076
-			public const int btn_sdk_login = 2131296374;
+			public const int btn_ezviz_scan2 = 2131296374;
 			
 			// aapt resource value: 0x7F090077
-			public const int btn_show_debug_tools = 2131296375;
+			public const int btn_ezviz_temp_password = 2131296375;
 			
 			// aapt resource value: 0x7F090078
-			public const int btn_start_ap = 2131296376;
+			public const int btn_get_device_list = 2131296376;
 			
 			// aapt resource value: 0x7F090079
-			public const int btn_stop_ap = 2131296377;
+			public const int btn_hat_audio_caller = 2131296377;
 			
 			// aapt resource value: 0x7F09007A
-			public const int btn_support = 2131296378;
+			public const int btn_hat_video_caller = 2131296378;
 			
 			// aapt resource value: 0x7F09007B
-			public const int btn_test = 2131296379;
+			public const int btn_id_save_name = 2131296379;
 			
 			// aapt resource value: 0x7F09007C
-			public const int btn_to_alarm_list = 2131296380;
+			public const int btn_landevice = 2131296380;
 			
 			// aapt resource value: 0x7F09007D
-			public const int btn_to_ap = 2131296381;
+			public const int btn_multi_screen_preview = 2131296381;
 			
 			// aapt resource value: 0x7F09007E
-			public const int btn_to_device_list = 2131296382;
+			public const int btn_ok = 2131296382;
 			
 			// aapt resource value: 0x7F09007F
-			public const int btn_to_smart_config = 2131296383;
+			public const int btn_online_device = 2131296383;
 			
 			// aapt resource value: 0x7F090080
-			public const int btn_to_sound_wave = 2131296384;
+			public const int btn_show_debug_tools = 2131296384;
 			
 			// aapt resource value: 0x7F090081
-			public const int btn_user = 2131296385;
+			public const int btn_start_ap = 2131296385;
 			
 			// aapt resource value: 0x7F090082
-			public const int buttonPanel = 2131296386;
+			public const int btn_stop_ap = 2131296386;
 			
 			// aapt resource value: 0x7F090083
-			public const int callAnswerImg = 2131296387;
+			public const int btn_to_alarm_list = 2131296387;
 			
 			// aapt resource value: 0x7F090084
-			public const int callAnswerLayout = 2131296388;
+			public const int btn_to_ap = 2131296388;
 			
 			// aapt resource value: 0x7F090085
-			public const int callHangupImg = 2131296389;
+			public const int btn_to_device_list = 2131296389;
 			
 			// aapt resource value: 0x7F090086
-			public const int callHangupText = 2131296390;
+			public const int btn_to_smart_config = 2131296390;
 			
 			// aapt resource value: 0x7F090087
-			public const int callScreenshotImg = 2131296391;
+			public const int btn_to_sound_wave = 2131296391;
 			
 			// aapt resource value: 0x7F090088
-			public const int callTipText = 2131296392;
+			public const int btn_user = 2131296392;
 			
 			// aapt resource value: 0x7F090089
-			public const int callUnlockImg = 2131296393;
+			public const int buttonPanel = 2131296393;
 			
 			// aapt resource value: 0x7F09008A
-			public const int call_accept = 2131296394;
+			public const int callAnswerImg = 2131296394;
 			
 			// aapt resource value: 0x7F09008B
-			public const int camera0 = 2131296395;
+			public const int callAnswerLayout = 2131296395;
 			
 			// aapt resource value: 0x7F09008C
-			public const int camera1 = 2131296396;
+			public const int callHangupImg = 2131296396;
 			
 			// aapt resource value: 0x7F09008D
-			public const int cameraListLy = 2131296397;
+			public const int callHangupText = 2131296397;
 			
 			// aapt resource value: 0x7F09008E
-			public const int cameraName = 2131296398;
+			public const int callScreenshotImg = 2131296398;
 			
 			// aapt resource value: 0x7F09008F
-			public const int cameraNameSort = 2131296399;
+			public const int callTipText = 2131296399;
 			
 			// aapt resource value: 0x7F090090
-			public const int camera_del_btn = 2131296400;
+			public const int callUnlockImg = 2131296400;
 			
 			// aapt resource value: 0x7F090091
-			public const int camera_item_btn = 2131296401;
+			public const int call_accept = 2131296401;
 			
 			// aapt resource value: 0x7F090092
-			public const int camera_item_rl = 2131296402;
+			public const int camera0 = 2131296402;
 			
 			// aapt resource value: 0x7F090093
-			public const int camera_layout = 2131296403;
+			public const int camera1 = 2131296403;
 			
 			// aapt resource value: 0x7F090094
-			public const int camera_layout_my = 2131296404;
-			
-			// aapt resource value: 0x7F090097
-			public const int camera_listview = 2131296407;
+			public const int cameraListLy = 2131296404;
 			
 			// aapt resource value: 0x7F090095
-			public const int camera_list_gc_ly = 2131296405;
+			public const int cameraName = 2131296405;
 			
 			// aapt resource value: 0x7F090096
-			public const int camera_list_refresh_btn = 2131296406;
+			public const int cameraNameSort = 2131296406;
+			
+			// aapt resource value: 0x7F090097
+			public const int camera_del_btn = 2131296407;
 			
 			// aapt resource value: 0x7F090098
-			public const int camera_name_tv = 2131296408;
+			public const int camera_item_btn = 2131296408;
 			
 			// aapt resource value: 0x7F090099
-			public const int camera_switch_btn = 2131296409;
+			public const int camera_item_rl = 2131296409;
 			
 			// aapt resource value: 0x7F09009A
-			public const int camera_view = 2131296410;
+			public const int camera_layout = 2131296410;
 			
 			// aapt resource value: 0x7F09009B
-			public const int camera_view_my = 2131296411;
-			
-			// aapt resource value: 0x7F09009C
-			public const int cancel_action = 2131296412;
+			public const int camera_layout_my = 2131296411;
 			
 			// aapt resource value: 0x7F09009D
-			public const int cancel_auto_play_btn = 2131296413;
+			public const int camera_listview = 2131296413;
+			
+			// aapt resource value: 0x7F09009C
+			public const int camera_list_refresh_btn = 2131296412;
 			
 			// aapt resource value: 0x7F09009E
-			public const int cancel_bg = 2131296414;
+			public const int camera_name_tv = 2131296414;
 			
 			// aapt resource value: 0x7F09009F
-			public const int cancel_btn = 2131296415;
+			public const int camera_switch_btn = 2131296415;
 			
 			// aapt resource value: 0x7F0900A0
-			public const int cancel_imageview = 2131296416;
+			public const int camera_view = 2131296416;
 			
 			// aapt resource value: 0x7F0900A1
-			public const int capture_container = 2131296417;
+			public const int camera_view_my = 2131296417;
 			
 			// aapt resource value: 0x7F0900A2
-			public const int capture_crop_view = 2131296418;
+			public const int cancel_action = 2131296418;
 			
 			// aapt resource value: 0x7F0900A3
-			public const int capture_mask_bottom = 2131296419;
+			public const int cancel_auto_play_btn = 2131296419;
 			
 			// aapt resource value: 0x7F0900A4
-			public const int capture_mask_top = 2131296420;
+			public const int cancel_btn = 2131296420;
 			
 			// aapt resource value: 0x7F0900A5
-			public const int capture_preview = 2131296421;
+			public const int capture_container = 2131296421;
 			
 			// aapt resource value: 0x7F0900A6
-			public const int capture_scan_line = 2131296422;
+			public const int capture_crop_view = 2131296422;
 			
 			// aapt resource value: 0x7F0900A7
-			public const int cb_confirm = 2131296423;
+			public const int capture_mask_bottom = 2131296423;
 			
 			// aapt resource value: 0x7F0900A8
-			public const int cc_btn_back = 2131296424;
+			public const int capture_mask_top = 2131296424;
 			
 			// aapt resource value: 0x7F0900A9
-			public const int cc_line_long = 2131296425;
+			public const int capture_preview = 2131296425;
 			
 			// aapt resource value: 0x7F0900AA
-			public const int cc_listview = 2131296426;
+			public const int capture_scan_line = 2131296426;
 			
 			// aapt resource value: 0x7F0900AB
-			public const int cc_nameView = 2131296427;
+			public const int cb_confirm = 2131296427;
 			
 			// aapt resource value: 0x7F0900AC
-			public const int cc_rl_topview = 2131296428;
+			public const int cc_btn_back = 2131296428;
 			
 			// aapt resource value: 0x7F0900AD
-			public const int cc_searchBarContainer = 2131296429;
+			public const int cc_line_long = 2131296429;
 			
 			// aapt resource value: 0x7F0900AE
-			public const int cc_sectionTextView = 2131296430;
+			public const int cc_listview = 2131296430;
 			
 			// aapt resource value: 0x7F0900AF
-			public const int cc_tv_activity_title = 2131296431;
+			public const int cc_nameView = 2131296431;
 			
 			// aapt resource value: 0x7F0900B0
-			public const int center = 2131296432;
+			public const int cc_rl_topview = 2131296432;
 			
 			// aapt resource value: 0x7F0900B1
-			public const int centerCrop = 2131296433;
+			public const int cc_searchBarContainer = 2131296433;
 			
 			// aapt resource value: 0x7F0900B2
-			public const int center_horizontal = 2131296434;
+			public const int cc_sectionTextView = 2131296434;
 			
 			// aapt resource value: 0x7F0900B3
-			public const int center_title = 2131296435;
+			public const int cc_tv_activity_title = 2131296435;
 			
 			// aapt resource value: 0x7F0900B4
-			public const int center_vertical = 2131296436;
+			public const int center = 2131296436;
 			
 			// aapt resource value: 0x7F0900B5
-			public const int chains = 2131296437;
+			public const int centerCrop = 2131296437;
 			
 			// aapt resource value: 0x7F0900B6
-			public const int channel_id_et = 2131296438;
+			public const int center_horizontal = 2131296438;
 			
 			// aapt resource value: 0x7F0900B7
-			public const int check1 = 2131296439;
+			public const int center_title = 2131296439;
 			
 			// aapt resource value: 0x7F0900B8
-			public const int check2 = 2131296440;
+			public const int center_vertical = 2131296440;
 			
 			// aapt resource value: 0x7F0900B9
-			public const int check3 = 2131296441;
-			
-			// aapt resource value: 0x7F0900C3
-			public const int checkbox = 2131296451;
+			public const int chains = 2131296441;
 			
 			// aapt resource value: 0x7F0900BA
-			public const int check_all = 2131296442;
+			public const int channel_id_et = 2131296442;
 			
 			// aapt resource value: 0x7F0900BB
-			public const int check_mic = 2131296443;
+			public const int check1 = 2131296443;
 			
 			// aapt resource value: 0x7F0900BC
-			public const int check_mic_my = 2131296444;
+			public const int check2 = 2131296444;
 			
 			// aapt resource value: 0x7F0900BD
-			public const int check_mode_bottom = 2131296445;
-			
-			// aapt resource value: 0x7F0900BE
-			public const int check_mode_bottom_divider = 2131296446;
-			
-			// aapt resource value: 0x7F0900BF
-			public const int check_mode_top = 2131296447;
-			
-			// aapt resource value: 0x7F0900C0
-			public const int check_mode_top_divider = 2131296448;
-			
-			// aapt resource value: 0x7F0900C1
-			public const int check_video = 2131296449;
-			
-			// aapt resource value: 0x7F0900C2
-			public const int check_video_my = 2131296450;
-			
-			// aapt resource value: 0x7F0900C4
-			public const int child_content = 2131296452;
-			
-			// aapt resource value: 0x7F0900C5
-			public const int chronometer = 2131296453;
-			
-			// aapt resource value: 0x7F0900C6
-			public const int cifyConfigList = 2131296454;
+			public const int check3 = 2131296445;
 			
 			// aapt resource value: 0x7F0900C7
-			public const int cityKey = 2131296455;
+			public const int checkbox = 2131296455;
+			
+			// aapt resource value: 0x7F0900BE
+			public const int check_all = 2131296446;
+			
+			// aapt resource value: 0x7F0900BF
+			public const int check_mic = 2131296447;
+			
+			// aapt resource value: 0x7F0900C0
+			public const int check_mic_my = 2131296448;
+			
+			// aapt resource value: 0x7F0900C1
+			public const int check_mode_bottom = 2131296449;
+			
+			// aapt resource value: 0x7F0900C2
+			public const int check_mode_bottom_divider = 2131296450;
+			
+			// aapt resource value: 0x7F0900C3
+			public const int check_mode_top = 2131296451;
+			
+			// aapt resource value: 0x7F0900C4
+			public const int check_mode_top_divider = 2131296452;
+			
+			// aapt resource value: 0x7F0900C5
+			public const int check_video = 2131296453;
+			
+			// aapt resource value: 0x7F0900C6
+			public const int check_video_my = 2131296454;
 			
 			// aapt resource value: 0x7F0900C8
-			public const int cityName = 2131296456;
+			public const int child_content = 2131296456;
 			
 			// aapt resource value: 0x7F0900C9
-			public const int ckbCloundService = 2131296457;
+			public const int chronometer = 2131296457;
 			
 			// aapt resource value: 0x7F0900CA
-			public const int ckbLight = 2131296458;
+			public const int cifyConfigList = 2131296458;
 			
 			// aapt resource value: 0x7F0900CB
-			public const int client_id_tv = 2131296459;
+			public const int cityKey = 2131296459;
 			
 			// aapt resource value: 0x7F0900CC
-			public const int clip_horizontal = 2131296460;
+			public const int cityName = 2131296460;
 			
 			// aapt resource value: 0x7F0900CD
-			public const int clip_vertical = 2131296461;
+			public const int ckbCloundService = 2131296461;
 			
 			// aapt resource value: 0x7F0900CE
-			public const int close = 2131296462;
+			public const int ckbLight = 2131296462;
 			
 			// aapt resource value: 0x7F0900CF
-			public const int cloud_image1 = 2131296463;
+			public const int clear_button = 2131296463;
 			
 			// aapt resource value: 0x7F0900D0
-			public const int cloud_image2 = 2131296464;
+			public const int client_id_tv = 2131296464;
 			
 			// aapt resource value: 0x7F0900D1
-			public const int cloud_progrees_img = 2131296465;
+			public const int clip_horizontal = 2131296465;
 			
 			// aapt resource value: 0x7F0900D2
-			public const int collapseActionView = 2131296466;
+			public const int clip_vertical = 2131296466;
 			
 			// aapt resource value: 0x7F0900D3
-			public const int collapsed = 2131296467;
+			public const int close = 2131296467;
 			
 			// aapt resource value: 0x7F0900D4
-			public const int collectBtn = 2131296468;
+			public const int cloud_image1 = 2131296468;
 			
 			// aapt resource value: 0x7F0900D5
-			public const int collectedTV = 2131296469;
+			public const int cloud_image2 = 2131296469;
 			
 			// aapt resource value: 0x7F0900D6
-			public const int comment = 2131296470;
+			public const int cloud_progrees_img = 2131296470;
 			
 			// aapt resource value: 0x7F0900D7
-			public const int common_name_layout = 2131296471;
+			public const int collapseActionView = 2131296471;
 			
 			// aapt resource value: 0x7F0900D8
-			public const int common_search_cancel = 2131296472;
+			public const int collapsed = 2131296472;
 			
 			// aapt resource value: 0x7F0900D9
-			public const int common_search_input = 2131296473;
+			public const int collectBtn = 2131296473;
 			
 			// aapt resource value: 0x7F0900DA
-			public const int configAVMsg = 2131296474;
+			public const int collectedTV = 2131296474;
 			
 			// aapt resource value: 0x7F0900DB
-			public const int confirm_btn = 2131296475;
+			public const int comment = 2131296475;
 			
 			// aapt resource value: 0x7F0900DC
-			public const int connectStateContainer = 2131296476;
+			public const int common_name_layout = 2131296476;
 			
 			// aapt resource value: 0x7F0900DD
-			public const int connectTip = 2131296477;
+			public const int common_search_cancel = 2131296477;
 			
 			// aapt resource value: 0x7F0900DE
-			public const int container = 2131296478;
+			public const int common_search_input = 2131296478;
 			
 			// aapt resource value: 0x7F0900DF
-			public const int content = 2131296479;
+			public const int configAVMsg = 2131296479;
 			
 			// aapt resource value: 0x7F0900E0
-			public const int contentFrame = 2131296480;
+			public const int confirm_btn = 2131296480;
 			
 			// aapt resource value: 0x7F0900E1
-			public const int contentPanel = 2131296481;
+			public const int connectStateContainer = 2131296481;
 			
 			// aapt resource value: 0x7F0900E2
-			public const int content_container = 2131296482;
+			public const int connectTip = 2131296482;
 			
 			// aapt resource value: 0x7F0900E3
-			public const int content_layout = 2131296483;
+			public const int connectTipPage = 2131296483;
 			
 			// aapt resource value: 0x7F0900E4
-			public const int content_tab_cloud_root = 2131296484;
+			public const int container = 2131296484;
 			
 			// aapt resource value: 0x7F0900E5
-			public const int content_tab_device_root = 2131296485;
+			public const int content = 2131296485;
 			
 			// aapt resource value: 0x7F0900E6
-			public const int content_textview = 2131296486;
+			public const int contentFrame = 2131296486;
 			
 			// aapt resource value: 0x7F0900E7
-			public const int control_area = 2131296487;
+			public const int contentPanel = 2131296487;
 			
 			// aapt resource value: 0x7F0900E8
-			public const int coordinator = 2131296488;
+			public const int content_container = 2131296488;
 			
 			// aapt resource value: 0x7F0900E9
-			public const int countdown_view = 2131296489;
+			public const int content_tab_cloud_root = 2131296489;
 			
 			// aapt resource value: 0x7F0900EA
-			public const int cover = 2131296490;
+			public const int content_tab_device_root = 2131296490;
+			
+			// aapt resource value: 0x7F0900EB
+			public const int control_area = 2131296491;
+			
+			// aapt resource value: 0x7F0900EC
+			public const int coordinator = 2131296492;
+			
+			// aapt resource value: 0x7F0900ED
+			public const int countdown_view = 2131296493;
+			
+			// aapt resource value: 0x7F0900EE
+			public const int cover = 2131296494;
 			
 			// aapt resource value: 0x7F090002
 			public const int CoverArea = 2131296258;
 			
-			// aapt resource value: 0x7F0900EB
-			public const int create_room_btn = 2131296491;
+			// aapt resource value: 0x7F0900EF
+			public const int coverImage = 2131296495;
+			
+			// aapt resource value: 0x7F0900F0
+			public const int create_room_btn = 2131296496;
 			
 			// aapt resource value: 0x7F090001
 			public const int CTRL = 2131296257;
 			
-			// aapt resource value: 0x7F0900EC
-			public const int cubein = 2131296492;
-			
-			// aapt resource value: 0x7F0900ED
-			public const int cubeout = 2131296493;
-			
-			// aapt resource value: 0x7F0900EE
-			public const int current_version = 2131296494;
-			
-			// aapt resource value: 0x7F0900EF
-			public const int current_version_layout = 2131296495;
-			
-			// aapt resource value: 0x7F0900F0
-			public const int custom = 2131296496;
-			
 			// aapt resource value: 0x7F0900F1
-			public const int customPanel = 2131296497;
+			public const int cubein = 2131296497;
 			
 			// aapt resource value: 0x7F0900F2
-			public const int custom_pwd_et = 2131296498;
+			public const int cubeout = 2131296498;
 			
 			// aapt resource value: 0x7F0900F3
-			public const int custom_pwd_layout = 2131296499;
+			public const int current_version = 2131296499;
 			
 			// aapt resource value: 0x7F0900F4
-			public const int day = 2131296500;
+			public const int current_version_layout = 2131296500;
 			
 			// aapt resource value: 0x7F0900F5
-			public const int debug_room_id = 2131296501;
+			public const int custom = 2131296501;
 			
 			// aapt resource value: 0x7F0900F6
-			public const int decode = 2131296502;
+			public const int customPanel = 2131296502;
 			
 			// aapt resource value: 0x7F0900F7
-			public const int decode_failed = 2131296503;
+			public const int custom_pwd_et = 2131296503;
 			
 			// aapt resource value: 0x7F0900F8
-			public const int decode_succeeded = 2131296504;
+			public const int custom_pwd_layout = 2131296504;
 			
 			// aapt resource value: 0x7F0900F9
-			public const int decor_content_parent = 2131296505;
+			public const int day = 2131296505;
 			
 			// aapt resource value: 0x7F0900FA
-			public const int default_activity_button = 2131296506;
+			public const int debug_room_id = 2131296506;
 			
 			// aapt resource value: 0x7F0900FB
-			public const int default_figure_iv = 2131296507;
+			public const int decode = 2131296507;
 			
 			// aapt resource value: 0x7F0900FC
-			public const int defence = 2131296508;
+			public const int decode_failed = 2131296508;
 			
 			// aapt resource value: 0x7F0900FD
-			public const int defence_layout = 2131296509;
+			public const int decode_succeeded = 2131296509;
 			
 			// aapt resource value: 0x7F0900FE
-			public const int defence_plan_arrow = 2131296510;
+			public const int decor_content_parent = 2131296510;
 			
 			// aapt resource value: 0x7F0900FF
-			public const int defence_plan_button = 2131296511;
+			public const int default_activity_button = 2131296511;
 			
 			// aapt resource value: 0x7F090100
-			public const int defence_plan_new = 2131296512;
+			public const int default_figure_iv = 2131296512;
 			
 			// aapt resource value: 0x7F090101
-			public const int defence_plan_parent_layout = 2131296513;
+			public const int defence = 2131296513;
 			
 			// aapt resource value: 0x7F090102
-			public const int defence_plan_progress = 2131296514;
+			public const int defence_layout = 2131296514;
 			
 			// aapt resource value: 0x7F090103
-			public const int defence_plan_retry = 2131296515;
+			public const int defence_plan_arrow = 2131296515;
 			
 			// aapt resource value: 0x7F090104
-			public const int defence_plan_set_layout = 2131296516;
+			public const int defence_plan_button = 2131296516;
 			
 			// aapt resource value: 0x7F090105
-			public const int defence_plan_state = 2131296517;
+			public const int defence_plan_new = 2131296517;
 			
 			// aapt resource value: 0x7F090106
-			public const int defence_plan_status_progress = 2131296518;
+			public const int defence_plan_parent_layout = 2131296518;
 			
 			// aapt resource value: 0x7F090107
-			public const int defence_plan_status_retry = 2131296519;
+			public const int defence_plan_progress = 2131296519;
 			
 			// aapt resource value: 0x7F090108
-			public const int defence_state = 2131296520;
+			public const int defence_plan_retry = 2131296520;
 			
 			// aapt resource value: 0x7F090109
-			public const int defence_toggle_button = 2131296521;
-			
-			// aapt resource value: 0x7F09010B
-			public const int delete_playback = 2131296523;
-			
-			// aapt resource value: 0x7F09010C
-			public const int delete_playback_device = 2131296524;
+			public const int defence_plan_set_layout = 2131296521;
 			
 			// aapt resource value: 0x7F09010A
-			public const int del_button = 2131296522;
+			public const int defence_plan_state = 2131296522;
+			
+			// aapt resource value: 0x7F09010B
+			public const int defence_plan_status_progress = 2131296523;
+			
+			// aapt resource value: 0x7F09010C
+			public const int defence_plan_status_retry = 2131296524;
 			
 			// aapt resource value: 0x7F09010D
-			public const int description = 2131296525;
+			public const int defence_state = 2131296525;
 			
 			// aapt resource value: 0x7F09010E
-			public const int design_bottom_sheet = 2131296526;
-			
-			// aapt resource value: 0x7F09010F
-			public const int design_menu_item_action_area = 2131296527;
+			public const int defence_toggle_button = 2131296526;
 			
 			// aapt resource value: 0x7F090110
-			public const int design_menu_item_action_area_stub = 2131296528;
+			public const int delete_playback = 2131296528;
 			
 			// aapt resource value: 0x7F090111
-			public const int design_menu_item_text = 2131296529;
+			public const int delete_playback_device = 2131296529;
+			
+			// aapt resource value: 0x7F09010F
+			public const int del_button = 2131296527;
 			
 			// aapt resource value: 0x7F090112
-			public const int design_navigation_view = 2131296530;
+			public const int description = 2131296530;
 			
 			// aapt resource value: 0x7F090113
-			public const int detector_type = 2131296531;
-			
-			// aapt resource value: 0x7F090116
-			public const int deviceIcon = 2131296534;
-			
-			// aapt resource value: 0x7F090117
-			public const int deviceName = 2131296535;
-			
-			// aapt resource value: 0x7F090118
-			public const int device_delete = 2131296536;
-			
-			// aapt resource value: 0x7F090119
-			public const int device_hidden_title = 2131296537;
-			
-			// aapt resource value: 0x7F09011A
-			public const int device_id_et = 2131296538;
-			
-			// aapt resource value: 0x7F09011B
-			public const int device_id_layout = 2131296539;
-			
-			// aapt resource value: 0x7F09011C
-			public const int device_info_layout = 2131296540;
-			
-			// aapt resource value: 0x7F09011D
-			public const int device_list = 2131296541;
-			
-			// aapt resource value: 0x7F09011E
-			public const int device_name = 2131296542;
-			
-			// aapt resource value: 0x7F09011F
-			public const int device_name_input = 2131296543;
-			
-			// aapt resource value: 0x7F090120
-			public const int device_type_sn = 2131296544;
-			
-			// aapt resource value: 0x7F090121
-			public const int device_wifi_list = 2131296545;
-			
-			// aapt resource value: 0x7F090122
-			public const int device_wifi_list_connected = 2131296546;
-			
-			// aapt resource value: 0x7F090123
-			public const int device_wifi_list_connected_info = 2131296547;
-			
-			// aapt resource value: 0x7F090124
-			public const int device_wifi_list_empty_view = 2131296548;
-			
-			// aapt resource value: 0x7F090125
-			public const int device_wifi_list_layout = 2131296549;
-			
-			// aapt resource value: 0x7F090126
-			public const int device_wifi_list_text = 2131296550;
-			
-			// aapt resource value: 0x7F090127
-			public const int device_wifi_list_title = 2131296551;
-			
-			// aapt resource value: 0x7F090128
-			public const int device_wifi_no_5g = 2131296552;
-			
-			// aapt resource value: 0x7F090129
-			public const int device_wifi_password = 2131296553;
-			
-			// aapt resource value: 0x7F09012A
-			public const int device_wifi_password_done_btn = 2131296554;
-			
-			// aapt resource value: 0x7F09012B
-			public const int device_wifi_password_title = 2131296555;
-			
-			// aapt resource value: 0x7F09012C
-			public const int device_wifi_ssid = 2131296556;
+			public const int design_bottom_sheet = 2131296531;
 			
 			// aapt resource value: 0x7F090114
-			public const int dev_img = 2131296532;
+			public const int design_menu_item_action_area = 2131296532;
 			
 			// aapt resource value: 0x7F090115
-			public const int dev_wifi_name = 2131296533;
+			public const int design_menu_item_action_area_stub = 2131296533;
+			
+			// aapt resource value: 0x7F090116
+			public const int design_menu_item_text = 2131296534;
+			
+			// aapt resource value: 0x7F090117
+			public const int design_navigation_view = 2131296535;
+			
+			// aapt resource value: 0x7F090118
+			public const int detector_type = 2131296536;
+			
+			// aapt resource value: 0x7F09011B
+			public const int deviceIcon = 2131296539;
+			
+			// aapt resource value: 0x7F09011C
+			public const int deviceName = 2131296540;
+			
+			// aapt resource value: 0x7F09011D
+			public const int device_delete = 2131296541;
+			
+			// aapt resource value: 0x7F09011E
+			public const int device_hidden_title = 2131296542;
+			
+			// aapt resource value: 0x7F09011F
+			public const int device_id_et = 2131296543;
+			
+			// aapt resource value: 0x7F090120
+			public const int device_id_layout = 2131296544;
+			
+			// aapt resource value: 0x7F090121
+			public const int device_info_layout = 2131296545;
+			
+			// aapt resource value: 0x7F090122
+			public const int device_list = 2131296546;
+			
+			// aapt resource value: 0x7F090123
+			public const int device_name = 2131296547;
+			
+			// aapt resource value: 0x7F090124
+			public const int device_name_input = 2131296548;
+			
+			// aapt resource value: 0x7F090125
+			public const int device_type_sn = 2131296549;
+			
+			// aapt resource value: 0x7F090126
+			public const int device_wifi_list = 2131296550;
+			
+			// aapt resource value: 0x7F090127
+			public const int device_wifi_list_connected = 2131296551;
+			
+			// aapt resource value: 0x7F090128
+			public const int device_wifi_list_connected_info = 2131296552;
+			
+			// aapt resource value: 0x7F090129
+			public const int device_wifi_list_empty_view = 2131296553;
+			
+			// aapt resource value: 0x7F09012A
+			public const int device_wifi_list_layout = 2131296554;
+			
+			// aapt resource value: 0x7F09012B
+			public const int device_wifi_list_text = 2131296555;
+			
+			// aapt resource value: 0x7F09012C
+			public const int device_wifi_list_title = 2131296556;
 			
 			// aapt resource value: 0x7F09012D
-			public const int dh_scannerstyle_view = 2131296557;
+			public const int device_wifi_no_5g = 2131296557;
 			
 			// aapt resource value: 0x7F09012E
-			public const int dh_scanview = 2131296558;
+			public const int device_wifi_password = 2131296558;
 			
 			// aapt resource value: 0x7F09012F
-			public const int dimensions = 2131296559;
+			public const int device_wifi_password_done_btn = 2131296559;
 			
 			// aapt resource value: 0x7F090130
-			public const int direct = 2131296560;
-			
-			// aapt resource value: 0x7F090133
-			public const int disabled = 2131296563;
+			public const int device_wifi_password_title = 2131296560;
 			
 			// aapt resource value: 0x7F090131
-			public const int disableHome = 2131296561;
+			public const int device_wifi_ssid = 2131296561;
+			
+			// aapt resource value: 0x7F090119
+			public const int dev_img = 2131296537;
+			
+			// aapt resource value: 0x7F09011A
+			public const int dev_wifi_name = 2131296538;
 			
 			// aapt resource value: 0x7F090132
-			public const int disableReportBytes = 2131296562;
+			public const int dh_scannerstyle_view = 2131296562;
+			
+			// aapt resource value: 0x7F090133
+			public const int dh_scanview = 2131296563;
 			
 			// aapt resource value: 0x7F090134
-			public const int disagree_btn = 2131296564;
+			public const int dialog_cancel_btn = 2131296564;
 			
 			// aapt resource value: 0x7F090135
-			public const int discover_list_lv = 2131296565;
+			public const int dialog_ok_btn = 2131296565;
 			
 			// aapt resource value: 0x7F090136
-			public const int discover_tv = 2131296566;
+			public const int dimensions = 2131296566;
 			
 			// aapt resource value: 0x7F090137
-			public const int display_layout = 2131296567;
-			
-			// aapt resource value: 0x7F090138
-			public const int divider = 2131296568;
-			
-			// aapt resource value: 0x7F09013B
-			public const int downloading = 2131296571;
-			
-			// aapt resource value: 0x7F09013C
-			public const int downloading_number = 2131296572;
+			public const int direct = 2131296567;
 			
 			// aapt resource value: 0x7F09013A
-			public const int download_info_progress = 2131296570;
+			public const int disabled = 2131296570;
+			
+			// aapt resource value: 0x7F090138
+			public const int disableHome = 2131296568;
 			
 			// aapt resource value: 0x7F090139
-			public const int down_layout = 2131296569;
+			public const int disableReportBytes = 2131296569;
+			
+			// aapt resource value: 0x7F09013B
+			public const int disagree_btn = 2131296571;
+			
+			// aapt resource value: 0x7F09013C
+			public const int discover_list_lv = 2131296572;
 			
 			// aapt resource value: 0x7F09013D
-			public const int edit_accesstoken = 2131296573;
+			public const int discover_tv = 2131296573;
 			
 			// aapt resource value: 0x7F09013E
-			public const int edit_apiurl = 2131296574;
+			public const int display_layout = 2131296574;
 			
 			// aapt resource value: 0x7F09013F
-			public const int edit_appkey = 2131296575;
-			
-			// aapt resource value: 0x7F090140
-			public const int edit_deviceserial = 2131296576;
-			
-			// aapt resource value: 0x7F090141
-			public const int edit_query = 2131296577;
+			public const int divider = 2131296575;
 			
 			// aapt resource value: 0x7F090142
-			public const int edit_weburl = 2131296578;
+			public const int downloading = 2131296578;
 			
 			// aapt resource value: 0x7F090143
-			public const int edtPassword = 2131296579;
+			public const int downloading_number = 2131296579;
+			
+			// aapt resource value: 0x7F090141
+			public const int download_success_size = 2131296577;
+			
+			// aapt resource value: 0x7F090140
+			public const int down_layout = 2131296576;
 			
 			// aapt resource value: 0x7F090144
-			public const int emptyView = 2131296580;
+			public const int edit_accesstoken = 2131296580;
 			
 			// aapt resource value: 0x7F090145
-			public const int empty_tip = 2131296581;
+			public const int edit_apiurl = 2131296581;
 			
 			// aapt resource value: 0x7F090146
-			public const int enableReportBytes = 2131296582;
+			public const int edit_appkey = 2131296582;
 			
 			// aapt resource value: 0x7F090147
-			public const int enable_audio_cb = 2131296583;
+			public const int edit_deviceserial = 2131296583;
 			
 			// aapt resource value: 0x7F090148
-			public const int enable_service_text = 2131296584;
+			public const int edit_query = 2131296584;
 			
 			// aapt resource value: 0x7F090149
-			public const int enable_video_cb = 2131296585;
+			public const int edit_weburl = 2131296585;
 			
 			// aapt resource value: 0x7F09014A
-			public const int encode_failed = 2131296586;
+			public const int edtPassword = 2131296586;
 			
 			// aapt resource value: 0x7F09014B
-			public const int encode_succeeded = 2131296587;
+			public const int emptyView = 2131296587;
 			
 			// aapt resource value: 0x7F09014C
-			public const int encrypt_button = 2131296588;
+			public const int empty_tip = 2131296588;
 			
 			// aapt resource value: 0x7F09014D
-			public const int encrypt_key = 2131296589;
+			public const int enableReportBytes = 2131296589;
 			
 			// aapt resource value: 0x7F09014E
-			public const int encrypt_layout = 2131296590;
+			public const int enable_audio_cb = 2131296590;
 			
 			// aapt resource value: 0x7F09014F
-			public const int encrypt_parent_layout = 2131296591;
+			public const int enable_service_text = 2131296591;
 			
 			// aapt resource value: 0x7F090150
-			public const int end = 2131296592;
+			public const int enable_video_cb = 2131296592;
 			
 			// aapt resource value: 0x7F090151
-			public const int end_padder = 2131296593;
+			public const int encode_failed = 2131296593;
 			
 			// aapt resource value: 0x7F090152
-			public const int end_time_tv = 2131296594;
+			public const int encode_succeeded = 2131296594;
 			
 			// aapt resource value: 0x7F090153
-			public const int enterAlways = 2131296595;
+			public const int encrypt_button = 2131296595;
 			
 			// aapt resource value: 0x7F090154
-			public const int enterAlwaysCollapsed = 2131296596;
+			public const int encrypt_key = 2131296596;
 			
 			// aapt resource value: 0x7F090155
-			public const int errorPage = 2131296597;
+			public const int encrypt_layout = 2131296597;
 			
 			// aapt resource value: 0x7F090156
-			public const int error_info_tv = 2131296598;
+			public const int encrypt_parent_layout = 2131296598;
 			
 			// aapt resource value: 0x7F090157
-			public const int error_prompt = 2131296599;
+			public const int end = 2131296599;
 			
 			// aapt resource value: 0x7F090158
-			public const int error_replay_btn = 2131296600;
+			public const int end_padder = 2131296600;
 			
 			// aapt resource value: 0x7F090159
-			public const int error_tip = 2131296601;
+			public const int end_time_tv = 2131296601;
 			
 			// aapt resource value: 0x7F09015A
-			public const int error_tip_title = 2131296602;
+			public const int end_viewstub = 2131296602;
 			
 			// aapt resource value: 0x7F09015B
-			public const int et_access_token = 2131296603;
+			public const int enterAlways = 2131296603;
 			
 			// aapt resource value: 0x7F09015C
-			public const int et_app_key = 2131296604;
+			public const int enterAlwaysCollapsed = 2131296604;
 			
 			// aapt resource value: 0x7F09015D
-			public const int et_camera_no = 2131296605;
+			public const int errorPage = 2131296605;
 			
 			// aapt resource value: 0x7F09015E
-			public const int et_device_pwd = 2131296606;
+			public const int error_info_tv = 2131296606;
 			
 			// aapt resource value: 0x7F09015F
-			public const int et_device_serial = 2131296607;
+			public const int error_prompt = 2131296607;
 			
 			// aapt resource value: 0x7F090160
-			public const int et_input_sc = 2131296608;
+			public const int error_replay_btn = 2131296608;
 			
 			// aapt resource value: 0x7F090161
-			public const int et_new_name = 2131296609;
+			public const int error_tip = 2131296609;
 			
 			// aapt resource value: 0x7F090162
-			public const int et_pwd_new = 2131296610;
+			public const int error_tip_title = 2131296610;
 			
 			// aapt resource value: 0x7F090163
-			public const int et_record_file_start_time = 2131296611;
+			public const int et_camera_no = 2131296611;
 			
 			// aapt resource value: 0x7F090164
-			public const int et_record_file_stop_time = 2131296612;
+			public const int et_device_pwd = 2131296612;
 			
 			// aapt resource value: 0x7F090165
-			public const int et_sms_valid = 2131296613;
+			public const int et_device_serial = 2131296613;
 			
 			// aapt resource value: 0x7F090166
-			public const int et_specified_device = 2131296614;
+			public const int et_input_sc = 2131296614;
 			
 			// aapt resource value: 0x7F090167
-			public const int et_user_input = 2131296615;
+			public const int et_new_name = 2131296615;
 			
 			// aapt resource value: 0x7F090168
-			public const int exitUntilCollapsed = 2131296616;
+			public const int et_pwd_new = 2131296616;
 			
 			// aapt resource value: 0x7F090169
-			public const int exit_btn = 2131296617;
-			
-			// aapt resource value: 0x7F09016B
-			public const int expanded = 2131296619;
-			
-			// aapt resource value: 0x7F09016C
-			public const int expanded_menu = 2131296620;
+			public const int et_record_file_start_time = 2131296617;
 			
 			// aapt resource value: 0x7F09016A
-			public const int expand_activities_button = 2131296618;
+			public const int et_record_file_stop_time = 2131296618;
 			
-			// aapt resource value: 0x7F090177
-			public const int ezopen_realplay_operate_bar = 2131296631;
+			// aapt resource value: 0x7F09016B
+			public const int et_sms_valid = 2131296619;
 			
-			// aapt resource value: 0x7F090178
-			public const int ezopen_realplay_operate_bar2 = 2131296632;
-			
-			// aapt resource value: 0x7F090179
-			public const int ezupgrade_button = 2131296633;
-			
-			// aapt resource value: 0x7F09017A
-			public const int ezupgrade_ll_btn = 2131296634;
-			
-			// aapt resource value: 0x7F09017B
-			public const int ezupgrade_ll_progress = 2131296635;
-			
-			// aapt resource value: 0x7F09017C
-			public const int ezupgrade_progress_text = 2131296636;
-			
-			// aapt resource value: 0x7F09017D
-			public const int ezupgrade_text_version_desc = 2131296637;
-			
-			// aapt resource value: 0x7F09016D
-			public const int ez_api_self_test = 2131296621;
+			// aapt resource value: 0x7F09016C
+			public const int et_text = 2131296620;
 			
 			// aapt resource value: 0x7F09016E
-			public const int ez_device_serial = 2131296622;
+			public const int et_username = 2131296622;
+			
+			// aapt resource value: 0x7F09016D
+			public const int et_user_input = 2131296621;
 			
 			// aapt resource value: 0x7F09016F
-			public const int ez_device_serial_layout = 2131296623;
+			public const int et_usetimes = 2131296623;
 			
 			// aapt resource value: 0x7F090170
-			public const int ez_handle_lyt = 2131296624;
+			public const int exitUntilCollapsed = 2131296624;
 			
 			// aapt resource value: 0x7F090171
-			public const int ez_platform_login_btn = 2131296625;
-			
-			// aapt resource value: 0x7F090172
-			public const int ez_sms_code_et = 2131296626;
+			public const int exit_btn = 2131296625;
 			
 			// aapt resource value: 0x7F090173
-			public const int ez_sms_code_lyt = 2131296627;
+			public const int expanded = 2131296627;
 			
 			// aapt resource value: 0x7F090174
-			public const int ez_square_btn = 2131296628;
+			public const int expanded_menu = 2131296628;
 			
-			// aapt resource value: 0x7F090175
-			public const int ez_tab_content_frame = 2131296629;
-			
-			// aapt resource value: 0x7F090176
-			public const int ez_v32_api_test = 2131296630;
-			
-			// aapt resource value: 0x7F09017E
-			public const int failedMsg = 2131296638;
+			// aapt resource value: 0x7F090172
+			public const int expand_activities_button = 2131296626;
 			
 			// aapt resource value: 0x7F09017F
-			public const int file_size_text = 2131296639;
+			public const int ezopen_realplay_operate_bar = 2131296639;
 			
 			// aapt resource value: 0x7F090180
-			public const int fill = 2131296640;
+			public const int ezopen_realplay_operate_bar2 = 2131296640;
+			
+			// aapt resource value: 0x7F090181
+			public const int ezupgrade_button = 2131296641;
+			
+			// aapt resource value: 0x7F090182
+			public const int ezupgrade_ll_btn = 2131296642;
+			
+			// aapt resource value: 0x7F090183
+			public const int ezupgrade_ll_progress = 2131296643;
+			
+			// aapt resource value: 0x7F090184
+			public const int ezupgrade_progress_text = 2131296644;
+			
+			// aapt resource value: 0x7F090185
+			public const int ezupgrade_text_version_desc = 2131296645;
+			
+			// aapt resource value: 0x7F090175
+			public const int ez_api_self_test = 2131296629;
+			
+			// aapt resource value: 0x7F090176
+			public const int ez_device_serial = 2131296630;
+			
+			// aapt resource value: 0x7F090177
+			public const int ez_device_serial_layout = 2131296631;
+			
+			// aapt resource value: 0x7F090178
+			public const int ez_handle_lyt = 2131296632;
+			
+			// aapt resource value: 0x7F090179
+			public const int ez_platform_login_btn = 2131296633;
+			
+			// aapt resource value: 0x7F09017A
+			public const int ez_sms_code_et = 2131296634;
+			
+			// aapt resource value: 0x7F09017B
+			public const int ez_sms_code_lyt = 2131296635;
+			
+			// aapt resource value: 0x7F09017C
+			public const int ez_square_btn = 2131296636;
+			
+			// aapt resource value: 0x7F09017D
+			public const int ez_tab_content_frame = 2131296637;
+			
+			// aapt resource value: 0x7F09017E
+			public const int ez_v32_api_test = 2131296638;
+			
+			// aapt resource value: 0x7F090186
+			public const int failedMsg = 2131296646;
+			
+			// aapt resource value: 0x7F090187
+			public const int file_size_text = 2131296647;
 			
 			// aapt resource value: 0x7F090003
 			public const int FILL = 2131296259;
 			
-			// aapt resource value: 0x7F090181
-			public const int fill_horizontal = 2131296641;
+			// aapt resource value: 0x7F090188
+			public const int fill = 2131296648;
+			
+			// aapt resource value: 0x7F090189
+			public const int fill_horizontal = 2131296649;
 			
 			// aapt resource value: 0x7F090004
 			public const int FILL_STROKE = 2131296260;
 			
-			// aapt resource value: 0x7F090182
-			public const int fill_vertical = 2131296642;
+			// aapt resource value: 0x7F09018A
+			public const int fill_vertical = 2131296650;
 			
-			// aapt resource value: 0x7F090183
-			public const int fingerprint_icon = 2131296643;
+			// aapt resource value: 0x7F09018B
+			public const int fingerprint_icon = 2131296651;
 			
-			// aapt resource value: 0x7F090184
-			public const int fitCenter = 2131296644;
+			// aapt resource value: 0x7F09018C
+			public const int fitCenter = 2131296652;
 			
-			// aapt resource value: 0x7F090185
-			public const int fitXY = 2131296645;
+			// aapt resource value: 0x7F09018D
+			public const int fitXY = 2131296653;
 			
-			// aapt resource value: 0x7F090186
-			public const int @fixed = 2131296646;
+			// aapt resource value: 0x7F09018E
+			public const int @fixed = 2131296654;
 			
 			// aapt resource value: 0x7F090006
 			public const int FixedBehind = 2131296262;
@@ -12397,2333 +12625,2627 @@
 			// aapt resource value: 0x7F090007
 			public const int FixedFront = 2131296263;
 			
-			// aapt resource value: 0x7F090188
-			public const int flip = 2131296648;
-			
-			// aapt resource value: 0x7F090189
-			public const int fliphorizontal = 2131296649;
-			
-			// aapt resource value: 0x7F09018A
-			public const int flipvertical = 2131296650;
-			
-			// aapt resource value: 0x7F09018B
-			public const int flow_area = 2131296651;
-			
-			// aapt resource value: 0x7F09018C
-			public const int flow_line = 2131296652;
-			
-			// aapt resource value: 0x7F09018D
-			public const int flt_layout = 2131296653;
-			
-			// aapt resource value: 0x7F090187
-			public const int fl_inner = 2131296647;
-			
-			// aapt resource value: 0x7F09018E
-			public const int focus_view = 2131296654;
-			
-			// aapt resource value: 0x7F09018F
-			public const int footer_hint = 2131296655;
-			
 			// aapt resource value: 0x7F090190
-			public const int footer_hint_more = 2131296656;
+			public const int flip = 2131296656;
 			
 			// aapt resource value: 0x7F090191
-			public const int footer_loading_layout = 2131296657;
+			public const int fliphorizontal = 2131296657;
 			
 			// aapt resource value: 0x7F090192
-			public const int footer_progress = 2131296658;
+			public const int flipvertical = 2131296658;
 			
 			// aapt resource value: 0x7F090193
-			public const int forever = 2131296659;
-			
-			// aapt resource value: 0x7F090199
-			public const int from_tv = 2131296665;
+			public const int flow_area = 2131296659;
 			
 			// aapt resource value: 0x7F090194
-			public const int fr_content = 2131296660;
+			public const int flow_line = 2131296660;
 			
 			// aapt resource value: 0x7F090195
-			public const int fr_detail = 2131296661;
+			public const int flt_layout = 2131296661;
+			
+			// aapt resource value: 0x7F09018F
+			public const int fl_inner = 2131296655;
 			
 			// aapt resource value: 0x7F090196
-			public const int fr_live_window = 2131296662;
+			public const int focus_view = 2131296662;
 			
 			// aapt resource value: 0x7F090197
-			public const int fr_live_window_content = 2131296663;
+			public const int footer_hint = 2131296663;
 			
 			// aapt resource value: 0x7F090198
-			public const int fr_record = 2131296664;
+			public const int footer_hint_more = 2131296664;
+			
+			// aapt resource value: 0x7F090199
+			public const int footer_loading_layout = 2131296665;
 			
 			// aapt resource value: 0x7F09019A
-			public const int fullscreen_button = 2131296666;
+			public const int footer_progress = 2131296666;
 			
 			// aapt resource value: 0x7F09019B
-			public const int fullscreen_full_button = 2131296667;
+			public const int forever = 2131296667;
+			
+			// aapt resource value: 0x7F0901A1
+			public const int from_tv = 2131296673;
+			
+			// aapt resource value: 0x7F09019C
+			public const int fr_content = 2131296668;
+			
+			// aapt resource value: 0x7F09019D
+			public const int fr_detail = 2131296669;
+			
+			// aapt resource value: 0x7F09019E
+			public const int fr_live_window = 2131296670;
+			
+			// aapt resource value: 0x7F09019F
+			public const int fr_live_window_content = 2131296671;
+			
+			// aapt resource value: 0x7F0901A0
+			public const int fr_record = 2131296672;
+			
+			// aapt resource value: 0x7F0901A2
+			public const int fullscreen_button = 2131296674;
+			
+			// aapt resource value: 0x7F0901A3
+			public const int fullscreen_full_button = 2131296675;
 			
 			// aapt resource value: 0x7F090005
 			public const int FUNCTION = 2131296261;
 			
-			// aapt resource value: 0x7F09019C
-			public const int gatway_list = 2131296668;
-			
-			// aapt resource value: 0x7F09019D
-			public const int gd_btn_back = 2131296669;
-			
-			// aapt resource value: 0x7F09019E
-			public const int gd_btn_myLocation = 2131296670;
-			
-			// aapt resource value: 0x7F09019F
-			public const int gd_btn_save = 2131296671;
-			
-			// aapt resource value: 0x7F0901A0
-			public const int gd_img_search_delete = 2131296672;
-			
-			// aapt resource value: 0x7F0901A1
-			public const int gd_ll_myhome = 2131296673;
-			
-			// aapt resource value: 0x7F0901A2
-			public const int gd_ll_search = 2131296674;
-			
-			// aapt resource value: 0x7F0901A3
-			public const int gd_mapView = 2131296675;
-			
 			// aapt resource value: 0x7F0901A4
-			public const int gd_rl_topview = 2131296676;
+			public const int gatway_list = 2131296676;
 			
 			// aapt resource value: 0x7F0901A5
-			public const int gd_tv_activity_title = 2131296677;
+			public const int gd_btn_back = 2131296677;
 			
 			// aapt resource value: 0x7F0901A6
-			public const int gd_tv_radius = 2131296678;
+			public const int gd_btn_myLocation = 2131296678;
 			
 			// aapt resource value: 0x7F0901A7
-			public const int gd_tv_search_title = 2131296679;
+			public const int gd_btn_save = 2131296679;
 			
 			// aapt resource value: 0x7F0901A8
-			public const int get_camera_fail_tip_ly = 2131296680;
+			public const int gd_img_search_delete = 2131296680;
 			
 			// aapt resource value: 0x7F0901A9
-			public const int get_camera_list_fail_tv = 2131296681;
+			public const int gd_ll_myhome = 2131296681;
 			
 			// aapt resource value: 0x7F0901AA
-			public const int get_sms_code_btn = 2131296682;
+			public const int gd_ll_search = 2131296682;
 			
 			// aapt resource value: 0x7F0901AB
-			public const int get_sms_code_lyt = 2131296683;
+			public const int gd_mapView = 2131296683;
 			
 			// aapt resource value: 0x7F0901AC
-			public const int ghost_view = 2131296684;
+			public const int gd_rl_topview = 2131296684;
 			
 			// aapt resource value: 0x7F0901AD
-			public const int gone = 2131296685;
+			public const int gd_tv_activity_title = 2131296685;
 			
 			// aapt resource value: 0x7F0901AE
-			public const int gridview = 2131296686;
+			public const int gd_tv_radius = 2131296686;
 			
 			// aapt resource value: 0x7F0901AF
-			public const int handle_lyt = 2131296687;
+			public const int gd_tv_search_title = 2131296687;
 			
 			// aapt resource value: 0x7F0901B0
-			public const int hangup = 2131296688;
+			public const int get_camera_fail_tip_ly = 2131296688;
 			
 			// aapt resource value: 0x7F0901B1
-			public const int hangupMonitorIn = 2131296689;
+			public const int get_camera_list_fail_tv = 2131296689;
 			
 			// aapt resource value: 0x7F0901B2
-			public const int hdl_gallery_rootView = 2131296690;
+			public const int get_sms_code_btn = 2131296690;
 			
 			// aapt resource value: 0x7F0901B3
-			public const int hdl_gallery_viewPager = 2131296691;
+			public const int get_sms_code_lyt = 2131296691;
 			
 			// aapt resource value: 0x7F0901B4
-			public const int hdl_options1 = 2131296692;
+			public const int ghost_view = 2131296692;
 			
 			// aapt resource value: 0x7F0901B5
-			public const int hdl_options2 = 2131296693;
+			public const int gone = 2131296693;
 			
 			// aapt resource value: 0x7F0901B6
-			public const int hdl_options3 = 2131296694;
+			public const int gridview = 2131296694;
 			
 			// aapt resource value: 0x7F0901B7
-			public const int hdl_pickerview_ll = 2131296695;
+			public const int handle_lyt = 2131296695;
 			
 			// aapt resource value: 0x7F0901B8
-			public const int header = 2131296696;
+			public const int hangup = 2131296696;
 			
 			// aapt resource value: 0x7F0901B9
-			public const int header_arrow = 2131296697;
+			public const int hangupMonitorIn = 2131296697;
 			
 			// aapt resource value: 0x7F0901BA
-			public const int header_hint = 2131296698;
+			public const int hdl_gallery_rootView = 2131296698;
 			
 			// aapt resource value: 0x7F0901BB
-			public const int header_hint_more = 2131296699;
+			public const int hdl_gallery_viewPager = 2131296699;
 			
 			// aapt resource value: 0x7F0901BC
-			public const int header_parent = 2131296700;
+			public const int hdl_options1 = 2131296700;
 			
 			// aapt resource value: 0x7F0901BD
-			public const int header_progress = 2131296701;
+			public const int hdl_options2 = 2131296701;
 			
 			// aapt resource value: 0x7F0901BE
-			public const int header_text = 2131296702;
+			public const int hdl_options3 = 2131296702;
 			
 			// aapt resource value: 0x7F0901BF
-			public const int header_text_layout = 2131296703;
+			public const int hdl_pickerview_ll = 2131296703;
 			
 			// aapt resource value: 0x7F0901C0
-			public const int header_time = 2131296704;
+			public const int header = 2131296704;
 			
 			// aapt resource value: 0x7F0901C1
-			public const int header_time_layout = 2131296705;
+			public const int header_arrow = 2131296705;
 			
 			// aapt resource value: 0x7F0901C2
-			public const int help = 2131296706;
+			public const int header_hint = 2131296706;
 			
 			// aapt resource value: 0x7F0901C3
-			public const int helpTop = 2131296707;
+			public const int header_hint_more = 2131296707;
 			
 			// aapt resource value: 0x7F0901C4
-			public const int help_link = 2131296708;
+			public const int header_parent = 2131296708;
 			
 			// aapt resource value: 0x7F0901C5
-			public const int help_tip = 2131296709;
+			public const int header_progress = 2131296709;
 			
 			// aapt resource value: 0x7F0901C6
-			public const int hidden = 2131296710;
+			public const int header_text = 2131296710;
 			
 			// aapt resource value: 0x7F0901C7
-			public const int hide = 2131296711;
+			public const int header_text_layout = 2131296711;
 			
 			// aapt resource value: 0x7F0901C8
-			public const int hms_message_text = 2131296712;
+			public const int header_time = 2131296712;
 			
 			// aapt resource value: 0x7F0901C9
-			public const int hms_progress_bar = 2131296713;
+			public const int header_time_layout = 2131296713;
 			
 			// aapt resource value: 0x7F0901CA
-			public const int hms_progress_text = 2131296714;
+			public const int help = 2131296714;
 			
 			// aapt resource value: 0x7F0901CB
-			public const int home = 2131296715;
+			public const int helpTop = 2131296715;
 			
 			// aapt resource value: 0x7F0901CC
-			public const int homeAsUp = 2131296716;
+			public const int help_link = 2131296716;
 			
 			// aapt resource value: 0x7F0901CD
-			public const int horizontal = 2131296717;
+			public const int help_tip = 2131296717;
 			
 			// aapt resource value: 0x7F0901CE
-			public const int hour = 2131296718;
+			public const int hidden = 2131296718;
 			
 			// aapt resource value: 0x7F0901CF
-			public const int hour_24 = 2131296719;
+			public const int hide = 2131296719;
 			
 			// aapt resource value: 0x7F0901D0
-			public const int hour_48 = 2131296720;
+			public const int history_list = 2131296720;
 			
 			// aapt resource value: 0x7F0901D1
-			public const int icon = 2131296721;
+			public const int home = 2131296721;
 			
 			// aapt resource value: 0x7F0901D2
-			public const int icon_group = 2131296722;
+			public const int homeAsUp = 2131296722;
 			
 			// aapt resource value: 0x7F0901D3
-			public const int icon_sceenshotImg = 2131296723;
+			public const int horizontal = 2131296723;
 			
 			// aapt resource value: 0x7F0901D4
-			public const int icon_sceenshotLayout = 2131296724;
+			public const int hour = 2131296724;
 			
 			// aapt resource value: 0x7F0901D5
-			public const int icon_sceenshotText = 2131296725;
+			public const int hour_24 = 2131296725;
 			
 			// aapt resource value: 0x7F0901D6
-			public const int icon_unlockImg = 2131296726;
+			public const int hour_48 = 2131296726;
 			
 			// aapt resource value: 0x7F0901D7
-			public const int icon_unlockLayout = 2131296727;
+			public const int icon = 2131296727;
 			
 			// aapt resource value: 0x7F0901D8
-			public const int icon_unlockText = 2131296728;
+			public const int icon_group = 2131296728;
 			
 			// aapt resource value: 0x7F0901D9
-			public const int id_btn_join_qq_group = 2131296729;
+			public const int icon_sceenshotImg = 2131296729;
 			
 			// aapt resource value: 0x7F0901DA
-			public const int id_interface_self_test_forgetPassword = 2131296730;
+			public const int icon_sceenshotLayout = 2131296730;
 			
 			// aapt resource value: 0x7F0901DB
-			public const int id_interface_self_test_openCloudPage = 2131296731;
+			public const int icon_sceenshotText = 2131296731;
 			
 			// aapt resource value: 0x7F0901DC
-			public const int id_interface_test_forgetPassword = 2131296732;
+			public const int icon_unlockImg = 2131296732;
 			
 			// aapt resource value: 0x7F0901DD
-			public const int id_interface_test_openCloudPage = 2131296733;
+			public const int icon_unlockLayout = 2131296733;
 			
 			// aapt resource value: 0x7F0901DE
-			public const int id_ll_join_qq_group = 2131296734;
+			public const int icon_unlockText = 2131296734;
 			
 			// aapt resource value: 0x7F0901DF
-			public const int id_show_stream_limit_dialog = 2131296735;
+			public const int id_btn_join_qq_group = 2131296735;
 			
 			// aapt resource value: 0x7F0901E0
-			public const int id_show_stream_limit_dialog2 = 2131296736;
+			public const int id_interface_self_test_forgetPassword = 2131296736;
 			
 			// aapt resource value: 0x7F0901E1
-			public const int id_tv_join_qq_group = 2131296737;
+			public const int id_interface_self_test_openCloudPage = 2131296737;
 			
 			// aapt resource value: 0x7F0901E2
-			public const int ifRoom = 2131296738;
+			public const int id_interface_test_forgetPassword = 2131296738;
 			
 			// aapt resource value: 0x7F0901E3
-			public const int image = 2131296739;
+			public const int id_interface_test_openCloudPage = 2131296739;
 			
 			// aapt resource value: 0x7F0901E4
-			public const int image1 = 2131296740;
+			public const int id_ll_join_qq_group = 2131296740;
 			
 			// aapt resource value: 0x7F0901E5
-			public const int image2 = 2131296741;
+			public const int id_show_stream_limit_dialog = 2131296741;
 			
 			// aapt resource value: 0x7F0901E6
-			public const int image3 = 2131296742;
+			public const int id_show_stream_limit_dialog2 = 2131296742;
 			
 			// aapt resource value: 0x7F0901E7
-			public const int imageBg = 2131296743;
+			public const int id_tv_join_qq_group = 2131296743;
 			
 			// aapt resource value: 0x7F0901E8
-			public const int image_back = 2131296744;
+			public const int ifRoom = 2131296744;
 			
 			// aapt resource value: 0x7F0901E9
-			public const int imgAnimation = 2131296745;
+			public const int image = 2131296745;
 			
 			// aapt resource value: 0x7F0901EA
-			public const int imgLineConnectGuid = 2131296746;
+			public const int image1 = 2131296746;
 			
 			// aapt resource value: 0x7F0901EB
-			public const int imgResetPic = 2131296747;
+			public const int image2 = 2131296747;
 			
 			// aapt resource value: 0x7F0901EC
-			public const int img_active_cloud_video = 2131296748;
+			public const int image3 = 2131296748;
 			
 			// aapt resource value: 0x7F0901ED
-			public const int img_area1 = 2131296749;
+			public const int imageBg = 2131296749;
 			
 			// aapt resource value: 0x7F0901EE
-			public const int img_area2 = 2131296750;
+			public const int image_back = 2131296750;
 			
 			// aapt resource value: 0x7F0901EF
-			public const int img_area3 = 2131296751;
+			public const int imgAnimation = 2131296751;
 			
 			// aapt resource value: 0x7F0901F0
-			public const int img_iv = 2131296752;
+			public const int imgLineConnectGuid = 2131296752;
 			
 			// aapt resource value: 0x7F0901F1
-			public const int info = 2131296753;
+			public const int imgResetPic = 2131296753;
 			
 			// aapt resource value: 0x7F0901F2
-			public const int inputLinearlayout = 2131296754;
+			public const int imgRichpushBtnBack = 2131296754;
 			
 			// aapt resource value: 0x7F0901F3
-			public const int input_hint = 2131296755;
+			public const int imgView = 2131296755;
 			
 			// aapt resource value: 0x7F0901F4
-			public const int input_search_query = 2131296756;
+			public const int img_active_cloud_video = 2131296756;
 			
 			// aapt resource value: 0x7F0901F5
-			public const int input_view1 = 2131296757;
+			public const int img_area1 = 2131296757;
 			
 			// aapt resource value: 0x7F0901F6
-			public const int interface_self_test_button = 2131296758;
+			public const int img_area2 = 2131296758;
 			
 			// aapt resource value: 0x7F0901F7
-			public const int interface_self_test_editText = 2131296759;
+			public const int img_area3 = 2131296759;
 			
 			// aapt resource value: 0x7F0901F8
-			public const int interface_test_button = 2131296760;
+			public const int img_iv = 2131296760;
 			
 			// aapt resource value: 0x7F0901F9
-			public const int interface_test_editText = 2131296761;
+			public const int indicator_view = 2131296761;
 			
 			// aapt resource value: 0x7F0901FA
-			public const int interface_v33_self_test_button = 2131296762;
+			public const int info = 2131296762;
 			
 			// aapt resource value: 0x7F0901FB
-			public const int interface_v33_test_button = 2131296763;
+			public const int inputLinearlayout = 2131296763;
 			
 			// aapt resource value: 0x7F0901FC
-			public const int invisible = 2131296764;
+			public const int input_hint = 2131296764;
 			
 			// aapt resource value: 0x7F0901FD
-			public const int ip_info = 2131296765;
+			public const int input_search_query = 2131296765;
 			
 			// aapt resource value: 0x7F0901FE
-			public const int ip_tv = 2131296766;
+			public const int input_view1 = 2131296766;
 			
 			// aapt resource value: 0x7F0901FF
-			public const int is_call_device_cb = 2131296767;
+			public const int interface_self_test_button = 2131296767;
 			
 			// aapt resource value: 0x7F090200
-			public const int italic = 2131296768;
+			public const int interface_self_test_editText = 2131296768;
 			
 			// aapt resource value: 0x7F090201
-			public const int item_icon = 2131296769;
+			public const int interface_test_button = 2131296769;
 			
 			// aapt resource value: 0x7F090202
-			public const int item_icon_area = 2131296770;
+			public const int interface_test_editText = 2131296770;
 			
 			// aapt resource value: 0x7F090203
-			public const int item_offline = 2131296771;
+			public const int interface_v33_self_test_button = 2131296771;
 			
 			// aapt resource value: 0x7F090204
-			public const int item_play_btn = 2131296772;
+			public const int interface_v33_test_button = 2131296772;
 			
 			// aapt resource value: 0x7F090205
-			public const int item_touch_helper_previous_elevation = 2131296773;
+			public const int invisible = 2131296773;
 			
 			// aapt resource value: 0x7F090206
-			public const int iv_ap_img = 2131296774;
+			public const int ip_info = 2131296774;
 			
 			// aapt resource value: 0x7F090207
-			public const int iv_back = 2131296775;
+			public const int ip_tv = 2131296775;
 			
 			// aapt resource value: 0x7F090208
-			public const int iv_bg = 2131296776;
+			public const int is_call_device_cb = 2131296776;
 			
 			// aapt resource value: 0x7F090209
-			public const int iv_change_screen = 2131296777;
+			public const int italic = 2131296777;
 			
 			// aapt resource value: 0x7F09020A
-			public const int iv_check = 2131296778;
+			public const int item_icon = 2131296778;
 			
 			// aapt resource value: 0x7F09020B
-			public const int iv_child_watch_video_talk_player_head_image = 2131296779;
+			public const int item_icon_area = 2131296779;
 			
 			// aapt resource value: 0x7F09020C
-			public const int iv_choose_other = 2131296780;
+			public const int item_offline = 2131296780;
 			
 			// aapt resource value: 0x7F09020D
-			public const int iv_cloudStage = 2131296781;
+			public const int item_play_btn = 2131296781;
 			
 			// aapt resource value: 0x7F09020E
-			public const int iv_cloudStage1 = 2131296782;
+			public const int item_touch_helper_previous_elevation = 2131296782;
 			
 			// aapt resource value: 0x7F09020F
-			public const int iv_copy = 2131296783;
+			public const int iv_add_temp_right1 = 2131296783;
 			
 			// aapt resource value: 0x7F090210
-			public const int iv_day_next = 2131296784;
+			public const int iv_add_temp_right2 = 2131296784;
 			
 			// aapt resource value: 0x7F090211
-			public const int iv_day_pre = 2131296785;
+			public const int iv_ap_img = 2131296785;
 			
 			// aapt resource value: 0x7F090212
-			public const int iv_detail = 2131296786;
+			public const int iv_back = 2131296786;
 			
 			// aapt resource value: 0x7F090213
-			public const int iv_device_pic = 2131296787;
+			public const int iv_bg = 2131296787;
 			
 			// aapt resource value: 0x7F090214
-			public const int iv_direction_limit_down = 2131296788;
+			public const int iv_change_screen = 2131296788;
 			
 			// aapt resource value: 0x7F090215
-			public const int iv_direction_limit_left = 2131296789;
+			public const int iv_check = 2131296789;
 			
 			// aapt resource value: 0x7F090216
-			public const int iv_direction_limit_right = 2131296790;
+			public const int iv_child_watch_video_talk_player_head_image = 2131296790;
 			
 			// aapt resource value: 0x7F090217
-			public const int iv_direction_limit_up = 2131296791;
+			public const int iv_choose_other = 2131296791;
 			
 			// aapt resource value: 0x7F090218
-			public const int iv_icon = 2131296792;
+			public const int iv_cloudStage = 2131296792;
 			
 			// aapt resource value: 0x7F090219
-			public const int iv_img = 2131296793;
+			public const int iv_cloudStage1 = 2131296793;
 			
 			// aapt resource value: 0x7F09021A
-			public const int iv_lp_answer = 2131296794;
+			public const int iv_copy = 2131296794;
 			
 			// aapt resource value: 0x7F09021B
-			public const int iv_lp_hangUp = 2131296795;
+			public const int iv_day_next = 2131296795;
 			
 			// aapt resource value: 0x7F09021C
-			public const int iv_lp_screenshot = 2131296796;
+			public const int iv_day_pre = 2131296796;
 			
 			// aapt resource value: 0x7F09021D
-			public const int iv_lp_unlock = 2131296797;
+			public const int iv_detail = 2131296797;
 			
 			// aapt resource value: 0x7F09021E
-			public const int iv_more = 2131296798;
+			public const int iv_device_pic = 2131296798;
 			
 			// aapt resource value: 0x7F09021F
-			public const int iv_move_check = 2131296799;
+			public const int iv_direction_limit_down = 2131296799;
 			
 			// aapt resource value: 0x7F090220
-			public const int iv_name_next = 2131296800;
+			public const int iv_direction_limit_left = 2131296800;
 			
 			// aapt resource value: 0x7F090221
-			public const int iv_no_device = 2131296801;
+			public const int iv_direction_limit_right = 2131296801;
 			
 			// aapt resource value: 0x7F090222
-			public const int iv_paly_pause = 2131296802;
+			public const int iv_direction_limit_up = 2131296802;
 			
 			// aapt resource value: 0x7F090223
-			public const int iv_play = 2131296803;
+			public const int iv_icon = 2131296803;
 			
 			// aapt resource value: 0x7F090224
-			public const int iv_play_style = 2131296804;
+			public const int iv_img = 2131296804;
 			
 			// aapt resource value: 0x7F090225
-			public const int iv_screen_shot = 2131296805;
+			public const int iv_lp_answer = 2131296805;
 			
 			// aapt resource value: 0x7F090226
-			public const int iv_screen_shot1 = 2131296806;
+			public const int iv_lp_hangUp = 2131296806;
 			
 			// aapt resource value: 0x7F090227
-			public const int iv_self_input = 2131296807;
+			public const int iv_lp_screenshot = 2131296807;
 			
 			// aapt resource value: 0x7F090228
-			public const int iv_sound = 2131296808;
+			public const int iv_lp_unlock = 2131296808;
 			
 			// aapt resource value: 0x7F090229
-			public const int iv_speak = 2131296809;
+			public const int iv_more = 2131296809;
 			
 			// aapt resource value: 0x7F09022A
-			public const int iv_speak1 = 2131296810;
+			public const int iv_move_check = 2131296810;
 			
 			// aapt resource value: 0x7F09022B
-			public const int iv_video = 2131296811;
+			public const int iv_name_next = 2131296811;
 			
 			// aapt resource value: 0x7F09022C
-			public const int iv_video1 = 2131296812;
+			public const int iv_no_device = 2131296812;
 			
 			// aapt resource value: 0x7F09022D
-			public const int iv_wifi = 2131296813;
+			public const int iv_paly_pause = 2131296813;
 			
 			// aapt resource value: 0x7F09022E
-			public const int join_room_btn = 2131296814;
-			
-			// aapt resource value: 0x7F090232
-			public const int labelbelongType = 2131296818;
+			public const int iv_play = 2131296814;
 			
 			// aapt resource value: 0x7F09022F
-			public const int labelFilter = 2131296815;
+			public const int iv_play_style = 2131296815;
 			
 			// aapt resource value: 0x7F090230
-			public const int labelLocation = 2131296816;
+			public const int iv_screen_shot = 2131296816;
 			
 			// aapt resource value: 0x7F090231
-			public const int labelSort = 2131296817;
+			public const int iv_screen_shot1 = 2131296817;
+			
+			// aapt resource value: 0x7F090232
+			public const int iv_self_input = 2131296818;
 			
 			// aapt resource value: 0x7F090233
-			public const int largeLabel = 2131296819;
+			public const int iv_sound = 2131296819;
 			
 			// aapt resource value: 0x7F090234
-			public const int latitude = 2131296820;
+			public const int iv_speak = 2131296820;
 			
 			// aapt resource value: 0x7F090235
-			public const int launch_product_query = 2131296821;
-			
-			// aapt resource value: 0x7F090237
-			public const int layout = 2131296823;
-			
-			// aapt resource value: 0x7F090238
-			public const int layout_more_ly = 2131296824;
-			
-			// aapt resource value: 0x7F090239
-			public const int layout_password = 2131296825;
-			
-			// aapt resource value: 0x7F09023A
-			public const int layout_wifi_pwd = 2131296826;
+			public const int iv_speak1 = 2131296821;
 			
 			// aapt resource value: 0x7F090236
-			public const int lay_down = 2131296822;
+			public const int iv_video = 2131296822;
+			
+			// aapt resource value: 0x7F090237
+			public const int iv_video1 = 2131296823;
+			
+			// aapt resource value: 0x7F090238
+			public const int iv_wifi = 2131296824;
+			
+			// aapt resource value: 0x7F090239
+			public const int jad_action = 2131296825;
+			
+			// aapt resource value: 0x7F09023A
+			public const int jad_desc = 2131296826;
 			
 			// aapt resource value: 0x7F09023B
-			public const int left = 2131296827;
+			public const int jad_download_size = 2131296827;
 			
 			// aapt resource value: 0x7F09023C
-			public const int likedCount = 2131296828;
+			public const int jad_download_status = 2131296828;
 			
 			// aapt resource value: 0x7F09023D
-			public const int line1 = 2131296829;
+			public const int jad_download_success = 2131296829;
 			
 			// aapt resource value: 0x7F09023E
-			public const int line3 = 2131296830;
+			public const int jad_download_success_status = 2131296830;
 			
 			// aapt resource value: 0x7F09023F
-			public const int lineConnectContainer = 2131296831;
+			public const int jad_download_text = 2131296831;
 			
 			// aapt resource value: 0x7F090240
-			public const int listMode = 2131296832;
+			public const int jad_icon = 2131296832;
 			
 			// aapt resource value: 0x7F090241
-			public const int listView = 2131296833;
+			public const int jad_root_view = 2131296833;
 			
 			// aapt resource value: 0x7F090242
-			public const int listView_device = 2131296834;
+			public const int join_room_btn = 2131296834;
 			
 			// aapt resource value: 0x7F090246
-			public const int listview_line = 2131296838;
-			
-			// aapt resource value: 0x7F090247
-			public const int listview_line_device = 2131296839;
+			public const int labelbelongType = 2131296838;
 			
 			// aapt resource value: 0x7F090243
-			public const int list_camera = 2131296835;
+			public const int labelFilter = 2131296835;
 			
 			// aapt resource value: 0x7F090244
-			public const int list_device = 2131296836;
+			public const int labelLocation = 2131296836;
 			
 			// aapt resource value: 0x7F090245
-			public const int list_item = 2131296837;
+			public const int labelSort = 2131296837;
+			
+			// aapt resource value: 0x7F090247
+			public const int largeLabel = 2131296839;
 			
 			// aapt resource value: 0x7F090248
-			public const int live_window = 2131296840;
-			
-			// aapt resource value: 0x7F09026C
-			public const int llyCloundService = 2131296876;
-			
-			// aapt resource value: 0x7F09026D
-			public const int llyStatus1 = 2131296877;
-			
-			// aapt resource value: 0x7F09026E
-			public const int llyStatus2 = 2131296878;
-			
-			// aapt resource value: 0x7F09026F
-			public const int llyStatus3 = 2131296879;
+			public const int last_refresh_time = 2131296840;
 			
 			// aapt resource value: 0x7F090249
-			public const int ll_add = 2131296841;
+			public const int latitude = 2131296841;
 			
 			// aapt resource value: 0x7F09024A
-			public const int ll_alarm_p_bg_name = 2131296842;
-			
-			// aapt resource value: 0x7F09024B
-			public const int ll_all = 2131296843;
+			public const int launch_product_query = 2131296842;
 			
 			// aapt resource value: 0x7F09024C
-			public const int ll_back = 2131296844;
+			public const int layout = 2131296844;
 			
 			// aapt resource value: 0x7F09024D
-			public const int ll_choose_other = 2131296845;
+			public const int layout_more_ly = 2131296845;
 			
 			// aapt resource value: 0x7F09024E
-			public const int ll_cloudstage = 2131296846;
+			public const int layout_password = 2131296846;
 			
 			// aapt resource value: 0x7F09024F
-			public const int ll_cloudstage1 = 2131296847;
+			public const int layout_version_2 = 2131296847;
 			
 			// aapt resource value: 0x7F090250
-			public const int ll_controller = 2131296848;
+			public const int layout_wifi_pwd = 2131296848;
+			
+			// aapt resource value: 0x7F09024B
+			public const int lay_down = 2131296843;
 			
 			// aapt resource value: 0x7F090251
-			public const int ll_delete = 2131296849;
+			public const int left = 2131296849;
 			
 			// aapt resource value: 0x7F090252
-			public const int ll_detail = 2131296850;
+			public const int likedCount = 2131296850;
 			
 			// aapt resource value: 0x7F090253
-			public const int ll_edit = 2131296851;
+			public const int line1 = 2131296851;
 			
 			// aapt resource value: 0x7F090254
-			public const int ll_fullscreen = 2131296852;
+			public const int line3 = 2131296852;
 			
 			// aapt resource value: 0x7F090255
-			public const int ll_help = 2131296853;
+			public const int lineConnectContainer = 2131296853;
 			
 			// aapt resource value: 0x7F090256
-			public const int ll_input = 2131296854;
+			public const int listMode = 2131296854;
 			
 			// aapt resource value: 0x7F090257
-			public const int ll_lp_btn_back = 2131296855;
+			public const int listView = 2131296855;
 			
 			// aapt resource value: 0x7F090258
-			public const int ll_new_version = 2131296856;
-			
-			// aapt resource value: 0x7F090259
-			public const int ll_operate = 2131296857;
-			
-			// aapt resource value: 0x7F09025A
-			public const int ll_paly_pause = 2131296858;
-			
-			// aapt resource value: 0x7F09025B
-			public const int ll_play_style = 2131296859;
+			public const int listView_device = 2131296856;
 			
 			// aapt resource value: 0x7F09025C
-			public const int ll_screenshot = 2131296860;
+			public const int listview_header_arrow = 2131296860;
 			
 			// aapt resource value: 0x7F09025D
-			public const int ll_screenshot1 = 2131296861;
+			public const int listview_header_content = 2131296861;
 			
 			// aapt resource value: 0x7F09025E
-			public const int ll_self_input = 2131296862;
+			public const int listview_header_progressbar = 2131296862;
 			
 			// aapt resource value: 0x7F09025F
-			public const int ll_sound = 2131296863;
+			public const int listview_header_text = 2131296863;
 			
 			// aapt resource value: 0x7F090260
-			public const int ll_speak = 2131296864;
+			public const int listview_line = 2131296864;
 			
 			// aapt resource value: 0x7F090261
-			public const int ll_speak1 = 2131296865;
+			public const int listview_line_device = 2131296865;
+			
+			// aapt resource value: 0x7F090259
+			public const int list_camera = 2131296857;
+			
+			// aapt resource value: 0x7F09025A
+			public const int list_device = 2131296858;
+			
+			// aapt resource value: 0x7F09025B
+			public const int list_item = 2131296859;
 			
 			// aapt resource value: 0x7F090262
-			public const int ll_switch_btn = 2131296866;
-			
-			// aapt resource value: 0x7F090263
-			public const int ll_title_center = 2131296867;
-			
-			// aapt resource value: 0x7F090264
-			public const int ll_title_left = 2131296868;
-			
-			// aapt resource value: 0x7F090265
-			public const int ll_title_left2 = 2131296869;
-			
-			// aapt resource value: 0x7F090266
-			public const int ll_title_right = 2131296870;
-			
-			// aapt resource value: 0x7F090267
-			public const int ll_title_right2 = 2131296871;
-			
-			// aapt resource value: 0x7F090268
-			public const int ll_video = 2131296872;
-			
-			// aapt resource value: 0x7F090269
-			public const int ll_video1 = 2131296873;
-			
-			// aapt resource value: 0x7F09026A
-			public const int ll_video_content = 2131296874;
-			
-			// aapt resource value: 0x7F09026B
-			public const int ll_video_lp_rendering = 2131296875;
-			
-			// aapt resource value: 0x7F090270
-			public const int loadingTextView = 2131296880;
-			
-			// aapt resource value: 0x7F090271
-			public const int loading_pb = 2131296881;
-			
-			// aapt resource value: 0x7F090272
-			public const int loading_pb_ly = 2131296882;
-			
-			// aapt resource value: 0x7F090273
-			public const int loading_play_btn = 2131296883;
-			
-			// aapt resource value: 0x7F090274
-			public const int loading_text = 2131296884;
-			
-			// aapt resource value: 0x7F090275
-			public const int loading_view = 2131296885;
-			
-			// aapt resource value: 0x7F090277
-			public const int localDoorUnlock = 2131296887;
-			
-			// aapt resource value: 0x7F090278
-			public const int localVideo = 2131296888;
-			
-			// aapt resource value: 0x7F090279
-			public const int local_alarm1 = 2131296889;
-			
-			// aapt resource value: 0x7F09027A
-			public const int local_alarm2 = 2131296890;
-			
-			// aapt resource value: 0x7F09027B
-			public const int local_alarm3 = 2131296891;
-			
-			// aapt resource value: 0x7F09027C
-			public const int local_l1 = 2131296892;
-			
-			// aapt resource value: 0x7F09027D
-			public const int local_l2 = 2131296893;
-			
-			// aapt resource value: 0x7F09027E
-			public const int local_l3 = 2131296894;
-			
-			// aapt resource value: 0x7F09027F
-			public const int local_realplay_btn = 2131296895;
-			
-			// aapt resource value: 0x7F090280
-			public const int local_time_part1 = 2131296896;
-			
-			// aapt resource value: 0x7F090281
-			public const int local_time_part2 = 2131296897;
-			
-			// aapt resource value: 0x7F090282
-			public const int local_time_part3 = 2131296898;
-			
-			// aapt resource value: 0x7F090276
-			public const int locaVideo = 2131296886;
-			
-			// aapt resource value: 0x7F090283
-			public const int login_login = 2131296899;
-			
-			// aapt resource value: 0x7F090284
-			public const int login_name = 2131296900;
-			
-			// aapt resource value: 0x7F090285
-			public const int login_pwd = 2131296901;
+			public const int live_window = 2131296866;
 			
 			// aapt resource value: 0x7F090286
-			public const int login_regesiter = 2131296902;
+			public const int llyCloundService = 2131296902;
 			
 			// aapt resource value: 0x7F090287
-			public const int login_username = 2131296903;
+			public const int llyStatus1 = 2131296903;
 			
 			// aapt resource value: 0x7F090288
-			public const int longitude = 2131296904;
-			
-			// aapt resource value: 0x7F09028D
-			public const int lpsdk_dialog_cancel_tv = 2131296909;
-			
-			// aapt resource value: 0x7F09028E
-			public const int lpsdk_dialog_confirm_tv = 2131296910;
-			
-			// aapt resource value: 0x7F09028F
-			public const int lpsdk_dialog_content_tv = 2131296911;
-			
-			// aapt resource value: 0x7F090290
-			public const int lpsdk_dialog_title_tv = 2131296912;
+			public const int llyStatus2 = 2131296904;
 			
 			// aapt resource value: 0x7F090289
-			public const int lp_dialog_cancel_tv = 2131296905;
+			public const int llyStatus3 = 2131296905;
+			
+			// aapt resource value: 0x7F090263
+			public const int ll_add = 2131296867;
+			
+			// aapt resource value: 0x7F090264
+			public const int ll_alarm_p_bg_name = 2131296868;
+			
+			// aapt resource value: 0x7F090265
+			public const int ll_all = 2131296869;
+			
+			// aapt resource value: 0x7F090266
+			public const int ll_back = 2131296870;
+			
+			// aapt resource value: 0x7F090267
+			public const int ll_choose_other = 2131296871;
+			
+			// aapt resource value: 0x7F090268
+			public const int ll_cloudstage = 2131296872;
+			
+			// aapt resource value: 0x7F090269
+			public const int ll_cloudstage1 = 2131296873;
+			
+			// aapt resource value: 0x7F09026A
+			public const int ll_controller = 2131296874;
+			
+			// aapt resource value: 0x7F09026B
+			public const int ll_delete = 2131296875;
+			
+			// aapt resource value: 0x7F09026C
+			public const int ll_detail = 2131296876;
+			
+			// aapt resource value: 0x7F09026D
+			public const int ll_edit = 2131296877;
+			
+			// aapt resource value: 0x7F09026E
+			public const int ll_fullscreen = 2131296878;
+			
+			// aapt resource value: 0x7F09026F
+			public const int ll_help = 2131296879;
+			
+			// aapt resource value: 0x7F090270
+			public const int ll_input = 2131296880;
+			
+			// aapt resource value: 0x7F090271
+			public const int ll_lp_btn_back = 2131296881;
+			
+			// aapt resource value: 0x7F090272
+			public const int ll_new_version = 2131296882;
+			
+			// aapt resource value: 0x7F090273
+			public const int ll_operate = 2131296883;
+			
+			// aapt resource value: 0x7F090274
+			public const int ll_paly_pause = 2131296884;
+			
+			// aapt resource value: 0x7F090275
+			public const int ll_play_style = 2131296885;
+			
+			// aapt resource value: 0x7F090276
+			public const int ll_screenshot = 2131296886;
+			
+			// aapt resource value: 0x7F090277
+			public const int ll_screenshot1 = 2131296887;
+			
+			// aapt resource value: 0x7F090278
+			public const int ll_self_input = 2131296888;
+			
+			// aapt resource value: 0x7F090279
+			public const int ll_sound = 2131296889;
+			
+			// aapt resource value: 0x7F09027A
+			public const int ll_speak = 2131296890;
+			
+			// aapt resource value: 0x7F09027B
+			public const int ll_speak1 = 2131296891;
+			
+			// aapt resource value: 0x7F09027C
+			public const int ll_switch_btn = 2131296892;
+			
+			// aapt resource value: 0x7F09027D
+			public const int ll_title_center = 2131296893;
+			
+			// aapt resource value: 0x7F09027E
+			public const int ll_title_left = 2131296894;
+			
+			// aapt resource value: 0x7F09027F
+			public const int ll_title_left2 = 2131296895;
+			
+			// aapt resource value: 0x7F090280
+			public const int ll_title_right = 2131296896;
+			
+			// aapt resource value: 0x7F090281
+			public const int ll_title_right2 = 2131296897;
+			
+			// aapt resource value: 0x7F090282
+			public const int ll_video = 2131296898;
+			
+			// aapt resource value: 0x7F090283
+			public const int ll_video1 = 2131296899;
+			
+			// aapt resource value: 0x7F090284
+			public const int ll_video_content = 2131296900;
+			
+			// aapt resource value: 0x7F090285
+			public const int ll_video_lp_rendering = 2131296901;
 			
 			// aapt resource value: 0x7F09028A
-			public const int lp_dialog_confirm_tv = 2131296906;
+			public const int loadingTextView = 2131296906;
 			
 			// aapt resource value: 0x7F09028B
-			public const int lp_dialog_data_picker = 2131296907;
+			public const int loading_end_text = 2131296907;
 			
 			// aapt resource value: 0x7F09028C
-			public const int lp_dialog_time_picker = 2131296908;
+			public const int loading_pb = 2131296908;
+			
+			// aapt resource value: 0x7F09028D
+			public const int loading_pb_ly = 2131296909;
+			
+			// aapt resource value: 0x7F09028E
+			public const int loading_play_btn = 2131296910;
+			
+			// aapt resource value: 0x7F09028F
+			public const int loading_progressbar = 2131296911;
+			
+			// aapt resource value: 0x7F090290
+			public const int loading_text = 2131296912;
 			
 			// aapt resource value: 0x7F090291
-			public const int main_layout = 2131296913;
+			public const int loading_view = 2131296913;
 			
 			// aapt resource value: 0x7F090292
-			public const int manualOnly = 2131296914;
+			public const int loading_viewstub = 2131296914;
+			
+			// aapt resource value: 0x7F090294
+			public const int localDoorUnlock = 2131296916;
+			
+			// aapt resource value: 0x7F090295
+			public const int localVideo = 2131296917;
+			
+			// aapt resource value: 0x7F090296
+			public const int local_alarm1 = 2131296918;
+			
+			// aapt resource value: 0x7F090297
+			public const int local_alarm2 = 2131296919;
+			
+			// aapt resource value: 0x7F090298
+			public const int local_alarm3 = 2131296920;
+			
+			// aapt resource value: 0x7F090299
+			public const int local_l1 = 2131296921;
+			
+			// aapt resource value: 0x7F09029A
+			public const int local_l2 = 2131296922;
+			
+			// aapt resource value: 0x7F09029B
+			public const int local_l3 = 2131296923;
+			
+			// aapt resource value: 0x7F09029C
+			public const int local_realplay_btn = 2131296924;
+			
+			// aapt resource value: 0x7F09029D
+			public const int local_time_part1 = 2131296925;
+			
+			// aapt resource value: 0x7F09029E
+			public const int local_time_part2 = 2131296926;
+			
+			// aapt resource value: 0x7F09029F
+			public const int local_time_part3 = 2131296927;
 			
 			// aapt resource value: 0x7F090293
-			public const int masked = 2131296915;
+			public const int locaVideo = 2131296915;
+			
+			// aapt resource value: 0x7F0902A0
+			public const int lockVerifyBtn = 2131296928;
+			
+			// aapt resource value: 0x7F0902A1
+			public const int login_login = 2131296929;
+			
+			// aapt resource value: 0x7F0902A2
+			public const int login_name = 2131296930;
+			
+			// aapt resource value: 0x7F0902A3
+			public const int login_pwd = 2131296931;
+			
+			// aapt resource value: 0x7F0902A4
+			public const int login_regesiter = 2131296932;
+			
+			// aapt resource value: 0x7F0902A5
+			public const int login_username = 2131296933;
+			
+			// aapt resource value: 0x7F0902A6
+			public const int longitude = 2131296934;
+			
+			// aapt resource value: 0x7F0902AB
+			public const int lpsdk_dialog_cancel_tv = 2131296939;
+			
+			// aapt resource value: 0x7F0902AC
+			public const int lpsdk_dialog_confirm_tv = 2131296940;
+			
+			// aapt resource value: 0x7F0902AD
+			public const int lpsdk_dialog_content_tv = 2131296941;
+			
+			// aapt resource value: 0x7F0902AE
+			public const int lpsdk_dialog_title_tv = 2131296942;
+			
+			// aapt resource value: 0x7F0902A7
+			public const int lp_dialog_cancel_tv = 2131296935;
+			
+			// aapt resource value: 0x7F0902A8
+			public const int lp_dialog_confirm_tv = 2131296936;
+			
+			// aapt resource value: 0x7F0902A9
+			public const int lp_dialog_data_picker = 2131296937;
+			
+			// aapt resource value: 0x7F0902AA
+			public const int lp_dialog_time_picker = 2131296938;
+			
+			// aapt resource value: 0x7F0902AF
+			public const int main_layout = 2131296943;
+			
+			// aapt resource value: 0x7F0902B0
+			public const int manualOnly = 2131296944;
+			
+			// aapt resource value: 0x7F0902B1
+			public const int masked = 2131296945;
 			
 			// aapt resource value: 0x7F090009
 			public const int MatchLayout = 2131296265;
 			
-			// aapt resource value: 0x7F090294
-			public const int matte_image = 2131296916;
+			// aapt resource value: 0x7F0902B2
+			public const int matte_image = 2131296946;
 			
-			// aapt resource value: 0x7F090295
-			public const int media_actions = 2131296917;
+			// aapt resource value: 0x7F0902B3
+			public const int media_actions = 2131296947;
 			
-			// aapt resource value: 0x7F090296
-			public const int menu_layout = 2131296918;
+			// aapt resource value: 0x7F0902B4
+			public const int menu_layout = 2131296948;
 			
-			// aapt resource value: 0x7F090297
-			public const int menu_play = 2131296919;
+			// aapt resource value: 0x7F0902B5
+			public const int menu_play = 2131296949;
 			
-			// aapt resource value: 0x7F090298
-			public const int message = 2131296920;
+			// aapt resource value: 0x7F0902B6
+			public const int message = 2131296950;
 			
-			// aapt resource value: 0x7F090299
-			public const int message1 = 2131296921;
+			// aapt resource value: 0x7F0902B7
+			public const int message1 = 2131296951;
 			
-			// aapt resource value: 0x7F09029A
-			public const int message2 = 2131296922;
+			// aapt resource value: 0x7F0902B8
+			public const int message2 = 2131296952;
 			
-			// aapt resource value: 0x7F09029B
-			public const int message_check = 2131296923;
+			// aapt resource value: 0x7F0902B9
+			public const int message_check = 2131296953;
 			
-			// aapt resource value: 0x7F09029C
-			public const int message_content = 2131296924;
+			// aapt resource value: 0x7F0902BA
+			public const int message_content = 2131296954;
 			
-			// aapt resource value: 0x7F09029D
-			public const int message_from = 2131296925;
+			// aapt resource value: 0x7F0902BB
+			public const int message_from = 2131296955;
 			
-			// aapt resource value: 0x7F09029E
-			public const int message_from_tip = 2131296926;
+			// aapt resource value: 0x7F0902BC
+			public const int message_from_tip = 2131296956;
 			
-			// aapt resource value: 0x7F09029F
-			public const int message_image = 2131296927;
+			// aapt resource value: 0x7F0902BD
+			public const int message_image = 2131296957;
 			
-			// aapt resource value: 0x7F0902A0
-			public const int message_image_layout = 2131296928;
+			// aapt resource value: 0x7F0902BE
+			public const int message_image_layout = 2131296958;
 			
-			// aapt resource value: 0x7F0902A1
-			public const int message_image_progress = 2131296929;
+			// aapt resource value: 0x7F0902BF
+			public const int message_image_progress = 2131296959;
 			
-			// aapt resource value: 0x7F0902A2
-			public const int message_layout = 2131296930;
+			// aapt resource value: 0x7F0902C0
+			public const int message_layout = 2131296960;
 			
-			// aapt resource value: 0x7F0902A3
-			public const int message_list = 2131296931;
+			// aapt resource value: 0x7F0902C1
+			public const int message_list = 2131296961;
 			
-			// aapt resource value: 0x7F0902A4
-			public const int message_num_tv = 2131296932;
+			// aapt resource value: 0x7F0902C2
+			public const int message_num_tv = 2131296962;
 			
-			// aapt resource value: 0x7F0902A5
-			public const int message_play_layout = 2131296933;
+			// aapt resource value: 0x7F0902C3
+			public const int message_play_layout = 2131296963;
 			
-			// aapt resource value: 0x7F0902A6
-			public const int message_time = 2131296934;
+			// aapt resource value: 0x7F0902C4
+			public const int message_time = 2131296964;
 			
-			// aapt resource value: 0x7F0902A7
-			public const int message_type = 2131296935;
+			// aapt resource value: 0x7F0902C5
+			public const int message_type = 2131296965;
 			
-			// aapt resource value: 0x7F0902A8
-			public const int message_unread = 2131296936;
+			// aapt resource value: 0x7F0902C6
+			public const int message_unread = 2131296966;
 			
-			// aapt resource value: 0x7F0902A9
-			public const int message_video_layout = 2131296937;
+			// aapt resource value: 0x7F0902C7
+			public const int message_video_layout = 2131296967;
 			
 			// aapt resource value: 0x7F090008
 			public const int META = 2131296264;
 			
-			// aapt resource value: 0x7F0902AB
-			public const int middle = 2131296939;
-			
-			// aapt resource value: 0x7F0902AA
-			public const int mid_vertical_view = 2131296938;
-			
-			// aapt resource value: 0x7F0902AC
-			public const int min = 2131296940;
-			
-			// aapt resource value: 0x7F0902AD
-			public const int mini = 2131296941;
-			
-			// aapt resource value: 0x7F0902AE
-			public const int mirror_line = 2131296942;
-			
-			// aapt resource value: 0x7F0902AF
-			public const int modify_password_layout = 2131296943;
-			
-			// aapt resource value: 0x7F0902B0
-			public const int monitor = 2131296944;
-			
-			// aapt resource value: 0x7F0902B1
-			public const int month = 2131296945;
-			
-			// aapt resource value: 0x7F0902B2
-			public const int more_btn = 2131296946;
-			
-			// aapt resource value: 0x7F0902B3
-			public const int msg_content_tv = 2131296947;
-			
-			// aapt resource value: 0x7F0902B4
-			public const int multiply = 2131296948;
-			
-			// aapt resource value: 0x7F0902B5
-			public const int myRelativeLayout = 2131296949;
-			
-			// aapt resource value: 0x7F0902B6
-			public const int myRetry = 2131296950;
-			
-			// aapt resource value: 0x7F0902B7
-			public const int nameText = 2131296951;
-			
-			// aapt resource value: 0x7F0902B8
-			public const int name_del = 2131296952;
-			
-			// aapt resource value: 0x7F0902B9
-			public const int name_layout = 2131296953;
-			
-			// aapt resource value: 0x7F0902BA
-			public const int name_text = 2131296954;
-			
-			// aapt resource value: 0x7F0902BB
-			public const int name_textview = 2131296955;
-			
-			// aapt resource value: 0x7F0902BC
-			public const int name_tv = 2131296956;
-			
-			// aapt resource value: 0x7F0902BD
-			public const int navigation_header_container = 2131296957;
-			
-			// aapt resource value: 0x7F0902BE
-			public const int never = 2131296958;
-			
-			// aapt resource value: 0x7F0902BF
-			public const int new_password = 2131296959;
-			
-			// aapt resource value: 0x7F0902C0
-			public const int next = 2131296960;
-			
-			// aapt resource value: 0x7F0902C1
-			public const int next_btn = 2131296961;
-			
-			// aapt resource value: 0x7F0902C2
-			public const int next_play_btn = 2131296962;
-			
-			// aapt resource value: 0x7F0902CA
-			public const int none = 2131296970;
-			
-			// aapt resource value: 0x7F0902CB
-			public const int normal = 2131296971;
-			
-			// aapt resource value: 0x7F0902C3
-			public const int noText = 2131296963;
-			
-			// aapt resource value: 0x7F0902CD
-			public const int notification_background = 2131296973;
-			
-			// aapt resource value: 0x7F0902CE
-			public const int notification_main_column = 2131296974;
-			
-			// aapt resource value: 0x7F0902CF
-			public const int notification_main_column_container = 2131296975;
-			
-			// aapt resource value: 0x7F0902CC
-			public const int not_show = 2131296972;
-			
-			// aapt resource value: 0x7F0902D0
-			public const int novideo_img = 2131296976;
-			
-			// aapt resource value: 0x7F0902D1
-			public const int novideo_img_device = 2131296977;
-			
-			// aapt resource value: 0x7F0902C4
-			public const int no_camera_tip_ly = 2131296964;
-			
-			// aapt resource value: 0x7F0902C5
-			public const int no_message_button = 2131296965;
-			
-			// aapt resource value: 0x7F0902C6
-			public const int no_message_layout = 2131296966;
-			
-			// aapt resource value: 0x7F0902C7
-			public const int no_message_text = 2131296967;
+			// aapt resource value: 0x7F0902C9
+			public const int middle = 2131296969;
 			
 			// aapt resource value: 0x7F0902C8
-			public const int no_more_hint = 2131296968;
+			public const int mid_vertical_view = 2131296968;
 			
-			// aapt resource value: 0x7F0902C9
-			public const int no_more_text = 2131296969;
+			// aapt resource value: 0x7F0902CA
+			public const int min = 2131296970;
+			
+			// aapt resource value: 0x7F0902CB
+			public const int mini = 2131296971;
+			
+			// aapt resource value: 0x7F0902CC
+			public const int mirror_line = 2131296972;
+			
+			// aapt resource value: 0x7F0902CD
+			public const int modify_password_layout = 2131296973;
+			
+			// aapt resource value: 0x7F0902CE
+			public const int monitor = 2131296974;
+			
+			// aapt resource value: 0x7F0902CF
+			public const int month = 2131296975;
+			
+			// aapt resource value: 0x7F0902D0
+			public const int more_btn = 2131296976;
+			
+			// aapt resource value: 0x7F0902D1
+			public const int msg_content_tv = 2131296977;
 			
 			// aapt resource value: 0x7F0902D2
-			public const int offline_bg = 2131296978;
+			public const int multiply = 2131296978;
 			
 			// aapt resource value: 0x7F0902D3
-			public const int ok_tv = 2131296979;
-			
-			// aapt resource value: 0x7F0902D6
-			public const int options1 = 2131296982;
-			
-			// aapt resource value: 0x7F0902D7
-			public const int options2 = 2131296983;
-			
-			// aapt resource value: 0x7F0902D8
-			public const int options3 = 2131296984;
-			
-			// aapt resource value: 0x7F0902D9
-			public const int optionspicker = 2131296985;
+			public const int myRelativeLayout = 2131296979;
 			
 			// aapt resource value: 0x7F0902D4
-			public const int option_list = 2131296980;
+			public const int myRetry = 2131296980;
 			
 			// aapt resource value: 0x7F0902D5
-			public const int option_name = 2131296981;
+			public const int nameText = 2131296981;
+			
+			// aapt resource value: 0x7F0902D6
+			public const int name_del = 2131296982;
+			
+			// aapt resource value: 0x7F0902D7
+			public const int name_text = 2131296983;
+			
+			// aapt resource value: 0x7F0902D8
+			public const int name_tv = 2131296984;
+			
+			// aapt resource value: 0x7F0902D9
+			public const int navigation_header_container = 2131296985;
 			
 			// aapt resource value: 0x7F0902DA
-			public const int outmost_container = 2131296986;
+			public const int network_error_text = 2131296986;
 			
 			// aapt resource value: 0x7F0902DB
-			public const int packed = 2131296987;
-			
-			// aapt resource value: 0x7F0902DD
-			public const int pager = 2131296989;
-			
-			// aapt resource value: 0x7F0902DE
-			public const int pager_tab_strip = 2131296990;
+			public const int network_error_viewstub = 2131296987;
 			
 			// aapt resource value: 0x7F0902DC
-			public const int page_container = 2131296988;
+			public const int never = 2131296988;
+			
+			// aapt resource value: 0x7F0902DD
+			public const int new_password = 2131296989;
+			
+			// aapt resource value: 0x7F0902DE
+			public const int next = 2131296990;
 			
 			// aapt resource value: 0x7F0902DF
-			public const int pair_img1 = 2131296991;
+			public const int next_btn = 2131296991;
 			
 			// aapt resource value: 0x7F0902E0
-			public const int pair_img2 = 2131296992;
-			
-			// aapt resource value: 0x7F0902E1
-			public const int parallax = 2131296993;
-			
-			// aapt resource value: 0x7F0902E2
-			public const int parent = 2131296994;
-			
-			// aapt resource value: 0x7F0902E3
-			public const int parentPanel = 2131296995;
-			
-			// aapt resource value: 0x7F0902E4
-			public const int parent_matrix = 2131296996;
-			
-			// aapt resource value: 0x7F0902E5
-			public const int passwordETV = 2131296997;
-			
-			// aapt resource value: 0x7F0902E6
-			public const int pb_loading = 2131296998;
-			
-			// aapt resource value: 0x7F0902E7
-			public const int pb_notlist_title_bar_landscape = 2131296999;
-			
-			// aapt resource value: 0x7F0902E8
-			public const int pb_play_loading = 2131297000;
-			
-			// aapt resource value: 0x7F0902E9
-			public const int pb_search_content_tab = 2131297001;
-			
-			// aapt resource value: 0x7F0902EA
-			public const int pb_search_tab_btn_cloud = 2131297002;
-			
-			// aapt resource value: 0x7F0902EB
-			public const int pb_search_tab_btn_device = 2131297003;
+			public const int next_play_btn = 2131296992;
 			
 			// aapt resource value: 0x7F0902EC
-			public const int pb_title_bar_landscape = 2131297004;
+			public const int none = 2131297004;
 			
 			// aapt resource value: 0x7F0902ED
-			public const int peerAddress = 2131297005;
+			public const int normal = 2131297005;
 			
-			// aapt resource value: 0x7F0902EE
-			public const int percent = 2131297006;
+			// aapt resource value: 0x7F0902E1
+			public const int noText = 2131296993;
 			
 			// aapt resource value: 0x7F0902EF
-			public const int pg_download = 2131297007;
+			public const int notification_background = 2131297007;
 			
 			// aapt resource value: 0x7F0902F0
-			public const int pg_upodate = 2131297008;
+			public const int notification_main_column = 2131297008;
 			
 			// aapt resource value: 0x7F0902F1
-			public const int phone_btn = 2131297009;
+			public const int notification_main_column_container = 2131297009;
+			
+			// aapt resource value: 0x7F0902EE
+			public const int not_show = 2131297006;
 			
 			// aapt resource value: 0x7F0902F2
-			public const int phone_et = 2131297010;
+			public const int novideo_img = 2131297010;
 			
 			// aapt resource value: 0x7F0902F3
-			public const int phone_ly = 2131297011;
+			public const int novideo_img_device = 2131297011;
+			
+			// aapt resource value: 0x7F0902E2
+			public const int no_camera_tip_ly = 2131296994;
+			
+			// aapt resource value: 0x7F0902E3
+			public const int no_history_layout = 2131296995;
+			
+			// aapt resource value: 0x7F0902E4
+			public const int no_history_text = 2131296996;
+			
+			// aapt resource value: 0x7F0902E5
+			public const int no_message_button = 2131296997;
+			
+			// aapt resource value: 0x7F0902E6
+			public const int no_message_layout = 2131296998;
+			
+			// aapt resource value: 0x7F0902E7
+			public const int no_message_text = 2131296999;
+			
+			// aapt resource value: 0x7F0902E8
+			public const int no_more_hint = 2131297000;
+			
+			// aapt resource value: 0x7F0902E9
+			public const int no_more_text = 2131297001;
+			
+			// aapt resource value: 0x7F0902EA
+			public const int no_temppassword_layout = 2131297002;
+			
+			// aapt resource value: 0x7F0902EB
+			public const int no_temppassword_text = 2131297003;
 			
 			// aapt resource value: 0x7F0902F4
-			public const int phone_lyt = 2131297012;
+			public const int offline_bg = 2131297012;
 			
 			// aapt resource value: 0x7F0902F5
-			public const int pin = 2131297013;
-			
-			// aapt resource value: 0x7F0902F6
-			public const int pixel_recycle = 2131297014;
+			public const int ok_tv = 2131297013;
 			
 			// aapt resource value: 0x7F0902F8
-			public const int platform_login_btn = 2131297016;
-			
-			// aapt resource value: 0x7F0902F7
-			public const int plat_tv = 2131297015;
+			public const int options1 = 2131297016;
 			
 			// aapt resource value: 0x7F0902F9
-			public const int play_video_layout = 2131297017;
+			public const int options2 = 2131297017;
 			
 			// aapt resource value: 0x7F0902FA
-			public const int preview_view = 2131297018;
+			public const int options3 = 2131297018;
 			
 			// aapt resource value: 0x7F0902FB
-			public const int privacy_policy_btn = 2131297019;
+			public const int optionspicker = 2131297019;
 			
-			// aapt resource value: 0x7F090300
-			public const int progressbar = 2131297024;
+			// aapt resource value: 0x7F0902F6
+			public const int option_list = 2131297014;
+			
+			// aapt resource value: 0x7F0902F7
+			public const int option_name = 2131297015;
 			
 			// aapt resource value: 0x7F0902FC
-			public const int progress_area = 2131297020;
+			public const int outmost_container = 2131297020;
 			
 			// aapt resource value: 0x7F0902FD
-			public const int progress_circular = 2131297021;
-			
-			// aapt resource value: 0x7F0902FE
-			public const int progress_horizontal = 2131297022;
+			public const int packed = 2131297021;
 			
 			// aapt resource value: 0x7F0902FF
-			public const int progress_seekbar = 2131297023;
+			public const int pager = 2131297023;
+			
+			// aapt resource value: 0x7F090300
+			public const int pager_tab_strip = 2131297024;
+			
+			// aapt resource value: 0x7F0902FE
+			public const int page_container = 2131297022;
 			
 			// aapt resource value: 0x7F090301
-			public const int ptz_bottom_btn = 2131297025;
+			public const int pair_img1 = 2131297025;
 			
 			// aapt resource value: 0x7F090302
-			public const int ptz_close_btn = 2131297026;
+			public const int pair_img2 = 2131297026;
 			
 			// aapt resource value: 0x7F090303
-			public const int ptz_control_ly = 2131297027;
+			public const int parallax = 2131297027;
 			
 			// aapt resource value: 0x7F090304
-			public const int ptz_flip_btn = 2131297028;
+			public const int parent = 2131297028;
 			
 			// aapt resource value: 0x7F090305
-			public const int ptz_left_btn = 2131297029;
+			public const int parentPanel = 2131297029;
 			
 			// aapt resource value: 0x7F090306
-			public const int ptz_right_btn = 2131297030;
+			public const int parent_matrix = 2131297030;
 			
 			// aapt resource value: 0x7F090307
-			public const int ptz_top_btn = 2131297031;
+			public const int passwordETV = 2131297031;
 			
 			// aapt resource value: 0x7F090308
-			public const int pullDownFromTop = 2131297032;
+			public const int pb_loading = 2131297032;
 			
 			// aapt resource value: 0x7F090309
-			public const int pullFromEnd = 2131297033;
+			public const int pb_notlist_title_bar_landscape = 2131297033;
 			
 			// aapt resource value: 0x7F09030A
-			public const int pullFromStart = 2131297034;
+			public const int pb_play_loading = 2131297034;
 			
 			// aapt resource value: 0x7F09030B
-			public const int pullUpFromBottom = 2131297035;
+			public const int pb_search_content_tab = 2131297035;
 			
 			// aapt resource value: 0x7F09030C
-			public const int pull_out = 2131297036;
+			public const int pb_search_tab_btn_cloud = 2131297036;
 			
 			// aapt resource value: 0x7F09030D
-			public const int pull_to_refresh_image = 2131297037;
+			public const int pb_search_tab_btn_device = 2131297037;
 			
 			// aapt resource value: 0x7F09030E
-			public const int pull_to_refresh_progress = 2131297038;
+			public const int pb_title_bar_landscape = 2131297038;
 			
 			// aapt resource value: 0x7F09030F
-			public const int pull_to_refresh_sub_text = 2131297039;
+			public const int peerAddress = 2131297039;
 			
 			// aapt resource value: 0x7F090310
-			public const int pull_to_refresh_text = 2131297040;
+			public const int percent = 2131297040;
 			
 			// aapt resource value: 0x7F090311
-			public const int quality_balanced_btn = 2131297041;
+			public const int pg_download = 2131297041;
 			
 			// aapt resource value: 0x7F090312
-			public const int quality_close_btn = 2131297042;
+			public const int pg_upodate = 2131297042;
 			
 			// aapt resource value: 0x7F090313
-			public const int quality_flunet_btn = 2131297043;
+			public const int phone_btn = 2131297043;
 			
 			// aapt resource value: 0x7F090314
-			public const int quality_hd_btn = 2131297044;
+			public const int phone_et = 2131297044;
 			
 			// aapt resource value: 0x7F090315
-			public const int quality_line = 2131297045;
+			public const int phone_ly = 2131297045;
 			
 			// aapt resource value: 0x7F090316
-			public const int quality_super_hd_btn = 2131297046;
-			
-			// aapt resource value: 0x7F090318
-			public const int queryingCameraRyt = 2131297048;
-			
-			// aapt resource value: 0x7F090319
-			public const int querying_camera_tv = 2131297049;
+			public const int phone_lyt = 2131297046;
 			
 			// aapt resource value: 0x7F090317
-			public const int query_exception_ly = 2131297047;
+			public const int pin = 2131297047;
+			
+			// aapt resource value: 0x7F090318
+			public const int pixel_recycle = 2131297048;
 			
 			// aapt resource value: 0x7F09031A
-			public const int quit = 2131297050;
+			public const int platform_login_btn = 2131297050;
+			
+			// aapt resource value: 0x7F090319
+			public const int plat_tv = 2131297049;
 			
 			// aapt resource value: 0x7F09031B
-			public const int radio = 2131297051;
+			public const int play_video_layout = 2131297051;
 			
 			// aapt resource value: 0x7F09031C
-			public const int range = 2131297052;
+			public const int popLayoutId = 2131297052;
 			
 			// aapt resource value: 0x7F09031D
-			public const int rangeSort = 2131297053;
+			public const int preview_view = 2131297053;
 			
 			// aapt resource value: 0x7F09031E
-			public const int rate_16x = 2131297054;
-			
-			// aapt resource value: 0x7F09031F
-			public const int rate_1x = 2131297055;
-			
-			// aapt resource value: 0x7F090320
-			public const int rate_4x = 2131297056;
-			
-			// aapt resource value: 0x7F090321
-			public const int rate_8x = 2131297057;
-			
-			// aapt resource value: 0x7F090322
-			public const int rb_never_remind = 2131297058;
+			public const int privacy_policy_btn = 2131297054;
 			
 			// aapt resource value: 0x7F090323
-			public const int rcv_channel = 2131297059;
+			public const int progressbar = 2131297059;
+			
+			// aapt resource value: 0x7F09031F
+			public const int progress_area = 2131297055;
+			
+			// aapt resource value: 0x7F090320
+			public const int progress_circular = 2131297056;
+			
+			// aapt resource value: 0x7F090321
+			public const int progress_horizontal = 2131297057;
+			
+			// aapt resource value: 0x7F090322
+			public const int progress_seekbar = 2131297058;
 			
 			// aapt resource value: 0x7F090324
-			public const int rcv_record = 2131297060;
+			public const int ptz_bottom_btn = 2131297060;
 			
 			// aapt resource value: 0x7F090325
-			public const int rcv_video_list = 2131297061;
-			
-			// aapt resource value: 0x7F090327
-			public const int read_button = 2131297063;
-			
-			// aapt resource value: 0x7F090328
-			public const int realplay_area = 2131297064;
-			
-			// aapt resource value: 0x7F090329
-			public const int realplay_back_btn = 2131297065;
-			
-			// aapt resource value: 0x7F09032A
-			public const int realplay_capture_iv = 2131297066;
-			
-			// aapt resource value: 0x7F09032B
-			public const int realplay_capture_rl = 2131297067;
-			
-			// aapt resource value: 0x7F09032C
-			public const int realplay_capture_watermark_iv = 2131297068;
-			
-			// aapt resource value: 0x7F09032D
-			public const int realplay_control_bar = 2131297069;
-			
-			// aapt resource value: 0x7F09032E
-			public const int realplay_control_rl = 2131297070;
-			
-			// aapt resource value: 0x7F09032F
-			public const int realplay_display_view = 2131297071;
-			
-			// aapt resource value: 0x7F090330
-			public const int realplay_flow_tv = 2131297072;
-			
-			// aapt resource value: 0x7F090331
-			public const int realplay_full_anim_btn = 2131297073;
-			
-			// aapt resource value: 0x7F090332
-			public const int realplay_full_flow_ly = 2131297074;
-			
-			// aapt resource value: 0x7F090333
-			public const int realplay_full_flow_tv = 2131297075;
-			
-			// aapt resource value: 0x7F090334
-			public const int realplay_full_operate_bar = 2131297076;
-			
-			// aapt resource value: 0x7F090335
-			public const int realplay_full_operate_layout = 2131297077;
-			
-			// aapt resource value: 0x7F090336
-			public const int realplay_full_play_btn = 2131297078;
-			
-			// aapt resource value: 0x7F090337
-			public const int realplay_full_previously_btn = 2131297079;
-			
-			// aapt resource value: 0x7F090338
-			public const int realplay_full_ptz_anim_btn = 2131297080;
-			
-			// aapt resource value: 0x7F090339
-			public const int realplay_full_ptz_btn = 2131297081;
-			
-			// aapt resource value: 0x7F09033A
-			public const int realplay_full_ptz_prompt_iv = 2131297082;
-			
-			// aapt resource value: 0x7F09033B
-			public const int realplay_full_rate_tv = 2131297083;
-			
-			// aapt resource value: 0x7F09033C
-			public const int realplay_full_sound_btn = 2131297084;
-			
-			// aapt resource value: 0x7F09033D
-			public const int realplay_full_talk_anim_btn = 2131297085;
-			
-			// aapt resource value: 0x7F09033E
-			public const int realplay_full_talk_btn = 2131297086;
-			
-			// aapt resource value: 0x7F09033F
-			public const int realplay_full_video_btn = 2131297087;
-			
-			// aapt resource value: 0x7F090340
-			public const int realplay_full_video_container = 2131297088;
-			
-			// aapt resource value: 0x7F090341
-			public const int realplay_full_video_start_btn = 2131297089;
-			
-			// aapt resource value: 0x7F090342
-			public const int realplay_loading = 2131297090;
-			
-			// aapt resource value: 0x7F090343
-			public const int realplay_loading_rl = 2131297091;
-			
-			// aapt resource value: 0x7F090344
-			public const int realplay_operate_bar = 2131297092;
-			
-			// aapt resource value: 0x7F090345
-			public const int realplay_operate_bar2 = 2131297093;
-			
-			// aapt resource value: 0x7F090346
-			public const int realplay_operate_ly = 2131297094;
-			
-			// aapt resource value: 0x7F090347
-			public const int realplay_operate_ly2 = 2131297095;
-			
-			// aapt resource value: 0x7F09034A
-			public const int realplay_pages_gallery = 2131297098;
-			
-			// aapt resource value: 0x7F090348
-			public const int realplay_page_anim_iv = 2131297096;
-			
-			// aapt resource value: 0x7F090349
-			public const int realplay_page_ly = 2131297097;
-			
-			// aapt resource value: 0x7F09034B
-			public const int realplay_play_btn = 2131297099;
-			
-			// aapt resource value: 0x7F09034C
-			public const int realplay_play_iv = 2131297100;
-			
-			// aapt resource value: 0x7F09034D
-			public const int realplay_play_rl = 2131297101;
-			
-			// aapt resource value: 0x7F09034E
-			public const int realplay_previously_btn = 2131297102;
-			
-			// aapt resource value: 0x7F09034F
-			public const int realplay_previously_btn2 = 2131297103;
-			
-			// aapt resource value: 0x7F090350
-			public const int realplay_previously_btn_ly = 2131297104;
-			
-			// aapt resource value: 0x7F090351
-			public const int realplay_previously_btn_ly2 = 2131297105;
-			
-			// aapt resource value: 0x7F090352
-			public const int realplay_privacy_btn = 2131297106;
-			
-			// aapt resource value: 0x7F090353
-			public const int realplay_privacy_btn2 = 2131297107;
-			
-			// aapt resource value: 0x7F090354
-			public const int realplay_privacy_btn_ly = 2131297108;
-			
-			// aapt resource value: 0x7F090355
-			public const int realplay_privacy_btn_ly2 = 2131297109;
-			
-			// aapt resource value: 0x7F090356
-			public const int realplay_privacy_ly = 2131297110;
-			
-			// aapt resource value: 0x7F090357
-			public const int realplay_privacy_tv = 2131297111;
-			
-			// aapt resource value: 0x7F090358
-			public const int realplay_privacy_tv2 = 2131297112;
-			
-			// aapt resource value: 0x7F090359
-			public const int realplay_prompt_rl = 2131297113;
-			
-			// aapt resource value: 0x7F09035A
-			public const int realplay_ptz_btn = 2131297114;
-			
-			// aapt resource value: 0x7F09035B
-			public const int realplay_ptz_btn2 = 2131297115;
-			
-			// aapt resource value: 0x7F09035C
-			public const int realplay_ptz_btn_ly = 2131297116;
-			
-			// aapt resource value: 0x7F09035D
-			public const int realplay_ptz_btn_ly2 = 2131297117;
-			
-			// aapt resource value: 0x7F09035E
-			public const int realplay_ptz_direction_iv = 2131297118;
-			
-			// aapt resource value: 0x7F09035F
-			public const int realplay_quality_btn = 2131297119;
-			
-			// aapt resource value: 0x7F090360
-			public const int realplay_ratio_tv = 2131297120;
-			
-			// aapt resource value: 0x7F090361
-			public const int realplay_record_iv = 2131297121;
-			
-			// aapt resource value: 0x7F090362
-			public const int realplay_record_ly = 2131297122;
-			
-			// aapt resource value: 0x7F090363
-			public const int realplay_record_tv = 2131297123;
-			
-			// aapt resource value: 0x7F090364
-			public const int realplay_sound_btn = 2131297124;
-			
-			// aapt resource value: 0x7F090365
-			public const int realplay_ssl_btn = 2131297125;
-			
-			// aapt resource value: 0x7F090366
-			public const int realplay_ssl_btn2 = 2131297126;
-			
-			// aapt resource value: 0x7F090367
-			public const int realplay_ssl_btn_ly = 2131297127;
-			
-			// aapt resource value: 0x7F090368
-			public const int realplay_ssl_btn_ly2 = 2131297128;
-			
-			// aapt resource value: 0x7F090369
-			public const int realplay_ssl_btn_rl = 2131297129;
-			
-			// aapt resource value: 0x7F09036A
-			public const int realplay_ssl_btn_rl2 = 2131297130;
-			
-			// aapt resource value: 0x7F09036B
-			public const int realplay_ssl_progress = 2131297131;
-			
-			// aapt resource value: 0x7F09036C
-			public const int realplay_ssl_progress2 = 2131297132;
-			
-			// aapt resource value: 0x7F09036D
-			public const int realplay_ssl_tv = 2131297133;
-			
-			// aapt resource value: 0x7F09036E
-			public const int realplay_ssl_tv2 = 2131297134;
-			
-			// aapt resource value: 0x7F09036F
-			public const int realplay_stop_btn = 2131297135;
-			
-			// aapt resource value: 0x7F090370
-			public const int realplay_sv = 2131297136;
-			
-			// aapt resource value: 0x7F090371
-			public const int realplay_talk_btn = 2131297137;
-			
-			// aapt resource value: 0x7F090372
-			public const int realplay_talk_btn2 = 2131297138;
-			
-			// aapt resource value: 0x7F090373
-			public const int realplay_talk_btn_ly = 2131297139;
-			
-			// aapt resource value: 0x7F090374
-			public const int realplay_talk_btn_ly2 = 2131297140;
-			
-			// aapt resource value: 0x7F090375
-			public const int realplay_tip_tv = 2131297141;
-			
-			// aapt resource value: 0x7F090376
-			public const int realplay_title_tv = 2131297142;
-			
-			// aapt resource value: 0x7F090377
-			public const int realplay_top_bar = 2131297143;
-			
-			// aapt resource value: 0x7F090378
-			public const int realplay_video_btn = 2131297144;
-			
-			// aapt resource value: 0x7F090379
-			public const int realplay_video_btn2 = 2131297145;
-			
-			// aapt resource value: 0x7F09037A
-			public const int realplay_video_container = 2131297146;
-			
-			// aapt resource value: 0x7F09037B
-			public const int realplay_video_container2 = 2131297147;
-			
-			// aapt resource value: 0x7F09037C
-			public const int realplay_video_container_ly = 2131297148;
-			
-			// aapt resource value: 0x7F09037D
-			public const int realplay_video_container_ly2 = 2131297149;
-			
-			// aapt resource value: 0x7F09037E
-			public const int realplay_video_start_btn = 2131297150;
-			
-			// aapt resource value: 0x7F09037F
-			public const int realplay_video_start_btn2 = 2131297151;
-			
-			// aapt resource value: 0x7F090380
-			public const int realplay_waiting_lr = 2131297152;
-			
-			// aapt resource value: 0x7F090381
-			public const int realplay_watting_pb = 2131297153;
-			
-			// aapt resource value: 0x7F090382
-			public const int realplay_watting_tv = 2131297154;
-			
-			// aapt resource value: 0x7F090383
-			public const int realplay_wnd_sv = 2131297155;
-			
-			// aapt resource value: 0x7F090384
-			public const int record_endTime = 2131297156;
-			
-			// aapt resource value: 0x7F090385
-			public const int record_list = 2131297157;
-			
-			// aapt resource value: 0x7F090386
-			public const int record_seekbar = 2131297158;
-			
-			// aapt resource value: 0x7F090387
-			public const int record_startTime = 2131297159;
-			
-			// aapt resource value: 0x7F090388
-			public const int rectangle = 2131297160;
-			
-			// aapt resource value: 0x7F090389
-			public const int recycler_view = 2131297161;
-			
-			// aapt resource value: 0x7F09038A
-			public const int refresh_button = 2131297162;
-			
-			// aapt resource value: 0x7F09038B
-			public const int refresh_layout = 2131297163;
-			
-			// aapt resource value: 0x7F09038C
-			public const int refresh_tip = 2131297164;
-			
-			// aapt resource value: 0x7F09038D
-			public const int remoteFrame = 2131297165;
-			
-			// aapt resource value: 0x7F09038E
-			public const int remoteFrameContainer = 2131297166;
-			
-			// aapt resource value: 0x7F09039B
-			public const int remoteplayback_begin_time_tv = 2131297179;
-			
-			// aapt resource value: 0x7F09039C
-			public const int remoteplayback_capture_iv = 2131297180;
-			
-			// aapt resource value: 0x7F09039D
-			public const int remoteplayback_capture_rl = 2131297181;
-			
-			// aapt resource value: 0x7F09039E
-			public const int remoteplayback_capture_watermark_iv = 2131297182;
-			
-			// aapt resource value: 0x7F09039F
-			public const int remoteplayback_control_rl = 2131297183;
-			
-			// aapt resource value: 0x7F0903A0
-			public const int remoteplayback_end_time_tv = 2131297184;
-			
-			// aapt resource value: 0x7F0903A1
-			public const int remoteplayback_file_time_bar = 2131297185;
-			
-			// aapt resource value: 0x7F0903A2
-			public const int remoteplayback_flow_tv = 2131297186;
-			
-			// aapt resource value: 0x7F0903A3
-			public const int remoteplayback_full_down_btn = 2131297187;
-			
-			// aapt resource value: 0x7F0903A4
-			public const int remoteplayback_full_flow_ly = 2131297188;
-			
-			// aapt resource value: 0x7F0903A5
-			public const int remoteplayback_full_flow_tv = 2131297189;
-			
-			// aapt resource value: 0x7F0903A6
-			public const int remoteplayback_full_operate_bar = 2131297190;
-			
-			// aapt resource value: 0x7F0903A7
-			public const int remoteplayback_full_play_btn = 2131297191;
-			
-			// aapt resource value: 0x7F0903A8
-			public const int remoteplayback_full_previously_btn = 2131297192;
-			
-			// aapt resource value: 0x7F0903A9
-			public const int remoteplayback_full_rate_tv = 2131297193;
-			
-			// aapt resource value: 0x7F0903AA
-			public const int remoteplayback_full_sound_btn = 2131297194;
-			
-			// aapt resource value: 0x7F0903AB
-			public const int remoteplayback_full_video_btn = 2131297195;
-			
-			// aapt resource value: 0x7F0903AC
-			public const int remoteplayback_full_video_container = 2131297196;
-			
-			// aapt resource value: 0x7F0903AD
-			public const int remoteplayback_full_video_start_btn = 2131297197;
-			
-			// aapt resource value: 0x7F0903AE
-			public const int remoteplayback_loading_iv = 2131297198;
-			
-			// aapt resource value: 0x7F0903AF
-			public const int remoteplayback_loading_ly = 2131297199;
-			
-			// aapt resource value: 0x7F0903B0
-			public const int remoteplayback_loading_pb_ly = 2131297200;
-			
-			// aapt resource value: 0x7F0903B1
-			public const int remoteplayback_loading_play_btn = 2131297201;
-			
-			// aapt resource value: 0x7F0903B2
-			public const int remoteplayback_loading_tv = 2131297202;
-			
-			// aapt resource value: 0x7F0903B3
-			public const int remoteplayback_operate_bar = 2131297203;
-			
-			// aapt resource value: 0x7F0903B4
-			public const int remoteplayback_page_ly = 2131297204;
-			
-			// aapt resource value: 0x7F0903B5
-			public const int remoteplayback_play_btn = 2131297205;
-			
-			// aapt resource value: 0x7F0903B6
-			public const int remoteplayback_play_rl = 2131297206;
-			
-			// aapt resource value: 0x7F0903B7
-			public const int remoteplayback_previously_btn = 2131297207;
-			
-			// aapt resource value: 0x7F0903BA
-			public const int remoteplayback_progressbar = 2131297210;
-			
-			// aapt resource value: 0x7F0903B8
-			public const int remoteplayback_progress_ly = 2131297208;
-			
-			// aapt resource value: 0x7F0903B9
-			public const int remoteplayback_progress_seekbar = 2131297209;
-			
-			// aapt resource value: 0x7F0903BB
-			public const int remoteplayback_ratio_tv = 2131297211;
-			
-			// aapt resource value: 0x7F0903BC
-			public const int remoteplayback_record_iv = 2131297212;
-			
-			// aapt resource value: 0x7F0903BD
-			public const int remoteplayback_record_ly = 2131297213;
-			
-			// aapt resource value: 0x7F0903BE
-			public const int remoteplayback_record_tv = 2131297214;
-			
-			// aapt resource value: 0x7F0903BF
-			public const int remoteplayback_replay_btn = 2131297215;
-			
-			// aapt resource value: 0x7F0903C0
-			public const int remoteplayback_small_previously_btn = 2131297216;
-			
-			// aapt resource value: 0x7F0903C1
-			public const int remoteplayback_small_video_btn = 2131297217;
-			
-			// aapt resource value: 0x7F0903C2
-			public const int remoteplayback_small_video_container = 2131297218;
-			
-			// aapt resource value: 0x7F0903C3
-			public const int remoteplayback_small_video_start_btn = 2131297219;
-			
-			// aapt resource value: 0x7F0903C4
-			public const int remoteplayback_sound_btn = 2131297220;
-			
-			// aapt resource value: 0x7F0903C5
-			public const int remoteplayback_sv = 2131297221;
-			
-			// aapt resource value: 0x7F0903C7
-			public const int remoteplayback_timebar = 2131297223;
-			
-			// aapt resource value: 0x7F0903C8
-			public const int remoteplayback_timebar_rl = 2131297224;
-			
-			// aapt resource value: 0x7F0903C6
-			public const int remoteplayback_time_tv = 2131297222;
-			
-			// aapt resource value: 0x7F0903C9
-			public const int remoteplayback_tip_tv = 2131297225;
-			
-			// aapt resource value: 0x7F0903CA
-			public const int remoteplayback_video_btn = 2131297226;
-			
-			// aapt resource value: 0x7F0903CB
-			public const int remoteplayback_video_container = 2131297227;
-			
-			// aapt resource value: 0x7F0903CC
-			public const int remoteplayback_video_start_btn = 2131297228;
-			
-			// aapt resource value: 0x7F09038F
-			public const int remoteVideo = 2131297167;
-			
-			// aapt resource value: 0x7F090390
-			public const int remote_list_page = 2131297168;
-			
-			// aapt resource value: 0x7F090391
-			public const int remote_loading_buffer_tv = 2131297169;
-			
-			// aapt resource value: 0x7F090392
-			public const int remote_loading_iv = 2131297170;
-			
-			// aapt resource value: 0x7F090393
-			public const int remote_playback_area = 2131297171;
-			
-			// aapt resource value: 0x7F090394
-			public const int remote_playback_capture_btn = 2131297172;
-			
-			// aapt resource value: 0x7F090395
-			public const int remote_playback_download_btn = 2131297173;
-			
-			// aapt resource value: 0x7F090396
-			public const int remote_playback_flow_tv = 2131297174;
-			
-			// aapt resource value: 0x7F090397
-			public const int remote_playback_pause_btn = 2131297175;
-			
-			// aapt resource value: 0x7F090398
-			public const int remote_playback_sound_btn = 2131297176;
-			
-			// aapt resource value: 0x7F090399
-			public const int remote_playback_video_recording_btn = 2131297177;
-			
-			// aapt resource value: 0x7F09039A
-			public const int remote_playback_wnd_sv = 2131297178;
-			
-			// aapt resource value: 0x7F0903CD
-			public const int render_texture_view = 2131297229;
-			
-			// aapt resource value: 0x7F0903CE
-			public const int render_texture_view_soft = 2131297230;
-			
-			// aapt resource value: 0x7F0903CF
-			public const int replay_btn = 2131297231;
-			
-			// aapt resource value: 0x7F0903D0
-			public const int requestA = 2131297232;
-			
-			// aapt resource value: 0x7F0903D1
-			public const int requestMasterAudio = 2131297233;
-			
-			// aapt resource value: 0x7F0903D2
-			public const int requestMasterVideo = 2131297234;
-			
-			// aapt resource value: 0x7F0903D3
-			public const int requestV = 2131297235;
-			
-			// aapt resource value: 0x7F0903D4
-			public const int restart_preview = 2131297236;
-			
-			// aapt resource value: 0x7F0903D5
-			public const int retry_btn = 2131297237;
-			
-			// aapt resource value: 0x7F0903D6
-			public const int retry_button = 2131297238;
-			
-			// aapt resource value: 0x7F0903D7
-			public const int return_scan_result = 2131297239;
-			
-			// aapt resource value: 0x7F0903D8
-			public const int reverseCall = 2131297240;
-			
-			// aapt resource value: 0x7F0903D9
-			public const int reverseCallInfo = 2131297241;
+			public const int ptz_close_btn = 2131297061;
 			
 			// aapt resource value: 0x7F090326
-			public const int re_next_area = 2131297062;
+			public const int ptz_control_ly = 2131297062;
+			
+			// aapt resource value: 0x7F090327
+			public const int ptz_flip_btn = 2131297063;
+			
+			// aapt resource value: 0x7F090328
+			public const int ptz_left_btn = 2131297064;
+			
+			// aapt resource value: 0x7F090329
+			public const int ptz_right_btn = 2131297065;
+			
+			// aapt resource value: 0x7F09032A
+			public const int ptz_top_btn = 2131297066;
+			
+			// aapt resource value: 0x7F09032B
+			public const int pullDownFromTop = 2131297067;
+			
+			// aapt resource value: 0x7F09032C
+			public const int pullFromEnd = 2131297068;
+			
+			// aapt resource value: 0x7F09032D
+			public const int pullFromStart = 2131297069;
+			
+			// aapt resource value: 0x7F09032E
+			public const int pullUpFromBottom = 2131297070;
+			
+			// aapt resource value: 0x7F09032F
+			public const int pull_out = 2131297071;
+			
+			// aapt resource value: 0x7F090330
+			public const int pull_to_refresh_image = 2131297072;
+			
+			// aapt resource value: 0x7F090331
+			public const int pull_to_refresh_progress = 2131297073;
+			
+			// aapt resource value: 0x7F090332
+			public const int pull_to_refresh_sub_text = 2131297074;
+			
+			// aapt resource value: 0x7F090333
+			public const int pull_to_refresh_text = 2131297075;
+			
+			// aapt resource value: 0x7F090334
+			public const int pushPrograssBar = 2131297076;
+			
+			// aapt resource value: 0x7F090335
+			public const int push_big_bigtext_defaultView = 2131297077;
+			
+			// aapt resource value: 0x7F090336
+			public const int push_big_bigview_defaultView = 2131297078;
+			
+			// aapt resource value: 0x7F090337
+			public const int push_big_defaultView = 2131297079;
+			
+			// aapt resource value: 0x7F090338
+			public const int push_big_notification = 2131297080;
+			
+			// aapt resource value: 0x7F090339
+			public const int push_big_notification_content = 2131297081;
+			
+			// aapt resource value: 0x7F09033A
+			public const int push_big_notification_date = 2131297082;
+			
+			// aapt resource value: 0x7F09033B
+			public const int push_big_notification_icon = 2131297083;
+			
+			// aapt resource value: 0x7F09033C
+			public const int push_big_notification_icon2 = 2131297084;
+			
+			// aapt resource value: 0x7F09033D
+			public const int push_big_notification_title = 2131297085;
+			
+			// aapt resource value: 0x7F09033E
+			public const int push_big_pic_default_Content = 2131297086;
+			
+			// aapt resource value: 0x7F09033F
+			public const int push_big_text_notification_area = 2131297087;
+			
+			// aapt resource value: 0x7F090340
+			public const int push_notification_banner_icon = 2131297088;
+			
+			// aapt resource value: 0x7F090341
+			public const int push_notification_banner_img = 2131297089;
+			
+			// aapt resource value: 0x7F090342
+			public const int push_notification_banner_layout = 2131297090;
+			
+			// aapt resource value: 0x7F090343
+			public const int push_notification_big_icon = 2131297091;
+			
+			// aapt resource value: 0x7F090344
+			public const int push_notification_content = 2131297092;
+			
+			// aapt resource value: 0x7F090345
+			public const int push_notification_content_one_line = 2131297093;
+			
+			// aapt resource value: 0x7F090346
+			public const int push_notification_date = 2131297094;
+			
+			// aapt resource value: 0x7F090347
+			public const int push_notification_dot = 2131297095;
+			
+			// aapt resource value: 0x7F090348
+			public const int push_notification_fb_content = 2131297096;
+			
+			// aapt resource value: 0x7F090349
+			public const int push_notification_fb_content_no_like1 = 2131297097;
+			
+			// aapt resource value: 0x7F09034A
+			public const int push_notification_fb_content_no_like2 = 2131297098;
+			
+			// aapt resource value: 0x7F09034B
+			public const int push_notification_fb_content_no_like3 = 2131297099;
+			
+			// aapt resource value: 0x7F09034C
+			public const int push_notification_fb_content_no_like4 = 2131297100;
+			
+			// aapt resource value: 0x7F09034D
+			public const int push_notification_for_bottom_margin = 2131297101;
+			
+			// aapt resource value: 0x7F09034E
+			public const int push_notification_header_expand = 2131297102;
+			
+			// aapt resource value: 0x7F09034F
+			public const int push_notification_header_neg_fb = 2131297103;
+			
+			// aapt resource value: 0x7F090350
+			public const int push_notification_layout_lefttop = 2131297104;
+			
+			// aapt resource value: 0x7F090351
+			public const int push_notification_layout_time = 2131297105;
+			
+			// aapt resource value: 0x7F090352
+			public const int push_notification_main_layout = 2131297106;
+			
+			// aapt resource value: 0x7F090353
+			public const int push_notification_null = 2131297107;
+			
+			// aapt resource value: 0x7F090354
+			public const int push_notification_small_icon = 2131297108;
+			
+			// aapt resource value: 0x7F090355
+			public const int push_notification_style_1 = 2131297109;
+			
+			// aapt resource value: 0x7F090356
+			public const int push_notification_style_1_banner_icon = 2131297110;
+			
+			// aapt resource value: 0x7F090357
+			public const int push_notification_style_1_big_icon = 2131297111;
+			
+			// aapt resource value: 0x7F090358
+			public const int push_notification_style_1_content = 2131297112;
+			
+			// aapt resource value: 0x7F090359
+			public const int push_notification_style_1_date = 2131297113;
+			
+			// aapt resource value: 0x7F09035A
+			public const int push_notification_style_1_main_layout = 2131297114;
+			
+			// aapt resource value: 0x7F09035B
+			public const int push_notification_style_1_title = 2131297115;
+			
+			// aapt resource value: 0x7F09035C
+			public const int push_notification_style_default = 2131297116;
+			
+			// aapt resource value: 0x7F09035D
+			public const int push_notification_sub_title = 2131297117;
+			
+			// aapt resource value: 0x7F09035E
+			public const int push_notification_title = 2131297118;
+			
+			// aapt resource value: 0x7F09035F
+			public const int push_pure_bigview_banner = 2131297119;
+			
+			// aapt resource value: 0x7F090360
+			public const int push_pure_bigview_expanded = 2131297120;
+			
+			// aapt resource value: 0x7F090361
+			public const int push_pure_close = 2131297121;
+			
+			// aapt resource value: 0x7F090362
+			public const int push_root_view = 2131297122;
+			
+			// aapt resource value: 0x7F090363
+			public const int quality_balanced_btn = 2131297123;
+			
+			// aapt resource value: 0x7F090364
+			public const int quality_close_btn = 2131297124;
+			
+			// aapt resource value: 0x7F090365
+			public const int quality_flunet_btn = 2131297125;
+			
+			// aapt resource value: 0x7F090366
+			public const int quality_hd_btn = 2131297126;
+			
+			// aapt resource value: 0x7F090367
+			public const int quality_line = 2131297127;
+			
+			// aapt resource value: 0x7F090368
+			public const int quality_super_hd_btn = 2131297128;
+			
+			// aapt resource value: 0x7F09036A
+			public const int queryingCameraRyt = 2131297130;
+			
+			// aapt resource value: 0x7F09036B
+			public const int querying_camera_tv = 2131297131;
+			
+			// aapt resource value: 0x7F090369
+			public const int query_exception_ly = 2131297129;
+			
+			// aapt resource value: 0x7F09036C
+			public const int quit = 2131297132;
+			
+			// aapt resource value: 0x7F09036D
+			public const int radio = 2131297133;
+			
+			// aapt resource value: 0x7F09036E
+			public const int range = 2131297134;
+			
+			// aapt resource value: 0x7F09036F
+			public const int rangeSort = 2131297135;
+			
+			// aapt resource value: 0x7F090370
+			public const int rate_16x = 2131297136;
+			
+			// aapt resource value: 0x7F090371
+			public const int rate_1x = 2131297137;
+			
+			// aapt resource value: 0x7F090372
+			public const int rate_32x = 2131297138;
+			
+			// aapt resource value: 0x7F090373
+			public const int rate_4x = 2131297139;
+			
+			// aapt resource value: 0x7F090374
+			public const int rate_8x = 2131297140;
+			
+			// aapt resource value: 0x7F090375
+			public const int rb_never_remind = 2131297141;
+			
+			// aapt resource value: 0x7F090376
+			public const int rcv_channel = 2131297142;
+			
+			// aapt resource value: 0x7F090377
+			public const int rcv_record = 2131297143;
+			
+			// aapt resource value: 0x7F090378
+			public const int rcv_video_list = 2131297144;
+			
+			// aapt resource value: 0x7F09037A
+			public const int read_button = 2131297146;
+			
+			// aapt resource value: 0x7F09037B
+			public const int realplay_area = 2131297147;
+			
+			// aapt resource value: 0x7F09037C
+			public const int realplay_back_btn = 2131297148;
+			
+			// aapt resource value: 0x7F09037D
+			public const int realplay_capture_iv = 2131297149;
+			
+			// aapt resource value: 0x7F09037E
+			public const int realplay_capture_rl = 2131297150;
+			
+			// aapt resource value: 0x7F09037F
+			public const int realplay_capture_watermark_iv = 2131297151;
+			
+			// aapt resource value: 0x7F090380
+			public const int realplay_control_bar = 2131297152;
+			
+			// aapt resource value: 0x7F090381
+			public const int realplay_control_rl = 2131297153;
+			
+			// aapt resource value: 0x7F090382
+			public const int realplay_display_view = 2131297154;
+			
+			// aapt resource value: 0x7F090383
+			public const int realplay_flow_tv = 2131297155;
+			
+			// aapt resource value: 0x7F090384
+			public const int realplay_full_anim_btn = 2131297156;
+			
+			// aapt resource value: 0x7F090385
+			public const int realplay_full_flow_ly = 2131297157;
+			
+			// aapt resource value: 0x7F090386
+			public const int realplay_full_flow_tv = 2131297158;
+			
+			// aapt resource value: 0x7F090387
+			public const int realplay_full_operate_bar = 2131297159;
+			
+			// aapt resource value: 0x7F090388
+			public const int realplay_full_operate_layout = 2131297160;
+			
+			// aapt resource value: 0x7F090389
+			public const int realplay_full_play_btn = 2131297161;
+			
+			// aapt resource value: 0x7F09038A
+			public const int realplay_full_previously_btn = 2131297162;
+			
+			// aapt resource value: 0x7F09038B
+			public const int realplay_full_ptz_anim_btn = 2131297163;
+			
+			// aapt resource value: 0x7F09038C
+			public const int realplay_full_ptz_btn = 2131297164;
+			
+			// aapt resource value: 0x7F09038D
+			public const int realplay_full_ptz_prompt_iv = 2131297165;
+			
+			// aapt resource value: 0x7F09038E
+			public const int realplay_full_rate_tv = 2131297166;
+			
+			// aapt resource value: 0x7F09038F
+			public const int realplay_full_sound_btn = 2131297167;
+			
+			// aapt resource value: 0x7F090390
+			public const int realplay_full_talk_anim_btn = 2131297168;
+			
+			// aapt resource value: 0x7F090391
+			public const int realplay_full_talk_btn = 2131297169;
+			
+			// aapt resource value: 0x7F090392
+			public const int realplay_full_video_btn = 2131297170;
+			
+			// aapt resource value: 0x7F090393
+			public const int realplay_full_video_container = 2131297171;
+			
+			// aapt resource value: 0x7F090394
+			public const int realplay_full_video_start_btn = 2131297172;
+			
+			// aapt resource value: 0x7F090395
+			public const int realplay_loading = 2131297173;
+			
+			// aapt resource value: 0x7F090396
+			public const int realplay_loading_rl = 2131297174;
+			
+			// aapt resource value: 0x7F090397
+			public const int realplay_operate_bar = 2131297175;
+			
+			// aapt resource value: 0x7F090398
+			public const int realplay_operate_bar2 = 2131297176;
+			
+			// aapt resource value: 0x7F090399
+			public const int realplay_operate_ly = 2131297177;
+			
+			// aapt resource value: 0x7F09039A
+			public const int realplay_operate_ly2 = 2131297178;
+			
+			// aapt resource value: 0x7F09039D
+			public const int realplay_pages_gallery = 2131297181;
+			
+			// aapt resource value: 0x7F09039B
+			public const int realplay_page_anim_iv = 2131297179;
+			
+			// aapt resource value: 0x7F09039C
+			public const int realplay_page_ly = 2131297180;
+			
+			// aapt resource value: 0x7F09039E
+			public const int realplay_play_btn = 2131297182;
+			
+			// aapt resource value: 0x7F09039F
+			public const int realplay_play_iv = 2131297183;
+			
+			// aapt resource value: 0x7F0903A0
+			public const int realplay_play_rl = 2131297184;
+			
+			// aapt resource value: 0x7F0903A1
+			public const int realplay_previously_btn = 2131297185;
+			
+			// aapt resource value: 0x7F0903A2
+			public const int realplay_previously_btn2 = 2131297186;
+			
+			// aapt resource value: 0x7F0903A3
+			public const int realplay_previously_btn_ly = 2131297187;
+			
+			// aapt resource value: 0x7F0903A4
+			public const int realplay_previously_btn_ly2 = 2131297188;
+			
+			// aapt resource value: 0x7F0903A5
+			public const int realplay_privacy_btn = 2131297189;
+			
+			// aapt resource value: 0x7F0903A6
+			public const int realplay_privacy_btn2 = 2131297190;
+			
+			// aapt resource value: 0x7F0903A7
+			public const int realplay_privacy_btn_ly = 2131297191;
+			
+			// aapt resource value: 0x7F0903A8
+			public const int realplay_privacy_btn_ly2 = 2131297192;
+			
+			// aapt resource value: 0x7F0903A9
+			public const int realplay_privacy_ly = 2131297193;
+			
+			// aapt resource value: 0x7F0903AA
+			public const int realplay_privacy_tv = 2131297194;
+			
+			// aapt resource value: 0x7F0903AB
+			public const int realplay_privacy_tv2 = 2131297195;
+			
+			// aapt resource value: 0x7F0903AC
+			public const int realplay_prompt_rl = 2131297196;
+			
+			// aapt resource value: 0x7F0903AD
+			public const int realplay_ptz_btn = 2131297197;
+			
+			// aapt resource value: 0x7F0903AE
+			public const int realplay_ptz_btn2 = 2131297198;
+			
+			// aapt resource value: 0x7F0903AF
+			public const int realplay_ptz_btn_ly = 2131297199;
+			
+			// aapt resource value: 0x7F0903B0
+			public const int realplay_ptz_btn_ly2 = 2131297200;
+			
+			// aapt resource value: 0x7F0903B1
+			public const int realplay_ptz_direction_iv = 2131297201;
+			
+			// aapt resource value: 0x7F0903B2
+			public const int realplay_quality_btn = 2131297202;
+			
+			// aapt resource value: 0x7F0903B3
+			public const int realplay_ratio_tv = 2131297203;
+			
+			// aapt resource value: 0x7F0903B4
+			public const int realplay_record_iv = 2131297204;
+			
+			// aapt resource value: 0x7F0903B5
+			public const int realplay_record_ly = 2131297205;
+			
+			// aapt resource value: 0x7F0903B6
+			public const int realplay_record_tv = 2131297206;
+			
+			// aapt resource value: 0x7F0903B7
+			public const int realplay_sound_btn = 2131297207;
+			
+			// aapt resource value: 0x7F0903B8
+			public const int realplay_ssl_btn = 2131297208;
+			
+			// aapt resource value: 0x7F0903B9
+			public const int realplay_ssl_btn2 = 2131297209;
+			
+			// aapt resource value: 0x7F0903BA
+			public const int realplay_ssl_btn_ly = 2131297210;
+			
+			// aapt resource value: 0x7F0903BB
+			public const int realplay_ssl_btn_ly2 = 2131297211;
+			
+			// aapt resource value: 0x7F0903BC
+			public const int realplay_ssl_btn_rl = 2131297212;
+			
+			// aapt resource value: 0x7F0903BD
+			public const int realplay_ssl_btn_rl2 = 2131297213;
+			
+			// aapt resource value: 0x7F0903BE
+			public const int realplay_ssl_progress = 2131297214;
+			
+			// aapt resource value: 0x7F0903BF
+			public const int realplay_ssl_progress2 = 2131297215;
+			
+			// aapt resource value: 0x7F0903C0
+			public const int realplay_ssl_tv = 2131297216;
+			
+			// aapt resource value: 0x7F0903C1
+			public const int realplay_ssl_tv2 = 2131297217;
+			
+			// aapt resource value: 0x7F0903C2
+			public const int realplay_stop_btn = 2131297218;
+			
+			// aapt resource value: 0x7F0903C3
+			public const int realplay_sv = 2131297219;
+			
+			// aapt resource value: 0x7F0903C4
+			public const int realplay_talk_btn = 2131297220;
+			
+			// aapt resource value: 0x7F0903C5
+			public const int realplay_talk_btn2 = 2131297221;
+			
+			// aapt resource value: 0x7F0903C6
+			public const int realplay_talk_btn_ly = 2131297222;
+			
+			// aapt resource value: 0x7F0903C7
+			public const int realplay_talk_btn_ly2 = 2131297223;
+			
+			// aapt resource value: 0x7F0903C8
+			public const int realplay_tip_tv = 2131297224;
+			
+			// aapt resource value: 0x7F0903C9
+			public const int realplay_title_tv = 2131297225;
+			
+			// aapt resource value: 0x7F0903CA
+			public const int realplay_top_bar = 2131297226;
+			
+			// aapt resource value: 0x7F0903CB
+			public const int realplay_unblanking_btn = 2131297227;
+			
+			// aapt resource value: 0x7F0903CC
+			public const int realplay_unblanking_btn2 = 2131297228;
+			
+			// aapt resource value: 0x7F0903CD
+			public const int realplay_unblanking_btn_ly = 2131297229;
+			
+			// aapt resource value: 0x7F0903CE
+			public const int realplay_unblanking_btn_ly2 = 2131297230;
+			
+			// aapt resource value: 0x7F0903CF
+			public const int realplay_video_btn = 2131297231;
+			
+			// aapt resource value: 0x7F0903D0
+			public const int realplay_video_btn2 = 2131297232;
+			
+			// aapt resource value: 0x7F0903D1
+			public const int realplay_video_container = 2131297233;
+			
+			// aapt resource value: 0x7F0903D2
+			public const int realplay_video_container2 = 2131297234;
+			
+			// aapt resource value: 0x7F0903D3
+			public const int realplay_video_container_ly = 2131297235;
+			
+			// aapt resource value: 0x7F0903D4
+			public const int realplay_video_container_ly2 = 2131297236;
+			
+			// aapt resource value: 0x7F0903D5
+			public const int realplay_video_start_btn = 2131297237;
+			
+			// aapt resource value: 0x7F0903D6
+			public const int realplay_video_start_btn2 = 2131297238;
+			
+			// aapt resource value: 0x7F0903D7
+			public const int realplay_waiting_lr = 2131297239;
+			
+			// aapt resource value: 0x7F0903D8
+			public const int realplay_watting_pb = 2131297240;
+			
+			// aapt resource value: 0x7F0903D9
+			public const int realplay_watting_tv = 2131297241;
 			
 			// aapt resource value: 0x7F0903DA
-			public const int right = 2131297242;
+			public const int realplay_wnd_sv = 2131297242;
 			
 			// aapt resource value: 0x7F0903DB
-			public const int right_icon = 2131297243;
+			public const int record_endTime = 2131297243;
 			
 			// aapt resource value: 0x7F0903DC
-			public const int right_side = 2131297244;
+			public const int record_list = 2131297244;
 			
 			// aapt resource value: 0x7F0903DD
-			public const int rl_cur_wifi = 2131297245;
+			public const int record_seekbar = 2131297245;
 			
 			// aapt resource value: 0x7F0903DE
-			public const int rl_deployment = 2131297246;
+			public const int record_startTime = 2131297246;
 			
 			// aapt resource value: 0x7F0903DF
-			public const int rl_detail = 2131297247;
+			public const int rectangle = 2131297247;
 			
 			// aapt resource value: 0x7F0903E0
-			public const int rl_detail_type = 2131297248;
+			public const int recycler_view = 2131297248;
 			
 			// aapt resource value: 0x7F0903E1
-			public const int rl_detail_version = 2131297249;
+			public const int refresh_button = 2131297249;
 			
 			// aapt resource value: 0x7F0903E2
-			public const int rl_detele = 2131297250;
+			public const int refresh_layout = 2131297250;
 			
 			// aapt resource value: 0x7F0903E3
-			public const int rl_device_detail = 2131297251;
+			public const int refresh_status_textview = 2131297251;
 			
 			// aapt resource value: 0x7F0903E4
-			public const int rl_device_modify = 2131297252;
+			public const int refresh_tip = 2131297252;
 			
 			// aapt resource value: 0x7F0903E5
-			public const int rl_device_serial = 2131297253;
+			public const int remoteFrame = 2131297253;
 			
 			// aapt resource value: 0x7F0903E6
-			public const int rl_loading = 2131297254;
-			
-			// aapt resource value: 0x7F0903E7
-			public const int rl_lp_answerView = 2131297255;
-			
-			// aapt resource value: 0x7F0903E8
-			public const int rl_lp_topView = 2131297256;
-			
-			// aapt resource value: 0x7F0903E9
-			public const int rl_lp_unlock = 2131297257;
-			
-			// aapt resource value: 0x7F0903EA
-			public const int rl_no_device = 2131297258;
-			
-			// aapt resource value: 0x7F0903EB
-			public const int rl_offline = 2131297259;
-			
-			// aapt resource value: 0x7F0903EC
-			public const int rl_title = 2131297260;
-			
-			// aapt resource value: 0x7F0903ED
-			public const int room_id = 2131297261;
-			
-			// aapt resource value: 0x7F0903EE
-			public const int room_id_text = 2131297262;
-			
-			// aapt resource value: 0x7F0903EF
-			public const int rotate = 2131297263;
-			
-			// aapt resource value: 0x7F0903F0
-			public const int rotatedown = 2131297264;
-			
-			// aapt resource value: 0x7F0903F1
-			public const int rotateup = 2131297265;
-			
-			// aapt resource value: 0x7F0903F2
-			public const int round = 2131297266;
+			public const int remoteFrameContainer = 2131297254;
 			
 			// aapt resource value: 0x7F0903F3
-			public const int rudder = 2131297267;
+			public const int remoteplayback_begin_time_tv = 2131297267;
 			
 			// aapt resource value: 0x7F0903F4
-			public const int rv_multi_screen = 2131297268;
+			public const int remoteplayback_capture_iv = 2131297268;
 			
 			// aapt resource value: 0x7F0903F5
-			public const int rv_topbar = 2131297269;
+			public const int remoteplayback_capture_rl = 2131297269;
 			
 			// aapt resource value: 0x7F0903F6
-			public const int safe_box_tip = 2131297270;
+			public const int remoteplayback_capture_watermark_iv = 2131297270;
 			
 			// aapt resource value: 0x7F0903F7
-			public const int sample_text = 2131297271;
+			public const int remoteplayback_control_rl = 2131297271;
 			
 			// aapt resource value: 0x7F0903F8
-			public const int save_image_matrix = 2131297272;
+			public const int remoteplayback_end_time_tv = 2131297272;
 			
 			// aapt resource value: 0x7F0903F9
-			public const int save_non_transition_alpha = 2131297273;
+			public const int remoteplayback_file_time_bar = 2131297273;
 			
 			// aapt resource value: 0x7F0903FA
-			public const int save_scale_type = 2131297274;
+			public const int remoteplayback_flow_tv = 2131297274;
+			
+			// aapt resource value: 0x7F0903FB
+			public const int remoteplayback_full_down_btn = 2131297275;
+			
+			// aapt resource value: 0x7F0903FC
+			public const int remoteplayback_full_flow_ly = 2131297276;
+			
+			// aapt resource value: 0x7F0903FD
+			public const int remoteplayback_full_flow_tv = 2131297277;
+			
+			// aapt resource value: 0x7F0903FE
+			public const int remoteplayback_full_operate_bar = 2131297278;
+			
+			// aapt resource value: 0x7F0903FF
+			public const int remoteplayback_full_play_btn = 2131297279;
+			
+			// aapt resource value: 0x7F090400
+			public const int remoteplayback_full_previously_btn = 2131297280;
+			
+			// aapt resource value: 0x7F090401
+			public const int remoteplayback_full_rate_tv = 2131297281;
+			
+			// aapt resource value: 0x7F090402
+			public const int remoteplayback_full_sound_btn = 2131297282;
+			
+			// aapt resource value: 0x7F090403
+			public const int remoteplayback_full_video_btn = 2131297283;
+			
+			// aapt resource value: 0x7F090404
+			public const int remoteplayback_full_video_container = 2131297284;
+			
+			// aapt resource value: 0x7F090405
+			public const int remoteplayback_full_video_start_btn = 2131297285;
+			
+			// aapt resource value: 0x7F090406
+			public const int remoteplayback_loading_iv = 2131297286;
+			
+			// aapt resource value: 0x7F090407
+			public const int remoteplayback_loading_ly = 2131297287;
+			
+			// aapt resource value: 0x7F090408
+			public const int remoteplayback_loading_pb_ly = 2131297288;
+			
+			// aapt resource value: 0x7F090409
+			public const int remoteplayback_loading_play_btn = 2131297289;
+			
+			// aapt resource value: 0x7F09040A
+			public const int remoteplayback_loading_tv = 2131297290;
+			
+			// aapt resource value: 0x7F09040B
+			public const int remoteplayback_operate_bar = 2131297291;
+			
+			// aapt resource value: 0x7F09040C
+			public const int remoteplayback_page_ly = 2131297292;
+			
+			// aapt resource value: 0x7F09040D
+			public const int remoteplayback_play_btn = 2131297293;
+			
+			// aapt resource value: 0x7F09040E
+			public const int remoteplayback_play_rl = 2131297294;
+			
+			// aapt resource value: 0x7F09040F
+			public const int remoteplayback_previously_btn = 2131297295;
+			
+			// aapt resource value: 0x7F090412
+			public const int remoteplayback_progressbar = 2131297298;
+			
+			// aapt resource value: 0x7F090410
+			public const int remoteplayback_progress_ly = 2131297296;
+			
+			// aapt resource value: 0x7F090411
+			public const int remoteplayback_progress_seekbar = 2131297297;
+			
+			// aapt resource value: 0x7F090413
+			public const int remoteplayback_ratio_tv = 2131297299;
+			
+			// aapt resource value: 0x7F090414
+			public const int remoteplayback_record_iv = 2131297300;
+			
+			// aapt resource value: 0x7F090415
+			public const int remoteplayback_record_ly = 2131297301;
+			
+			// aapt resource value: 0x7F090416
+			public const int remoteplayback_record_tv = 2131297302;
+			
+			// aapt resource value: 0x7F090417
+			public const int remoteplayback_replay_btn = 2131297303;
+			
+			// aapt resource value: 0x7F090418
+			public const int remoteplayback_small_previously_btn = 2131297304;
+			
+			// aapt resource value: 0x7F090419
+			public const int remoteplayback_small_video_btn = 2131297305;
+			
+			// aapt resource value: 0x7F09041A
+			public const int remoteplayback_small_video_container = 2131297306;
+			
+			// aapt resource value: 0x7F09041B
+			public const int remoteplayback_small_video_start_btn = 2131297307;
+			
+			// aapt resource value: 0x7F09041C
+			public const int remoteplayback_sound_btn = 2131297308;
+			
+			// aapt resource value: 0x7F09041D
+			public const int remoteplayback_sv = 2131297309;
+			
+			// aapt resource value: 0x7F09041F
+			public const int remoteplayback_timebar = 2131297311;
+			
+			// aapt resource value: 0x7F090420
+			public const int remoteplayback_timebar_rl = 2131297312;
+			
+			// aapt resource value: 0x7F09041E
+			public const int remoteplayback_time_tv = 2131297310;
+			
+			// aapt resource value: 0x7F090421
+			public const int remoteplayback_tip_tv = 2131297313;
+			
+			// aapt resource value: 0x7F090422
+			public const int remoteplayback_video_btn = 2131297314;
+			
+			// aapt resource value: 0x7F090423
+			public const int remoteplayback_video_container = 2131297315;
+			
+			// aapt resource value: 0x7F090424
+			public const int remoteplayback_video_start_btn = 2131297316;
+			
+			// aapt resource value: 0x7F0903E7
+			public const int remoteVideo = 2131297255;
+			
+			// aapt resource value: 0x7F0903E8
+			public const int remote_list_page = 2131297256;
+			
+			// aapt resource value: 0x7F0903E9
+			public const int remote_loading_buffer_tv = 2131297257;
+			
+			// aapt resource value: 0x7F0903EA
+			public const int remote_loading_iv = 2131297258;
+			
+			// aapt resource value: 0x7F0903EB
+			public const int remote_playback_area = 2131297259;
+			
+			// aapt resource value: 0x7F0903EC
+			public const int remote_playback_capture_btn = 2131297260;
+			
+			// aapt resource value: 0x7F0903ED
+			public const int remote_playback_download_btn = 2131297261;
+			
+			// aapt resource value: 0x7F0903EE
+			public const int remote_playback_flow_tv = 2131297262;
+			
+			// aapt resource value: 0x7F0903EF
+			public const int remote_playback_pause_btn = 2131297263;
+			
+			// aapt resource value: 0x7F0903F0
+			public const int remote_playback_sound_btn = 2131297264;
+			
+			// aapt resource value: 0x7F0903F1
+			public const int remote_playback_video_recording_btn = 2131297265;
+			
+			// aapt resource value: 0x7F0903F2
+			public const int remote_playback_wnd_sv = 2131297266;
+			
+			// aapt resource value: 0x7F090425
+			public const int render_texture_view = 2131297317;
+			
+			// aapt resource value: 0x7F090426
+			public const int render_texture_view_soft = 2131297318;
+			
+			// aapt resource value: 0x7F090427
+			public const int replay_btn = 2131297319;
+			
+			// aapt resource value: 0x7F090428
+			public const int requestA = 2131297320;
+			
+			// aapt resource value: 0x7F090429
+			public const int requestMasterAudio = 2131297321;
+			
+			// aapt resource value: 0x7F09042A
+			public const int requestMasterVideo = 2131297322;
+			
+			// aapt resource value: 0x7F09042B
+			public const int requestV = 2131297323;
+			
+			// aapt resource value: 0x7F09042C
+			public const int restart_preview = 2131297324;
+			
+			// aapt resource value: 0x7F09042D
+			public const int retry_btn = 2131297325;
+			
+			// aapt resource value: 0x7F09042E
+			public const int retry_button = 2131297326;
+			
+			// aapt resource value: 0x7F09042F
+			public const int return_scan_result = 2131297327;
+			
+			// aapt resource value: 0x7F090430
+			public const int reverseCall = 2131297328;
+			
+			// aapt resource value: 0x7F090431
+			public const int reverseCallInfo = 2131297329;
+			
+			// aapt resource value: 0x7F090379
+			public const int re_next_area = 2131297145;
+			
+			// aapt resource value: 0x7F090432
+			public const int right = 2131297330;
+			
+			// aapt resource value: 0x7F090433
+			public const int right_icon = 2131297331;
+			
+			// aapt resource value: 0x7F090434
+			public const int right_side = 2131297332;
+			
+			// aapt resource value: 0x7F090435
+			public const int rlRichpushTitleBar = 2131297333;
+			
+			// aapt resource value: 0x7F090436
+			public const int rl_add = 2131297334;
+			
+			// aapt resource value: 0x7F090437
+			public const int rl_back = 2131297335;
+			
+			// aapt resource value: 0x7F090438
+			public const int rl_cancel = 2131297336;
+			
+			// aapt resource value: 0x7F090439
+			public const int rl_confirm = 2131297337;
+			
+			// aapt resource value: 0x7F09043A
+			public const int rl_cur_wifi = 2131297338;
+			
+			// aapt resource value: 0x7F09043B
+			public const int rl_deployment = 2131297339;
+			
+			// aapt resource value: 0x7F09043C
+			public const int rl_detail = 2131297340;
+			
+			// aapt resource value: 0x7F09043D
+			public const int rl_detail_type = 2131297341;
+			
+			// aapt resource value: 0x7F09043E
+			public const int rl_detail_version = 2131297342;
+			
+			// aapt resource value: 0x7F09043F
+			public const int rl_detele = 2131297343;
+			
+			// aapt resource value: 0x7F090440
+			public const int rl_device_detail = 2131297344;
+			
+			// aapt resource value: 0x7F090441
+			public const int rl_device_modify = 2131297345;
+			
+			// aapt resource value: 0x7F090442
+			public const int rl_device_serial = 2131297346;
+			
+			// aapt resource value: 0x7F090443
+			public const int rl_end = 2131297347;
+			
+			// aapt resource value: 0x7F090444
+			public const int rl_input_text = 2131297348;
+			
+			// aapt resource value: 0x7F090445
+			public const int rl_loading = 2131297349;
+			
+			// aapt resource value: 0x7F090446
+			public const int rl_lp_answerView = 2131297350;
+			
+			// aapt resource value: 0x7F090447
+			public const int rl_lp_topView = 2131297351;
+			
+			// aapt resource value: 0x7F090448
+			public const int rl_lp_unlock = 2131297352;
+			
+			// aapt resource value: 0x7F090449
+			public const int rl_message_content = 2131297353;
+			
+			// aapt resource value: 0x7F09044A
+			public const int rl_no_device = 2131297354;
+			
+			// aapt resource value: 0x7F09044B
+			public const int rl_offline = 2131297355;
+			
+			// aapt resource value: 0x7F09044C
+			public const int rl_start = 2131297356;
+			
+			// aapt resource value: 0x7F09044D
+			public const int rl_temp_password = 2131297357;
+			
+			// aapt resource value: 0x7F09044E
+			public const int rl_term_validity = 2131297358;
+			
+			// aapt resource value: 0x7F09044F
+			public const int rl_title = 2131297359;
+			
+			// aapt resource value: 0x7F090450
+			public const int rl_title_bar = 2131297360;
+			
+			// aapt resource value: 0x7F090453
+			public const int rl_username = 2131297363;
+			
+			// aapt resource value: 0x7F090452
+			public const int rl_user_name = 2131297362;
+			
+			// aapt resource value: 0x7F090454
+			public const int rl_usetimes = 2131297364;
+			
+			// aapt resource value: 0x7F090451
+			public const int rl_use_times = 2131297361;
+			
+			// aapt resource value: 0x7F090455
+			public const int room_id = 2131297365;
+			
+			// aapt resource value: 0x7F090456
+			public const int room_id_text = 2131297366;
+			
+			// aapt resource value: 0x7F090457
+			public const int rotate = 2131297367;
+			
+			// aapt resource value: 0x7F090458
+			public const int rotatedown = 2131297368;
+			
+			// aapt resource value: 0x7F090459
+			public const int rotateup = 2131297369;
+			
+			// aapt resource value: 0x7F09045A
+			public const int round = 2131297370;
+			
+			// aapt resource value: 0x7F09045B
+			public const int rudder = 2131297371;
+			
+			// aapt resource value: 0x7F09045C
+			public const int rv_multi_screen = 2131297372;
+			
+			// aapt resource value: 0x7F09045D
+			public const int rv_topbar = 2131297373;
+			
+			// aapt resource value: 0x7F09045E
+			public const int safe_box_tip = 2131297374;
+			
+			// aapt resource value: 0x7F09045F
+			public const int sample_text = 2131297375;
+			
+			// aapt resource value: 0x7F090460
+			public const int save_image_matrix = 2131297376;
+			
+			// aapt resource value: 0x7F090461
+			public const int save_non_transition_alpha = 2131297377;
+			
+			// aapt resource value: 0x7F090462
+			public const int save_scale_type = 2131297378;
 			
 			// aapt resource value: 0x7F09000D
 			public const int Scale = 2131296269;
 			
-			// aapt resource value: 0x7F0903FB
-			public const int scan_line = 2131297275;
+			// aapt resource value: 0x7F090463
+			public const int scan_line = 2131297379;
 			
-			// aapt resource value: 0x7F0903FC
-			public const int screen = 2131297276;
+			// aapt resource value: 0x7F090464
+			public const int screen = 2131297380;
 			
-			// aapt resource value: 0x7F0903FD
-			public const int scroll = 2131297277;
+			// aapt resource value: 0x7F090465
+			public const int scroll = 2131297381;
 			
-			// aapt resource value: 0x7F090402
-			public const int scrollable = 2131297282;
+			// aapt resource value: 0x7F090469
+			public const int scrollable = 2131297385;
 			
-			// aapt resource value: 0x7F0903FE
-			public const int scrollIndicatorDown = 2131297278;
+			// aapt resource value: 0x7F090466
+			public const int scrollIndicatorDown = 2131297382;
 			
-			// aapt resource value: 0x7F0903FF
-			public const int scrollIndicatorUp = 2131297279;
+			// aapt resource value: 0x7F090467
+			public const int scrollIndicatorUp = 2131297383;
 			
-			// aapt resource value: 0x7F090400
-			public const int scrollView = 2131297280;
+			// aapt resource value: 0x7F09046A
+			public const int scrollview = 2131297386;
 			
-			// aapt resource value: 0x7F090403
-			public const int scrollview = 2131297283;
+			// aapt resource value: 0x7F090468
+			public const int scrollView = 2131297384;
 			
-			// aapt resource value: 0x7F090401
-			public const int scroll_layout = 2131297281;
+			// aapt resource value: 0x7F09046B
+			public const int searchAnim = 2131297387;
 			
-			// aapt resource value: 0x7F090404
-			public const int searchAnim = 2131297284;
+			// aapt resource value: 0x7F09046C
+			public const int searchBtn = 2131297388;
 			
-			// aapt resource value: 0x7F090405
-			public const int searchBtn = 2131297285;
+			// aapt resource value: 0x7F09046D
+			public const int searchEditTextContainer = 2131297389;
 			
-			// aapt resource value: 0x7F090406
-			public const int searchEditTextContainer = 2131297286;
+			// aapt resource value: 0x7F09046E
+			public const int searchFragment = 2131297390;
 			
-			// aapt resource value: 0x7F090407
-			public const int searchFragment = 2131297287;
+			// aapt resource value: 0x7F09046F
+			public const int search_badge = 2131297391;
 			
-			// aapt resource value: 0x7F090408
-			public const int search_badge = 2131297288;
+			// aapt resource value: 0x7F090470
+			public const int search_bar = 2131297392;
 			
-			// aapt resource value: 0x7F090409
-			public const int search_bar = 2131297289;
+			// aapt resource value: 0x7F090471
+			public const int search_button = 2131297393;
 			
-			// aapt resource value: 0x7F09040A
-			public const int search_button = 2131297290;
+			// aapt resource value: 0x7F090472
+			public const int search_close_btn = 2131297394;
 			
-			// aapt resource value: 0x7F09040B
-			public const int search_close_btn = 2131297291;
+			// aapt resource value: 0x7F090473
+			public const int search_edit_frame = 2131297395;
 			
-			// aapt resource value: 0x7F09040C
-			public const int search_edit_frame = 2131297292;
+			// aapt resource value: 0x7F090474
+			public const int search_go_btn = 2131297396;
 			
-			// aapt resource value: 0x7F09040D
-			public const int search_go_btn = 2131297293;
+			// aapt resource value: 0x7F090475
+			public const int search_mag_icon = 2131297397;
 			
-			// aapt resource value: 0x7F09040E
-			public const int search_mag_icon = 2131297294;
+			// aapt resource value: 0x7F090476
+			public const int search_plate = 2131297398;
 			
-			// aapt resource value: 0x7F09040F
-			public const int search_plate = 2131297295;
+			// aapt resource value: 0x7F090477
+			public const int search_src_text = 2131297399;
 			
-			// aapt resource value: 0x7F090410
-			public const int search_src_text = 2131297296;
+			// aapt resource value: 0x7F090478
+			public const int search_voice_btn = 2131297400;
 			
-			// aapt resource value: 0x7F090411
-			public const int search_voice_btn = 2131297297;
+			// aapt resource value: 0x7F090479
+			public const int second = 2131297401;
 			
-			// aapt resource value: 0x7F090412
-			public const int second = 2131297298;
+			// aapt resource value: 0x7F09047A
+			public const int select_dialog_listview = 2131297402;
 			
-			// aapt resource value: 0x7F090413
-			public const int select_dialog_listview = 2131297299;
+			// aapt resource value: 0x7F09047B
+			public const int select_ipc_talkback = 2131297403;
 			
-			// aapt resource value: 0x7F090414
-			public const int select_ipc_talkback = 2131297300;
+			// aapt resource value: 0x7F09047C
+			public const int select_nvr_talkback = 2131297404;
 			
-			// aapt resource value: 0x7F090415
-			public const int select_nvr_talkback = 2131297301;
+			// aapt resource value: 0x7F09047D
+			public const int sendA = 2131297405;
 			
-			// aapt resource value: 0x7F090416
-			public const int sendA = 2131297302;
+			// aapt resource value: 0x7F09047E
+			public const int sendCustomData = 2131297406;
 			
-			// aapt resource value: 0x7F090417
-			public const int sendCustomData = 2131297303;
+			// aapt resource value: 0x7F09047F
+			public const int sendV = 2131297407;
 			
-			// aapt resource value: 0x7F090418
-			public const int sendV = 2131297304;
+			// aapt resource value: 0x7F090480
+			public const int separate_line = 2131297408;
 			
-			// aapt resource value: 0x7F090419
-			public const int separate_line = 2131297305;
+			// aapt resource value: 0x7F090481
+			public const int serial_tv = 2131297409;
 			
-			// aapt resource value: 0x7F09041A
-			public const int serial_tv = 2131297306;
+			// aapt resource value: 0x7F090482
+			public const int seriesNumberEt = 2131297410;
 			
-			// aapt resource value: 0x7F09041B
-			public const int seriesNumberEt = 2131297307;
-			
-			// aapt resource value: 0x7F09041C
-			public const int service_agreement_btn = 2131297308;
+			// aapt resource value: 0x7F090483
+			public const int service_agreement_btn = 2131297411;
 			
 			// aapt resource value: 0x7F09000A
 			public const int SHIFT = 2131296266;
 			
-			// aapt resource value: 0x7F09041D
-			public const int shipin7_logo_lyt = 2131297309;
+			// aapt resource value: 0x7F090484
+			public const int shipin7_logo_lyt = 2131297412;
 			
-			// aapt resource value: 0x7F09041E
-			public const int shortcut = 2131297310;
+			// aapt resource value: 0x7F090485
+			public const int shortcut = 2131297413;
 			
-			// aapt resource value: 0x7F09041F
-			public const int show = 2131297311;
+			// aapt resource value: 0x7F090486
+			public const int show = 2131297414;
 			
-			// aapt resource value: 0x7F090420
-			public const int showCustom = 2131297312;
+			// aapt resource value: 0x7F090487
+			public const int showCustom = 2131297415;
 			
-			// aapt resource value: 0x7F090421
-			public const int showHome = 2131297313;
+			// aapt resource value: 0x7F090488
+			public const int showHome = 2131297416;
 			
-			// aapt resource value: 0x7F090422
-			public const int showTitle = 2131297314;
+			// aapt resource value: 0x7F090489
+			public const int showTitle = 2131297417;
 			
-			// aapt resource value: 0x7F090423
-			public const int sign_et = 2131297315;
+			// aapt resource value: 0x7F09048A
+			public const int sign_et = 2131297418;
 			
-			// aapt resource value: 0x7F090424
-			public const int size_layout = 2131297316;
+			// aapt resource value: 0x7F09048B
+			public const int smallLabel = 2131297419;
 			
-			// aapt resource value: 0x7F090425
-			public const int smallLabel = 2131297317;
+			// aapt resource value: 0x7F09048C
+			public const int sms_code_et = 2131297420;
 			
-			// aapt resource value: 0x7F090426
-			public const int sms_code_et = 2131297318;
+			// aapt resource value: 0x7F09048D
+			public const int sms_code_lyt = 2131297421;
 			
-			// aapt resource value: 0x7F090427
-			public const int sms_code_lyt = 2131297319;
+			// aapt resource value: 0x7F09048E
+			public const int sms_verify_dailog_ly = 2131297422;
 			
-			// aapt resource value: 0x7F090428
-			public const int sms_verify_dailog_ly = 2131297320;
+			// aapt resource value: 0x7F09048F
+			public const int snackbar_action = 2131297423;
 			
-			// aapt resource value: 0x7F090429
-			public const int snackbar_action = 2131297321;
+			// aapt resource value: 0x7F090490
+			public const int snackbar_text = 2131297424;
 			
-			// aapt resource value: 0x7F09042A
-			public const int snackbar_text = 2131297322;
+			// aapt resource value: 0x7F090491
+			public const int snap = 2131297425;
 			
-			// aapt resource value: 0x7F09042B
-			public const int snap = 2131297323;
+			// aapt resource value: 0x7F090492
+			public const int snapshot = 2131297426;
 			
-			// aapt resource value: 0x7F09042C
-			public const int snapshot = 2131297324;
+			// aapt resource value: 0x7F090493
+			public const int sound_line = 2131297427;
 			
-			// aapt resource value: 0x7F09042D
-			public const int sound_line = 2131297325;
+			// aapt resource value: 0x7F090494
+			public const int spacer = 2131297428;
 			
-			// aapt resource value: 0x7F09042F
-			public const int spacer = 2131297327;
+			// aapt resource value: 0x7F090495
+			public const int split_action_bar = 2131297429;
 			
-			// aapt resource value: 0x7F090430
-			public const int split_action_bar = 2131297328;
+			// aapt resource value: 0x7F090496
+			public const int spread = 2131297430;
 			
-			// aapt resource value: 0x7F090431
-			public const int spread = 2131297329;
+			// aapt resource value: 0x7F090497
+			public const int spread_inside = 2131297431;
 			
-			// aapt resource value: 0x7F090432
-			public const int spread_inside = 2131297330;
+			// aapt resource value: 0x7F090498
+			public const int squareColumnItem = 2131297432;
 			
-			// aapt resource value: 0x7F09042E
-			public const int sp_server_area = 2131297326;
+			// aapt resource value: 0x7F090499
+			public const int squareVideo = 2131297433;
 			
-			// aapt resource value: 0x7F090433
-			public const int squareColumnItem = 2131297331;
+			// aapt resource value: 0x7F09049A
+			public const int squareVideoList = 2131297434;
 			
-			// aapt resource value: 0x7F090434
-			public const int squareVideo = 2131297332;
+			// aapt resource value: 0x7F09049B
+			public const int square_channel = 2131297435;
 			
-			// aapt resource value: 0x7F090435
-			public const int squareVideoList = 2131297333;
+			// aapt resource value: 0x7F09049C
+			public const int src_atop = 2131297436;
 			
-			// aapt resource value: 0x7F090436
-			public const int square_channel = 2131297334;
+			// aapt resource value: 0x7F09049D
+			public const int src_in = 2131297437;
 			
-			// aapt resource value: 0x7F090437
-			public const int src_atop = 2131297335;
+			// aapt resource value: 0x7F09049E
+			public const int src_over = 2131297438;
 			
-			// aapt resource value: 0x7F090438
-			public const int src_in = 2131297336;
+			// aapt resource value: 0x7F09049F
+			public const int srl_classics_arrow = 2131297439;
 			
-			// aapt resource value: 0x7F090439
-			public const int src_over = 2131297337;
+			// aapt resource value: 0x7F0904A0
+			public const int srl_classics_center = 2131297440;
 			
-			// aapt resource value: 0x7F09043A
-			public const int srl_classics_arrow = 2131297338;
+			// aapt resource value: 0x7F0904A1
+			public const int srl_classics_progress = 2131297441;
 			
-			// aapt resource value: 0x7F09043B
-			public const int srl_classics_center = 2131297339;
+			// aapt resource value: 0x7F0904A2
+			public const int srl_classics_title = 2131297442;
 			
-			// aapt resource value: 0x7F09043C
-			public const int srl_classics_progress = 2131297340;
+			// aapt resource value: 0x7F0904A3
+			public const int srl_classics_update = 2131297443;
 			
-			// aapt resource value: 0x7F09043D
-			public const int srl_classics_title = 2131297341;
+			// aapt resource value: 0x7F0904A4
+			public const int ssid = 2131297444;
 			
-			// aapt resource value: 0x7F09043E
-			public const int srl_classics_update = 2131297342;
+			// aapt resource value: 0x7F0904A5
+			public const int ssid_title = 2131297445;
 			
-			// aapt resource value: 0x7F09043F
-			public const int ssid = 2131297343;
+			// aapt resource value: 0x7F0904A6
+			public const int stack = 2131297446;
 			
-			// aapt resource value: 0x7F090440
-			public const int ssid_title = 2131297344;
+			// aapt resource value: 0x7F0904A7
+			public const int standard = 2131297447;
 			
-			// aapt resource value: 0x7F090441
-			public const int stack = 2131297345;
+			// aapt resource value: 0x7F0904A8
+			public const int start = 2131297448;
 			
-			// aapt resource value: 0x7F090442
-			public const int standard = 2131297346;
+			// aapt resource value: 0x7F0904A9
+			public const int startAVMsg = 2131297449;
 			
-			// aapt resource value: 0x7F090443
-			public const int start = 2131297347;
+			// aapt resource value: 0x7F0904AA
+			public const int startDoorKey = 2131297450;
 			
-			// aapt resource value: 0x7F090444
-			public const int startAVMsg = 2131297348;
+			// aapt resource value: 0x7F0904AB
+			public const int startLocalRecord = 2131297451;
 			
-			// aapt resource value: 0x7F090445
-			public const int startDoorKey = 2131297349;
+			// aapt resource value: 0x7F0904AC
+			public const int startReadCard = 2131297452;
 			
-			// aapt resource value: 0x7F090446
-			public const int startLocalRecord = 2131297350;
+			// aapt resource value: 0x7F0904AD
+			public const int startRecord = 2131297453;
 			
-			// aapt resource value: 0x7F090447
-			public const int startReadCard = 2131297351;
+			// aapt resource value: 0x7F0904AE
+			public const int startRecordLocalAudio = 2131297454;
 			
-			// aapt resource value: 0x7F090448
-			public const int startRecord = 2131297352;
+			// aapt resource value: 0x7F0904AF
+			public const int startRecordPeerAudio = 2131297455;
 			
-			// aapt resource value: 0x7F090449
-			public const int startRecordLocalAudio = 2131297353;
+			// aapt resource value: 0x7F0904B0
+			public const int startStream = 2131297456;
 			
-			// aapt resource value: 0x7F09044A
-			public const int startRecordPeerAudio = 2131297354;
+			// aapt resource value: 0x7F0904B1
+			public const int startWatchDog = 2131297457;
 			
-			// aapt resource value: 0x7F09044B
-			public const int startStream = 2131297355;
+			// aapt resource value: 0x7F0904B2
+			public const int start_stop = 2131297458;
 			
-			// aapt resource value: 0x7F09044C
-			public const int startWatchDog = 2131297356;
+			// aapt resource value: 0x7F0904B3
+			public const int start_stop_stream = 2131297459;
 			
-			// aapt resource value: 0x7F09044D
-			public const int start_stop = 2131297357;
+			// aapt resource value: 0x7F0904B4
+			public const int status = 2131297460;
 			
-			// aapt resource value: 0x7F09044E
-			public const int start_stop_stream = 2131297358;
+			// aapt resource value: 0x7F0904B5
+			public const int status_bar_latest_event_content = 2131297461;
 			
-			// aapt resource value: 0x7F09044F
-			public const int status = 2131297359;
+			// aapt resource value: 0x7F0904B6
+			public const int stopAVMsg = 2131297462;
 			
-			// aapt resource value: 0x7F090450
-			public const int status_bar_latest_event_content = 2131297360;
+			// aapt resource value: 0x7F0904B7
+			public const int stopDoorKey = 2131297463;
 			
-			// aapt resource value: 0x7F090451
-			public const int stopAVMsg = 2131297361;
+			// aapt resource value: 0x7F0904B8
+			public const int stopLocalRecord = 2131297464;
 			
-			// aapt resource value: 0x7F090452
-			public const int stopDoorKey = 2131297362;
+			// aapt resource value: 0x7F0904B9
+			public const int stopReadCard = 2131297465;
 			
-			// aapt resource value: 0x7F090453
-			public const int stopLocalRecord = 2131297363;
+			// aapt resource value: 0x7F0904BA
+			public const int stopRecord = 2131297466;
 			
-			// aapt resource value: 0x7F090454
-			public const int stopReadCard = 2131297364;
+			// aapt resource value: 0x7F0904BB
+			public const int stopRecordLocalAudio = 2131297467;
 			
-			// aapt resource value: 0x7F090455
-			public const int stopRecord = 2131297365;
+			// aapt resource value: 0x7F0904BC
+			public const int stopRecordPeerAudio = 2131297468;
 			
-			// aapt resource value: 0x7F090456
-			public const int stopRecordLocalAudio = 2131297366;
+			// aapt resource value: 0x7F0904BD
+			public const int stopStream = 2131297469;
 			
-			// aapt resource value: 0x7F090457
-			public const int stopRecordPeerAudio = 2131297367;
+			// aapt resource value: 0x7F0904BE
+			public const int stopWatchDog = 2131297470;
 			
-			// aapt resource value: 0x7F090458
-			public const int stopStream = 2131297368;
+			// aapt resource value: 0x7F0904BF
+			public const int storage_layout = 2131297471;
 			
-			// aapt resource value: 0x7F090459
-			public const int stopWatchDog = 2131297369;
-			
-			// aapt resource value: 0x7F09045A
-			public const int storage_layout = 2131297370;
-			
-			// aapt resource value: 0x7F09045B
-			public const int storage_notice = 2131297371;
+			// aapt resource value: 0x7F0904C0
+			public const int storage_notice = 2131297472;
 			
 			// aapt resource value: 0x7F09000B
 			public const int STROKE = 2131296267;
 			
-			// aapt resource value: 0x7F09045E
-			public const int submenuarrow = 2131297374;
+			// aapt resource value: 0x7F0904C3
+			public const int submenuarrow = 2131297475;
 			
-			// aapt resource value: 0x7F09045F
-			public const int submit = 2131297375;
+			// aapt resource value: 0x7F0904C4
+			public const int submit = 2131297476;
 			
-			// aapt resource value: 0x7F090460
-			public const int submit_area = 2131297376;
+			// aapt resource value: 0x7F0904C5
+			public const int submit_area = 2131297477;
 			
-			// aapt resource value: 0x7F090461
-			public const int subtitle = 2131297377;
+			// aapt resource value: 0x7F0904C6
+			public const int subtitle = 2131297478;
 			
-			// aapt resource value: 0x7F09045C
-			public const int sub_title_text = 2131297372;
+			// aapt resource value: 0x7F0904C1
+			public const int sub_title_text = 2131297473;
 			
-			// aapt resource value: 0x7F09045D
-			public const int sub_tv = 2131297373;
+			// aapt resource value: 0x7F0904C2
+			public const int sub_tv = 2131297474;
 			
-			// aapt resource value: 0x7F090462
-			public const int successIcon = 2131297378;
+			// aapt resource value: 0x7F0904C7
+			public const int successIcon = 2131297479;
 			
-			// aapt resource value: 0x7F090463
-			public const int surfaceview = 2131297379;
+			// aapt resource value: 0x7F0904C8
+			public const int surfaceview = 2131297480;
 			
-			// aapt resource value: 0x7F090464
-			public const int switch_tv = 2131297380;
+			// aapt resource value: 0x7F0904C9
+			public const int sv_test = 2131297481;
 			
-			// aapt resource value: 0x7F090465
-			public const int switch_wifi = 2131297381;
+			// aapt resource value: 0x7F0904CA
+			public const int swipe_content = 2131297482;
+			
+			// aapt resource value: 0x7F0904CB
+			public const int swipe_left = 2131297483;
+			
+			// aapt resource value: 0x7F0904CC
+			public const int swipe_right = 2131297484;
+			
+			// aapt resource value: 0x7F0904CD
+			public const int switch_tv = 2131297485;
+			
+			// aapt resource value: 0x7F0904CE
+			public const int switch_wifi = 2131297486;
 			
 			// aapt resource value: 0x7F09000C
 			public const int SYM = 2131296268;
 			
-			// aapt resource value: 0x7F090475
-			public const int tablet = 2131297397;
+			// aapt resource value: 0x7F0904DE
+			public const int tablet = 2131297502;
 			
-			// aapt resource value: 0x7F090466
-			public const int tabMode = 2131297382;
+			// aapt resource value: 0x7F0904CF
+			public const int tabMode = 2131297487;
 			
-			// aapt resource value: 0x7F090467
-			public const int tab_alarmlist_btn = 2131297383;
+			// aapt resource value: 0x7F0904D0
+			public const int tab_alarmlist_btn = 2131297488;
 			
-			// aapt resource value: 0x7F090468
-			public const int tab_alarmlist_rl = 2131297384;
+			// aapt resource value: 0x7F0904D1
+			public const int tab_alarmlist_rl = 2131297489;
 			
-			// aapt resource value: 0x7F090469
-			public const int tab_devicedefence_btn = 2131297385;
+			// aapt resource value: 0x7F0904D2
+			public const int tab_devicedefence_btn = 2131297490;
 			
-			// aapt resource value: 0x7F09046A
-			public const int tab_devicedefence_rl = 2131297386;
+			// aapt resource value: 0x7F0904D3
+			public const int tab_devicedefence_rl = 2131297491;
 			
-			// aapt resource value: 0x7F09046B
-			public const int tab_devicepicture_btn = 2131297387;
+			// aapt resource value: 0x7F0904D4
+			public const int tab_devicepicture_btn = 2131297492;
 			
-			// aapt resource value: 0x7F09046C
-			public const int tab_devicepicture_rl = 2131297388;
+			// aapt resource value: 0x7F0904D5
+			public const int tab_devicepicture_rl = 2131297493;
 			
-			// aapt resource value: 0x7F09046D
-			public const int tab_devicevideo_btn = 2131297389;
+			// aapt resource value: 0x7F0904D6
+			public const int tab_devicevideo_btn = 2131297494;
 			
-			// aapt resource value: 0x7F09046E
-			public const int tab_devicevideo_rl = 2131297390;
+			// aapt resource value: 0x7F0904D7
+			public const int tab_devicevideo_rl = 2131297495;
 			
-			// aapt resource value: 0x7F09046F
-			public const int tab_remoteplayback_btn = 2131297391;
+			// aapt resource value: 0x7F0904D8
+			public const int tab_remoteplayback_btn = 2131297496;
 			
-			// aapt resource value: 0x7F090470
-			public const int tab_remoteplayback_rl = 2131297392;
+			// aapt resource value: 0x7F0904D9
+			public const int tab_remoteplayback_rl = 2131297497;
 			
-			// aapt resource value: 0x7F090471
-			public const int tab_setdevice_btn = 2131297393;
+			// aapt resource value: 0x7F0904DA
+			public const int tab_setdevice_btn = 2131297498;
 			
-			// aapt resource value: 0x7F090472
-			public const int tab_setdevice_rl = 2131297394;
+			// aapt resource value: 0x7F0904DB
+			public const int tab_setdevice_rl = 2131297499;
 			
-			// aapt resource value: 0x7F090473
-			public const int tab_video_talk_btn = 2131297395;
+			// aapt resource value: 0x7F0904DC
+			public const int tab_video_talk_btn = 2131297500;
 			
-			// aapt resource value: 0x7F090474
-			public const int tab_video_talk_rl = 2131297396;
+			// aapt resource value: 0x7F0904DD
+			public const int tab_video_talk_rl = 2131297501;
 			
-			// aapt resource value: 0x7F090476
-			public const int tag_key_position = 2131297398;
+			// aapt resource value: 0x7F0904DF
+			public const int tag_key_position = 2131297503;
 			
-			// aapt resource value: 0x7F090477
-			public const int tag_left = 2131297399;
+			// aapt resource value: 0x7F0904E0
+			public const int tag_left = 2131297504;
 			
-			// aapt resource value: 0x7F090478
-			public const int tag_right = 2131297400;
+			// aapt resource value: 0x7F0904E1
+			public const int tag_right = 2131297505;
 			
-			// aapt resource value: 0x7F090479
-			public const int talkback_close_btn = 2131297401;
+			// aapt resource value: 0x7F0904E2
+			public const int talkback_close_btn = 2131297506;
 			
-			// aapt resource value: 0x7F09047A
-			public const int talkback_control_btn = 2131297402;
+			// aapt resource value: 0x7F0904E3
+			public const int talkback_control_btn = 2131297507;
 			
-			// aapt resource value: 0x7F09047B
-			public const int talkback_rv = 2131297403;
+			// aapt resource value: 0x7F0904E4
+			public const int talkback_rv = 2131297508;
 			
-			// aapt resource value: 0x7F09047C
-			public const int test = 2131297404;
+			// aapt resource value: 0x7F0904E5
+			public const int temppassword_list = 2131297509;
 			
-			// aapt resource value: 0x7F09047D
-			public const int testWatchDogReboot = 2131297405;
+			// aapt resource value: 0x7F0904E6
+			public const int test = 2131297510;
 			
-			// aapt resource value: 0x7F09047E
-			public const int text = 2131297406;
+			// aapt resource value: 0x7F0904E7
+			public const int testWatchDogReboot = 2131297511;
 			
-			// aapt resource value: 0x7F09047F
-			public const int text1 = 2131297407;
+			// aapt resource value: 0x7F0904E8
+			public const int text = 2131297512;
 			
-			// aapt resource value: 0x7F090480
-			public const int text2 = 2131297408;
+			// aapt resource value: 0x7F0904E9
+			public const int text1 = 2131297513;
 			
-			// aapt resource value: 0x7F090481
-			public const int text3 = 2131297409;
+			// aapt resource value: 0x7F0904EA
+			public const int text2 = 2131297514;
 			
-			// aapt resource value: 0x7F09048E
-			public const int textinput_counter = 2131297422;
+			// aapt resource value: 0x7F0904EB
+			public const int text3 = 2131297515;
 			
-			// aapt resource value: 0x7F09048F
-			public const int textinput_error = 2131297423;
+			// aapt resource value: 0x7F0904F8
+			public const int textinput_counter = 2131297528;
 			
-			// aapt resource value: 0x7F090482
-			public const int textSpacerNoButtons = 2131297410;
+			// aapt resource value: 0x7F0904F9
+			public const int textinput_error = 2131297529;
 			
-			// aapt resource value: 0x7F090483
-			public const int textSpacerNoTitle = 2131297411;
+			// aapt resource value: 0x7F0904EC
+			public const int textSpacerNoButtons = 2131297516;
 			
-			// aapt resource value: 0x7F090490
-			public const int textureView_play = 2131297424;
+			// aapt resource value: 0x7F0904ED
+			public const int textSpacerNoTitle = 2131297517;
 			
-			// aapt resource value: 0x7F090491
-			public const int texture_view_play_window = 2131297425;
+			// aapt resource value: 0x7F0904FA
+			public const int textureView_play = 2131297530;
+			
+			// aapt resource value: 0x7F0904FB
+			public const int texture_view_play_window = 2131297531;
 			
 			// aapt resource value: 0x7F09000E
 			public const int TextView01 = 2131296270;
@@ -14731,803 +15253,839 @@
 			// aapt resource value: 0x7F09000F
 			public const int TextView03 = 2131296271;
 			
-			// aapt resource value: 0x7F090485
-			public const int text_camerano = 2131297413;
+			// aapt resource value: 0x7F0904EF
+			public const int text_camerano = 2131297519;
 			
-			// aapt resource value: 0x7F090484
-			public const int text_camera_name = 2131297412;
+			// aapt resource value: 0x7F0904EE
+			public const int text_camera_name = 2131297518;
 			
-			// aapt resource value: 0x7F090486
-			public const int text_device_ip = 2131297414;
+			// aapt resource value: 0x7F0904F0
+			public const int text_device_ip = 2131297520;
 			
-			// aapt resource value: 0x7F090487
-			public const int text_input_password_toggle = 2131297415;
+			// aapt resource value: 0x7F0904F1
+			public const int text_input_password_toggle = 2131297521;
 			
-			// aapt resource value: 0x7F090488
-			public const int text_left = 2131297416;
+			// aapt resource value: 0x7F0904F2
+			public const int text_left = 2131297522;
 			
-			// aapt resource value: 0x7F090489
-			public const int text_my = 2131297417;
+			// aapt resource value: 0x7F0904F3
+			public const int text_my = 2131297523;
 			
-			// aapt resource value: 0x7F09048A
-			public const int text_right = 2131297418;
+			// aapt resource value: 0x7F0904F4
+			public const int text_right = 2131297524;
 			
-			// aapt resource value: 0x7F09048B
-			public const int text_serial = 2131297419;
+			// aapt resource value: 0x7F0904F5
+			public const int text_serial = 2131297525;
 			
-			// aapt resource value: 0x7F09048C
-			public const int text_share = 2131297420;
+			// aapt resource value: 0x7F0904F6
+			public const int text_share = 2131297526;
 			
-			// aapt resource value: 0x7F09048D
-			public const int text_title = 2131297421;
+			// aapt resource value: 0x7F0904F7
+			public const int text_title = 2131297527;
 			
-			// aapt resource value: 0x7F090493
-			public const int third_app_dl_progressbar = 2131297427;
+			// aapt resource value: 0x7F0904FC
+			public const int time = 2131297532;
 			
-			// aapt resource value: 0x7F090492
-			public const int third_app_dl_progress_text = 2131297426;
+			// aapt resource value: 0x7F0904FF
+			public const int timeline_image = 2131297535;
 			
-			// aapt resource value: 0x7F090494
-			public const int third_app_warn_text = 2131297428;
+			// aapt resource value: 0x7F090500
+			public const int timepicker = 2131297536;
 			
-			// aapt resource value: 0x7F090495
-			public const int time = 2131297429;
+			// aapt resource value: 0x7F090501
+			public const int timer = 2131297537;
 			
-			// aapt resource value: 0x7F090498
-			public const int timeline_image = 2131297432;
+			// aapt resource value: 0x7F090502
+			public const int timer_lp_calltime = 2131297538;
 			
-			// aapt resource value: 0x7F090499
-			public const int timepicker = 2131297433;
+			// aapt resource value: 0x7F0904FD
+			public const int time_text = 2131297533;
 			
-			// aapt resource value: 0x7F09049A
-			public const int timer = 2131297434;
+			// aapt resource value: 0x7F0904FE
+			public const int time_tv = 2131297534;
 			
-			// aapt resource value: 0x7F09049B
-			public const int timer_lp_calltime = 2131297435;
+			// aapt resource value: 0x7F090503
+			public const int tip = 2131297539;
 			
-			// aapt resource value: 0x7F090496
-			public const int time_text = 2131297430;
+			// aapt resource value: 0x7F090504
+			public const int tip1 = 2131297540;
 			
-			// aapt resource value: 0x7F090497
-			public const int time_tv = 2131297431;
+			// aapt resource value: 0x7F090505
+			public const int tip2_txt = 2131297541;
 			
-			// aapt resource value: 0x7F09049C
-			public const int tip = 2131297436;
+			// aapt resource value: 0x7F090506
+			public const int tip_img = 2131297542;
 			
-			// aapt resource value: 0x7F09049D
-			public const int tip1 = 2131297437;
+			// aapt resource value: 0x7F090507
+			public const int tip_txt = 2131297543;
 			
-			// aapt resource value: 0x7F09049E
-			public const int tip2_txt = 2131297438;
+			// aapt resource value: 0x7F090508
+			public const int tip_txt2 = 2131297544;
 			
-			// aapt resource value: 0x7F09049F
-			public const int tip_img = 2131297439;
+			// aapt resource value: 0x7F090509
+			public const int tip_txt_1 = 2131297545;
 			
-			// aapt resource value: 0x7F0904A0
-			public const int tip_txt = 2131297440;
+			// aapt resource value: 0x7F09050A
+			public const int tip_wifi_pwd_error = 2131297546;
 			
-			// aapt resource value: 0x7F0904A1
-			public const int tip_txt2 = 2131297441;
+			// aapt resource value: 0x7F09050B
+			public const int title = 2131297547;
 			
-			// aapt resource value: 0x7F0904A2
-			public const int tip_txt_1 = 2131297442;
+			// aapt resource value: 0x7F09050C
+			public const int titleBar = 2131297548;
 			
-			// aapt resource value: 0x7F0904A3
-			public const int tip_wifi_pwd_error = 2131297443;
+			// aapt resource value: 0x7F09050D
+			public const int titleDividerNoCustom = 2131297549;
 			
-			// aapt resource value: 0x7F0904A4
-			public const int title = 2131297444;
+			// aapt resource value: 0x7F09050E
+			public const int title_bar = 2131297550;
 			
-			// aapt resource value: 0x7F0904A5
-			public const int titleBar = 2131297445;
+			// aapt resource value: 0x7F09050F
+			public const int title_bar_landscape = 2131297551;
 			
-			// aapt resource value: 0x7F0904A6
-			public const int titleDividerNoCustom = 2131297446;
+			// aapt resource value: 0x7F090510
+			public const int title_bar_portrait = 2131297552;
 			
-			// aapt resource value: 0x7F0904A7
-			public const int title_bar = 2131297447;
+			// aapt resource value: 0x7F090511
+			public const int title_layout = 2131297553;
 			
-			// aapt resource value: 0x7F0904A8
-			public const int title_bar_landscape = 2131297448;
+			// aapt resource value: 0x7F090512
+			public const int title_left = 2131297554;
 			
-			// aapt resource value: 0x7F0904A9
-			public const int title_bar_portrait = 2131297449;
+			// aapt resource value: 0x7F090513
+			public const int title_right = 2131297555;
 			
-			// aapt resource value: 0x7F0904AA
-			public const int title_layout = 2131297450;
+			// aapt resource value: 0x7F090514
+			public const int title_template = 2131297556;
 			
-			// aapt resource value: 0x7F0904AB
-			public const int title_left = 2131297451;
+			// aapt resource value: 0x7F090515
+			public const int title_text = 2131297557;
 			
-			// aapt resource value: 0x7F0904AC
-			public const int title_right = 2131297452;
+			// aapt resource value: 0x7F090516
+			public const int title_text_layout = 2131297558;
 			
-			// aapt resource value: 0x7F0904AD
-			public const int title_template = 2131297453;
+			// aapt resource value: 0x7F090517
+			public const int title_top = 2131297559;
 			
-			// aapt resource value: 0x7F0904AE
-			public const int title_text = 2131297454;
+			// aapt resource value: 0x7F090518
+			public const int title_tv = 2131297560;
 			
-			// aapt resource value: 0x7F0904AF
-			public const int title_text_layout = 2131297455;
+			// aapt resource value: 0x7F090519
+			public const int top = 2131297561;
 			
-			// aapt resource value: 0x7F0904B0
-			public const int title_top = 2131297456;
+			// aapt resource value: 0x7F090520
+			public const int topbar = 2131297568;
 			
-			// aapt resource value: 0x7F0904B1
-			public const int title_tv = 2131297457;
+			// aapt resource value: 0x7F090521
+			public const int topbar_right_img = 2131297569;
 			
-			// aapt resource value: 0x7F0904B2
-			public const int top = 2131297458;
+			// aapt resource value: 0x7F09051A
+			public const int topPanel = 2131297562;
 			
-			// aapt resource value: 0x7F0904B9
-			public const int topbar = 2131297465;
+			// aapt resource value: 0x7F09051B
+			public const int topTip = 2131297563;
 			
-			// aapt resource value: 0x7F0904BA
-			public const int topbar_right_img = 2131297466;
+			// aapt resource value: 0x7F09051C
+			public const int top_bar = 2131297564;
 			
-			// aapt resource value: 0x7F0904B3
-			public const int topPanel = 2131297459;
+			// aapt resource value: 0x7F09051D
+			public const int top_container = 2131297565;
 			
-			// aapt resource value: 0x7F0904B4
-			public const int topTip = 2131297460;
+			// aapt resource value: 0x7F09051E
+			public const int top_img_container = 2131297566;
 			
-			// aapt resource value: 0x7F0904B5
-			public const int top_bar = 2131297461;
+			// aapt resource value: 0x7F09051F
+			public const int top_line = 2131297567;
 			
-			// aapt resource value: 0x7F0904B6
-			public const int top_container = 2131297462;
+			// aapt resource value: 0x7F090522
+			public const int touch_loading_buffer_tv = 2131297570;
 			
-			// aapt resource value: 0x7F0904B7
-			public const int top_img_container = 2131297463;
+			// aapt resource value: 0x7F090523
+			public const int touch_outside = 2131297571;
 			
-			// aapt resource value: 0x7F0904B8
-			public const int top_line = 2131297464;
+			// aapt resource value: 0x7F090524
+			public const int touch_progress_layout = 2131297572;
 			
-			// aapt resource value: 0x7F0904BB
-			public const int touch_loading_buffer_tv = 2131297467;
+			// aapt resource value: 0x7F090525
+			public const int transition_current_scene = 2131297573;
 			
-			// aapt resource value: 0x7F0904BC
-			public const int touch_outside = 2131297468;
+			// aapt resource value: 0x7F090526
+			public const int transition_layout_save = 2131297574;
 			
-			// aapt resource value: 0x7F0904BD
-			public const int touch_progress_layout = 2131297469;
+			// aapt resource value: 0x7F090527
+			public const int transition_position = 2131297575;
 			
-			// aapt resource value: 0x7F0904BE
-			public const int transition_current_scene = 2131297470;
+			// aapt resource value: 0x7F090528
+			public const int transition_scene_layoutid_cache = 2131297576;
 			
-			// aapt resource value: 0x7F0904BF
-			public const int transition_layout_save = 2131297471;
-			
-			// aapt resource value: 0x7F0904C0
-			public const int transition_position = 2131297472;
-			
-			// aapt resource value: 0x7F0904C1
-			public const int transition_scene_layoutid_cache = 2131297473;
-			
-			// aapt resource value: 0x7F0904C2
-			public const int transition_transform = 2131297474;
+			// aapt resource value: 0x7F090529
+			public const int transition_transform = 2131297577;
 			
 			// aapt resource value: 0x7F090010
 			public const int Translate = 2131296272;
 			
-			// aapt resource value: 0x7F0904C3
-			public const int tvDeviceWifiConfigTip = 2131297475;
-			
-			// aapt resource value: 0x7F0904C4
-			public const int tvFormat_sd = 2131297476;
-			
-			// aapt resource value: 0x7F0904C5
-			public const int tvIntroduce1 = 2131297477;
-			
-			// aapt resource value: 0x7F0904C6
-			public const int tvIntroduce2 = 2131297478;
-			
-			// aapt resource value: 0x7F0904C7
-			public const int tvMore = 2131297479;
-			
-			// aapt resource value: 0x7F0904C8
-			public const int tvSSID = 2131297480;
-			
-			// aapt resource value: 0x7F0904C9
-			public const int tvStatus = 2131297481;
-			
-			// aapt resource value: 0x7F0904CA
-			public const int tvSuccess = 2131297482;
-			
-			// aapt resource value: 0x7F0904CB
-			public const int tvTip = 2131297483;
-			
-			// aapt resource value: 0x7F0904CC
-			public const int tvTitle = 2131297484;
-			
-			// aapt resource value: 0x7F0904CD
-			public const int tv_5g_tip = 2131297485;
-			
-			// aapt resource value: 0x7F0904CE
-			public const int tv_about_wifi_pwd = 2131297486;
-			
-			// aapt resource value: 0x7F0904CF
-			public const int tv_action1 = 2131297487;
-			
-			// aapt resource value: 0x7F0904D0
-			public const int tv_adding_to_account = 2131297488;
-			
-			// aapt resource value: 0x7F0904D1
-			public const int tv_all = 2131297489;
-			
-			// aapt resource value: 0x7F0904D2
-			public const int tv_ap_sn = 2131297490;
-			
-			// aapt resource value: 0x7F0904D3
-			public const int tv_camera_name = 2131297491;
-			
-			// aapt resource value: 0x7F0904D4
-			public const int tv_cancel = 2131297492;
-			
-			// aapt resource value: 0x7F0904D5
-			public const int tv_child_watch_video_talk_notification = 2131297493;
-			
-			// aapt resource value: 0x7F0904D6
-			public const int tv_choose_other = 2131297494;
-			
-			// aapt resource value: 0x7F0904D7
-			public const int tv_cloud_record = 2131297495;
-			
-			// aapt resource value: 0x7F0904D8
-			public const int tv_cloud_video = 2131297496;
-			
-			// aapt resource value: 0x7F0904D9
-			public const int tv_connecting_to_device = 2131297497;
-			
-			// aapt resource value: 0x7F0904DA
-			public const int tv_content = 2131297498;
-			
-			// aapt resource value: 0x7F0904DB
-			public const int tv_cover_stream = 2131297499;
-			
-			// aapt resource value: 0x7F0904DD
-			public const int tv_current_version_tip = 2131297501;
-			
-			// aapt resource value: 0x7F0904DE
-			public const int tv_current_wifi = 2131297502;
-			
-			// aapt resource value: 0x7F0904DC
-			public const int tv_cur_wifi_tip = 2131297500;
-			
-			// aapt resource value: 0x7F0904DF
-			public const int tv_decode_type = 2131297503;
-			
-			// aapt resource value: 0x7F0904E0
-			public const int tv_delete = 2131297504;
-			
-			// aapt resource value: 0x7F0904E1
-			public const int tv_deployment_tip = 2131297505;
-			
-			// aapt resource value: 0x7F0904E2
-			public const int tv_device_current_version = 2131297506;
-			
-			// aapt resource value: 0x7F0904E3
-			public const int tv_device_info = 2131297507;
-			
-			// aapt resource value: 0x7F0904E4
-			public const int tv_device_name = 2131297508;
-			
-			// aapt resource value: 0x7F0904E5
-			public const int tv_device_name_tip = 2131297509;
-			
-			// aapt resource value: 0x7F0904E6
-			public const int tv_device_serial = 2131297510;
-			
-			// aapt resource value: 0x7F0904E7
-			public const int tv_device_serial_tip = 2131297511;
-			
-			// aapt resource value: 0x7F0904E8
-			public const int tv_device_type = 2131297512;
-			
-			// aapt resource value: 0x7F0904E9
-			public const int tv_device_version = 2131297513;
-			
-			// aapt resource value: 0x7F0904EA
-			public const int tv_edit = 2131297514;
-			
-			// aapt resource value: 0x7F0904EB
-			public const int tv_ezviz_account_login = 2131297515;
-			
-			// aapt resource value: 0x7F0904EC
-			public const int tv_file_path = 2131297516;
-			
-			// aapt resource value: 0x7F0904ED
-			public const int tv_flash = 2131297517;
-			
-			// aapt resource value: 0x7F0904EE
-			public const int tv_goto_connect = 2131297518;
-			
-			// aapt resource value: 0x7F0904EF
-			public const int tv_help_phone = 2131297519;
-			
-			// aapt resource value: 0x7F0904F0
-			public const int tv_image_show_tip = 2131297520;
-			
-			// aapt resource value: 0x7F0904F1
-			public const int tv_init = 2131297521;
-			
-			// aapt resource value: 0x7F0904F2
-			public const int tv_input_ok = 2131297522;
-			
-			// aapt resource value: 0x7F0904F3
-			public const int tv_lan = 2131297523;
-			
-			// aapt resource value: 0x7F0904F4
-			public const int tv_left_btn = 2131297524;
-			
-			// aapt resource value: 0x7F0904F6
-			public const int tv_loadingmore = 2131297526;
-			
-			// aapt resource value: 0x7F0904F5
-			public const int tv_loading_msg = 2131297525;
-			
-			// aapt resource value: 0x7F0904F7
-			public const int tv_local_record = 2131297527;
-			
-			// aapt resource value: 0x7F0904F8
-			public const int tv_local_video = 2131297528;
-			
-			// aapt resource value: 0x7F0904F9
-			public const int tv_lp_answer = 2131297529;
-			
-			// aapt resource value: 0x7F0904FA
-			public const int tv_lp_calltime = 2131297530;
-			
-			// aapt resource value: 0x7F0904FB
-			public const int tv_lp_hangUp = 2131297531;
-			
-			// aapt resource value: 0x7F0904FC
-			public const int tv_lp_screenshot = 2131297532;
-			
-			// aapt resource value: 0x7F0904FD
-			public const int tv_lp_title = 2131297533;
-			
-			// aapt resource value: 0x7F0904FE
-			public const int tv_lp_unlock = 2131297534;
-			
-			// aapt resource value: 0x7F0904FF
-			public const int tv_message = 2131297535;
-			
-			// aapt resource value: 0x7F090500
-			public const int tv_message2 = 2131297536;
-			
-			// aapt resource value: 0x7F090501
-			public const int tv_modify_device_pwd = 2131297537;
-			
-			// aapt resource value: 0x7F090502
-			public const int tv_month_day = 2131297538;
-			
-			// aapt resource value: 0x7F090503
-			public const int tv_msg = 2131297539;
-			
-			// aapt resource value: 0x7F090504
-			public const int tv_name = 2131297540;
-			
-			// aapt resource value: 0x7F090505
-			public const int tv_name_input = 2131297541;
-			
-			// aapt resource value: 0x7F090506
-			public const int tv_new_version = 2131297542;
-			
-			// aapt resource value: 0x7F090507
-			public const int tv_new_version_1 = 2131297543;
-			
-			// aapt resource value: 0x7F090508
-			public const int tv_new_version_tip = 2131297544;
-			
-			// aapt resource value: 0x7F090509
-			public const int tv_next = 2131297545;
-			
-			// aapt resource value: 0x7F09050A
-			public const int tv_no_video = 2131297546;
-			
-			// aapt resource value: 0x7F09050B
-			public const int tv_offline = 2131297547;
-			
-			// aapt resource value: 0x7F09050C
-			public const int tv_ok = 2131297548;
-			
-			// aapt resource value: 0x7F09050D
-			public const int tv_overseas = 2131297549;
-			
-			// aapt resource value: 0x7F09050E
-			public const int tv_pixel = 2131297550;
-			
-			// aapt resource value: 0x7F09050F
-			public const int tv_play_error = 2131297551;
-			
-			// aapt resource value: 0x7F090510
-			public const int tv_play_pixel = 2131297552;
-			
-			// aapt resource value: 0x7F090511
-			public const int tv_pwd = 2131297553;
-			
-			// aapt resource value: 0x7F090512
-			public const int tv_pwd_tip_new = 2131297554;
-			
-			// aapt resource value: 0x7F090513
-			public const int tv_record_stream = 2131297555;
-			
-			// aapt resource value: 0x7F090514
-			public const int tv_registering_to_platform = 2131297556;
-			
-			// aapt resource value: 0x7F090515
-			public const int tv_right_btn = 2131297557;
-			
-			// aapt resource value: 0x7F090516
-			public const int tv_sdk_ver = 2131297558;
-			
-			// aapt resource value: 0x7F090517
-			public const int tv_show_tip = 2131297559;
-			
-			// aapt resource value: 0x7F090518
-			public const int tv_single_btn = 2131297560;
-			
-			// aapt resource value: 0x7F090519
-			public const int tv_sms_valid_tip = 2131297561;
-			
-			// aapt resource value: 0x7F09051A
-			public const int tv_softap = 2131297562;
-			
-			// aapt resource value: 0x7F09051B
-			public const int tv_ssid = 2131297563;
-			
-			// aapt resource value: 0x7F09051C
-			public const int tv_stream_type = 2131297564;
-			
-			// aapt resource value: 0x7F09051D
-			public const int tv_sure = 2131297565;
-			
-			// aapt resource value: 0x7F09051E
-			public const int tv_time = 2131297566;
-			
-			// aapt resource value: 0x7F09051F
-			public const int tv_time_m = 2131297567;
-			
-			// aapt resource value: 0x7F090520
-			public const int tv_time_s = 2131297568;
-			
-			// aapt resource value: 0x7F090521
-			public const int tv_tip = 2131297569;
-			
-			// aapt resource value: 0x7F090522
-			public const int tv_tip_title = 2131297570;
-			
-			// aapt resource value: 0x7F090523
-			public const int tv_title = 2131297571;
-			
-			// aapt resource value: 0x7F090524
-			public const int tv_title_center = 2131297572;
-			
-			// aapt resource value: 0x7F090525
-			public const int tv_title_center_sub = 2131297573;
-			
-			// aapt resource value: 0x7F090526
-			public const int tv_title_cn = 2131297574;
-			
-			// aapt resource value: 0x7F090527
-			public const int tv_title_left = 2131297575;
-			
-			// aapt resource value: 0x7F090528
-			public const int tv_title_left2 = 2131297576;
-			
-			// aapt resource value: 0x7F090529
-			public const int tv_title_right = 2131297577;
-			
 			// aapt resource value: 0x7F09052A
-			public const int tv_title_right2 = 2131297578;
+			public const int tvDeviceWifiConfigTip = 2131297578;
 			
 			// aapt resource value: 0x7F09052B
-			public const int tv_title_type = 2131297579;
+			public const int tvFormat_sd = 2131297579;
 			
 			// aapt resource value: 0x7F09052C
-			public const int tv_today = 2131297580;
+			public const int tvIntroduce1 = 2131297580;
 			
 			// aapt resource value: 0x7F09052D
-			public const int tv_type_tip = 2131297581;
+			public const int tvIntroduce2 = 2131297581;
 			
 			// aapt resource value: 0x7F09052E
-			public const int tv_version_tip = 2131297582;
+			public const int tvMore = 2131297582;
 			
 			// aapt resource value: 0x7F09052F
-			public const int tv_wifi_name = 2131297583;
+			public const int tvRichpushTitle = 2131297583;
 			
 			// aapt resource value: 0x7F090530
-			public const int tv_wifi_pwd = 2131297584;
+			public const int tvSSID = 2131297584;
 			
 			// aapt resource value: 0x7F090531
-			public const int tv_wlan = 2131297585;
+			public const int tvStatus = 2131297585;
 			
 			// aapt resource value: 0x7F090532
-			public const int tv_zxing_back = 2131297586;
+			public const int tvSuccess = 2131297586;
 			
 			// aapt resource value: 0x7F090533
-			public const int tv_zxing_flash = 2131297587;
+			public const int tvTip = 2131297587;
 			
 			// aapt resource value: 0x7F090534
-			public const int tv_zxing_scan = 2131297588;
+			public const int tvTitle = 2131297588;
 			
 			// aapt resource value: 0x7F090535
-			public const int two_button_layout = 2131297589;
+			public const int tv_5g_tip = 2131297589;
 			
 			// aapt resource value: 0x7F090536
-			public const int txtResult = 2131297590;
+			public const int tv_about_wifi_pwd = 2131297590;
 			
 			// aapt resource value: 0x7F090537
-			public const int unbind_button = 2131297591;
+			public const int tv_action1 = 2131297591;
 			
 			// aapt resource value: 0x7F090538
-			public const int uniform = 2131297592;
+			public const int tv_adding_to_account = 2131297592;
 			
 			// aapt resource value: 0x7F090539
-			public const int up = 2131297593;
+			public const int tv_all = 2131297593;
 			
 			// aapt resource value: 0x7F09053A
-			public const int useLogo = 2131297594;
-			
-			// aapt resource value: 0x7F09053E
-			public const int userid_et = 2131297598;
-			
-			// aapt resource value: 0x7F09053F
-			public const int userid_lyt = 2131297599;
-			
-			// aapt resource value: 0x7F090540
-			public const int username_et = 2131297600;
-			
-			// aapt resource value: 0x7F090541
-			public const int username_text = 2131297601;
-			
-			// aapt resource value: 0x7F090542
-			public const int username_tv = 2131297602;
-			
-			// aapt resource value: 0x7F09053C
-			public const int user_layout = 2131297596;
-			
-			// aapt resource value: 0x7F09053D
-			public const int user_register = 2131297597;
+			public const int tv_ap_sn = 2131297594;
 			
 			// aapt resource value: 0x7F09053B
-			public const int use_custom_pwd_cb = 2131297595;
+			public const int tv_camera_name = 2131297595;
+			
+			// aapt resource value: 0x7F09053C
+			public const int tv_cancel = 2131297596;
+			
+			// aapt resource value: 0x7F09053D
+			public const int tv_child_watch_video_talk_notification = 2131297597;
+			
+			// aapt resource value: 0x7F09053E
+			public const int tv_choose_other = 2131297598;
+			
+			// aapt resource value: 0x7F09053F
+			public const int tv_cloud_record = 2131297599;
+			
+			// aapt resource value: 0x7F090540
+			public const int tv_cloud_video = 2131297600;
+			
+			// aapt resource value: 0x7F090541
+			public const int tv_connecting_to_device = 2131297601;
+			
+			// aapt resource value: 0x7F090542
+			public const int tv_content = 2131297602;
 			
 			// aapt resource value: 0x7F090543
-			public const int uvc = 2131297603;
+			public const int tv_cover_stream = 2131297603;
 			
 			// aapt resource value: 0x7F090545
-			public const int verifycodeEditTextContainer = 2131297605;
+			public const int tv_current_version_tip = 2131297605;
 			
 			// aapt resource value: 0x7F090546
-			public const int verifycodeEt = 2131297606;
-			
-			// aapt resource value: 0x7F090547
-			public const int version = 2131297607;
-			
-			// aapt resource value: 0x7F090548
-			public const int version_arrow = 2131297608;
-			
-			// aapt resource value: 0x7F090549
-			public const int version_layout = 2131297609;
-			
-			// aapt resource value: 0x7F09054A
-			public const int version_newest = 2131297610;
-			
-			// aapt resource value: 0x7F09054B
-			public const int version_notice = 2131297611;
-			
-			// aapt resource value: 0x7F09054C
-			public const int version_textview = 2131297612;
-			
-			// aapt resource value: 0x7F09054D
-			public const int vertical = 2131297613;
-			
-			// aapt resource value: 0x7F09054E
-			public const int vg_child_watch_video_talk_camera = 2131297614;
-			
-			// aapt resource value: 0x7F09054F
-			public const int vg_child_watch_video_talk_notification_container = 2131297615;
-			
-			// aapt resource value: 0x7F090550
-			public const int vg_child_watch_video_talk_operation_container = 2131297616;
-			
-			// aapt resource value: 0x7F090551
-			public const int vg_child_watch_video_talk_player = 2131297617;
-			
-			// aapt resource value: 0x7F090552
-			public const int vg_child_watch_video_talk_tool_container = 2131297618;
-			
-			// aapt resource value: 0x7F090553
-			public const int vg_child_watch_video_talk_video_container = 2131297619;
-			
-			// aapt resource value: 0x7F090554
-			public const int vg_error_tips = 2131297620;
-			
-			// aapt resource value: 0x7F090555
-			public const int vg_login_anim = 2131297621;
-			
-			// aapt resource value: 0x7F090556
-			public const int vg_notification_operation_tool_container = 2131297622;
-			
-			// aapt resource value: 0x7F090557
-			public const int vg_play_info = 2131297623;
-			
-			// aapt resource value: 0x7F090558
-			public const int vg_play_window = 2131297624;
-			
-			// aapt resource value: 0x7F090559
-			public const int videoBackImg = 2131297625;
-			
-			// aapt resource value: 0x7F09055A
-			public const int videoParent = 2131297626;
-			
-			// aapt resource value: 0x7F09055B
-			public const int videoTitle = 2131297627;
-			
-			// aapt resource value: 0x7F09055C
-			public const int video_button = 2131297628;
-			
-			// aapt resource value: 0x7F09055D
-			public const int video_lp_rendering = 2131297629;
-			
-			// aapt resource value: 0x7F09055E
-			public const int video_lp_rendering2 = 2131297630;
-			
-			// aapt resource value: 0x7F09055F
-			public const int video_talk_et_room_id = 2131297631;
-			
-			// aapt resource value: 0x7F090564
-			public const int viewedCount = 2131297636;
-			
-			// aapt resource value: 0x7F090565
-			public const int viewfinder_view = 2131297637;
-			
-			// aapt resource value: 0x7F090560
-			public const int viewSort = 2131297632;
-			
-			// aapt resource value: 0x7F090561
-			public const int view_child_watch_video_talk_camera = 2131297633;
-			
-			// aapt resource value: 0x7F090562
-			public const int view_child_watch_video_talk_player = 2131297634;
-			
-			// aapt resource value: 0x7F090563
-			public const int view_offset_helper = 2131297635;
-			
-			// aapt resource value: 0x7F090566
-			public const int visible = 2131297638;
+			public const int tv_current_wifi = 2131297606;
 			
 			// aapt resource value: 0x7F090544
-			public const int v_bottom_line = 2131297604;
+			public const int tv_cur_wifi_tip = 2131297604;
+			
+			// aapt resource value: 0x7F090547
+			public const int tv_decode_type = 2131297607;
+			
+			// aapt resource value: 0x7F090548
+			public const int tv_delete = 2131297608;
+			
+			// aapt resource value: 0x7F090549
+			public const int tv_deployment_tip = 2131297609;
+			
+			// aapt resource value: 0x7F09054A
+			public const int tv_device_current_version = 2131297610;
+			
+			// aapt resource value: 0x7F09054B
+			public const int tv_device_info = 2131297611;
+			
+			// aapt resource value: 0x7F09054C
+			public const int tv_device_name = 2131297612;
+			
+			// aapt resource value: 0x7F09054D
+			public const int tv_device_name_tip = 2131297613;
+			
+			// aapt resource value: 0x7F09054E
+			public const int tv_device_serial = 2131297614;
+			
+			// aapt resource value: 0x7F09054F
+			public const int tv_device_serial_tip = 2131297615;
+			
+			// aapt resource value: 0x7F090550
+			public const int tv_device_type = 2131297616;
+			
+			// aapt resource value: 0x7F090551
+			public const int tv_device_version = 2131297617;
+			
+			// aapt resource value: 0x7F090552
+			public const int tv_edit = 2131297618;
+			
+			// aapt resource value: 0x7F090553
+			public const int tv_end_time = 2131297619;
+			
+			// aapt resource value: 0x7F090554
+			public const int tv_file_path = 2131297620;
+			
+			// aapt resource value: 0x7F090555
+			public const int tv_flash = 2131297621;
+			
+			// aapt resource value: 0x7F090556
+			public const int tv_goto_connect = 2131297622;
+			
+			// aapt resource value: 0x7F090557
+			public const int tv_help_phone = 2131297623;
+			
+			// aapt resource value: 0x7F090558
+			public const int tv_image_show_tip = 2131297624;
+			
+			// aapt resource value: 0x7F090559
+			public const int tv_init = 2131297625;
+			
+			// aapt resource value: 0x7F09055A
+			public const int tv_input_ok = 2131297626;
+			
+			// aapt resource value: 0x7F09055B
+			public const int tv_lan = 2131297627;
+			
+			// aapt resource value: 0x7F09055C
+			public const int tv_left_btn = 2131297628;
+			
+			// aapt resource value: 0x7F09055E
+			public const int tv_loadingmore = 2131297630;
+			
+			// aapt resource value: 0x7F09055D
+			public const int tv_loading_msg = 2131297629;
+			
+			// aapt resource value: 0x7F09055F
+			public const int tv_local_record = 2131297631;
+			
+			// aapt resource value: 0x7F090560
+			public const int tv_local_video = 2131297632;
+			
+			// aapt resource value: 0x7F090561
+			public const int tv_lp_answer = 2131297633;
+			
+			// aapt resource value: 0x7F090562
+			public const int tv_lp_calltime = 2131297634;
+			
+			// aapt resource value: 0x7F090563
+			public const int tv_lp_hangUp = 2131297635;
+			
+			// aapt resource value: 0x7F090564
+			public const int tv_lp_screenshot = 2131297636;
+			
+			// aapt resource value: 0x7F090565
+			public const int tv_lp_title = 2131297637;
+			
+			// aapt resource value: 0x7F090566
+			public const int tv_lp_unlock = 2131297638;
 			
 			// aapt resource value: 0x7F090567
-			public const int wait_bar = 2131297639;
+			public const int tv_message = 2131297639;
 			
 			// aapt resource value: 0x7F090568
-			public const int wait_tv = 2131297640;
+			public const int tv_message2 = 2131297640;
 			
 			// aapt resource value: 0x7F090569
-			public const int watting_pb = 2131297641;
-			
-			// aapt resource value: 0x7F09056C
-			public const int webview = 2131297644;
+			public const int tv_message_content = 2131297641;
 			
 			// aapt resource value: 0x7F09056A
-			public const int webView1 = 2131297642;
-			
-			// aapt resource value: 0x7F09056D
-			public const int webview_back_img = 2131297645;
-			
-			// aapt resource value: 0x7F09056E
-			public const int webview_back_ll = 2131297646;
+			public const int tv_message_time = 2131297642;
 			
 			// aapt resource value: 0x7F09056B
-			public const int web_login_btn = 2131297643;
+			public const int tv_message_title = 2131297643;
+			
+			// aapt resource value: 0x7F09056C
+			public const int tv_modify_device_pwd = 2131297644;
+			
+			// aapt resource value: 0x7F09056D
+			public const int tv_month_day = 2131297645;
+			
+			// aapt resource value: 0x7F09056E
+			public const int tv_msg = 2131297646;
 			
 			// aapt resource value: 0x7F09056F
-			public const int wheel_vertical_view = 2131297647;
+			public const int tv_name = 2131297647;
 			
 			// aapt resource value: 0x7F090570
-			public const int wifi_animation_view = 2131297648;
+			public const int tv_name_input = 2131297648;
 			
 			// aapt resource value: 0x7F090571
-			public const int wifi_img = 2131297649;
+			public const int tv_new_version = 2131297649;
 			
 			// aapt resource value: 0x7F090572
-			public const int wifi_list = 2131297650;
+			public const int tv_new_version_1 = 2131297650;
 			
 			// aapt resource value: 0x7F090573
-			public const int wifi_list_container = 2131297651;
+			public const int tv_new_version_tip = 2131297651;
 			
 			// aapt resource value: 0x7F090574
-			public const int wifi_name = 2131297652;
+			public const int tv_next = 2131297652;
 			
 			// aapt resource value: 0x7F090575
-			public const int wifi_psw = 2131297653;
+			public const int tv_no_video = 2131297653;
 			
 			// aapt resource value: 0x7F090576
-			public const int wifi_pwd = 2131297654;
+			public const int tv_offline = 2131297654;
 			
 			// aapt resource value: 0x7F090577
-			public const int wifi_pwd_check = 2131297655;
+			public const int tv_ok = 2131297655;
 			
 			// aapt resource value: 0x7F090578
-			public const int wifi_quality_icon = 2131297656;
+			public const int tv_overseas = 2131297656;
 			
 			// aapt resource value: 0x7F090579
-			public const int wifi_ssid = 2131297657;
+			public const int tv_pixel = 2131297657;
 			
 			// aapt resource value: 0x7F09057A
-			public const int wifi_tv = 2131297658;
+			public const int tv_play_error = 2131297658;
 			
 			// aapt resource value: 0x7F09057B
-			public const int withText = 2131297659;
+			public const int tv_play_pixel = 2131297659;
 			
 			// aapt resource value: 0x7F09057C
-			public const int wlan_len = 2131297660;
+			public const int tv_pwd = 2131297660;
 			
 			// aapt resource value: 0x7F09057D
-			public const int wlan_mode = 2131297661;
+			public const int tv_pwd_tip_new = 2131297661;
 			
 			// aapt resource value: 0x7F09057E
-			public const int wlan_name = 2131297662;
+			public const int tv_record_stream = 2131297662;
 			
 			// aapt resource value: 0x7F09057F
-			public const int wrap = 2131297663;
+			public const int tv_registering_to_platform = 2131297663;
 			
 			// aapt resource value: 0x7F090580
-			public const int wrap_content = 2131297664;
+			public const int tv_right_btn = 2131297664;
 			
 			// aapt resource value: 0x7F090581
-			public const int year = 2131297665;
+			public const int tv_sdk_info = 2131297665;
 			
 			// aapt resource value: 0x7F090582
-			public const int zoomin = 2131297666;
+			public const int tv_show_tip = 2131297666;
 			
 			// aapt resource value: 0x7F090583
-			public const int zoomout = 2131297667;
+			public const int tv_single_btn = 2131297667;
 			
 			// aapt resource value: 0x7F090584
-			public const int zxing_back_button = 2131297668;
+			public const int tv_sms_valid_tip = 2131297668;
 			
 			// aapt resource value: 0x7F090585
-			public const int zxing_barcode_scanner = 2131297669;
+			public const int tv_softap = 2131297669;
 			
 			// aapt resource value: 0x7F090586
-			public const int zxing_barcode_surface = 2131297670;
+			public const int tv_ssid = 2131297670;
 			
 			// aapt resource value: 0x7F090587
-			public const int zxing_camera_closed = 2131297671;
+			public const int tv_start_time = 2131297671;
 			
 			// aapt resource value: 0x7F090588
-			public const int zxing_camera_error = 2131297672;
+			public const int tv_stream_type = 2131297672;
 			
 			// aapt resource value: 0x7F090589
-			public const int zxing_decode = 2131297673;
-			
-			// aapt resource value: 0x7F09058A
-			public const int zxing_decode_failed = 2131297674;
-			
-			// aapt resource value: 0x7F09058B
-			public const int zxing_decode_succeeded = 2131297675;
-			
-			// aapt resource value: 0x7F09058C
-			public const int zxing_possible_result_points = 2131297676;
-			
-			// aapt resource value: 0x7F09058D
-			public const int zxing_preview_failed = 2131297677;
+			public const int tv_sure = 2131297673;
 			
 			// aapt resource value: 0x7F09058E
-			public const int zxing_prewiew_size_ready = 2131297678;
+			public const int tv_temppassword_detail = 2131297678;
+			
+			// aapt resource value: 0x7F09058A
+			public const int tv_temp_count = 2131297674;
+			
+			// aapt resource value: 0x7F09058B
+			public const int tv_temp_password = 2131297675;
+			
+			// aapt resource value: 0x7F09058C
+			public const int tv_temp_time = 2131297676;
+			
+			// aapt resource value: 0x7F09058D
+			public const int tv_temp_username = 2131297677;
 			
 			// aapt resource value: 0x7F09058F
-			public const int zxing_status_view = 2131297679;
+			public const int tv_test = 2131297679;
 			
 			// aapt resource value: 0x7F090590
-			public const int zxing_viewfinder_view = 2131297680;
+			public const int tv_time = 2131297680;
+			
+			// aapt resource value: 0x7F090591
+			public const int tv_time_m = 2131297681;
+			
+			// aapt resource value: 0x7F090592
+			public const int tv_time_s = 2131297682;
+			
+			// aapt resource value: 0x7F090593
+			public const int tv_tip = 2131297683;
+			
+			// aapt resource value: 0x7F090594
+			public const int tv_tip_title = 2131297684;
+			
+			// aapt resource value: 0x7F090595
+			public const int tv_title = 2131297685;
+			
+			// aapt resource value: 0x7F090596
+			public const int tv_title_center = 2131297686;
+			
+			// aapt resource value: 0x7F090597
+			public const int tv_title_center_sub = 2131297687;
+			
+			// aapt resource value: 0x7F090598
+			public const int tv_title_cn = 2131297688;
+			
+			// aapt resource value: 0x7F090599
+			public const int tv_title_left = 2131297689;
+			
+			// aapt resource value: 0x7F09059A
+			public const int tv_title_left2 = 2131297690;
+			
+			// aapt resource value: 0x7F09059B
+			public const int tv_title_right = 2131297691;
+			
+			// aapt resource value: 0x7F09059C
+			public const int tv_title_right2 = 2131297692;
+			
+			// aapt resource value: 0x7F09059D
+			public const int tv_title_type = 2131297693;
+			
+			// aapt resource value: 0x7F09059E
+			public const int tv_today = 2131297694;
+			
+			// aapt resource value: 0x7F09059F
+			public const int tv_type_tip = 2131297695;
+			
+			// aapt resource value: 0x7F0905A1
+			public const int tv_username = 2131297697;
+			
+			// aapt resource value: 0x7F0905A0
+			public const int tv_use_times = 2131297696;
+			
+			// aapt resource value: 0x7F0905A2
+			public const int tv_version_tip = 2131297698;
+			
+			// aapt resource value: 0x7F0905A3
+			public const int tv_wifi_name = 2131297699;
+			
+			// aapt resource value: 0x7F0905A4
+			public const int tv_wifi_pwd = 2131297700;
+			
+			// aapt resource value: 0x7F0905A5
+			public const int tv_wlan = 2131297701;
+			
+			// aapt resource value: 0x7F0905A6
+			public const int tv_zxing_back = 2131297702;
+			
+			// aapt resource value: 0x7F0905A7
+			public const int tv_zxing_flash = 2131297703;
+			
+			// aapt resource value: 0x7F0905A8
+			public const int tv_zxing_scan = 2131297704;
+			
+			// aapt resource value: 0x7F0905A9
+			public const int two_button_layout = 2131297705;
+			
+			// aapt resource value: 0x7F0905AA
+			public const int txtResult = 2131297706;
+			
+			// aapt resource value: 0x7F0905AB
+			public const int unbind_button = 2131297707;
+			
+			// aapt resource value: 0x7F0905AC
+			public const int uniform = 2131297708;
+			
+			// aapt resource value: 0x7F0905AD
+			public const int up = 2131297709;
+			
+			// aapt resource value: 0x7F0905AE
+			public const int useLogo = 2131297710;
+			
+			// aapt resource value: 0x7F0905B2
+			public const int userid_et = 2131297714;
+			
+			// aapt resource value: 0x7F0905B3
+			public const int userid_lyt = 2131297715;
+			
+			// aapt resource value: 0x7F0905B4
+			public const int username_et = 2131297716;
+			
+			// aapt resource value: 0x7F0905B5
+			public const int username_text = 2131297717;
+			
+			// aapt resource value: 0x7F0905B6
+			public const int username_tv = 2131297718;
+			
+			// aapt resource value: 0x7F0905B0
+			public const int user_layout = 2131297712;
+			
+			// aapt resource value: 0x7F0905B1
+			public const int user_register = 2131297713;
+			
+			// aapt resource value: 0x7F0905AF
+			public const int use_custom_pwd_cb = 2131297711;
+			
+			// aapt resource value: 0x7F0905B7
+			public const int uvc = 2131297719;
+			
+			// aapt resource value: 0x7F0905B8
+			public const int v21 = 2131297720;
+			
+			// aapt resource value: 0x7F0905BA
+			public const int verifycodeEditTextContainer = 2131297722;
+			
+			// aapt resource value: 0x7F0905BB
+			public const int verifycodeEt = 2131297723;
+			
+			// aapt resource value: 0x7F0905BC
+			public const int version = 2131297724;
+			
+			// aapt resource value: 0x7F0905BD
+			public const int version_arrow = 2131297725;
+			
+			// aapt resource value: 0x7F0905BE
+			public const int version_layout = 2131297726;
+			
+			// aapt resource value: 0x7F0905BF
+			public const int version_newest = 2131297727;
+			
+			// aapt resource value: 0x7F0905C0
+			public const int version_notice = 2131297728;
+			
+			// aapt resource value: 0x7F0905C1
+			public const int vertical = 2131297729;
+			
+			// aapt resource value: 0x7F0905C2
+			public const int vg_child_watch_video_talk_camera = 2131297730;
+			
+			// aapt resource value: 0x7F0905C3
+			public const int vg_child_watch_video_talk_notification_container = 2131297731;
+			
+			// aapt resource value: 0x7F0905C4
+			public const int vg_child_watch_video_talk_operation_container = 2131297732;
+			
+			// aapt resource value: 0x7F0905C5
+			public const int vg_child_watch_video_talk_player = 2131297733;
+			
+			// aapt resource value: 0x7F0905C6
+			public const int vg_child_watch_video_talk_tool_container = 2131297734;
+			
+			// aapt resource value: 0x7F0905C7
+			public const int vg_child_watch_video_talk_video_container = 2131297735;
+			
+			// aapt resource value: 0x7F0905C8
+			public const int vg_error_tips = 2131297736;
+			
+			// aapt resource value: 0x7F0905C9
+			public const int vg_notification_operation_tool_container = 2131297737;
+			
+			// aapt resource value: 0x7F0905CA
+			public const int vg_play_info = 2131297738;
+			
+			// aapt resource value: 0x7F0905CB
+			public const int vg_play_window = 2131297739;
+			
+			// aapt resource value: 0x7F0905CC
+			public const int videoBackImg = 2131297740;
+			
+			// aapt resource value: 0x7F0905CD
+			public const int videoParent = 2131297741;
+			
+			// aapt resource value: 0x7F0905CE
+			public const int videoTitle = 2131297742;
+			
+			// aapt resource value: 0x7F0905CF
+			public const int video_button = 2131297743;
+			
+			// aapt resource value: 0x7F0905D0
+			public const int video_lp_rendering = 2131297744;
+			
+			// aapt resource value: 0x7F0905D1
+			public const int video_lp_rendering2 = 2131297745;
+			
+			// aapt resource value: 0x7F0905D2
+			public const int video_talk_et_room_id = 2131297746;
+			
+			// aapt resource value: 0x7F0905D3
+			public const int view = 2131297747;
+			
+			// aapt resource value: 0x7F0905D9
+			public const int viewedCount = 2131297753;
+			
+			// aapt resource value: 0x7F0905DA
+			public const int viewfinder_view = 2131297754;
+			
+			// aapt resource value: 0x7F0905D4
+			public const int viewSort = 2131297748;
+			
+			// aapt resource value: 0x7F0905D5
+			public const int view_child_watch_video_talk_camera = 2131297749;
+			
+			// aapt resource value: 0x7F0905D6
+			public const int view_child_watch_video_talk_player = 2131297750;
+			
+			// aapt resource value: 0x7F0905D7
+			public const int view_offset_helper = 2131297751;
+			
+			// aapt resource value: 0x7F0905D8
+			public const int view_split = 2131297752;
+			
+			// aapt resource value: 0x7F0905DB
+			public const int visible = 2131297755;
+			
+			// aapt resource value: 0x7F0905B9
+			public const int v_bottom_line = 2131297721;
+			
+			// aapt resource value: 0x7F0905DC
+			public const int wait_bar = 2131297756;
+			
+			// aapt resource value: 0x7F0905DD
+			public const int wait_tv = 2131297757;
+			
+			// aapt resource value: 0x7F0905DE
+			public const int watting_pb = 2131297758;
+			
+			// aapt resource value: 0x7F0905E1
+			public const int webview = 2131297761;
+			
+			// aapt resource value: 0x7F0905DF
+			public const int webView1 = 2131297759;
+			
+			// aapt resource value: 0x7F0905E2
+			public const int webview_back_img = 2131297762;
+			
+			// aapt resource value: 0x7F0905E3
+			public const int webview_back_ll = 2131297763;
+			
+			// aapt resource value: 0x7F0905E0
+			public const int web_login_btn = 2131297760;
+			
+			// aapt resource value: 0x7F0905E4
+			public const int wheel_vertical_view = 2131297764;
+			
+			// aapt resource value: 0x7F0905E5
+			public const int wifi_animation_view = 2131297765;
+			
+			// aapt resource value: 0x7F0905E6
+			public const int wifi_img = 2131297766;
+			
+			// aapt resource value: 0x7F0905E7
+			public const int wifi_list = 2131297767;
+			
+			// aapt resource value: 0x7F0905E8
+			public const int wifi_list_container = 2131297768;
+			
+			// aapt resource value: 0x7F0905E9
+			public const int wifi_name = 2131297769;
+			
+			// aapt resource value: 0x7F0905EA
+			public const int wifi_psw = 2131297770;
+			
+			// aapt resource value: 0x7F0905EB
+			public const int wifi_pwd = 2131297771;
+			
+			// aapt resource value: 0x7F0905EC
+			public const int wifi_pwd_check = 2131297772;
+			
+			// aapt resource value: 0x7F0905ED
+			public const int wifi_quality_icon = 2131297773;
+			
+			// aapt resource value: 0x7F0905EE
+			public const int wifi_ssid = 2131297774;
+			
+			// aapt resource value: 0x7F0905EF
+			public const int wifi_tv = 2131297775;
+			
+			// aapt resource value: 0x7F0905F0
+			public const int withText = 2131297776;
+			
+			// aapt resource value: 0x7F0905F1
+			public const int wlan_len = 2131297777;
+			
+			// aapt resource value: 0x7F0905F2
+			public const int wlan_mode = 2131297778;
+			
+			// aapt resource value: 0x7F0905F3
+			public const int wlan_name = 2131297779;
+			
+			// aapt resource value: 0x7F0905F4
+			public const int wrap = 2131297780;
+			
+			// aapt resource value: 0x7F0905F5
+			public const int wrap_content = 2131297781;
+			
+			// aapt resource value: 0x7F0905F6
+			public const int wvPopwin = 2131297782;
+			
+			// aapt resource value: 0x7F0905F7
+			public const int year = 2131297783;
+			
+			// aapt resource value: 0x7F0905F8
+			public const int zoomin = 2131297784;
+			
+			// aapt resource value: 0x7F0905F9
+			public const int zoomout = 2131297785;
+			
+			// aapt resource value: 0x7F0905FA
+			public const int zxing_back_button = 2131297786;
+			
+			// aapt resource value: 0x7F0905FB
+			public const int zxing_barcode_scanner = 2131297787;
+			
+			// aapt resource value: 0x7F0905FC
+			public const int zxing_barcode_surface = 2131297788;
+			
+			// aapt resource value: 0x7F0905FD
+			public const int zxing_camera_closed = 2131297789;
+			
+			// aapt resource value: 0x7F0905FE
+			public const int zxing_camera_error = 2131297790;
+			
+			// aapt resource value: 0x7F0905FF
+			public const int zxing_decode = 2131297791;
+			
+			// aapt resource value: 0x7F090600
+			public const int zxing_decode_failed = 2131297792;
+			
+			// aapt resource value: 0x7F090601
+			public const int zxing_decode_succeeded = 2131297793;
+			
+			// aapt resource value: 0x7F090602
+			public const int zxing_possible_result_points = 2131297794;
+			
+			// aapt resource value: 0x7F090603
+			public const int zxing_preview_failed = 2131297795;
+			
+			// aapt resource value: 0x7F090604
+			public const int zxing_prewiew_size_ready = 2131297796;
+			
+			// aapt resource value: 0x7F090605
+			public const int zxing_status_view = 2131297797;
+			
+			// aapt resource value: 0x7F090606
+			public const int zxing_viewfinder_view = 2131297798;
 			
 			static Id()
 			{
@@ -15676,307 +16234,307 @@
 			public const int activity_capture = 2131427356;
 			
 			// aapt resource value: 0x7F0B001D
-			public const int activity_collect_device_info = 2131427357;
+			public const int activity_collect_play_info = 2131427357;
 			
 			// aapt resource value: 0x7F0B001E
-			public const int activity_collect_play_info = 2131427358;
+			public const int activity_config_wifi_executing = 2131427358;
 			
 			// aapt resource value: 0x7F0B001F
-			public const int activity_config_wifi_executing = 2131427359;
+			public const int activity_device_add = 2131427359;
 			
 			// aapt resource value: 0x7F0B0020
-			public const int activity_device_add = 2131427360;
+			public const int activity_device_detail = 2131427360;
 			
 			// aapt resource value: 0x7F0B0021
-			public const int activity_device_detail = 2131427361;
+			public const int activity_device_hidden_wifi = 2131427361;
 			
 			// aapt resource value: 0x7F0B0022
-			public const int activity_device_hidden_wifi = 2131427362;
+			public const int activity_device_list = 2131427362;
 			
 			// aapt resource value: 0x7F0B0023
-			public const int activity_device_list = 2131427363;
+			public const int activity_device_online_media_play = 2131427363;
 			
 			// aapt resource value: 0x7F0B0024
-			public const int activity_device_online_media_play = 2131427364;
+			public const int activity_device_record_list = 2131427364;
 			
 			// aapt resource value: 0x7F0B0025
-			public const int activity_device_record_list = 2131427365;
+			public const int activity_device_record_play = 2131427365;
 			
 			// aapt resource value: 0x7F0B0026
-			public const int activity_device_record_play = 2131427366;
+			public const int activity_device_wifi_list = 2131427366;
 			
 			// aapt resource value: 0x7F0B0027
-			public const int activity_device_wifi_list = 2131427367;
+			public const int activity_device_wifi_password = 2131427367;
 			
 			// aapt resource value: 0x7F0B0028
-			public const int activity_device_wifi_password = 2131427368;
+			public const int activity_endisable_service = 2131427368;
 			
 			// aapt resource value: 0x7F0B0029
-			public const int activity_endisable_service = 2131427369;
+			public const int activity_environment_guide = 2131427369;
 			
 			// aapt resource value: 0x7F0B002A
-			public const int activity_environment_guide = 2131427370;
+			public const int activity_error_tip = 2131427370;
 			
 			// aapt resource value: 0x7F0B002B
-			public const int activity_error_tip = 2131427371;
+			public const int activity_ezupgrade_device = 2131427371;
 			
 			// aapt resource value: 0x7F0B002C
-			public const int activity_ezupgrade_device = 2131427372;
+			public const int activity_hc = 2131427372;
 			
 			// aapt resource value: 0x7F0B002D
-			public const int activity_hc = 2131427373;
+			public const int activity_hcactive = 2131427373;
 			
 			// aapt resource value: 0x7F0B002E
-			public const int activity_hcactive = 2131427374;
+			public const int activity_hcplay = 2131427374;
 			
 			// aapt resource value: 0x7F0B002F
-			public const int activity_hcplay = 2131427375;
+			public const int activity_hdllinphone_intercom = 2131427375;
 			
 			// aapt resource value: 0x7F0B0030
-			public const int activity_hdllinphone_intercom = 2131427376;
+			public const int activity_hdllinphone_monitor = 2131427376;
 			
 			// aapt resource value: 0x7F0B0031
-			public const int activity_hdllinphone_monitor = 2131427377;
+			public const int activity_interface_self_test = 2131427377;
 			
 			// aapt resource value: 0x7F0B0032
-			public const int activity_interface_self_test = 2131427378;
+			public const int activity_interface_test = 2131427378;
 			
 			// aapt resource value: 0x7F0B0033
-			public const int activity_interface_test = 2131427379;
+			public const int activity_lan_multi_device = 2131427379;
 			
 			// aapt resource value: 0x7F0B0034
-			public const int activity_lan_multi_device = 2131427380;
+			public const int activity_list = 2131427380;
 			
 			// aapt resource value: 0x7F0B0035
-			public const int activity_list = 2131427381;
+			public const int activity_main = 2131427381;
 			
 			// aapt resource value: 0x7F0B0036
-			public const int activity_main = 2131427382;
+			public const int activity_main_ez = 2131427382;
 			
 			// aapt resource value: 0x7F0B0037
-			public const int activity_main_ez = 2131427383;
+			public const int activity_manual_choose_config_wifi_way = 2131427383;
 			
 			// aapt resource value: 0x7F0B0038
-			public const int activity_manual_choose_config_wifi_way = 2131427384;
+			public const int activity_manual_connect_device_hotspot = 2131427384;
 			
 			// aapt resource value: 0x7F0B0039
-			public const int activity_manual_connect_device_hotspot = 2131427385;
+			public const int activity_manual_input_device_hotspot_info = 2131427385;
 			
 			// aapt resource value: 0x7F0B003A
-			public const int activity_manual_input_device_hotspot_info = 2131427386;
+			public const int activity_more_features_entrance = 2131427386;
 			
 			// aapt resource value: 0x7F0B003B
-			public const int activity_more_features_entrance = 2131427387;
+			public const int activity_multi_screen_preview = 2131427387;
 			
 			// aapt resource value: 0x7F0B003C
-			public const int activity_multi_screen_preview = 2131427388;
+			public const int activity_multi_video_talk = 2131427388;
 			
 			// aapt resource value: 0x7F0B003D
-			public const int activity_multi_video_talk = 2131427389;
+			public const int activity_multi_video_talk_test = 2131427389;
 			
 			// aapt resource value: 0x7F0B003E
-			public const int activity_multi_video_talk_test = 2131427390;
+			public const int activity_my_collect = 2131427390;
 			
 			// aapt resource value: 0x7F0B003F
-			public const int activity_my_collect = 2131427391;
+			public const int activity_option = 2131427391;
 			
 			// aapt resource value: 0x7F0B0040
-			public const int activity_option = 2131427392;
+			public const int activity_origin_stream_control = 2131427392;
 			
 			// aapt resource value: 0x7F0B0041
-			public const int activity_origin_stream_control = 2131427393;
+			public const int activity_rtp_stream_play = 2131427393;
 			
 			// aapt resource value: 0x7F0B0042
-			public const int activity_rtp_stream_play = 2131427394;
+			public const int activity_safety_hat_talk = 2131427394;
 			
 			// aapt resource value: 0x7F0B0043
-			public const int activity_safety_hat_talk = 2131427395;
+			public const int activity_splash = 2131427395;
 			
 			// aapt resource value: 0x7F0B0044
-			public const int activity_splash = 2131427396;
+			public const int activity_square = 2131427396;
 			
 			// aapt resource value: 0x7F0B0045
-			public const int activity_square = 2131427397;
+			public const int activity_square_video_list = 2131427397;
 			
 			// aapt resource value: 0x7F0B0046
-			public const int activity_square_video_list = 2131427398;
+			public const int activity_square_video_list2 = 2131427398;
 			
 			// aapt resource value: 0x7F0B0047
-			public const int activity_square_video_list2 = 2131427399;
+			public const int activity_square_video_search = 2131427399;
 			
 			// aapt resource value: 0x7F0B0048
-			public const int activity_square_video_search = 2131427400;
+			public const int activity_support = 2131427400;
 			
 			// aapt resource value: 0x7F0B0049
-			public const int activity_support = 2131427401;
+			public const int activity_test_config_wifi = 2131427401;
 			
 			// aapt resource value: 0x7F0B004A
-			public const int activity_test_config_wifi = 2131427402;
+			public const int activity_test_for_sdk = 2131427402;
 			
 			// aapt resource value: 0x7F0B004B
-			public const int activity_test_for_sdk = 2131427403;
+			public const int activity_test_page = 2131427403;
 			
 			// aapt resource value: 0x7F0B004C
-			public const int activity_test_page = 2131427404;
+			public const int activity_video_phone = 2131427404;
 			
 			// aapt resource value: 0x7F0B004D
-			public const int activity_video_phone = 2131427405;
+			public const int activity_video_talk = 2131427405;
 			
 			// aapt resource value: 0x7F0B004E
-			public const int activity_video_talk = 2131427406;
+			public const int activity_webview = 2131427406;
 			
 			// aapt resource value: 0x7F0B004F
-			public const int activity_webview = 2131427407;
+			public const int activity_zxing_layout = 2131427407;
 			
 			// aapt resource value: 0x7F0B0050
-			public const int activity_zxing_layout = 2131427408;
+			public const int adapter_history_list_item = 2131427408;
 			
 			// aapt resource value: 0x7F0B0051
-			public const int add_camera_by_series_number_page = 2131427409;
+			public const int adapter_temppassword_list_item = 2131427409;
 			
 			// aapt resource value: 0x7F0B0052
-			public const int auto_wifi_connecting = 2131427410;
+			public const int add_camera_by_series_number_page = 2131427410;
 			
 			// aapt resource value: 0x7F0B0053
-			public const int auto_wifi_connecting_status_item = 2131427411;
+			public const int auto_wifi_connecting = 2131427411;
 			
 			// aapt resource value: 0x7F0B0054
-			public const int auto_wifi_connecting_status_item_ez = 2131427412;
+			public const int auto_wifi_connecting_status_item = 2131427412;
 			
 			// aapt resource value: 0x7F0B0055
-			public const int auto_wifi_net_config = 2131427413;
+			public const int auto_wifi_connecting_status_item_ez = 2131427413;
 			
 			// aapt resource value: 0x7F0B0056
-			public const int auto_wifi_prepare_step_on = 2131427414;
+			public const int auto_wifi_net_config = 2131427414;
 			
 			// aapt resource value: 0x7F0B0057
-			public const int auto_wifi_reset = 2131427415;
+			public const int auto_wifi_prepare_step_on = 2131427415;
 			
 			// aapt resource value: 0x7F0B0058
-			public const int auto_wifi_reset_introduce = 2131427416;
+			public const int auto_wifi_reset = 2131427416;
 			
 			// aapt resource value: 0x7F0B0059
-			public const int biometric_prompt_dialog_content = 2131427417;
+			public const int auto_wifi_reset_introduce = 2131427417;
 			
 			// aapt resource value: 0x7F0B005A
-			public const int box_add_tip = 2131427418;
+			public const int biometric_prompt_dialog_content = 2131427418;
 			
 			// aapt resource value: 0x7F0B005B
-			public const int cameralist_page = 2131427419;
+			public const int box_add_tip = 2131427419;
 			
 			// aapt resource value: 0x7F0B005C
-			public const int cameralist_page_common = 2131427420;
+			public const int cameralist_page = 2131427420;
 			
 			// aapt resource value: 0x7F0B005D
 			public const int cameralist_small_item = 2131427421;
 			
 			// aapt resource value: 0x7F0B005E
-			public const int cameralist_small_item_common = 2131427422;
+			public const int capture_activity = 2131427422;
 			
 			// aapt resource value: 0x7F0B005F
-			public const int capture_activity = 2131427423;
+			public const int cc_activity_widget_countrycode = 2131427423;
 			
 			// aapt resource value: 0x7F0B0060
-			public const int cc_activity_widget_countrycode = 2131427424;
+			public const int cc_activity_widget_sortselection = 2131427424;
 			
 			// aapt resource value: 0x7F0B0061
-			public const int cc_activity_widget_sortselection = 2131427425;
+			public const int cc_country_list_item = 2131427425;
 			
 			// aapt resource value: 0x7F0B0062
-			public const int cc_country_list_item = 2131427426;
+			public const int chose_type_layout = 2131427426;
 			
 			// aapt resource value: 0x7F0B0063
-			public const int chose_type_layout = 2131427427;
+			public const int city_config_item = 2131427427;
 			
 			// aapt resource value: 0x7F0B0064
-			public const int city_config_item = 2131427428;
+			public const int common_progressdialog_layout1 = 2131427428;
 			
 			// aapt resource value: 0x7F0B0065
-			public const int common_progressdialog_layout1 = 2131427429;
+			public const int ddns_device_ist_page = 2131427429;
 			
 			// aapt resource value: 0x7F0B0066
-			public const int ddns_device_ist_page = 2131427430;
+			public const int ddns_device_list_item = 2131427430;
 			
 			// aapt resource value: 0x7F0B0067
-			public const int ddns_device_list_item = 2131427431;
+			public const int design_bottom_navigation_item = 2131427431;
 			
 			// aapt resource value: 0x7F0B0068
-			public const int design_bottom_navigation_item = 2131427432;
+			public const int design_bottom_sheet_dialog = 2131427432;
 			
 			// aapt resource value: 0x7F0B0069
-			public const int design_bottom_sheet_dialog = 2131427433;
+			public const int design_layout_snackbar = 2131427433;
 			
 			// aapt resource value: 0x7F0B006A
-			public const int design_layout_snackbar = 2131427434;
+			public const int design_layout_snackbar_include = 2131427434;
 			
 			// aapt resource value: 0x7F0B006B
-			public const int design_layout_snackbar_include = 2131427435;
+			public const int design_layout_tab_icon = 2131427435;
 			
 			// aapt resource value: 0x7F0B006C
-			public const int design_layout_tab_icon = 2131427436;
+			public const int design_layout_tab_text = 2131427436;
 			
 			// aapt resource value: 0x7F0B006D
-			public const int design_layout_tab_text = 2131427437;
+			public const int design_menu_item_action_area = 2131427437;
 			
 			// aapt resource value: 0x7F0B006E
-			public const int design_menu_item_action_area = 2131427438;
+			public const int design_navigation_item = 2131427438;
 			
 			// aapt resource value: 0x7F0B006F
-			public const int design_navigation_item = 2131427439;
+			public const int design_navigation_item_header = 2131427439;
 			
 			// aapt resource value: 0x7F0B0070
-			public const int design_navigation_item_header = 2131427440;
+			public const int design_navigation_item_separator = 2131427440;
 			
 			// aapt resource value: 0x7F0B0071
-			public const int design_navigation_item_separator = 2131427441;
+			public const int design_navigation_item_subheader = 2131427441;
 			
 			// aapt resource value: 0x7F0B0072
-			public const int design_navigation_item_subheader = 2131427442;
+			public const int design_navigation_menu = 2131427442;
 			
 			// aapt resource value: 0x7F0B0073
-			public const int design_navigation_menu = 2131427443;
+			public const int design_navigation_menu_item = 2131427443;
 			
 			// aapt resource value: 0x7F0B0074
-			public const int design_navigation_menu_item = 2131427444;
+			public const int design_text_input_password_icon = 2131427444;
 			
 			// aapt resource value: 0x7F0B0075
-			public const int design_text_input_password_icon = 2131427445;
+			public const int device_add_wifi_list_item = 2131427445;
 			
 			// aapt resource value: 0x7F0B0076
-			public const int device_add_wifi_list_item = 2131427446;
+			public const int device_add_wifi_list_item_more = 2131427446;
 			
 			// aapt resource value: 0x7F0B0077
-			public const int device_add_wifi_list_item_more = 2131427447;
+			public const int device_discover_item = 2131427447;
 			
 			// aapt resource value: 0x7F0B0078
-			public const int device_discover_item = 2131427448;
+			public const int device_discover_page = 2131427448;
 			
 			// aapt resource value: 0x7F0B0079
-			public const int device_discover_page = 2131427449;
+			public const int device_setting_page = 2131427449;
 			
 			// aapt resource value: 0x7F0B007A
-			public const int device_setting_page = 2131427450;
+			public const int device_video_encrypt_dialog = 2131427450;
 			
 			// aapt resource value: 0x7F0B007B
-			public const int device_video_encrypt_dialog = 2131427451;
+			public const int dialog_choose_net = 2131427451;
 			
 			// aapt resource value: 0x7F0B007C
-			public const int dialog_choose_net = 2131427452;
+			public const int dialog_device_update = 2131427452;
 			
 			// aapt resource value: 0x7F0B007D
-			public const int dialog_device_update = 2131427453;
+			public const int dialog_encryptkey_input = 2131427453;
 			
 			// aapt resource value: 0x7F0B007E
-			public const int dialog_encryptkey_input = 2131427454;
+			public const int dialog_loading_view = 2131427454;
 			
 			// aapt resource value: 0x7F0B007F
-			public const int dialog_loading_view = 2131427455;
+			public const int dialog_lpsdk_time_select = 2131427455;
 			
 			// aapt resource value: 0x7F0B0080
-			public const int dialog_lpsdk_time_select = 2131427456;
+			public const int dialog_lpsdk_tip = 2131427456;
 			
 			// aapt resource value: 0x7F0B0081
-			public const int dialog_lpsdk_tip = 2131427457;
+			public const int dialog_opendoor_password = 2131427457;
 			
 			// aapt resource value: 0x7F0B0082
 			public const int dialog_sd_card_reconver = 2131427458;
@@ -15984,44 +16542,41 @@
 			// aapt resource value: 0x7F0B0083
 			public const int dialog_tip = 2131427459;
 			
-			// aapt resource value: 0x7F0B0099
-			public const int ezopen_realplay_operate_bar = 2131427481;
+			// aapt resource value: 0x7F0B0097
+			public const int ezopen_realplay_operate_bar = 2131427479;
 			
-			// aapt resource value: 0x7F0B009A
-			public const int ezopen_realplay_operate_bar2 = 2131427482;
+			// aapt resource value: 0x7F0B0098
+			public const int ezopen_realplay_operate_bar2 = 2131427480;
 			
 			// aapt resource value: 0x7F0B0084
-			public const int ez_demo_interface_activity = 2131427460;
+			public const int ez_add_temppassword_page_new = 2131427460;
 			
 			// aapt resource value: 0x7F0B0085
-			public const int ez_message_image_page = 2131427461;
+			public const int ez_add_user_page_new = 2131427461;
 			
 			// aapt resource value: 0x7F0B0086
-			public const int ez_message_image_page_new = 2131427462;
+			public const int ez_add_usetimes_page_new = 2131427462;
 			
 			// aapt resource value: 0x7F0B0087
-			public const int ez_message_list_item = 2131427463;
+			public const int ez_demo_interface_activity = 2131427463;
 			
 			// aapt resource value: 0x7F0B0088
-			public const int ez_message_list_item_new = 2131427464;
+			public const int ez_history_page_new = 2131427464;
 			
 			// aapt resource value: 0x7F0B0089
-			public const int ez_message_list_section = 2131427465;
+			public const int ez_message_image_page_new = 2131427465;
 			
 			// aapt resource value: 0x7F0B008A
-			public const int ez_message_list_section_new = 2131427466;
+			public const int ez_message_list_item_new = 2131427466;
 			
 			// aapt resource value: 0x7F0B008B
-			public const int ez_message_page = 2131427467;
+			public const int ez_message_list_section_new = 2131427467;
 			
 			// aapt resource value: 0x7F0B008C
 			public const int ez_message_page_new = 2131427468;
 			
 			// aapt resource value: 0x7F0B008F
-			public const int ez_playback_list_page_common = 2131427471;
-			
-			// aapt resource value: 0x7F0B0090
-			public const int ez_playback_list_page_new = 2131427472;
+			public const int ez_playback_list_page_new = 2131427471;
 			
 			// aapt resource value: 0x7F0B008D
 			public const int ez_play_control = 2131427469;
@@ -16029,152 +16584,155 @@
 			// aapt resource value: 0x7F0B008E
 			public const int ez_play_control_new = 2131427470;
 			
+			// aapt resource value: 0x7F0B0090
+			public const int ez_realplay_page = 2131427472;
+			
 			// aapt resource value: 0x7F0B0091
-			public const int ez_realplay_page = 2131427473;
+			public const int ez_realplay_prompt_layout = 2131427473;
 			
 			// aapt resource value: 0x7F0B0092
-			public const int ez_realplay_page_new = 2131427474;
+			public const int ez_realplay_prompt_layout_new = 2131427474;
 			
 			// aapt resource value: 0x7F0B0093
-			public const int ez_realplay_prompt_layout = 2131427475;
+			public const int ez_realplay_quality_items_new = 2131427475;
 			
 			// aapt resource value: 0x7F0B0094
-			public const int ez_realplay_prompt_layout_new = 2131427476;
+			public const int ez_remote_playback_page_new = 2131427476;
 			
 			// aapt resource value: 0x7F0B0095
-			public const int ez_realplay_quality_items = 2131427477;
+			public const int ez_temppassword_detail_page_new = 2131427477;
 			
 			// aapt resource value: 0x7F0B0096
-			public const int ez_realplay_quality_items_new = 2131427478;
+			public const int ez_temppassword_page_new = 2131427478;
 			
-			// aapt resource value: 0x7F0B0097
-			public const int ez_remote_playback_page = 2131427479;
+			// aapt resource value: 0x7F0B0099
+			public const int fragment_ap_bind_success = 2131427481;
 			
-			// aapt resource value: 0x7F0B0098
-			public const int ez_remote_playback_page_new = 2131427480;
+			// aapt resource value: 0x7F0B009A
+			public const int fragment_ap_pair = 2131427482;
 			
 			// aapt resource value: 0x7F0B009B
-			public const int fragment_ap_bind_success = 2131427483;
+			public const int fragment_base_tip = 2131427483;
 			
 			// aapt resource value: 0x7F0B009C
-			public const int fragment_ap_pair = 2131427484;
+			public const int fragment_bind_success = 2131427484;
 			
 			// aapt resource value: 0x7F0B009D
-			public const int fragment_base_tip = 2131427485;
+			public const int fragment_call = 2131427485;
 			
 			// aapt resource value: 0x7F0B009E
-			public const int fragment_bind_success = 2131427486;
+			public const int fragment_city_config = 2131427486;
 			
 			// aapt resource value: 0x7F0B009F
-			public const int fragment_call = 2131427487;
-			
-			// aapt resource value: 0x7F0B00A0
-			public const int fragment_city_config = 2131427488;
-			
-			// aapt resource value: 0x7F0B00A1
-			public const int fragment_connect_process = 2131427489;
-			
-			// aapt resource value: 0x7F0B00A5
-			public const int fragment_device_cloud_list = 2131427493;
-			
-			// aapt resource value: 0x7F0B00A6
-			public const int fragment_device_detail_deployment = 2131427494;
-			
-			// aapt resource value: 0x7F0B00A7
-			public const int fragment_device_detail_main = 2131427495;
-			
-			// aapt resource value: 0x7F0B00A8
-			public const int fragment_device_detail_name = 2131427496;
-			
-			// aapt resource value: 0x7F0B00A9
-			public const int fragment_device_dispatch = 2131427497;
-			
-			// aapt resource value: 0x7F0B00AA
-			public const int fragment_device_modify_name = 2131427498;
-			
-			// aapt resource value: 0x7F0B00AB
-			public const int fragment_device_version = 2131427499;
-			
-			// aapt resource value: 0x7F0B00A2
-			public const int fragment_dev_login = 2131427490;
+			public const int fragment_connect_process = 2131427487;
 			
 			// aapt resource value: 0x7F0B00A3
-			public const int fragment_dev_sec_code = 2131427491;
+			public const int fragment_device_cloud_list = 2131427491;
 			
 			// aapt resource value: 0x7F0B00A4
-			public const int fragment_dev_wifi_list = 2131427492;
+			public const int fragment_device_detail_deployment = 2131427492;
+			
+			// aapt resource value: 0x7F0B00A5
+			public const int fragment_device_detail_main = 2131427493;
+			
+			// aapt resource value: 0x7F0B00A6
+			public const int fragment_device_detail_name = 2131427494;
+			
+			// aapt resource value: 0x7F0B00A7
+			public const int fragment_device_dispatch = 2131427495;
+			
+			// aapt resource value: 0x7F0B00A8
+			public const int fragment_device_modify_name = 2131427496;
+			
+			// aapt resource value: 0x7F0B00A9
+			public const int fragment_device_version = 2131427497;
+			
+			// aapt resource value: 0x7F0B00A0
+			public const int fragment_dev_login = 2131427488;
+			
+			// aapt resource value: 0x7F0B00A1
+			public const int fragment_dev_sec_code = 2131427489;
+			
+			// aapt resource value: 0x7F0B00A2
+			public const int fragment_dev_wifi_list = 2131427490;
+			
+			// aapt resource value: 0x7F0B00AA
+			public const int fragment_error_tip = 2131427498;
+			
+			// aapt resource value: 0x7F0B00AB
+			public const int fragment_gateway_list = 2131427499;
 			
 			// aapt resource value: 0x7F0B00AC
-			public const int fragment_error_tip = 2131427500;
+			public const int fragment_hidden_wifi = 2131427500;
 			
 			// aapt resource value: 0x7F0B00AD
-			public const int fragment_gateway_list = 2131427501;
+			public const int fragment_imei_input = 2131427501;
 			
 			// aapt resource value: 0x7F0B00AE
-			public const int fragment_hidden_wifi = 2131427502;
+			public const int fragment_init = 2131427502;
 			
 			// aapt resource value: 0x7F0B00AF
-			public const int fragment_imei_input = 2131427503;
+			public const int fragment_manual_input = 2131427503;
 			
 			// aapt resource value: 0x7F0B00B0
-			public const int fragment_init = 2131427504;
+			public const int fragment_monitor = 2131427504;
 			
 			// aapt resource value: 0x7F0B00B1
-			public const int fragment_manual_input = 2131427505;
+			public const int fragment_scan = 2131427505;
 			
 			// aapt resource value: 0x7F0B00B2
-			public const int fragment_monitor = 2131427506;
+			public const int fragment_search_video = 2131427506;
 			
 			// aapt resource value: 0x7F0B00B3
-			public const int fragment_scan = 2131427507;
+			public const int fragment_security_check = 2131427507;
 			
 			// aapt resource value: 0x7F0B00B4
-			public const int fragment_search_video = 2131427508;
+			public const int fragment_smart_config = 2131427508;
 			
 			// aapt resource value: 0x7F0B00B5
-			public const int fragment_security_check = 2131427509;
+			public const int fragment_square_video_list = 2131427509;
 			
 			// aapt resource value: 0x7F0B00B6
-			public const int fragment_smart_config = 2131427510;
+			public const int fragment_tip_about_wifi_pwd = 2131427510;
 			
 			// aapt resource value: 0x7F0B00B7
-			public const int fragment_square_video_list = 2131427511;
+			public const int fragment_tip_connect_fail = 2131427511;
 			
 			// aapt resource value: 0x7F0B00B8
-			public const int fragment_tip_about_wifi_pwd = 2131427512;
+			public const int fragment_tip_not_support_5g = 2131427512;
 			
 			// aapt resource value: 0x7F0B00B9
-			public const int fragment_tip_connect_fail = 2131427513;
+			public const int fragment_tip_soft_ap_connect_wifi = 2131427513;
 			
 			// aapt resource value: 0x7F0B00BA
-			public const int fragment_tip_not_support_5g = 2131427514;
+			public const int fragment_tip_timeout = 2131427514;
 			
 			// aapt resource value: 0x7F0B00BB
-			public const int fragment_tip_soft_ap_connect_wifi = 2131427515;
+			public const int fragment_tip_user_bind = 2131427515;
 			
 			// aapt resource value: 0x7F0B00BC
-			public const int fragment_tip_timeout = 2131427516;
+			public const int fragment_tip_wifi_name = 2131427516;
 			
 			// aapt resource value: 0x7F0B00BD
-			public const int fragment_tip_user_bind = 2131427517;
+			public const int fragment_type_input = 2131427517;
 			
 			// aapt resource value: 0x7F0B00BE
-			public const int fragment_tip_wifi_name = 2131427518;
+			public const int fragment_wifi_connect_tip = 2131427518;
 			
 			// aapt resource value: 0x7F0B00BF
-			public const int fragment_type_input = 2131427519;
+			public const int fragment_wifi_pwd = 2131427519;
 			
 			// aapt resource value: 0x7F0B00C0
-			public const int fragment_wifi_connect_tip = 2131427520;
+			public const int gateway_list_item = 2131427520;
 			
 			// aapt resource value: 0x7F0B00C1
-			public const int fragment_wifi_pwd = 2131427521;
+			public const int hdl_gallery_banner_view_layout = 2131427521;
 			
 			// aapt resource value: 0x7F0B00C2
-			public const int gateway_list_item = 2131427522;
+			public const int hdl_titlebar_button_page = 2131427522;
 			
 			// aapt resource value: 0x7F0B00C3
-			public const int hdl_gallery_banner_view_layout = 2131427523;
+			public const int hdl_titlebar_page = 2131427523;
 			
 			// aapt resource value: 0x7F0B00C4
 			public const int hdl_widget_activity_crop_image = 2131427524;
@@ -16201,7 +16759,7 @@
 			public const int hdl_widget_pickerview_time = 2131427531;
 			
 			// aapt resource value: 0x7F0B00CC
-			public const int hms_download_progress = 2131427532;
+			public const int hwpush_trans_activity = 2131427532;
 			
 			// aapt resource value: 0x7F0B00CD
 			public const int include_device_wifi_list_item = 2131427533;
@@ -16231,313 +16789,385 @@
 			public const int item_wifi_list_more = 2131427541;
 			
 			// aapt resource value: 0x7F0B00D6
-			public const int lan_device_adapter_item = 2131427542;
+			public const int jpush_inapp_banner = 2131427542;
 			
 			// aapt resource value: 0x7F0B00D7
-			public const int lan_device_login_dialog = 2131427543;
+			public const int jpush_popwin_layout = 2131427543;
 			
 			// aapt resource value: 0x7F0B00D8
-			public const int layout_camera_view = 2131427544;
+			public const int jpush_webview_layout = 2131427544;
 			
 			// aapt resource value: 0x7F0B00D9
-			public const int layout_camera_view_soft = 2131427545;
+			public const int lan_device_adapter_item = 2131427545;
 			
 			// aapt resource value: 0x7F0B00DA
-			public const int layout_change_playback_rate = 2131427546;
+			public const int lan_device_login_dialog = 2131427546;
 			
 			// aapt resource value: 0x7F0B00DB
-			public const int layout_child_watch_video_talk_operation = 2131427547;
+			public const int layout_camera_view = 2131427547;
 			
 			// aapt resource value: 0x7F0B00DC
-			public const int layout_dialog_tip = 2131427548;
+			public const int layout_camera_view_soft = 2131427548;
 			
 			// aapt resource value: 0x7F0B00DD
-			public const int layout_login_anim = 2131427549;
+			public const int layout_change_playback_rate = 2131427549;
 			
 			// aapt resource value: 0x7F0B00DE
-			public const int line_connecting_introduce_activity = 2131427550;
+			public const int layout_child_watch_video_talk_operation = 2131427550;
 			
 			// aapt resource value: 0x7F0B00DF
-			public const int list_section = 2131427551;
+			public const int layout_dialog_tip = 2131427551;
 			
 			// aapt resource value: 0x7F0B00E0
-			public const int loading_text_view = 2131427552;
+			public const int layout_horizontal_recyclerview_footer = 2131427552;
 			
 			// aapt resource value: 0x7F0B00E1
-			public const int login_activity = 2131427553;
+			public const int layout_horizontal_recyclerview_footer_end = 2131427553;
 			
 			// aapt resource value: 0x7F0B00E2
-			public const int login_page = 2131427554;
+			public const int layout_horizontal_recyclerview_footer_loading = 2131427554;
 			
 			// aapt resource value: 0x7F0B00E3
-			public const int message_list_item = 2131427555;
+			public const int layout_horizontal_recyclerview_footer_network_error = 2131427555;
 			
 			// aapt resource value: 0x7F0B00E4
-			public const int message_page = 2131427556;
+			public const int layout_horizontal_recyclerview_refresh_header = 2131427556;
 			
 			// aapt resource value: 0x7F0B00E5
-			public const int mobile_common_comment = 2131427557;
+			public const int layout_indicator_view = 2131427557;
 			
 			// aapt resource value: 0x7F0B00E6
-			public const int mobile_common_lc_alert_dialog_layout = 2131427558;
+			public const int layout_login_anim = 2131427558;
 			
 			// aapt resource value: 0x7F0B00E7
-			public const int mobile_common_progressdialog_layout = 2131427559;
+			public const int layout_recyclerview_footer = 2131427559;
 			
 			// aapt resource value: 0x7F0B00E8
-			public const int mobile_common_roll_select_dialog = 2131427560;
+			public const int layout_recyclerview_footer_end = 2131427560;
 			
 			// aapt resource value: 0x7F0B00E9
-			public const int mobile_common_search_view = 2131427561;
+			public const int layout_recyclerview_footer_loading = 2131427561;
 			
 			// aapt resource value: 0x7F0B00EA
-			public const int mobile_common_widget_common_title = 2131427562;
+			public const int layout_recyclerview_footer_network_error = 2131427562;
 			
 			// aapt resource value: 0x7F0B00EB
-			public const int mobile_common_widget_switch_title = 2131427563;
+			public const int layout_recyclerview_refresh_header = 2131427563;
 			
 			// aapt resource value: 0x7F0B00EC
-			public const int modify_device_name_page = 2131427564;
+			public const int layout_recyclerview_swipe_item_default = 2131427564;
 			
 			// aapt resource value: 0x7F0B00ED
-			public const int more_options_layout = 2131427565;
+			public const int line_connecting_introduce_activity = 2131427565;
 			
 			// aapt resource value: 0x7F0B00EE
-			public const int multi_video_talk_item = 2131427566;
+			public const int list_section = 2131427566;
 			
 			// aapt resource value: 0x7F0B00EF
-			public const int network_error_retry_page = 2131427567;
-			
-			// aapt resource value: 0x7F0B00F3
-			public const int notification_action = 2131427571;
-			
-			// aapt resource value: 0x7F0B00F4
-			public const int notification_action_tombstone = 2131427572;
-			
-			// aapt resource value: 0x7F0B00F5
-			public const int notification_media_action = 2131427573;
-			
-			// aapt resource value: 0x7F0B00F6
-			public const int notification_media_cancel_action = 2131427574;
-			
-			// aapt resource value: 0x7F0B00F7
-			public const int notification_template_big_media = 2131427575;
-			
-			// aapt resource value: 0x7F0B00F8
-			public const int notification_template_big_media_custom = 2131427576;
-			
-			// aapt resource value: 0x7F0B00F9
-			public const int notification_template_big_media_narrow = 2131427577;
-			
-			// aapt resource value: 0x7F0B00FA
-			public const int notification_template_big_media_narrow_custom = 2131427578;
-			
-			// aapt resource value: 0x7F0B00FB
-			public const int notification_template_custom_big = 2131427579;
-			
-			// aapt resource value: 0x7F0B00FC
-			public const int notification_template_icon_group = 2131427580;
-			
-			// aapt resource value: 0x7F0B00FD
-			public const int notification_template_lines_media = 2131427581;
-			
-			// aapt resource value: 0x7F0B00FE
-			public const int notification_template_media = 2131427582;
-			
-			// aapt resource value: 0x7F0B00FF
-			public const int notification_template_media_custom = 2131427583;
-			
-			// aapt resource value: 0x7F0B0100
-			public const int notification_template_part_chronometer = 2131427584;
-			
-			// aapt resource value: 0x7F0B0101
-			public const int notification_template_part_time = 2131427585;
-			
-			// aapt resource value: 0x7F0B0102
-			public const int notifier_alarmloginfo_list_item = 2131427586;
-			
-			// aapt resource value: 0x7F0B0103
-			public const int notifier_page = 2131427587;
+			public const int loading_text_view = 2131427567;
 			
 			// aapt resource value: 0x7F0B00F0
-			public const int no_device_more_footer = 2131427568;
+			public const int login_activity = 2131427568;
 			
 			// aapt resource value: 0x7F0B00F1
-			public const int no_more_footer = 2131427569;
+			public const int login_page = 2131427569;
 			
 			// aapt resource value: 0x7F0B00F2
-			public const int no_msg_more_footer = 2131427570;
+			public const int message_list_item = 2131427570;
+			
+			// aapt resource value: 0x7F0B00F3
+			public const int message_page = 2131427571;
+			
+			// aapt resource value: 0x7F0B00F4
+			public const int mobile_common_comment = 2131427572;
+			
+			// aapt resource value: 0x7F0B00F5
+			public const int mobile_common_lc_alert_dialog_layout = 2131427573;
+			
+			// aapt resource value: 0x7F0B00F6
+			public const int mobile_common_progressdialog_layout = 2131427574;
+			
+			// aapt resource value: 0x7F0B00F7
+			public const int mobile_common_roll_select_dialog = 2131427575;
+			
+			// aapt resource value: 0x7F0B00F8
+			public const int mobile_common_search_view = 2131427576;
+			
+			// aapt resource value: 0x7F0B00F9
+			public const int mobile_common_widget_common_title = 2131427577;
+			
+			// aapt resource value: 0x7F0B00FA
+			public const int mobile_common_widget_switch_title = 2131427578;
+			
+			// aapt resource value: 0x7F0B00FB
+			public const int modify_device_name_page = 2131427579;
+			
+			// aapt resource value: 0x7F0B00FC
+			public const int more_options_layout = 2131427580;
+			
+			// aapt resource value: 0x7F0B00FD
+			public const int multi_video_talk_item = 2131427581;
+			
+			// aapt resource value: 0x7F0B00FE
+			public const int network_error_retry_page = 2131427582;
+			
+			// aapt resource value: 0x7F0B0102
+			public const int notification_action = 2131427586;
+			
+			// aapt resource value: 0x7F0B0103
+			public const int notification_action_tombstone = 2131427587;
 			
 			// aapt resource value: 0x7F0B0104
-			public const int open_ysservice_dialog = 2131427588;
+			public const int notification_media_action = 2131427588;
 			
 			// aapt resource value: 0x7F0B0105
-			public const int option_item = 2131427589;
+			public const int notification_media_cancel_action = 2131427589;
 			
 			// aapt resource value: 0x7F0B0106
-			public const int password_error_layout = 2131427590;
+			public const int notification_template_big_media = 2131427590;
 			
 			// aapt resource value: 0x7F0B0107
-			public const int playback_list_page = 2131427591;
+			public const int notification_template_big_media_custom = 2131427591;
 			
 			// aapt resource value: 0x7F0B0108
-			public const int pull_to_refresh_footer = 2131427592;
+			public const int notification_template_big_media_narrow = 2131427592;
 			
 			// aapt resource value: 0x7F0B0109
-			public const int pull_to_refresh_header = 2131427593;
+			public const int notification_template_big_media_narrow_custom = 2131427593;
 			
 			// aapt resource value: 0x7F0B010A
-			public const int pull_to_refresh_header_horizontal = 2131427594;
+			public const int notification_template_custom_big = 2131427594;
 			
 			// aapt resource value: 0x7F0B010B
-			public const int pull_to_refresh_header_vertical = 2131427595;
-			
-			// aapt resource value: 0x7F0B0117
-			public const int realplayer_item = 2131427607;
-			
-			// aapt resource value: 0x7F0B0118
-			public const int realplayer_page = 2131427608;
+			public const int notification_template_icon_group = 2131427595;
 			
 			// aapt resource value: 0x7F0B010C
-			public const int realplay_control_layout = 2131427596;
+			public const int notification_template_lines_media = 2131427596;
 			
 			// aapt resource value: 0x7F0B010D
-			public const int realplay_full_operate_layout = 2131427597;
+			public const int notification_template_media = 2131427597;
 			
 			// aapt resource value: 0x7F0B010E
-			public const int realplay_loading_layout = 2131427598;
+			public const int notification_template_media_custom = 2131427598;
 			
 			// aapt resource value: 0x7F0B010F
-			public const int realplay_operate_bar = 2131427599;
+			public const int notification_template_part_chronometer = 2131427599;
 			
 			// aapt resource value: 0x7F0B0110
-			public const int realplay_operate_bar2 = 2131427600;
+			public const int notification_template_part_time = 2131427600;
 			
 			// aapt resource value: 0x7F0B0111
-			public const int realplay_page = 2131427601;
+			public const int notifier_alarmloginfo_list_item = 2131427601;
 			
 			// aapt resource value: 0x7F0B0112
-			public const int realplay_prompt_layout = 2131427602;
+			public const int notifier_page = 2131427602;
+			
+			// aapt resource value: 0x7F0B00FF
+			public const int no_device_more_footer = 2131427583;
+			
+			// aapt resource value: 0x7F0B0100
+			public const int no_more_footer = 2131427584;
+			
+			// aapt resource value: 0x7F0B0101
+			public const int no_msg_more_footer = 2131427585;
 			
 			// aapt resource value: 0x7F0B0113
-			public const int realplay_ptz_wnd = 2131427603;
+			public const int open_ysservice_dialog = 2131427603;
 			
 			// aapt resource value: 0x7F0B0114
-			public const int realplay_quality_items = 2131427604;
+			public const int option_item = 2131427604;
 			
 			// aapt resource value: 0x7F0B0115
-			public const int realplay_quality_wnd = 2131427605;
+			public const int password_error_layout = 2131427605;
 			
 			// aapt resource value: 0x7F0B0116
-			public const int realplay_talkback_wnd = 2131427606;
+			public const int playback_list_page = 2131427606;
+			
+			// aapt resource value: 0x7F0B0117
+			public const int pull_to_refresh_footer = 2131427607;
+			
+			// aapt resource value: 0x7F0B0118
+			public const int pull_to_refresh_header = 2131427608;
 			
 			// aapt resource value: 0x7F0B0119
-			public const int remote_playback_page = 2131427609;
+			public const int pull_to_refresh_header_horizontal = 2131427609;
 			
 			// aapt resource value: 0x7F0B011A
-			public const int section_list_item = 2131427610;
+			public const int pull_to_refresh_header_vertical = 2131427610;
 			
 			// aapt resource value: 0x7F0B011B
-			public const int select_camera_no_dialog = 2131427611;
+			public const int push_download_notification_layout = 2131427611;
 			
 			// aapt resource value: 0x7F0B011C
-			public const int select_camera_no_dialog_item = 2131427612;
+			public const int push_expandable_big_image_notification = 2131427612;
 			
 			// aapt resource value: 0x7F0B011D
-			public const int select_dialog_item_material = 2131427613;
+			public const int push_expandable_big_text_notification = 2131427613;
 			
 			// aapt resource value: 0x7F0B011E
-			public const int select_dialog_multichoice_material = 2131427614;
+			public const int push_notification = 2131427614;
 			
 			// aapt resource value: 0x7F0B011F
-			public const int select_dialog_singlechoice_material = 2131427615;
+			public const int push_notification_large = 2131427615;
 			
 			// aapt resource value: 0x7F0B0120
-			public const int select_talkback_items = 2131427616;
+			public const int push_notification_middle = 2131427616;
 			
 			// aapt resource value: 0x7F0B0121
-			public const int simple_demo = 2131427617;
+			public const int push_pure_pic_notification_f6 = 2131427617;
 			
 			// aapt resource value: 0x7F0B0122
-			public const int sms_valid_view = 2131427618;
+			public const int push_pure_pic_notification_f7 = 2131427618;
 			
 			// aapt resource value: 0x7F0B0123
-			public const int sms_verify_dialog = 2131427619;
+			public const int push_pure_pic_notification_f8 = 2131427619;
 			
 			// aapt resource value: 0x7F0B0124
-			public const int square_column_item = 2131427620;
+			public const int push_pure_pic_notification_f9 = 2131427620;
 			
 			// aapt resource value: 0x7F0B0125
-			public const int square_video_item = 2131427621;
-			
-			// aapt resource value: 0x7F0B0126
-			public const int srl_classics_footer = 2131427622;
-			
-			// aapt resource value: 0x7F0B0127
-			public const int srl_classics_header = 2131427623;
-			
-			// aapt resource value: 0x7F0B0128
-			public const int support_simple_spinner_dropdown_item = 2131427624;
-			
-			// aapt resource value: 0x7F0B0129
-			public const int test_surfaceview = 2131427625;
-			
-			// aapt resource value: 0x7F0B012A
-			public const int toolbar = 2131427626;
-			
-			// aapt resource value: 0x7F0B012B
-			public const int tooltip = 2131427627;
-			
-			// aapt resource value: 0x7F0B012C
-			public const int topbar = 2131427628;
-			
-			// aapt resource value: 0x7F0B012D
-			public const int upsdk_app_dl_progress_dialog = 2131427629;
-			
-			// aapt resource value: 0x7F0B012E
-			public const int upsdk_ota_update_view = 2131427630;
-			
-			// aapt resource value: 0x7F0B012F
-			public const int user_regesiter_activity = 2131427631;
-			
-			// aapt resource value: 0x7F0B0130
-			public const int verifycode_layout = 2131427632;
+			public const int push_pure_pic_notification_f9_275 = 2131427621;
 			
 			// aapt resource value: 0x7F0B0131
-			public const int video_device = 2131427633;
+			public const int realplayer_item = 2131427633;
 			
 			// aapt resource value: 0x7F0B0132
-			public const int view_pixel_popwindow = 2131427634;
+			public const int realplayer_page = 2131427634;
+			
+			// aapt resource value: 0x7F0B0126
+			public const int realplay_control_layout = 2131427622;
+			
+			// aapt resource value: 0x7F0B0127
+			public const int realplay_full_operate_layout = 2131427623;
+			
+			// aapt resource value: 0x7F0B0128
+			public const int realplay_loading_layout = 2131427624;
+			
+			// aapt resource value: 0x7F0B0129
+			public const int realplay_operate_bar = 2131427625;
+			
+			// aapt resource value: 0x7F0B012A
+			public const int realplay_operate_bar2 = 2131427626;
+			
+			// aapt resource value: 0x7F0B012B
+			public const int realplay_page = 2131427627;
+			
+			// aapt resource value: 0x7F0B012C
+			public const int realplay_prompt_layout = 2131427628;
+			
+			// aapt resource value: 0x7F0B012D
+			public const int realplay_ptz_wnd = 2131427629;
+			
+			// aapt resource value: 0x7F0B012E
+			public const int realplay_quality_items = 2131427630;
+			
+			// aapt resource value: 0x7F0B012F
+			public const int realplay_quality_wnd = 2131427631;
+			
+			// aapt resource value: 0x7F0B0130
+			public const int realplay_talkback_wnd = 2131427632;
 			
 			// aapt resource value: 0x7F0B0133
-			public const int wait_dialog = 2131427635;
+			public const int remote_playback_page = 2131427635;
 			
 			// aapt resource value: 0x7F0B0134
-			public const int web_page = 2131427636;
+			public const int section_list_item = 2131427636;
 			
 			// aapt resource value: 0x7F0B0135
-			public const int wheel_text = 2131427637;
+			public const int select_camera_no_dialog = 2131427637;
 			
 			// aapt resource value: 0x7F0B0136
-			public const int widget_common_itme = 2131427638;
+			public const int select_camera_no_dialog_item = 2131427638;
 			
 			// aapt resource value: 0x7F0B0137
-			public const int widget_common_sub_title = 2131427639;
-			
-			// aapt resource value: 0x7F0B013B
-			public const int zxingscanneractivitylayout = 2131427643;
-			
-			// aapt resource value: 0x7F0B013C
-			public const int zxingscannerfragmentlayout = 2131427644;
+			public const int select_dialog_item_material = 2131427639;
 			
 			// aapt resource value: 0x7F0B0138
-			public const int zxing_barcode_scanner = 2131427640;
+			public const int select_dialog_multichoice_material = 2131427640;
 			
 			// aapt resource value: 0x7F0B0139
-			public const int zxing_capture = 2131427641;
+			public const int select_dialog_singlechoice_material = 2131427641;
 			
 			// aapt resource value: 0x7F0B013A
-			public const int zxing_layout = 2131427642;
+			public const int select_talkback_items = 2131427642;
+			
+			// aapt resource value: 0x7F0B013B
+			public const int simple_demo = 2131427643;
+			
+			// aapt resource value: 0x7F0B013C
+			public const int sms_valid_view = 2131427644;
+			
+			// aapt resource value: 0x7F0B013D
+			public const int sms_verify_dialog = 2131427645;
+			
+			// aapt resource value: 0x7F0B013E
+			public const int square_column_item = 2131427646;
+			
+			// aapt resource value: 0x7F0B013F
+			public const int square_video_item = 2131427647;
+			
+			// aapt resource value: 0x7F0B0140
+			public const int srl_classics_footer = 2131427648;
+			
+			// aapt resource value: 0x7F0B0141
+			public const int srl_classics_header = 2131427649;
+			
+			// aapt resource value: 0x7F0B0142
+			public const int support_simple_spinner_dropdown_item = 2131427650;
+			
+			// aapt resource value: 0x7F0B0143
+			public const int test_surfaceview = 2131427651;
+			
+			// aapt resource value: 0x7F0B0144
+			public const int toolbar = 2131427652;
+			
+			// aapt resource value: 0x7F0B0145
+			public const int tooltip = 2131427653;
+			
+			// aapt resource value: 0x7F0B0146
+			public const int topbar = 2131427654;
+			
+			// aapt resource value: 0x7F0B0147
+			public const int user_regesiter_activity = 2131427655;
+			
+			// aapt resource value: 0x7F0B0148
+			public const int verifycode_layout = 2131427656;
+			
+			// aapt resource value: 0x7F0B0149
+			public const int video_device = 2131427657;
+			
+			// aapt resource value: 0x7F0B014A
+			public const int view_pixel_popwindow = 2131427658;
+			
+			// aapt resource value: 0x7F0B014B
+			public const int wait_dialog = 2131427659;
+			
+			// aapt resource value: 0x7F0B014C
+			public const int web_page = 2131427660;
+			
+			// aapt resource value: 0x7F0B014D
+			public const int wheel_text = 2131427661;
+			
+			// aapt resource value: 0x7F0B014E
+			public const int widget_common_itme = 2131427662;
+			
+			// aapt resource value: 0x7F0B014F
+			public const int widget_common_sub_title = 2131427663;
+			
+			// aapt resource value: 0x7F0B0153
+			public const int zxingscanneractivitylayout = 2131427667;
+			
+			// aapt resource value: 0x7F0B0154
+			public const int zxingscannerfragmentlayout = 2131427668;
+			
+			// aapt resource value: 0x7F0B0150
+			public const int zxing_barcode_scanner = 2131427664;
+			
+			// aapt resource value: 0x7F0B0151
+			public const int zxing_capture = 2131427665;
+			
+			// aapt resource value: 0x7F0B0152
+			public const int zxing_layout = 2131427666;
 			
 			static Layout()
 			{
@@ -17013,6 +17643,9 @@
 			
 			// aapt resource value: 0x7F0F00D7
 			public const int adding_device_to_your_account = 2131689687;
+			
+			// aapt resource value: 0x7F0F00D8
+			public const int adding_device_to_your_account2 = 2131689688;
 			
 			// aapt resource value: 0x7F0F0026
 			public const int add_box_tip = 2131689510;
@@ -17527,2648 +18160,2786 @@
 			// aapt resource value: 0x7F0F00D0
 			public const int add_device_yellow_light_twinkle = 2131689680;
 			
-			// aapt resource value: 0x7F0F00D8
-			public const int agree = 2131689688;
-			
 			// aapt resource value: 0x7F0F00D9
-			public const int alarm_box = 2131689689;
+			public const int agree = 2131689689;
 			
 			// aapt resource value: 0x7F0F00DA
-			public const int alarm_message_check_fail = 2131689690;
+			public const int alarm_box = 2131689690;
 			
 			// aapt resource value: 0x7F0F00DB
-			public const int alarm_message_check_fail_network_exception = 2131689691;
+			public const int alarm_message_check_fail = 2131689691;
 			
 			// aapt resource value: 0x7F0F00DC
-			public const int alarm_message_del_fail_network_exception = 2131689692;
+			public const int alarm_message_check_fail_network_exception = 2131689692;
 			
 			// aapt resource value: 0x7F0F00DD
-			public const int alarm_message_del_fail_txt = 2131689693;
+			public const int alarm_message_del_fail_network_exception = 2131689693;
 			
 			// aapt resource value: 0x7F0F00DE
-			public const int alarm_message_del_success_txt = 2131689694;
+			public const int alarm_message_del_fail_txt = 2131689694;
 			
 			// aapt resource value: 0x7F0F00DF
-			public const int alarm_setted_close_success = 2131689695;
+			public const int alarm_message_del_success_txt = 2131689695;
 			
 			// aapt resource value: 0x7F0F00E0
-			public const int alarm_setted_success = 2131689696;
+			public const int alarm_setted_close_success = 2131689696;
 			
 			// aapt resource value: 0x7F0F00E1
-			public const int alarm_sound_mode = 2131689697;
+			public const int alarm_setted_success = 2131689697;
 			
 			// aapt resource value: 0x7F0F00E2
-			public const int alarm_type_baby_cry = 2131689698;
+			public const int alarm_sound_mode = 2131689698;
 			
 			// aapt resource value: 0x7F0F00E3
-			public const int alarm_type_door = 2131689699;
+			public const int alarm_type_baby_cry = 2131689699;
 			
 			// aapt resource value: 0x7F0F00E4
-			public const int alarm_type_gas = 2131689700;
+			public const int alarm_type_door = 2131689700;
 			
 			// aapt resource value: 0x7F0F00E5
-			public const int alarm_type_infrared = 2131689701;
+			public const int alarm_type_gas = 2131689701;
 			
 			// aapt resource value: 0x7F0F00E6
-			public const int alarm_type_motion_detection = 2131689702;
+			public const int alarm_type_infrared = 2131689702;
 			
 			// aapt resource value: 0x7F0F00E7
-			public const int alarm_type_person_alarm = 2131689703;
+			public const int alarm_type_motion_detection = 2131689703;
 			
 			// aapt resource value: 0x7F0F00E8
-			public const int alarm_type_remotecontrol = 2131689704;
+			public const int alarm_type_person_alarm = 2131689704;
 			
 			// aapt resource value: 0x7F0F00E9
-			public const int alarm_type_smoke = 2131689705;
+			public const int alarm_type_remotecontrol = 2131689705;
 			
 			// aapt resource value: 0x7F0F00EA
-			public const int alarm_type_unknown = 2131689706;
+			public const int alarm_type_smoke = 2131689706;
 			
 			// aapt resource value: 0x7F0F00EB
-			public const int alarm_type_urgent_button = 2131689707;
+			public const int alarm_type_unknown = 2131689707;
 			
 			// aapt resource value: 0x7F0F00EC
-			public const int alarm_type_water = 2131689708;
+			public const int alarm_type_urgent_button = 2131689708;
 			
 			// aapt resource value: 0x7F0F00ED
-			public const int already_reset = 2131689709;
+			public const int alarm_type_water = 2131689709;
 			
 			// aapt resource value: 0x7F0F00EE
-			public const int already_saved_to_volume = 2131689710;
+			public const int already_reset = 2131689710;
 			
 			// aapt resource value: 0x7F0F00EF
-			public const int am = 2131689711;
+			public const int already_saved_to_volume = 2131689711;
 			
 			// aapt resource value: 0x7F0F00F0
-			public const int aotu_wifi_add_device_success = 2131689712;
-			
-			// aapt resource value: 0x7F0F00FC
-			public const int appbar_scrolling_view_behavior = 2131689724;
-			
-			// aapt resource value: 0x7F0F00FD
-			public const int application_name = 2131689725;
-			
-			// aapt resource value: 0x7F0F00F3
-			public const int app_add_device_success = 2131689715;
-			
-			// aapt resource value: 0x7F0F00F4
-			public const int app_closed = 2131689716;
-			
-			// aapt resource value: 0x7F0F00F5
-			public const int app_common_deivce_hotspot_info_can_not_empty = 2131689717;
-			
-			// aapt resource value: 0x7F0F00F6
-			public const int app_common_hint_hotspot_name = 2131689718;
-			
-			// aapt resource value: 0x7F0F00F7
-			public const int app_common_hint_hotspot_pwd = 2131689719;
-			
-			// aapt resource value: 0x7F0F00F8
-			public const int app_common_next_step = 2131689720;
-			
-			// aapt resource value: 0x7F0F00F9
-			public const int app_common_stop_config_wifi_while_switched_to_background = 2131689721;
-			
-			// aapt resource value: 0x7F0F00FA
-			public const int app_key = 2131689722;
-			
-			// aapt resource value: 0x7F0F00FB
-			public const int app_name = 2131689723;
+			public const int am = 2131689712;
 			
 			// aapt resource value: 0x7F0F00F1
-			public const int ap_config_connecting_to_device = 2131689713;
+			public const int aotu_wifi_add_device_success = 2131689713;
 			
-			// aapt resource value: 0x7F0F00F2
-			public const int ap_config_device_try_registering_ezviz_platform = 2131689714;
+			// aapt resource value: 0x7F0F00FD
+			public const int appbar_scrolling_view_behavior = 2131689725;
 			
 			// aapt resource value: 0x7F0F00FE
-			public const int assetfont_html = 2131689726;
+			public const int application_name = 2131689726;
 			
-			// aapt resource value: 0x7F0F0128
-			public const int autowifi_heard_voice = 2131689768;
+			// aapt resource value: 0x7F0F00F4
+			public const int app_add_device_success = 2131689716;
 			
-			// aapt resource value: 0x7F0F0129
-			public const int autowifi_not_heard_voice = 2131689769;
+			// aapt resource value: 0x7F0F00F5
+			public const int app_closed = 2131689717;
+			
+			// aapt resource value: 0x7F0F00F6
+			public const int app_common_deivce_hotspot_info_can_not_empty = 2131689718;
+			
+			// aapt resource value: 0x7F0F00F7
+			public const int app_common_hint_hotspot_name = 2131689719;
+			
+			// aapt resource value: 0x7F0F00F8
+			public const int app_common_hint_hotspot_pwd = 2131689720;
+			
+			// aapt resource value: 0x7F0F00F9
+			public const int app_common_next_step = 2131689721;
+			
+			// aapt resource value: 0x7F0F00FA
+			public const int app_common_stop_config_wifi_while_switched_to_background = 2131689722;
+			
+			// aapt resource value: 0x7F0F00FB
+			public const int app_key = 2131689723;
+			
+			// aapt resource value: 0x7F0F00FC
+			public const int app_name = 2131689724;
+			
+			// aapt resource value: 0x7F0F00F2
+			public const int ap_config_connecting_to_device = 2131689714;
+			
+			// aapt resource value: 0x7F0F00F3
+			public const int ap_config_device_try_registering_ezviz_platform = 2131689715;
 			
 			// aapt resource value: 0x7F0F00FF
-			public const int auto_play_time = 2131689727;
+			public const int assetfont_html = 2131689727;
 			
-			// aapt resource value: 0x7F0F0100
-			public const int auto_wifi_add_device_failed = 2131689728;
-			
-			// aapt resource value: 0x7F0F0101
-			public const int auto_wifi_add_device_failed2 = 2131689729;
-			
-			// aapt resource value: 0x7F0F0102
-			public const int auto_wifi_cer_config_title = 2131689730;
-			
-			// aapt resource value: 0x7F0F0103
-			public const int auto_wifi_cer_config_title1 = 2131689731;
-			
-			// aapt resource value: 0x7F0F0104
-			public const int auto_wifi_cer_config_title2 = 2131689732;
-			
-			// aapt resource value: 0x7F0F0105
-			public const int auto_wifi_config_tip = 2131689733;
-			
-			// aapt resource value: 0x7F0F0106
-			public const int auto_wifi_connecting_failed = 2131689734;
-			
-			// aapt resource value: 0x7F0F0107
-			public const int auto_wifi_connecting_msg1 = 2131689735;
-			
-			// aapt resource value: 0x7F0F0108
-			public const int auto_wifi_connecting_msg2 = 2131689736;
-			
-			// aapt resource value: 0x7F0F0109
-			public const int auto_wifi_connecting_msg3 = 2131689737;
-			
-			// aapt resource value: 0x7F0F010A
-			public const int auto_wifi_device_added_already = 2131689738;
-			
-			// aapt resource value: 0x7F0F010B
-			public const int auto_wifi_device_added_by_others = 2131689739;
-			
-			// aapt resource value: 0x7F0F010C
-			public const int auto_wifi_device_not_exist = 2131689740;
-			
-			// aapt resource value: 0x7F0F010D
-			public const int auto_wifi_device_you_added_already = 2131689741;
-			
-			// aapt resource value: 0x7F0F010E
-			public const int auto_wifi_dialog_btn_wifi = 2131689742;
-			
-			// aapt resource value: 0x7F0F010F
-			public const int auto_wifi_dialog_connecting_msg = 2131689743;
-			
-			// aapt resource value: 0x7F0F0110
-			public const int auto_wifi_dialog_title_wifi_required = 2131689744;
-			
-			// aapt resource value: 0x7F0F0111
-			public const int auto_wifi_line_connect = 2131689745;
-			
-			// aapt resource value: 0x7F0F0113
-			public const int auto_wifi_line_connected = 2131689747;
-			
-			// aapt resource value: 0x7F0F0112
-			public const int auto_wifi_line_connect_title = 2131689746;
-			
-			// aapt resource value: 0x7F0F0114
-			public const int auto_wifi_line_msg = 2131689748;
-			
-			// aapt resource value: 0x7F0F0115
-			public const int auto_wifi_net = 2131689749;
-			
-			// aapt resource value: 0x7F0F0116
-			public const int auto_wifi_network_add_device = 2131689750;
-			
-			// aapt resource value: 0x7F0F0117
-			public const int auto_wifi_network_add_device1 = 2131689751;
-			
-			// aapt resource value: 0x7F0F0118
-			public const int auto_wifi_network_add_device2 = 2131689752;
-			
-			// aapt resource value: 0x7F0F0119
-			public const int auto_wifi_register_failed = 2131689753;
-			
-			// aapt resource value: 0x7F0F011A
-			public const int auto_wifi_ssid = 2131689754;
-			
-			// aapt resource value: 0x7F0F011B
-			public const int auto_wifi_step_one_title = 2131689755;
-			
-			// aapt resource value: 0x7F0F011C
-			public const int auto_wifi_step_three_title = 2131689756;
-			
-			// aapt resource value: 0x7F0F011D
-			public const int auto_wifi_step_two_title = 2131689757;
-			
-			// aapt resource value: 0x7F0F011E
-			public const int auto_wifi_tip_binding_account = 2131689758;
-			
-			// aapt resource value: 0x7F0F011F
-			public const int auto_wifi_tip_binding_account_ing = 2131689759;
-			
-			// aapt resource value: 0x7F0F0120
-			public const int auto_wifi_tip_connecting_server = 2131689760;
-			
-			// aapt resource value: 0x7F0F0121
-			public const int auto_wifi_tip_connecting_server_ing = 2131689761;
-			
-			// aapt resource value: 0x7F0F0122
-			public const int auto_wifi_tip_connecting_server_ok = 2131689762;
-			
-			// aapt resource value: 0x7F0F0123
-			public const int auto_wifi_tip_connecting_wifi = 2131689763;
-			
-			// aapt resource value: 0x7F0F0124
-			public const int auto_wifi_tip_connecting_wifi_ing = 2131689764;
-			
-			// aapt resource value: 0x7F0F0125
-			public const int auto_wifi_tip_connecting_wifi_ok = 2131689765;
-			
-			// aapt resource value: 0x7F0F0126
-			public const int auto_wifi_title_add_device = 2131689766;
-			
-			// aapt resource value: 0x7F0F0127
-			public const int auto_wifi_title_add_device2 = 2131689767;
+			// aapt resource value: 0x7F0F0129
+			public const int autowifi_heard_voice = 2131689769;
 			
 			// aapt resource value: 0x7F0F012A
-			public const int bind_baidu_account = 2131689770;
+			public const int autowifi_not_heard_voice = 2131689770;
+			
+			// aapt resource value: 0x7F0F0100
+			public const int auto_play_time = 2131689728;
+			
+			// aapt resource value: 0x7F0F0101
+			public const int auto_wifi_add_device_failed = 2131689729;
+			
+			// aapt resource value: 0x7F0F0102
+			public const int auto_wifi_add_device_failed2 = 2131689730;
+			
+			// aapt resource value: 0x7F0F0103
+			public const int auto_wifi_cer_config_title = 2131689731;
+			
+			// aapt resource value: 0x7F0F0104
+			public const int auto_wifi_cer_config_title1 = 2131689732;
+			
+			// aapt resource value: 0x7F0F0105
+			public const int auto_wifi_cer_config_title2 = 2131689733;
+			
+			// aapt resource value: 0x7F0F0106
+			public const int auto_wifi_config_tip = 2131689734;
+			
+			// aapt resource value: 0x7F0F0107
+			public const int auto_wifi_connecting_failed = 2131689735;
+			
+			// aapt resource value: 0x7F0F0108
+			public const int auto_wifi_connecting_msg1 = 2131689736;
+			
+			// aapt resource value: 0x7F0F0109
+			public const int auto_wifi_connecting_msg2 = 2131689737;
+			
+			// aapt resource value: 0x7F0F010A
+			public const int auto_wifi_connecting_msg3 = 2131689738;
+			
+			// aapt resource value: 0x7F0F010B
+			public const int auto_wifi_device_added_already = 2131689739;
+			
+			// aapt resource value: 0x7F0F010C
+			public const int auto_wifi_device_added_by_others = 2131689740;
+			
+			// aapt resource value: 0x7F0F010D
+			public const int auto_wifi_device_not_exist = 2131689741;
+			
+			// aapt resource value: 0x7F0F010E
+			public const int auto_wifi_device_you_added_already = 2131689742;
+			
+			// aapt resource value: 0x7F0F010F
+			public const int auto_wifi_dialog_btn_wifi = 2131689743;
+			
+			// aapt resource value: 0x7F0F0110
+			public const int auto_wifi_dialog_connecting_msg = 2131689744;
+			
+			// aapt resource value: 0x7F0F0111
+			public const int auto_wifi_dialog_title_wifi_required = 2131689745;
+			
+			// aapt resource value: 0x7F0F0112
+			public const int auto_wifi_line_connect = 2131689746;
+			
+			// aapt resource value: 0x7F0F0114
+			public const int auto_wifi_line_connected = 2131689748;
+			
+			// aapt resource value: 0x7F0F0113
+			public const int auto_wifi_line_connect_title = 2131689747;
+			
+			// aapt resource value: 0x7F0F0115
+			public const int auto_wifi_line_msg = 2131689749;
+			
+			// aapt resource value: 0x7F0F0116
+			public const int auto_wifi_net = 2131689750;
+			
+			// aapt resource value: 0x7F0F0117
+			public const int auto_wifi_network_add_device = 2131689751;
+			
+			// aapt resource value: 0x7F0F0118
+			public const int auto_wifi_network_add_device1 = 2131689752;
+			
+			// aapt resource value: 0x7F0F0119
+			public const int auto_wifi_network_add_device2 = 2131689753;
+			
+			// aapt resource value: 0x7F0F011A
+			public const int auto_wifi_register_failed = 2131689754;
+			
+			// aapt resource value: 0x7F0F011B
+			public const int auto_wifi_ssid = 2131689755;
+			
+			// aapt resource value: 0x7F0F011C
+			public const int auto_wifi_step_one_title = 2131689756;
+			
+			// aapt resource value: 0x7F0F011D
+			public const int auto_wifi_step_three_title = 2131689757;
+			
+			// aapt resource value: 0x7F0F011E
+			public const int auto_wifi_step_two_title = 2131689758;
+			
+			// aapt resource value: 0x7F0F011F
+			public const int auto_wifi_tip_binding_account = 2131689759;
+			
+			// aapt resource value: 0x7F0F0120
+			public const int auto_wifi_tip_binding_account_ing = 2131689760;
+			
+			// aapt resource value: 0x7F0F0121
+			public const int auto_wifi_tip_connecting_server = 2131689761;
+			
+			// aapt resource value: 0x7F0F0122
+			public const int auto_wifi_tip_connecting_server_ing = 2131689762;
+			
+			// aapt resource value: 0x7F0F0123
+			public const int auto_wifi_tip_connecting_server_ok = 2131689763;
+			
+			// aapt resource value: 0x7F0F0124
+			public const int auto_wifi_tip_connecting_wifi = 2131689764;
+			
+			// aapt resource value: 0x7F0F0125
+			public const int auto_wifi_tip_connecting_wifi_ing = 2131689765;
+			
+			// aapt resource value: 0x7F0F0126
+			public const int auto_wifi_tip_connecting_wifi_ok = 2131689766;
+			
+			// aapt resource value: 0x7F0F0127
+			public const int auto_wifi_title_add_device = 2131689767;
+			
+			// aapt resource value: 0x7F0F0128
+			public const int auto_wifi_title_add_device2 = 2131689768;
 			
 			// aapt resource value: 0x7F0F012B
-			public const int bottom_sheet_behavior = 2131689771;
+			public const int bind_baidu_account = 2131689771;
 			
 			// aapt resource value: 0x7F0F012C
-			public const int btn_ensure = 2131689772;
+			public const int bottom_sheet_behavior = 2131689772;
 			
 			// aapt resource value: 0x7F0F012D
-			public const int calendar_setting_error = 2131689773;
+			public const int btn_ensure = 2131689773;
 			
 			// aapt resource value: 0x7F0F012E
-			public const int calling = 2131689774;
-			
-			// aapt resource value: 0x7F0F0137
-			public const int cameradetail_close_success = 2131689783;
-			
-			// aapt resource value: 0x7F0F0138
-			public const int cameradetail_open_fail_not_online = 2131689784;
-			
-			// aapt resource value: 0x7F0F0139
-			public const int cameradetail_open_success = 2131689785;
-			
-			// aapt resource value: 0x7F0F013A
-			public const int cameras_txt = 2131689786;
+			public const int calendar_setting_error = 2131689774;
 			
 			// aapt resource value: 0x7F0F012F
-			public const int camera_detail_verifycode_error_title = 2131689775;
+			public const int calling = 2131689775;
 			
-			// aapt resource value: 0x7F0F0130
-			public const int camera_lens_closed = 2131689776;
+			// aapt resource value: 0x7F0F0138
+			public const int cameradetail_close_success = 2131689784;
 			
-			// aapt resource value: 0x7F0F0131
-			public const int camera_lens_closing = 2131689777;
+			// aapt resource value: 0x7F0F0139
+			public const int cameradetail_open_fail_not_online = 2131689785;
 			
-			// aapt resource value: 0x7F0F0132
-			public const int camera_lens_opening = 2131689778;
-			
-			// aapt resource value: 0x7F0F0133
-			public const int camera_lens_too_busy = 2131689779;
-			
-			// aapt resource value: 0x7F0F0134
-			public const int camera_not_online = 2131689780;
-			
-			// aapt resource value: 0x7F0F0135
-			public const int camera_password_error = 2131689781;
-			
-			// aapt resource value: 0x7F0F0136
-			public const int camera_password_is_null = 2131689782;
+			// aapt resource value: 0x7F0F013A
+			public const int cameradetail_open_success = 2131689786;
 			
 			// aapt resource value: 0x7F0F013B
-			public const int cancel = 2131689787;
+			public const int cameras_txt = 2131689787;
+			
+			// aapt resource value: 0x7F0F0130
+			public const int camera_detail_verifycode_error_title = 2131689776;
+			
+			// aapt resource value: 0x7F0F0131
+			public const int camera_lens_closed = 2131689777;
+			
+			// aapt resource value: 0x7F0F0132
+			public const int camera_lens_closing = 2131689778;
+			
+			// aapt resource value: 0x7F0F0133
+			public const int camera_lens_opening = 2131689779;
+			
+			// aapt resource value: 0x7F0F0134
+			public const int camera_lens_too_busy = 2131689780;
+			
+			// aapt resource value: 0x7F0F0135
+			public const int camera_not_online = 2131689781;
+			
+			// aapt resource value: 0x7F0F0136
+			public const int camera_password_error = 2131689782;
+			
+			// aapt resource value: 0x7F0F0137
+			public const int camera_password_is_null = 2131689783;
 			
 			// aapt resource value: 0x7F0F013C
-			public const int cancel_collect_fail = 2131689788;
+			public const int cancel = 2131689788;
 			
 			// aapt resource value: 0x7F0F013D
-			public const int cancel_collect_success = 2131689789;
+			public const int cancel_collect_fail = 2131689789;
 			
 			// aapt resource value: 0x7F0F013E
-			public const int cancel_init_sdk = 2131689790;
+			public const int cancel_collect_success = 2131689790;
 			
 			// aapt resource value: 0x7F0F013F
-			public const int capture = 2131689791;
+			public const int cancel_init_sdk = 2131689791;
 			
 			// aapt resource value: 0x7F0F0140
-			public const int capture_no_camera = 2131689792;
+			public const int capture = 2131689792;
 			
 			// aapt resource value: 0x7F0F0141
-			public const int capture_no_network = 2131689793;
+			public const int capture_no_camera = 2131689793;
 			
 			// aapt resource value: 0x7F0F0142
-			public const int capture_no_result = 2131689794;
+			public const int capture_no_network = 2131689794;
 			
 			// aapt resource value: 0x7F0F0143
-			public const int capture_no_result2 = 2131689795;
+			public const int capture_no_result = 2131689795;
 			
 			// aapt resource value: 0x7F0F0144
-			public const int cc_back = 2131689796;
+			public const int capture_no_result2 = 2131689796;
 			
 			// aapt resource value: 0x7F0F0145
-			public const int cc_search = 2131689797;
+			public const int cc_back = 2131689797;
 			
 			// aapt resource value: 0x7F0F0146
-			public const int cc_title = 2131689798;
+			public const int cc_search = 2131689798;
 			
 			// aapt resource value: 0x7F0F0147
-			public const int certain = 2131689799;
+			public const int cc_title = 2131689799;
 			
 			// aapt resource value: 0x7F0F0148
-			public const int character_counter_pattern = 2131689800;
+			public const int certain = 2131689800;
 			
 			// aapt resource value: 0x7F0F0149
-			public const int check_all_message = 2131689801;
+			public const int character_counter_pattern = 2131689801;
 			
 			// aapt resource value: 0x7F0F014A
-			public const int check_feature_code_fail = 2131689802;
+			public const int check_all_message = 2131689802;
 			
 			// aapt resource value: 0x7F0F014B
-			public const int choose_config_wifi_way = 2131689803;
+			public const int check_feature_code_fail = 2131689803;
 			
 			// aapt resource value: 0x7F0F014C
-			public const int cities = 2131689804;
+			public const int choose_config_wifi_way = 2131689804;
 			
 			// aapt resource value: 0x7F0F014D
-			public const int cityConfig = 2131689805;
+			public const int cities = 2131689805;
 			
 			// aapt resource value: 0x7F0F014E
-			public const int client_type = 2131689806;
+			public const int cityConfig = 2131689806;
 			
 			// aapt resource value: 0x7F0F014F
-			public const int close_camera_lens = 2131689807;
+			public const int client_type = 2131689807;
 			
 			// aapt resource value: 0x7F0F0150
-			public const int close_source_localization = 2131689808;
+			public const int close_camera_lens = 2131689808;
 			
 			// aapt resource value: 0x7F0F0151
-			public const int cloud = 2131689809;
+			public const int close_source_localization = 2131689809;
 			
 			// aapt resource value: 0x7F0F0152
-			public const int cloud_free = 2131689810;
+			public const int cloud = 2131689810;
 			
 			// aapt resource value: 0x7F0F0153
-			public const int collect_fail = 2131689811;
+			public const int cloud_free = 2131689811;
 			
 			// aapt resource value: 0x7F0F0154
-			public const int collect_success = 2131689812;
+			public const int collect_fail = 2131689812;
 			
 			// aapt resource value: 0x7F0F0155
-			public const int common_cancel = 2131689813;
+			public const int collect_success = 2131689813;
 			
 			// aapt resource value: 0x7F0F0156
-			public const int common_complete = 2131689814;
+			public const int common_cancel = 2131689814;
 			
 			// aapt resource value: 0x7F0F0157
-			public const int common_confirm = 2131689815;
+			public const int common_complete = 2131689815;
 			
 			// aapt resource value: 0x7F0F0158
-			public const int common_connect_failed = 2131689816;
+			public const int common_confirm = 2131689816;
 			
 			// aapt resource value: 0x7F0F0159
-			public const int common_copy_success = 2131689817;
+			public const int common_connect_failed = 2131689817;
 			
 			// aapt resource value: 0x7F0F015A
-			public const int common_local_photo = 2131689818;
+			public const int common_copy_success = 2131689818;
 			
 			// aapt resource value: 0x7F0F015B
-			public const int common_next = 2131689819;
+			public const int common_local_photo = 2131689819;
 			
 			// aapt resource value: 0x7F0F015C
-			public const int common_no_authority = 2131689820;
+			public const int common_next = 2131689820;
 			
 			// aapt resource value: 0x7F0F015D
-			public const int common_offline = 2131689821;
+			public const int common_no_authority = 2131689821;
 			
 			// aapt resource value: 0x7F0F015E
-			public const int common_passwd_error = 2131689822;
+			public const int common_offline = 2131689822;
 			
 			// aapt resource value: 0x7F0F015F
-			public const int common_today = 2131689823;
+			public const int common_passwd_error = 2131689823;
 			
 			// aapt resource value: 0x7F0F0160
-			public const int common_yesterday = 2131689824;
+			public const int common_today = 2131689824;
 			
 			// aapt resource value: 0x7F0F0161
-			public const int company_addr_is_empty = 2131689825;
+			public const int common_yesterday = 2131689825;
 			
 			// aapt resource value: 0x7F0F0162
-			public const int complete_txt = 2131689826;
-			
-			// aapt resource value: 0x7F0F0167
-			public const int configuring_wifi = 2131689831;
+			public const int company_addr_is_empty = 2131689826;
 			
 			// aapt resource value: 0x7F0F0163
-			public const int config_wifi_for_another_device = 2131689827;
-			
-			// aapt resource value: 0x7F0F0164
-			public const int config_wifi_page = 2131689828;
-			
-			// aapt resource value: 0x7F0F0165
-			public const int config_wifi_succeed = 2131689829;
-			
-			// aapt resource value: 0x7F0F0166
-			public const int config_wifi_succeeded = 2131689830;
+			public const int complete_txt = 2131689827;
 			
 			// aapt resource value: 0x7F0F0168
-			public const int confirm = 2131689832;
+			public const int configuring_wifi = 2131689832;
+			
+			// aapt resource value: 0x7F0F0164
+			public const int config_wifi_for_another_device = 2131689828;
+			
+			// aapt resource value: 0x7F0F0165
+			public const int config_wifi_page = 2131689829;
+			
+			// aapt resource value: 0x7F0F0166
+			public const int config_wifi_succeed = 2131689830;
+			
+			// aapt resource value: 0x7F0F0167
+			public const int config_wifi_succeeded = 2131689831;
 			
 			// aapt resource value: 0x7F0F0169
-			public const int connect_device_to_router = 2131689833;
+			public const int confirm = 2131689833;
 			
 			// aapt resource value: 0x7F0F016A
-			public const int connect_device_wifi_ap = 2131689834;
+			public const int connect_device_to_router = 2131689834;
 			
 			// aapt resource value: 0x7F0F016B
-			public const int connect_device_wifi_normal = 2131689835;
+			public const int connect_device_wifi_ap = 2131689835;
 			
 			// aapt resource value: 0x7F0F016C
-			public const int connect_device_wifi_tip3 = 2131689836;
+			public const int connect_device_wifi_normal = 2131689836;
 			
 			// aapt resource value: 0x7F0F016D
-			public const int connect_wlan = 2131689837;
+			public const int connect_device_wifi_tip3 = 2131689837;
 			
 			// aapt resource value: 0x7F0F016E
-			public const int countdown = 2131689838;
+			public const int connect_wlan = 2131689838;
 			
 			// aapt resource value: 0x7F0F016F
-			public const int day = 2131689839;
+			public const int copy_success = 2131689839;
 			
 			// aapt resource value: 0x7F0F0170
-			public const int ddns_device = 2131689840;
+			public const int countdown = 2131689840;
 			
 			// aapt resource value: 0x7F0F0171
-			public const int defence_plan = 2131689841;
+			public const int day = 2131689841;
 			
 			// aapt resource value: 0x7F0F0172
-			public const int defence_plan_tip = 2131689842;
+			public const int ddns_device = 2131689842;
 			
 			// aapt resource value: 0x7F0F0173
-			public const int delete = 2131689843;
+			public const int defence_plan = 2131689843;
 			
 			// aapt resource value: 0x7F0F0174
-			public const int delete_confirm = 2131689844;
+			public const int defence_plan_tip = 2131689844;
 			
 			// aapt resource value: 0x7F0F0175
-			public const int describtion = 2131689845;
+			public const int delete = 2131689845;
 			
 			// aapt resource value: 0x7F0F0176
-			public const int detail_defend_c1_c2_f1 = 2131689846;
+			public const int delete_confirm = 2131689846;
 			
 			// aapt resource value: 0x7F0F0177
-			public const int detail_del_device_btn_tip = 2131689847;
+			public const int describtion = 2131689847;
 			
 			// aapt resource value: 0x7F0F0178
-			public const int detail_del_device_success = 2131689848;
+			public const int detail_defend_c1_c2_f1 = 2131689848;
 			
 			// aapt resource value: 0x7F0F0179
-			public const int detail_modify_device_name_limit_tip = 2131689849;
+			public const int detail_del_device_btn_tip = 2131689849;
 			
 			// aapt resource value: 0x7F0F017A
-			public const int detail_modify_fail = 2131689850;
+			public const int detail_del_device_success = 2131689850;
 			
 			// aapt resource value: 0x7F0F017B
-			public const int detail_modify_success = 2131689851;
+			public const int detail_modify_device_name_limit_tip = 2131689851;
 			
 			// aapt resource value: 0x7F0F017C
-			public const int detail_notify_online = 2131689852;
+			public const int detail_modify_fail = 2131689852;
 			
 			// aapt resource value: 0x7F0F017D
-			public const int detail_notify_online_close_btn_tip = 2131689853;
+			public const int detail_modify_success = 2131689853;
 			
 			// aapt resource value: 0x7F0F017E
-			public const int detail_safe_btn_tip = 2131689854;
+			public const int detail_notify_online = 2131689854;
 			
 			// aapt resource value: 0x7F0F017F
-			public const int detail_safe_close_btn_tip = 2131689855;
+			public const int detail_notify_online_close_btn_tip = 2131689855;
 			
 			// aapt resource value: 0x7F0F0180
-			public const int detail_safe_mode = 2131689856;
+			public const int detail_safe_btn_tip = 2131689856;
 			
 			// aapt resource value: 0x7F0F0181
-			public const int detail_safe_mode_tip = 2131689857;
+			public const int detail_safe_close_btn_tip = 2131689857;
 			
 			// aapt resource value: 0x7F0F0182
-			public const int detail_version = 2131689858;
+			public const int detail_safe_mode = 2131689858;
 			
 			// aapt resource value: 0x7F0F0183
-			public const int device_add_scan_error = 2131689859;
+			public const int detail_safe_mode_tip = 2131689859;
 			
 			// aapt resource value: 0x7F0F0184
-			public const int device_bind_account = 2131689860;
+			public const int detail_version = 2131689860;
 			
 			// aapt resource value: 0x7F0F0185
-			public const int device_defence_close_fail = 2131689861;
+			public const int device_add_scan_error = 2131689861;
 			
 			// aapt resource value: 0x7F0F0186
-			public const int device_defence_close_success = 2131689862;
+			public const int device_bind_account = 2131689862;
 			
 			// aapt resource value: 0x7F0F0187
-			public const int device_defence_open_fail = 2131689863;
+			public const int device_defence_close_fail = 2131689863;
 			
 			// aapt resource value: 0x7F0F0188
-			public const int device_defence_open_success = 2131689864;
+			public const int device_defence_close_success = 2131689864;
 			
 			// aapt resource value: 0x7F0F0189
-			public const int device_disturb_state_failed = 2131689865;
+			public const int device_defence_open_fail = 2131689865;
 			
 			// aapt resource value: 0x7F0F018A
-			public const int device_error = 2131689866;
+			public const int device_defence_open_success = 2131689866;
 			
 			// aapt resource value: 0x7F0F018B
-			public const int device_has_binding = 2131689867;
+			public const int device_disturb_state_failed = 2131689867;
 			
 			// aapt resource value: 0x7F0F018C
-			public const int device_have_not_added = 2131689868;
+			public const int device_error = 2131689868;
 			
 			// aapt resource value: 0x7F0F018D
-			public const int device_hotspot_name = 2131689869;
+			public const int device_has_binding = 2131689869;
 			
 			// aapt resource value: 0x7F0F018E
-			public const int device_hotspot_password = 2131689870;
+			public const int device_have_not_added = 2131689870;
 			
 			// aapt resource value: 0x7F0F018F
-			public const int device_hotspot_pwd = 2131689871;
+			public const int device_hotspot_name = 2131689871;
 			
 			// aapt resource value: 0x7F0F0190
-			public const int device_hotspot_ssid = 2131689872;
+			public const int device_hotspot_password = 2131689872;
 			
 			// aapt resource value: 0x7F0F0191
-			public const int device_info = 2131689873;
+			public const int device_hotspot_pwd = 2131689873;
 			
 			// aapt resource value: 0x7F0F0192
-			public const int device_info_del = 2131689874;
+			public const int device_hotspot_ssid = 2131689874;
 			
 			// aapt resource value: 0x7F0F0193
-			public const int device_is_added = 2131689875;
+			public const int device_info = 2131689875;
 			
 			// aapt resource value: 0x7F0F0194
-			public const int device_manager_connect = 2131689876;
+			public const int device_info_del = 2131689876;
 			
 			// aapt resource value: 0x7F0F0195
-			public const int device_manager_connected_wifi = 2131689877;
+			public const int device_is_added = 2131689877;
 			
 			// aapt resource value: 0x7F0F0196
-			public const int device_manager_exit = 2131689878;
+			public const int device_manager_connect = 2131689878;
 			
 			// aapt resource value: 0x7F0F0197
-			public const int device_manager_input_captcha = 2131689879;
+			public const int device_manager_connected_wifi = 2131689879;
 			
 			// aapt resource value: 0x7F0F0198
-			public const int device_manager_input_device_name = 2131689880;
+			public const int device_manager_exit = 2131689880;
 			
 			// aapt resource value: 0x7F0F0199
-			public const int device_manager_input_wifi_password = 2131689881;
+			public const int device_manager_input_captcha = 2131689881;
 			
 			// aapt resource value: 0x7F0F019A
-			public const int device_manager_not_saved_tip = 2131689882;
+			public const int device_manager_input_device_name = 2131689882;
 			
 			// aapt resource value: 0x7F0F019B
-			public const int device_manager_password_error = 2131689883;
+			public const int device_manager_input_wifi_password = 2131689883;
 			
 			// aapt resource value: 0x7F0F019C
-			public const int device_manager_regain = 2131689884;
+			public const int device_manager_not_saved_tip = 2131689884;
 			
 			// aapt resource value: 0x7F0F019D
-			public const int device_manager_report_month_select_month = 2131689885;
+			public const int device_manager_password_error = 2131689885;
 			
 			// aapt resource value: 0x7F0F019E
-			public const int device_manager_report_month_select_year = 2131689886;
+			public const int device_manager_regain = 2131689886;
 			
 			// aapt resource value: 0x7F0F019F
-			public const int device_manager_summer_time = 2131689887;
+			public const int device_manager_report_month_select_month = 2131689887;
 			
 			// aapt resource value: 0x7F0F01A0
-			public const int device_manager_summer_time_rule = 2131689888;
+			public const int device_manager_report_month_select_year = 2131689888;
 			
 			// aapt resource value: 0x7F0F01A1
-			public const int device_manager_wifi_connetting_tip = 2131689889;
+			public const int device_manager_summer_time = 2131689889;
 			
 			// aapt resource value: 0x7F0F01A2
-			public const int device_manager_wifi_disable = 2131689890;
+			public const int device_manager_summer_time_rule = 2131689890;
 			
 			// aapt resource value: 0x7F0F01A3
-			public const int device_manager_wifi_list_empty = 2131689891;
+			public const int device_manager_wifi_connetting_tip = 2131689891;
 			
 			// aapt resource value: 0x7F0F01A4
-			public const int device_manager_wifi_name = 2131689892;
+			public const int device_manager_wifi_disable = 2131689892;
 			
 			// aapt resource value: 0x7F0F01A5
-			public const int device_manager_wifi_psw = 2131689893;
+			public const int device_manager_wifi_list_empty = 2131689893;
 			
 			// aapt resource value: 0x7F0F01A6
-			public const int device_manager_wifi_title = 2131689894;
-			
-			// aapt resource value: 0x7F0F01A9
-			public const int device_not_exist = 2131689897;
-			
-			// aapt resource value: 0x7F0F01AA
-			public const int device_not_online = 2131689898;
-			
-			// aapt resource value: 0x7F0F01AB
-			public const int device_not_set = 2131689899;
-			
-			// aapt resource value: 0x7F0F01AC
-			public const int device_not_support_view = 2131689900;
+			public const int device_manager_wifi_name = 2131689894;
 			
 			// aapt resource value: 0x7F0F01A7
-			public const int device_no_out_limit = 2131689895;
+			public const int device_manager_wifi_psw = 2131689895;
 			
 			// aapt resource value: 0x7F0F01A8
-			public const int device_no_support_talkback = 2131689896;
+			public const int device_manager_wifi_title = 2131689896;
+			
+			// aapt resource value: 0x7F0F01AB
+			public const int device_not_exist = 2131689899;
+			
+			// aapt resource value: 0x7F0F01AC
+			public const int device_not_online = 2131689900;
 			
 			// aapt resource value: 0x7F0F01AD
-			public const int device_password_is_null = 2131689901;
+			public const int device_not_set = 2131689901;
 			
 			// aapt resource value: 0x7F0F01AE
-			public const int device_picture = 2131689902;
+			public const int device_not_support_view = 2131689902;
+			
+			// aapt resource value: 0x7F0F01A9
+			public const int device_no_out_limit = 2131689897;
+			
+			// aapt resource value: 0x7F0F01AA
+			public const int device_no_support_talkback = 2131689898;
 			
 			// aapt resource value: 0x7F0F01AF
-			public const int device_ptz_flip = 2131689903;
+			public const int device_password_is_null = 2131689903;
 			
 			// aapt resource value: 0x7F0F01B0
-			public const int device_ptz_flip_desc = 2131689904;
+			public const int device_picture = 2131689904;
 			
 			// aapt resource value: 0x7F0F01B1
-			public const int device_reset_ok = 2131689905;
+			public const int device_ptz_flip = 2131689905;
 			
 			// aapt resource value: 0x7F0F01B2
-			public const int device_reset_tip = 2131689906;
+			public const int device_ptz_flip_desc = 2131689906;
 			
 			// aapt resource value: 0x7F0F01B3
-			public const int device_reset_title = 2131689907;
+			public const int device_reset_ok = 2131689907;
 			
 			// aapt resource value: 0x7F0F01B4
-			public const int device_setting = 2131689908;
+			public const int device_reset_tip = 2131689908;
 			
 			// aapt resource value: 0x7F0F01B5
-			public const int device_so_timeout = 2131689909;
+			public const int device_reset_title = 2131689909;
 			
 			// aapt resource value: 0x7F0F01B6
-			public const int device_status_lamp = 2131689910;
+			public const int device_setting = 2131689910;
 			
 			// aapt resource value: 0x7F0F01B7
-			public const int device_tip_content = 2131689911;
+			public const int device_so_timeout = 2131689911;
 			
 			// aapt resource value: 0x7F0F01B8
-			public const int device_transfter = 2131689912;
+			public const int device_status_lamp = 2131689912;
 			
 			// aapt resource value: 0x7F0F01B9
-			public const int device_transfter_desc = 2131689913;
+			public const int device_tip_content = 2131689913;
 			
 			// aapt resource value: 0x7F0F01BA
-			public const int device_type_choose = 2131689914;
+			public const int device_transfter = 2131689914;
 			
 			// aapt resource value: 0x7F0F01BB
-			public const int device_type_choose_tip = 2131689915;
+			public const int device_transfter_desc = 2131689915;
 			
 			// aapt resource value: 0x7F0F01BC
-			public const int device_type_input_hint = 2131689916;
+			public const int device_type_choose = 2131689916;
 			
 			// aapt resource value: 0x7F0F01BD
-			public const int device_type_other = 2131689917;
+			public const int device_type_choose_tip = 2131689917;
 			
 			// aapt resource value: 0x7F0F01BE
-			public const int device_type_sure = 2131689918;
+			public const int device_type_input_hint = 2131689918;
 			
 			// aapt resource value: 0x7F0F01BF
-			public const int device_unsupport_5g_wifi = 2131689919;
+			public const int device_type_other = 2131689919;
 			
 			// aapt resource value: 0x7F0F01C0
-			public const int device_warning_tone = 2131689920;
-			
-			// aapt resource value: 0x7F0F01C2
-			public const int device_wificonfig_hasline_introduce = 2131689922;
+			public const int device_type_sure = 2131689920;
 			
 			// aapt resource value: 0x7F0F01C1
-			public const int device_wifi_set_no_in_subnet = 2131689921;
+			public const int device_unsupport_5g_wifi = 2131689921;
+			
+			// aapt resource value: 0x7F0F01C2
+			public const int device_warning_tone = 2131689922;
+			
+			// aapt resource value: 0x7F0F01C4
+			public const int device_wificonfig_hasline_introduce = 2131689924;
+			
+			// aapt resource value: 0x7F0F01C3
+			public const int device_wifi_set_no_in_subnet = 2131689923;
 			
 			// aapt resource value: 0x7F0F0000
 			public const int DHScanner_name = 2131689472;
 			
-			// aapt resource value: 0x7F0F01C3
-			public const int digital_video_recorder = 2131689923;
-			
-			// aapt resource value: 0x7F0F01C4
-			public const int disable_fause_exception = 2131689924;
-			
 			// aapt resource value: 0x7F0F01C5
-			public const int disable_fause_network = 2131689925;
+			public const int digital_video_recorder = 2131689925;
 			
 			// aapt resource value: 0x7F0F01C6
-			public const int disagree = 2131689926;
-			
-			// aapt resource value: 0x7F0F01C8
-			public const int discovering_device = 2131689928;
+			public const int disable_fause_exception = 2131689926;
 			
 			// aapt resource value: 0x7F0F01C7
-			public const int discover_device_done = 2131689927;
+			public const int disable_fause_network = 2131689927;
 			
-			// aapt resource value: 0x7F0F01C9
-			public const int doorlock = 2131689929;
+			// aapt resource value: 0x7F0F01C8
+			public const int disagree = 2131689928;
 			
 			// aapt resource value: 0x7F0F01CA
-			public const int download_fail = 2131689930;
+			public const int discovering_device = 2131689930;
+			
+			// aapt resource value: 0x7F0F01C9
+			public const int discover_device_done = 2131689929;
 			
 			// aapt resource value: 0x7F0F01CB
-			public const int download_success = 2131689931;
+			public const int doorlock = 2131689931;
 			
 			// aapt resource value: 0x7F0F01CC
-			public const int edit_txt = 2131689932;
+			public const int download_fail = 2131689932;
 			
 			// aapt resource value: 0x7F0F01CD
-			public const int enable_cloud_fause = 2131689933;
+			public const int download_success = 2131689933;
 			
 			// aapt resource value: 0x7F0F01CE
-			public const int enable_cloud_fause_retry = 2131689934;
+			public const int edit_txt = 2131689934;
 			
 			// aapt resource value: 0x7F0F01CF
-			public const int enable_fause_exception = 2131689935;
+			public const int enable_cloud_fause = 2131689935;
 			
 			// aapt resource value: 0x7F0F01D0
-			public const int enable_fause_network = 2131689936;
+			public const int enable_cloud_fause_retry = 2131689936;
 			
 			// aapt resource value: 0x7F0F01D1
-			public const int encrypt_password_open_fail = 2131689937;
+			public const int enable_fause_exception = 2131689937;
 			
 			// aapt resource value: 0x7F0F01D2
-			public const int encrypt_password_open_fail_networkexception = 2131689938;
+			public const int enable_fause_network = 2131689938;
 			
 			// aapt resource value: 0x7F0F01D3
-			public const int encrypt_password_open_success = 2131689939;
+			public const int encrypt_password_open_fail = 2131689939;
 			
 			// aapt resource value: 0x7F0F01D4
-			public const int end_call = 2131689940;
+			public const int encrypt_password_open_fail_networkexception = 2131689940;
 			
 			// aapt resource value: 0x7F0F01D5
-			public const int event_message = 2131689941;
+			public const int encrypt_password_open_success = 2131689941;
 			
 			// aapt resource value: 0x7F0F01D6
-			public const int exit = 2131689942;
+			public const int end_call = 2131689942;
 			
 			// aapt resource value: 0x7F0F01D7
-			public const int exit_tip = 2131689943;
+			public const int event_message = 2131689943;
 			
 			// aapt resource value: 0x7F0F01D8
-			public const int explain_of_access_token = 2131689944;
+			public const int exit = 2131689944;
 			
 			// aapt resource value: 0x7F0F01D9
-			public const int explain_of_app_key = 2131689945;
+			public const int exit_tip = 2131689945;
 			
 			// aapt resource value: 0x7F0F01DA
-			public const int explain_of_server_area = 2131689946;
-			
-			// aapt resource value: 0x7F0F01F6
-			public const int ezviz_device = 2131689974;
+			public const int explain_of_access_token = 2131689946;
 			
 			// aapt resource value: 0x7F0F01DB
-			public const int ez_32_api_test = 2131689947;
+			public const int explain_of_app_key = 2131689947;
 			
 			// aapt resource value: 0x7F0F01DC
-			public const int ez_add_device_failed_not_online = 2131689948;
-			
-			// aapt resource value: 0x7F0F01DD
-			public const int ez_alarm_message_check_success = 2131689949;
-			
-			// aapt resource value: 0x7F0F01DE
-			public const int ez_alarm_type_person_alarm = 2131689950;
-			
-			// aapt resource value: 0x7F0F01DF
-			public const int ez_auto_wifi_connecting_failed = 2131689951;
-			
-			// aapt resource value: 0x7F0F01E0
-			public const int ez_auto_wifi_line_connect = 2131689952;
-			
-			// aapt resource value: 0x7F0F01E1
-			public const int ez_check_all_message = 2131689953;
-			
-			// aapt resource value: 0x7F0F01E2
-			public const int ez_cloud_video = 2131689954;
-			
-			// aapt resource value: 0x7F0F01E3
-			public const int ez_current_version = 2131689955;
-			
-			// aapt resource value: 0x7F0F01E4
-			public const int ez_device_name_hint = 2131689956;
-			
-			// aapt resource value: 0x7F0F01E5
-			public const int ez_device_upgrade = 2131689957;
-			
-			// aapt resource value: 0x7F0F01E6
-			public const int ez_device_video = 2131689958;
-			
-			// aapt resource value: 0x7F0F01E7
-			public const int ez_dialog_btn_disable_video_encrypt = 2131689959;
-			
-			// aapt resource value: 0x7F0F01E8
-			public const int ez_event_message = 2131689960;
-			
-			// aapt resource value: 0x7F0F01E9
-			public const int ez_event_message_detail = 2131689961;
-			
-			// aapt resource value: 0x7F0F01EA
-			public const int ez_latest_version = 2131689962;
-			
-			// aapt resource value: 0x7F0F01EB
-			public const int ez_modify_name = 2131689963;
-			
-			// aapt resource value: 0x7F0F01EC
-			public const int ez_no_message = 2131689964;
-			
-			// aapt resource value: 0x7F0F01ED
-			public const int ez_no_remote_data = 2131689965;
-			
-			// aapt resource value: 0x7F0F01EE
-			public const int ez_no_remote_data_device = 2131689966;
-			
-			// aapt resource value: 0x7F0F01EF
-			public const int ez_please_input_sms_code = 2131689967;
-			
-			// aapt resource value: 0x7F0F01F0
-			public const int ez_save = 2131689968;
-			
-			// aapt resource value: 0x7F0F01F1
-			public const int ez_scan_cue_txt = 2131689969;
-			
-			// aapt resource value: 0x7F0F01F2
-			public const int ez_scan_title_txt = 2131689970;
-			
-			// aapt resource value: 0x7F0F01F3
-			public const int ez_serial_add_hint = 2131689971;
-			
-			// aapt resource value: 0x7F0F01F4
-			public const int ez_setting = 2131689972;
-			
-			// aapt resource value: 0x7F0F01F5
-			public const int ez_settings_device_serial = 2131689973;
-			
-			// aapt resource value: 0x7F0F01F7
-			public const int failed_to_config_wifi = 2131689975;
-			
-			// aapt resource value: 0x7F0F01F8
-			public const int format_sd = 2131689976;
-			
-			// aapt resource value: 0x7F0F01F9
-			public const int format_sd_tip = 2131689977;
-			
-			// aapt resource value: 0x7F0F01FA
-			public const int from = 2131689978;
-			
-			// aapt resource value: 0x7F0F01FB
-			public const int gd_activity_title = 2131689979;
-			
-			// aapt resource value: 0x7F0F01FC
-			public const int gd_cancel = 2131689980;
-			
-			// aapt resource value: 0x7F0F01FD
-			public const int gd_myhome = 2131689981;
-			
-			// aapt resource value: 0x7F0F01FE
-			public const int gd_notifyMsg = 2131689982;
-			
-			// aapt resource value: 0x7F0F01FF
-			public const int gd_notifyTitle = 2131689983;
-			
-			// aapt resource value: 0x7F0F0200
-			public const int gd_save = 2131689984;
-			
-			// aapt resource value: 0x7F0F0201
-			public const int gd_search_tip = 2131689985;
-			
-			// aapt resource value: 0x7F0F0202
-			public const int gd_select_distance = 2131689986;
-			
-			// aapt resource value: 0x7F0F0203
-			public const int gd_setting = 2131689987;
-			
-			// aapt resource value: 0x7F0F0204
-			public const int geofence_backgroud_location_permission_explain = 2131689988;
-			
-			// aapt resource value: 0x7F0F0205
-			public const int get_camera_list_fail = 2131689989;
-			
-			// aapt resource value: 0x7F0F0206
-			public const int get_device_picture_fail = 2131689990;
-			
-			// aapt resource value: 0x7F0F0207
-			public const int get_message_fail_service_exception = 2131689991;
-			
-			// aapt resource value: 0x7F0F0208
-			public const int get_sms_code = 2131689992;
-			
-			// aapt resource value: 0x7F0F0209
-			public const int get_sms_code_fail = 2131689993;
-			
-			// aapt resource value: 0x7F0F020A
-			public const int give_up_adding = 2131689994;
-			
-			// aapt resource value: 0x7F0F020E
-			public const int goto_ad_close_page = 2131689998;
-			
-			// aapt resource value: 0x7F0F020F
-			public const int goto_cameralist_page_txt = 2131689999;
-			
-			// aapt resource value: 0x7F0F0210
-			public const int goto_help_error_page = 2131690000;
-			
-			// aapt resource value: 0x7F0F0211
-			public const int goto_mall_to_see = 2131690001;
-			
-			// aapt resource value: 0x7F0F020B
-			public const int go_to_connect_wifi = 2131689995;
-			
-			// aapt resource value: 0x7F0F020C
-			public const int go_to_see_immediately = 2131689996;
-			
-			// aapt resource value: 0x7F0F020D
-			public const int go_to_setting = 2131689997;
-			
-			// aapt resource value: 0x7F0F0212
-			public const int hc_net_account_pwd_error = 2131690002;
+			public const int explain_of_server_area = 2131689948;
 			
 			// aapt resource value: 0x7F0F0213
-			public const int hc_net_error = 2131690003;
+			public const int ezapp_name = 2131690003;
 			
 			// aapt resource value: 0x7F0F0214
-			public const int hms_abort = 2131690004;
+			public const int ezviz_device = 2131690004;
+			
+			// aapt resource value: 0x7F0F01DD
+			public const int ez_32_api_test = 2131689949;
+			
+			// aapt resource value: 0x7F0F01DE
+			public const int ez_add_device_failed_not_online = 2131689950;
+			
+			// aapt resource value: 0x7F0F01DF
+			public const int ez_add_temppassword_fail = 2131689951;
+			
+			// aapt resource value: 0x7F0F01E0
+			public const int ez_alarm_message_check_success = 2131689952;
+			
+			// aapt resource value: 0x7F0F01E1
+			public const int ez_alarm_type_person_alarm = 2131689953;
+			
+			// aapt resource value: 0x7F0F01E2
+			public const int ez_auto_wifi_connecting_failed = 2131689954;
+			
+			// aapt resource value: 0x7F0F01E3
+			public const int ez_auto_wifi_line_connect = 2131689955;
+			
+			// aapt resource value: 0x7F0F01E4
+			public const int ez_check_all_message = 2131689956;
+			
+			// aapt resource value: 0x7F0F01E5
+			public const int ez_cloud_video = 2131689957;
+			
+			// aapt resource value: 0x7F0F01E6
+			public const int ez_current_version = 2131689958;
+			
+			// aapt resource value: 0x7F0F01E7
+			public const int ez_device_name_hint = 2131689959;
+			
+			// aapt resource value: 0x7F0F01E8
+			public const int ez_device_upgrade = 2131689960;
+			
+			// aapt resource value: 0x7F0F01E9
+			public const int ez_device_video = 2131689961;
+			
+			// aapt resource value: 0x7F0F01EA
+			public const int ez_dialog_btn_disable_video_encrypt = 2131689962;
+			
+			// aapt resource value: 0x7F0F01EB
+			public const int ez_event_message = 2131689963;
+			
+			// aapt resource value: 0x7F0F01EC
+			public const int ez_event_message_detail = 2131689964;
+			
+			// aapt resource value: 0x7F0F01ED
+			public const int ez_event_temppassword = 2131689965;
+			
+			// aapt resource value: 0x7F0F01EE
+			public const int ez_historic_records = 2131689966;
+			
+			// aapt resource value: 0x7F0F01EF
+			public const int ez_input_open_door_password = 2131689967;
+			
+			// aapt resource value: 0x7F0F01F0
+			public const int ez_latest_version = 2131689968;
+			
+			// aapt resource value: 0x7F0F01F1
+			public const int ez_lock_count = 2131689969;
+			
+			// aapt resource value: 0x7F0F01F2
+			public const int ez_lock_surplus = 2131689970;
+			
+			// aapt resource value: 0x7F0F01F3
+			public const int ez_modify_name = 2131689971;
+			
+			// aapt resource value: 0x7F0F01F4
+			public const int ez_no_message = 2131689972;
+			
+			// aapt resource value: 0x7F0F01F5
+			public const int ez_no_remote_data = 2131689973;
+			
+			// aapt resource value: 0x7F0F01F6
+			public const int ez_no_remote_data_device = 2131689974;
+			
+			// aapt resource value: 0x7F0F01F7
+			public const int ez_no_temppassword = 2131689975;
+			
+			// aapt resource value: 0x7F0F01F8
+			public const int ez_open_door_fail = 2131689976;
+			
+			// aapt resource value: 0x7F0F01F9
+			public const int ez_open_door_success = 2131689977;
+			
+			// aapt resource value: 0x7F0F01FA
+			public const int ez_please_input_sms_code = 2131689978;
+			
+			// aapt resource value: 0x7F0F01FB
+			public const int ez_save = 2131689979;
+			
+			// aapt resource value: 0x7F0F01FC
+			public const int ez_scan_cue_txt = 2131689980;
+			
+			// aapt resource value: 0x7F0F01FD
+			public const int ez_scan_title_txt = 2131689981;
+			
+			// aapt resource value: 0x7F0F01FE
+			public const int ez_serial_add_hint = 2131689982;
+			
+			// aapt resource value: 0x7F0F01FF
+			public const int ez_setting = 2131689983;
+			
+			// aapt resource value: 0x7F0F0200
+			public const int ez_settings_device_serial = 2131689984;
+			
+			// aapt resource value: 0x7F0F0201
+			public const int ez_temppassword_cancel = 2131689985;
+			
+			// aapt resource value: 0x7F0F0202
+			public const int ez_temppassword_confirm = 2131689986;
+			
+			// aapt resource value: 0x7F0F0203
+			public const int ez_temppassword_day = 2131689987;
+			
+			// aapt resource value: 0x7F0F0204
+			public const int ez_temppassword_end = 2131689988;
+			
+			// aapt resource value: 0x7F0F0205
+			public const int ez_temppassword_month = 2131689989;
+			
+			// aapt resource value: 0x7F0F0206
+			public const int ez_temppassword_select_time = 2131689990;
+			
+			// aapt resource value: 0x7F0F0207
+			public const int ez_temppassword_start = 2131689991;
+			
+			// aapt resource value: 0x7F0F0208
+			public const int ez_temppassword_term_validity = 2131689992;
+			
+			// aapt resource value: 0x7F0F0209
+			public const int ez_temppassword_total = 2131689993;
+			
+			// aapt resource value: 0x7F0F020A
+			public const int ez_temppassword_unlimited_times = 2131689994;
+			
+			// aapt resource value: 0x7F0F020F
+			public const int ez_temppassword_username = 2131689999;
+			
+			// aapt resource value: 0x7F0F0210
+			public const int ez_temppassword_username_isempty = 2131690000;
+			
+			// aapt resource value: 0x7F0F020B
+			public const int ez_temppassword_use_times = 2131689995;
+			
+			// aapt resource value: 0x7F0F020C
+			public const int ez_temppassword_use_times_1_100 = 2131689996;
+			
+			// aapt resource value: 0x7F0F020D
+			public const int ez_temppassword_use_times_tips = 2131689997;
+			
+			// aapt resource value: 0x7F0F020E
+			public const int ez_temppassword_use_times_unlimited = 2131689998;
+			
+			// aapt resource value: 0x7F0F0211
+			public const int ez_temppassword_visitor = 2131690001;
+			
+			// aapt resource value: 0x7F0F0212
+			public const int ez_temppassword_year = 2131690002;
 			
 			// aapt resource value: 0x7F0F0215
-			public const int hms_abort_message = 2131690005;
+			public const int failed_to_config_wifi = 2131690005;
 			
 			// aapt resource value: 0x7F0F0216
-			public const int hms_bindfaildlg_message = 2131690006;
+			public const int format_sd = 2131690006;
 			
 			// aapt resource value: 0x7F0F0217
-			public const int hms_bindfaildlg_title = 2131690007;
+			public const int format_sd_tip = 2131690007;
 			
 			// aapt resource value: 0x7F0F0218
-			public const int hms_cancel = 2131690008;
-			
-			// aapt resource value: 0x7F0F021A
-			public const int hms_checking = 2131690010;
+			public const int from = 2131690008;
 			
 			// aapt resource value: 0x7F0F0219
-			public const int hms_check_failure = 2131690009;
+			public const int gd_activity_title = 2131690009;
+			
+			// aapt resource value: 0x7F0F021A
+			public const int gd_cancel = 2131690010;
 			
 			// aapt resource value: 0x7F0F021B
-			public const int hms_confirm = 2131690011;
-			
-			// aapt resource value: 0x7F0F021F
-			public const int hms_downloading_loading = 2131690015;
+			public const int gd_myhome = 2131690011;
 			
 			// aapt resource value: 0x7F0F021C
-			public const int hms_download_failure = 2131690012;
+			public const int gd_notifyMsg = 2131690012;
 			
 			// aapt resource value: 0x7F0F021D
-			public const int hms_download_no_space = 2131690013;
+			public const int gd_notifyTitle = 2131690013;
 			
 			// aapt resource value: 0x7F0F021E
-			public const int hms_download_retry = 2131690014;
+			public const int gd_save = 2131690014;
+			
+			// aapt resource value: 0x7F0F021F
+			public const int gd_search_tip = 2131690015;
 			
 			// aapt resource value: 0x7F0F0220
-			public const int hms_install = 2131690016;
+			public const int gd_select_distance = 2131690016;
 			
 			// aapt resource value: 0x7F0F0221
-			public const int hms_install_message = 2131690017;
+			public const int gd_setting = 2131690017;
 			
 			// aapt resource value: 0x7F0F0222
-			public const int hms_push_channel = 2131690018;
+			public const int geofence_backgroud_location_permission_explain = 2131690018;
 			
 			// aapt resource value: 0x7F0F0223
-			public const int hms_push_google = 2131690019;
+			public const int get_camera_list_fail = 2131690019;
 			
 			// aapt resource value: 0x7F0F0224
-			public const int hms_push_vmall = 2131690020;
+			public const int get_device_picture_fail = 2131690020;
 			
 			// aapt resource value: 0x7F0F0225
-			public const int hms_retry = 2131690021;
+			public const int get_historic_records_fail = 2131690021;
 			
 			// aapt resource value: 0x7F0F0226
-			public const int hms_update = 2131690022;
+			public const int get_message_fail_service_exception = 2131690022;
 			
 			// aapt resource value: 0x7F0F0227
-			public const int hms_update_continue = 2131690023;
+			public const int get_sms_code = 2131690023;
 			
 			// aapt resource value: 0x7F0F0228
-			public const int hms_update_message = 2131690024;
+			public const int get_sms_code_fail = 2131690024;
 			
 			// aapt resource value: 0x7F0F0229
-			public const int hms_update_message_new = 2131690025;
+			public const int get_temppassword_fail_service_exception = 2131690025;
 			
 			// aapt resource value: 0x7F0F022A
-			public const int hms_update_nettype = 2131690026;
-			
-			// aapt resource value: 0x7F0F022B
-			public const int hms_update_title = 2131690027;
-			
-			// aapt resource value: 0x7F0F022C
-			public const int host = 2131690028;
-			
-			// aapt resource value: 0x7F0F022D
-			public const int how_to_reset = 2131690029;
+			public const int give_up_adding = 2131690026;
 			
 			// aapt resource value: 0x7F0F022E
-			public const int if_your_device_has_been_used = 2131690030;
+			public const int goto_ad_close_page = 2131690030;
 			
 			// aapt resource value: 0x7F0F022F
-			public const int if_your_device_has_set_time = 2131690031;
+			public const int goto_cameralist_page_txt = 2131690031;
 			
 			// aapt resource value: 0x7F0F0230
-			public const int input_device_picture_size = 2131690032;
+			public const int goto_help_error_page = 2131690032;
 			
 			// aapt resource value: 0x7F0F0231
-			public const int input_device_picture_uuid = 2131690033;
+			public const int goto_mall_to_see = 2131690033;
+			
+			// aapt resource value: 0x7F0F022B
+			public const int go_to_connect_wifi = 2131690027;
+			
+			// aapt resource value: 0x7F0F022C
+			public const int go_to_see_immediately = 2131690028;
+			
+			// aapt resource value: 0x7F0F022D
+			public const int go_to_setting = 2131690029;
 			
 			// aapt resource value: 0x7F0F0232
-			public const int input_device_verify_code = 2131690034;
+			public const int hc_net_account_pwd_error = 2131690034;
 			
 			// aapt resource value: 0x7F0F0233
-			public const int input_device_video_uuid = 2131690035;
+			public const int hc_net_error = 2131690035;
 			
 			// aapt resource value: 0x7F0F0234
-			public const int interface_call_demo_txt = 2131690036;
+			public const int hms_apk_not_installed_hints = 2131690036;
 			
 			// aapt resource value: 0x7F0F0235
-			public const int interface_test_api = 2131690037;
+			public const int hms_bindfaildlg_message = 2131690037;
 			
 			// aapt resource value: 0x7F0F0236
-			public const int interface_test_hint_input_serial = 2131690038;
+			public const int hms_bindfaildlg_title = 2131690038;
 			
 			// aapt resource value: 0x7F0F0237
-			public const int interface_test_openCloudPage = 2131690039;
+			public const int hms_confirm = 2131690039;
 			
 			// aapt resource value: 0x7F0F0238
-			public const int interface_test_show_limit_dialog = 2131690040;
+			public const int hms_is_spoof = 2131690040;
 			
 			// aapt resource value: 0x7F0F0239
-			public const int interface_test_v33_api = 2131690041;
+			public const int hms_push_channel = 2131690041;
 			
 			// aapt resource value: 0x7F0F023A
-			public const int invalid_app_key_or_access_token = 2131690042;
+			public const int hms_push_google = 2131690042;
 			
 			// aapt resource value: 0x7F0F023B
-			public const int ip_camera = 2131690043;
+			public const int hms_push_vmall = 2131690043;
 			
 			// aapt resource value: 0x7F0F023C
-			public const int keyboard = 2131690044;
+			public const int hms_spoof_hints = 2131690044;
 			
 			// aapt resource value: 0x7F0F023D
-			public const int lan_camera_name = 2131690045;
+			public const int host = 2131690045;
 			
 			// aapt resource value: 0x7F0F023E
-			public const int lan_device_login_default_name = 2131690046;
+			public const int how_to_reset = 2131690046;
 			
 			// aapt resource value: 0x7F0F023F
-			public const int lan_device_login_title = 2131690047;
+			public const int if_your_device_has_been_used = 2131690047;
 			
 			// aapt resource value: 0x7F0F0240
-			public const int lan_device_pwd_tip = 2131690048;
+			public const int if_your_device_has_set_time = 2131690048;
 			
 			// aapt resource value: 0x7F0F0241
-			public const int later_alarm = 2131690049;
+			public const int input_device_picture_size = 2131690049;
 			
 			// aapt resource value: 0x7F0F0242
-			public const int lc_demo_choose_env_ak = 2131690050;
+			public const int input_device_picture_uuid = 2131690050;
 			
 			// aapt resource value: 0x7F0F0243
-			public const int lc_demo_choose_env_ak_tip = 2131690051;
+			public const int input_device_verify_code = 2131690051;
 			
 			// aapt resource value: 0x7F0F0244
-			public const int lc_demo_choose_env_sk = 2131690052;
+			public const int input_device_video_uuid = 2131690052;
 			
 			// aapt resource value: 0x7F0F0245
-			public const int lc_demo_choose_env_sk_tip = 2131690053;
+			public const int interface_call_demo_txt = 2131690053;
 			
 			// aapt resource value: 0x7F0F0246
-			public const int lc_demo_choose_env_tip1 = 2131690054;
+			public const int interface_test_api = 2131690054;
 			
 			// aapt resource value: 0x7F0F0247
-			public const int lc_demo_choose_env_tip2 = 2131690055;
+			public const int interface_test_hint_input_serial = 2131690055;
 			
 			// aapt resource value: 0x7F0F0248
-			public const int lc_demo_choose_env_tip3 = 2131690056;
+			public const int interface_test_openCloudPage = 2131690056;
 			
 			// aapt resource value: 0x7F0F0249
-			public const int lc_demo_choose_env_tip4 = 2131690057;
+			public const int interface_test_show_limit_dialog = 2131690057;
 			
 			// aapt resource value: 0x7F0F024A
-			public const int lc_demo_choose_env_tip5 = 2131690058;
+			public const int interface_test_v33_api = 2131690058;
 			
 			// aapt resource value: 0x7F0F024B
-			public const int lc_demo_cn = 2131690059;
+			public const int invalid_app_key_or_access_token = 2131690059;
 			
 			// aapt resource value: 0x7F0F024C
-			public const int lc_demo_cn_title_tip = 2131690060;
+			public const int ip_camera = 2131690060;
 			
 			// aapt resource value: 0x7F0F024D
-			public const int lc_demo_device_begin_update = 2131690061;
+			public const int jg_channel_name_p_default = 2131690061;
 			
 			// aapt resource value: 0x7F0F024E
-			public const int lc_demo_device_cancel = 2131690062;
+			public const int jg_channel_name_p_high = 2131690062;
 			
 			// aapt resource value: 0x7F0F024F
-			public const int lc_demo_device_capture_failed = 2131690063;
+			public const int jg_channel_name_p_low = 2131690063;
 			
 			// aapt resource value: 0x7F0F0250
-			public const int lc_demo_device_capture_success = 2131690064;
+			public const int jg_channel_name_p_min = 2131690064;
 			
 			// aapt resource value: 0x7F0F0251
-			public const int lc_demo_device_cloud_not_open = 2131690065;
+			public const int keyboard = 2131690065;
 			
 			// aapt resource value: 0x7F0F0252
-			public const int lc_demo_device_cloud_state_expired = 2131690066;
+			public const int keylock_verify = 2131690066;
 			
 			// aapt resource value: 0x7F0F0253
-			public const int lc_demo_device_cloud_state_not_opened = 2131690067;
+			public const int lan_camera_name = 2131690067;
 			
 			// aapt resource value: 0x7F0F0254
-			public const int lc_demo_device_cloud_state_suspended = 2131690068;
+			public const int lan_device_login_default_name = 2131690068;
 			
 			// aapt resource value: 0x7F0F0255
-			public const int lc_demo_device_cloud_video = 2131690069;
+			public const int lan_device_login_title = 2131690069;
 			
 			// aapt resource value: 0x7F0F0256
-			public const int lc_demo_device_cur_wifi = 2131690070;
+			public const int lan_device_pwd_tip = 2131690070;
 			
 			// aapt resource value: 0x7F0F0257
-			public const int lc_demo_device_delete = 2131690071;
+			public const int later_alarm = 2131690071;
 			
 			// aapt resource value: 0x7F0F0258
-			public const int lc_demo_device_delete_choose_all = 2131690072;
+			public const int lc_demo_choose_env_ak = 2131690072;
 			
 			// aapt resource value: 0x7F0F0259
-			public const int lc_demo_device_delete_exit = 2131690073;
+			public const int lc_demo_choose_env_ak_tip = 2131690073;
 			
 			// aapt resource value: 0x7F0F025A
-			public const int lc_demo_device_delete_exit_tip = 2131690074;
+			public const int lc_demo_choose_env_sk = 2131690074;
 			
 			// aapt resource value: 0x7F0F025B
-			public const int lc_demo_device_delete_sure = 2131690075;
+			public const int lc_demo_choose_env_sk_tip = 2131690075;
 			
 			// aapt resource value: 0x7F0F025C
-			public const int lc_demo_device_deployment_setting = 2131690076;
+			public const int lc_demo_choose_env_tip1 = 2131690076;
 			
 			// aapt resource value: 0x7F0F025D
-			public const int lc_demo_device_deployment_tip = 2131690077;
+			public const int lc_demo_choose_env_tip2 = 2131690077;
 			
 			// aapt resource value: 0x7F0F025E
-			public const int lc_demo_device_deployment_title = 2131690078;
+			public const int lc_demo_choose_env_tip3 = 2131690078;
 			
 			// aapt resource value: 0x7F0F025F
-			public const int lc_demo_device_detail_title = 2131690079;
+			public const int lc_demo_choose_env_tip4 = 2131690079;
 			
 			// aapt resource value: 0x7F0F0260
-			public const int lc_demo_device_encrypt_device_password_tip = 2131690080;
+			public const int lc_demo_choose_env_tip5 = 2131690080;
 			
 			// aapt resource value: 0x7F0F0261
-			public const int lc_demo_device_encrypt_key_tip = 2131690081;
+			public const int lc_demo_cn = 2131690081;
 			
 			// aapt resource value: 0x7F0F0262
-			public const int lc_demo_device_local_sd = 2131690082;
+			public const int lc_demo_cn_title_tip = 2131690082;
 			
 			// aapt resource value: 0x7F0F0263
-			public const int lc_demo_device_local_video = 2131690083;
+			public const int lc_demo_device_begin_update = 2131690083;
 			
 			// aapt resource value: 0x7F0F0264
-			public const int lc_demo_device_modify_success = 2131690084;
+			public const int lc_demo_device_cancel = 2131690084;
 			
 			// aapt resource value: 0x7F0F0265
-			public const int lc_demo_device_more_video = 2131690085;
+			public const int lc_demo_device_capture_failed = 2131690085;
 			
 			// aapt resource value: 0x7F0F0266
-			public const int lc_demo_device_move_check = 2131690086;
+			public const int lc_demo_device_capture_success = 2131690086;
 			
 			// aapt resource value: 0x7F0F0267
-			public const int lc_demo_device_name = 2131690087;
+			public const int lc_demo_device_cloud_not_open = 2131690087;
 			
 			// aapt resource value: 0x7F0F0268
-			public const int lc_demo_device_name_hint = 2131690088;
+			public const int lc_demo_device_cloud_state_expired = 2131690088;
 			
 			// aapt resource value: 0x7F0F0269
-			public const int lc_demo_device_nvr_no_channel = 2131690089;
+			public const int lc_demo_device_cloud_state_not_opened = 2131690089;
 			
 			// aapt resource value: 0x7F0F026A
-			public const int lc_demo_device_record_begin = 2131690090;
+			public const int lc_demo_device_cloud_state_suspended = 2131690090;
 			
 			// aapt resource value: 0x7F0F026B
-			public const int lc_demo_device_record_delete_success = 2131690091;
+			public const int lc_demo_device_cloud_video = 2131690091;
 			
 			// aapt resource value: 0x7F0F026C
-			public const int lc_demo_device_record_download = 2131690092;
+			public const int lc_demo_device_cur_wifi = 2131690092;
 			
 			// aapt resource value: 0x7F0F026D
-			public const int lc_demo_device_record_download_begin = 2131690093;
+			public const int lc_demo_device_delete = 2131690093;
 			
 			// aapt resource value: 0x7F0F026E
-			public const int lc_demo_device_record_download_error = 2131690094;
+			public const int lc_demo_device_delete_choose_all = 2131690094;
 			
 			// aapt resource value: 0x7F0F026F
-			public const int lc_demo_device_record_download_finish = 2131690095;
+			public const int lc_demo_device_delete_exit = 2131690095;
 			
 			// aapt resource value: 0x7F0F0270
-			public const int lc_demo_device_record_edit = 2131690096;
+			public const int lc_demo_device_delete_exit_tip = 2131690096;
 			
 			// aapt resource value: 0x7F0F0271
-			public const int lc_demo_device_record_edit_finish = 2131690097;
+			public const int lc_demo_device_delete_sure = 2131690097;
 			
 			// aapt resource value: 0x7F0F0272
-			public const int lc_demo_device_record_loading_more = 2131690098;
+			public const int lc_demo_device_deployment_setting = 2131690098;
 			
 			// aapt resource value: 0x7F0F0273
-			public const int lc_demo_device_record_stop = 2131690099;
+			public const int lc_demo_device_deployment_tip = 2131690099;
 			
 			// aapt resource value: 0x7F0F0274
-			public const int lc_demo_device_serial_tip = 2131690100;
+			public const int lc_demo_device_deployment_title = 2131690100;
 			
 			// aapt resource value: 0x7F0F0275
-			public const int lc_demo_device_sure = 2131690101;
+			public const int lc_demo_device_detail_title = 2131690101;
 			
 			// aapt resource value: 0x7F0F0276
-			public const int lc_demo_device_talk_close_success = 2131690102;
+			public const int lc_demo_device_encrypt_device_password_tip = 2131690102;
 			
 			// aapt resource value: 0x7F0F0277
-			public const int lc_demo_device_talk_open_failed = 2131690103;
+			public const int lc_demo_device_encrypt_key_tip = 2131690103;
 			
 			// aapt resource value: 0x7F0F0278
-			public const int lc_demo_device_talk_open_success = 2131690104;
+			public const int lc_demo_device_local_sd = 2131690104;
 			
 			// aapt resource value: 0x7F0F0279
-			public const int lc_demo_device_today_no_record = 2131690105;
+			public const int lc_demo_device_local_video = 2131690105;
 			
 			// aapt resource value: 0x7F0F027A
-			public const int lc_demo_device_type_tip = 2131690106;
+			public const int lc_demo_device_modify_success = 2131690106;
 			
 			// aapt resource value: 0x7F0F027B
-			public const int lc_demo_device_unbind_success = 2131690107;
+			public const int lc_demo_device_more_video = 2131690107;
 			
 			// aapt resource value: 0x7F0F027C
-			public const int lc_demo_device_update = 2131690108;
-			
-			// aapt resource value: 0x7F0F0280
-			public const int lc_demo_device_updateing = 2131690112;
+			public const int lc_demo_device_move_check = 2131690108;
 			
 			// aapt resource value: 0x7F0F027D
-			public const int lc_demo_device_update_msg = 2131690109;
+			public const int lc_demo_device_name = 2131690109;
 			
 			// aapt resource value: 0x7F0F027E
-			public const int lc_demo_device_update_success = 2131690110;
+			public const int lc_demo_device_name_hint = 2131690110;
 			
 			// aapt resource value: 0x7F0F027F
-			public const int lc_demo_device_update_tip = 2131690111;
+			public const int lc_demo_device_nvr_no_channel = 2131690111;
+			
+			// aapt resource value: 0x7F0F0280
+			public const int lc_demo_device_record_begin = 2131690112;
 			
 			// aapt resource value: 0x7F0F0281
-			public const int lc_demo_device_version_current = 2131690113;
+			public const int lc_demo_device_record_delete_success = 2131690113;
 			
 			// aapt resource value: 0x7F0F0282
-			public const int lc_demo_device_version_new = 2131690114;
+			public const int lc_demo_device_record_download = 2131690114;
 			
 			// aapt resource value: 0x7F0F0283
-			public const int lc_demo_device_version_new_tip = 2131690115;
+			public const int lc_demo_device_record_download_begin = 2131690115;
 			
 			// aapt resource value: 0x7F0F0284
-			public const int lc_demo_device_version_tip = 2131690116;
+			public const int lc_demo_device_record_download_error = 2131690116;
 			
 			// aapt resource value: 0x7F0F0285
-			public const int lc_demo_device_version_title = 2131690117;
+			public const int lc_demo_device_record_download_finish = 2131690117;
 			
 			// aapt resource value: 0x7F0F0286
-			public const int lc_demo_device_video_play_change = 2131690118;
+			public const int lc_demo_device_record_edit = 2131690118;
 			
 			// aapt resource value: 0x7F0F0287
-			public const int lc_demo_device_video_play_error = 2131690119;
+			public const int lc_demo_device_record_edit_finish = 2131690119;
 			
 			// aapt resource value: 0x7F0F0288
-			public const int lc_demo_device_video_play_loading = 2131690120;
+			public const int lc_demo_device_record_loading_more = 2131690120;
 			
 			// aapt resource value: 0x7F0F0289
-			public const int lc_demo_device_warn_setting = 2131690121;
+			public const int lc_demo_device_record_stop = 2131690121;
 			
 			// aapt resource value: 0x7F0F028A
-			public const int lc_demo_main_no_device = 2131690122;
+			public const int lc_demo_device_serial_tip = 2131690122;
 			
 			// aapt resource value: 0x7F0F028B
-			public const int lc_demo_main_offline = 2131690123;
+			public const int lc_demo_device_sure = 2131690123;
 			
 			// aapt resource value: 0x7F0F028C
-			public const int lc_demo_main_title = 2131690124;
+			public const int lc_demo_device_talk_close_success = 2131690124;
 			
 			// aapt resource value: 0x7F0F028D
-			public const int lc_demo_overseas = 2131690125;
+			public const int lc_demo_device_talk_open_failed = 2131690125;
 			
 			// aapt resource value: 0x7F0F028E
-			public const int lc_demo_overseas_title_tip = 2131690126;
+			public const int lc_demo_device_talk_open_success = 2131690126;
 			
 			// aapt resource value: 0x7F0F028F
-			public const int lc_demo_sure = 2131690127;
+			public const int lc_demo_device_today_no_record = 2131690127;
 			
 			// aapt resource value: 0x7F0F0290
-			public const int linphone_sdk_branch = 2131690128;
+			public const int lc_demo_device_type_tip = 2131690128;
 			
 			// aapt resource value: 0x7F0F0291
-			public const int linphone_sdk_version = 2131690129;
+			public const int lc_demo_device_unbind_success = 2131690129;
 			
 			// aapt resource value: 0x7F0F0292
-			public const int loading = 2131690130;
-			
-			// aapt resource value: 0x7F0F0293
-			public const int loading_text_default = 2131690131;
-			
-			// aapt resource value: 0x7F0F0298
-			public const int localmgt_video_square_txt = 2131690136;
-			
-			// aapt resource value: 0x7F0F0294
-			public const int local_network_exception = 2131690132;
-			
-			// aapt resource value: 0x7F0F0295
-			public const int local_play_hour = 2131690133;
+			public const int lc_demo_device_update = 2131690130;
 			
 			// aapt resource value: 0x7F0F0296
-			public const int local_realplay = 2131690134;
+			public const int lc_demo_device_updateing = 2131690134;
+			
+			// aapt resource value: 0x7F0F0293
+			public const int lc_demo_device_update_msg = 2131690131;
+			
+			// aapt resource value: 0x7F0F0294
+			public const int lc_demo_device_update_success = 2131690132;
+			
+			// aapt resource value: 0x7F0F0295
+			public const int lc_demo_device_update_tip = 2131690133;
 			
 			// aapt resource value: 0x7F0F0297
-			public const int local_video_not_delete = 2131690135;
+			public const int lc_demo_device_version_current = 2131690135;
+			
+			// aapt resource value: 0x7F0F0298
+			public const int lc_demo_device_version_new = 2131690136;
 			
 			// aapt resource value: 0x7F0F0299
-			public const int login_by_ezviz_account = 2131690137;
+			public const int lc_demo_device_version_new_tip = 2131690137;
 			
 			// aapt resource value: 0x7F0F029A
-			public const int login_expire = 2131690138;
+			public const int lc_demo_device_version_tip = 2131690138;
 			
 			// aapt resource value: 0x7F0F029B
-			public const int login_password_tv_txt = 2131690139;
+			public const int lc_demo_device_version_title = 2131690139;
 			
 			// aapt resource value: 0x7F0F029C
-			public const int login_privacy_policy = 2131690140;
+			public const int lc_demo_device_video_play_change = 2131690140;
 			
 			// aapt resource value: 0x7F0F029D
-			public const int login_user_service_agreement = 2131690141;
+			public const int lc_demo_device_video_play_error = 2131690141;
 			
 			// aapt resource value: 0x7F0F029E
-			public const int lp_answerStr = 2131690142;
+			public const int lc_demo_device_video_play_loading = 2131690142;
 			
 			// aapt resource value: 0x7F0F029F
-			public const int lp_callingStr = 2131690143;
+			public const int lc_demo_device_warn_setting = 2131690143;
 			
 			// aapt resource value: 0x7F0F02A0
-			public const int lp_cancel = 2131690144;
+			public const int lc_demo_main_no_device = 2131690144;
 			
 			// aapt resource value: 0x7F0F02A1
-			public const int lp_confirm = 2131690145;
+			public const int lc_demo_main_offline = 2131690145;
 			
 			// aapt resource value: 0x7F0F02A2
-			public const int lp_endMonitoringStr = 2131690146;
+			public const int lc_demo_main_title = 2131690146;
 			
 			// aapt resource value: 0x7F0F02A3
-			public const int lp_endOfCallStr = 2131690147;
+			public const int lc_demo_overseas = 2131690147;
 			
 			// aapt resource value: 0x7F0F02A4
-			public const int lp_hangupStr = 2131690148;
+			public const int lc_demo_overseas_title_tip = 2131690148;
 			
 			// aapt resource value: 0x7F0F02A5
-			public const int lp_okStr = 2131690149;
+			public const int lc_demo_sure = 2131690149;
 			
 			// aapt resource value: 0x7F0F02A6
-			public const int lp_operationFailedStr = 2131690150;
+			public const int linphone_sdk_branch = 2131690150;
 			
 			// aapt resource value: 0x7F0F02A7
-			public const int lp_outdoorUnitStr = 2131690151;
-			
-			// aapt resource value: 0x7F0F02A8
-			public const int lp_refuseStr = 2131690152;
-			
-			// aapt resource value: 0x7F0F02A9
-			public const int lp_saveToTheAlbumsStr = 2131690153;
-			
-			// aapt resource value: 0x7F0F02AA
-			public const int lp_screenshotStr = 2131690154;
+			public const int linphone_sdk_version = 2131690151;
 			
 			// aapt resource value: 0x7F0F02AB
-			public const int lp_sipAccount_null = 2131690155;
+			public const int listview_header_hint_normal = 2131690155;
 			
 			// aapt resource value: 0x7F0F02AC
-			public const int lp_tipStr = 2131690156;
-			
-			// aapt resource value: 0x7F0F02AF
-			public const int lp_unlockfailureStr = 2131690159;
+			public const int listview_header_hint_release = 2131690156;
 			
 			// aapt resource value: 0x7F0F02AD
-			public const int lp_unlockStr = 2131690157;
+			public const int listview_header_last_time = 2131690157;
 			
 			// aapt resource value: 0x7F0F02AE
-			public const int lp_unlockSuccessfullyStr = 2131690158;
+			public const int listview_loading = 2131690158;
+			
+			// aapt resource value: 0x7F0F02A8
+			public const int list_footer_end = 2131690152;
+			
+			// aapt resource value: 0x7F0F02A9
+			public const int list_footer_loading = 2131690153;
+			
+			// aapt resource value: 0x7F0F02AA
+			public const int list_footer_network_error = 2131690154;
+			
+			// aapt resource value: 0x7F0F02AF
+			public const int loading = 2131690159;
 			
 			// aapt resource value: 0x7F0F02B0
-			public const int main_tab_second_tab = 2131690160;
-			
-			// aapt resource value: 0x7F0F02B1
-			public const int message_come_from_tip = 2131690161;
-			
-			// aapt resource value: 0x7F0F02B2
-			public const int message_encrypt_inputpsw_tip_title = 2131690162;
-			
-			// aapt resource value: 0x7F0F02B3
-			public const int message_live = 2131690163;
-			
-			// aapt resource value: 0x7F0F02B4
-			public const int message_no_data_text = 2131690164;
+			public const int loading_text_default = 2131690160;
 			
 			// aapt resource value: 0x7F0F02B5
-			public const int message_refresh_fail_network_exception = 2131690165;
+			public const int localmgt_video_square_txt = 2131690165;
+			
+			// aapt resource value: 0x7F0F02B1
+			public const int local_network_exception = 2131690161;
+			
+			// aapt resource value: 0x7F0F02B2
+			public const int local_play_hour = 2131690162;
+			
+			// aapt resource value: 0x7F0F02B3
+			public const int local_realplay = 2131690163;
+			
+			// aapt resource value: 0x7F0F02B4
+			public const int local_video_not_delete = 2131690164;
 			
 			// aapt resource value: 0x7F0F02B6
-			public const int message_refresh_fail_server_exception = 2131690166;
+			public const int login_by_ezviz_account = 2131690166;
 			
 			// aapt resource value: 0x7F0F02B7
-			public const int message_video = 2131690167;
+			public const int login_expire = 2131690167;
 			
 			// aapt resource value: 0x7F0F02B8
-			public const int mobile_common_bec_add_device_valid_error = 2131690168;
+			public const int login_password_tv_txt = 2131690168;
 			
 			// aapt resource value: 0x7F0F02B9
-			public const int mobile_common_bec_common_network_exception = 2131690169;
+			public const int login_privacy_policy = 2131690169;
 			
 			// aapt resource value: 0x7F0F02BA
-			public const int mobile_common_bec_common_timeout = 2131690170;
+			public const int login_user_service_agreement = 2131690170;
 			
 			// aapt resource value: 0x7F0F02BB
-			public const int mobile_common_bec_device_locked = 2131690171;
+			public const int lp_answerStr = 2131690171;
 			
 			// aapt resource value: 0x7F0F02BC
-			public const int mobile_common_common_ignore = 2131690172;
+			public const int lp_callingStr = 2131690172;
 			
 			// aapt resource value: 0x7F0F02BD
-			public const int mobile_common_common_never_remind = 2131690173;
+			public const int lp_cancel = 2131690173;
 			
 			// aapt resource value: 0x7F0F02BE
-			public const int mobile_common_device = 2131690174;
+			public const int lp_confirm = 2131690174;
 			
 			// aapt resource value: 0x7F0F02BF
-			public const int mobile_common_device_pwd_rule = 2131690175;
+			public const int lp_endMonitoringStr = 2131690175;
 			
 			// aapt resource value: 0x7F0F02C0
-			public const int mobile_common_device_timezone = 2131690176;
+			public const int lp_endOfCallStr = 2131690176;
 			
 			// aapt resource value: 0x7F0F02C1
-			public const int mobile_common_get_info_failed = 2131690177;
+			public const int lp_hangupStr = 2131690177;
 			
 			// aapt resource value: 0x7F0F02C2
-			public const int mobile_common_how_modify_device_pwd = 2131690178;
+			public const int lp_okStr = 2131690178;
 			
 			// aapt resource value: 0x7F0F02C3
-			public const int mobile_common_lack_permission_then_exit = 2131690179;
+			public const int lp_operationFailedStr = 2131690179;
 			
 			// aapt resource value: 0x7F0F02C4
-			public const int mobile_common_later = 2131690180;
+			public const int lp_outdoorUnitStr = 2131690180;
 			
 			// aapt resource value: 0x7F0F02C5
-			public const int mobile_common_modify_device_pwd = 2131690181;
+			public const int lp_refuseStr = 2131690181;
 			
 			// aapt resource value: 0x7F0F02C6
-			public const int mobile_common_modify_device_pwd_tip = 2131690182;
+			public const int lp_saveToTheAlbumsStr = 2131690182;
 			
 			// aapt resource value: 0x7F0F02C7
-			public const int mobile_common_network_config = 2131690183;
+			public const int lp_screenshotStr = 2131690183;
 			
 			// aapt resource value: 0x7F0F02C8
-			public const int mobile_common_no_google_play_detection = 2131690184;
+			public const int lp_sipAccount_null = 2131690184;
 			
 			// aapt resource value: 0x7F0F02C9
-			public const int mobile_common_no_huawei_play_detection = 2131690185;
-			
-			// aapt resource value: 0x7F0F02CA
-			public const int mobile_common_password_too_simple = 2131690186;
-			
-			// aapt resource value: 0x7F0F02CB
-			public const int mobile_common_permission_apply = 2131690187;
+			public const int lp_tipStr = 2131690185;
 			
 			// aapt resource value: 0x7F0F02CC
-			public const int mobile_common_permission_explain_access_location_usage = 2131690188;
+			public const int lp_unlockfailureStr = 2131690188;
+			
+			// aapt resource value: 0x7F0F02CA
+			public const int lp_unlockStr = 2131690186;
+			
+			// aapt resource value: 0x7F0F02CB
+			public const int lp_unlockSuccessfullyStr = 2131690187;
 			
 			// aapt resource value: 0x7F0F02CD
-			public const int mobile_common_permission_explain_camera = 2131690189;
+			public const int main_tab_second_tab = 2131690189;
 			
 			// aapt resource value: 0x7F0F02CE
-			public const int mobile_common_permission_explain_external_storage = 2131690190;
+			public const int message_come_from_tip = 2131690190;
 			
 			// aapt resource value: 0x7F0F02CF
-			public const int mobile_common_permission_explain_get_accounts = 2131690191;
+			public const int message_encrypt_inputpsw_tip_title = 2131690191;
 			
 			// aapt resource value: 0x7F0F02D0
-			public const int mobile_common_permission_explain_read_phone_state = 2131690192;
+			public const int message_live = 2131690192;
 			
 			// aapt resource value: 0x7F0F02D1
-			public const int mobile_common_permission_explain_record_audio = 2131690193;
+			public const int message_no_data_text = 2131690193;
 			
 			// aapt resource value: 0x7F0F02D2
-			public const int mobile_common_permission_explain_write_accounts = 2131690194;
+			public const int message_refresh_fail_network_exception = 2131690194;
 			
 			// aapt resource value: 0x7F0F02D3
-			public const int mobile_common_retry = 2131690195;
+			public const int message_refresh_fail_server_exception = 2131690195;
 			
 			// aapt resource value: 0x7F0F02D4
-			public const int mobile_common_tap_to_view = 2131690196;
+			public const int message_video = 2131690196;
 			
 			// aapt resource value: 0x7F0F02D5
-			public const int modify_online_schedule = 2131690197;
+			public const int mobile_common_bec_add_device_valid_error = 2131690197;
 			
 			// aapt resource value: 0x7F0F02D6
-			public const int month = 2131690198;
+			public const int mobile_common_bec_common_network_exception = 2131690198;
 			
 			// aapt resource value: 0x7F0F02D7
-			public const int more = 2131690199;
+			public const int mobile_common_bec_common_timeout = 2131690199;
 			
 			// aapt resource value: 0x7F0F02D8
-			public const int more_local_image = 2131690200;
+			public const int mobile_common_bec_device_locked = 2131690200;
 			
 			// aapt resource value: 0x7F0F02D9
-			public const int more_setting = 2131690201;
+			public const int mobile_common_common_ignore = 2131690201;
 			
 			// aapt resource value: 0x7F0F02DA
-			public const int more_settings = 2131690202;
+			public const int mobile_common_common_never_remind = 2131690202;
 			
 			// aapt resource value: 0x7F0F02DB
-			public const int my_collect = 2131690203;
+			public const int mobile_common_device = 2131690203;
 			
 			// aapt resource value: 0x7F0F02DC
-			public const int my_devices = 2131690204;
+			public const int mobile_common_device_pwd_rule = 2131690204;
 			
 			// aapt resource value: 0x7F0F02DD
-			public const int network_error_retry_prompt = 2131690205;
+			public const int mobile_common_device_timezone = 2131690205;
 			
 			// aapt resource value: 0x7F0F02DE
-			public const int network_exception = 2131690206;
+			public const int mobile_common_get_info_failed = 2131690206;
 			
 			// aapt resource value: 0x7F0F02DF
-			public const int network_video_recorder = 2131690207;
+			public const int mobile_common_how_modify_device_pwd = 2131690207;
 			
 			// aapt resource value: 0x7F0F02E0
-			public const int newest_version = 2131690208;
+			public const int mobile_common_lack_permission_then_exit = 2131690208;
 			
 			// aapt resource value: 0x7F0F02E1
-			public const int next_button_txt = 2131690209;
-			
-			// aapt resource value: 0x7F0F02E8
-			public const int not_find_any_devices = 2131690216;
-			
-			// aapt resource value: 0x7F0F02E9
-			public const int not_now = 2131690217;
-			
-			// aapt resource value: 0x7F0F02EA
-			public const int not_recognized_fingerprint_hint = 2131690218;
+			public const int mobile_common_later = 2131690209;
 			
 			// aapt resource value: 0x7F0F02E2
-			public const int no_event_device_prompt = 2131690210;
+			public const int mobile_common_modify_device_pwd = 2131690210;
 			
 			// aapt resource value: 0x7F0F02E3
-			public const int no_leave_device_prompt = 2131690211;
+			public const int mobile_common_modify_device_pwd_tip = 2131690211;
 			
 			// aapt resource value: 0x7F0F02E4
-			public const int no_more_alarm_tip = 2131690212;
+			public const int mobile_common_network_config = 2131690212;
 			
 			// aapt resource value: 0x7F0F02E5
-			public const int no_more_leave_tip = 2131690213;
+			public const int mobile_common_no_google_play_detection = 2131690213;
 			
 			// aapt resource value: 0x7F0F02E6
-			public const int no_remote_data = 2131690214;
+			public const int mobile_common_no_huawei_play_detection = 2131690214;
 			
 			// aapt resource value: 0x7F0F02E7
-			public const int no_result_text = 2131690215;
+			public const int mobile_common_password_too_simple = 2131690215;
+			
+			// aapt resource value: 0x7F0F02E8
+			public const int mobile_common_permission_apply = 2131690216;
+			
+			// aapt resource value: 0x7F0F02E9
+			public const int mobile_common_permission_explain_access_location_usage = 2131690217;
+			
+			// aapt resource value: 0x7F0F02EA
+			public const int mobile_common_permission_explain_camera = 2131690218;
 			
 			// aapt resource value: 0x7F0F02EB
-			public const int offline_warn_text = 2131690219;
-			
-			// aapt resource value: 0x7F0F02ED
-			public const int online_time = 2131690221;
+			public const int mobile_common_permission_explain_external_storage = 2131690219;
 			
 			// aapt resource value: 0x7F0F02EC
-			public const int on_the_phone = 2131690220;
+			public const int mobile_common_permission_explain_get_accounts = 2131690220;
+			
+			// aapt resource value: 0x7F0F02ED
+			public const int mobile_common_permission_explain_read_phone_state = 2131690221;
 			
 			// aapt resource value: 0x7F0F02EE
-			public const int open_camera_fail = 2131690222;
+			public const int mobile_common_permission_explain_record_audio = 2131690222;
 			
 			// aapt resource value: 0x7F0F02EF
-			public const int open_camera_lens = 2131690223;
+			public const int mobile_common_permission_explain_write_accounts = 2131690223;
 			
 			// aapt resource value: 0x7F0F02F0
-			public const int open_source_localization = 2131690224;
+			public const int mobile_common_retry = 2131690224;
 			
 			// aapt resource value: 0x7F0F02F1
-			public const int open_ys_service = 2131690225;
+			public const int mobile_common_tap_to_view = 2131690225;
 			
 			// aapt resource value: 0x7F0F02F2
-			public const int open_ys_service_fail = 2131690226;
+			public const int modify_online_schedule = 2131690226;
 			
 			// aapt resource value: 0x7F0F02F3
-			public const int open_ys_service_success = 2131690227;
+			public const int month = 2131690227;
 			
 			// aapt resource value: 0x7F0F02F4
-			public const int operational_fail = 2131690228;
+			public const int more = 2131690228;
 			
 			// aapt resource value: 0x7F0F02F5
-			public const int option_support_web = 2131690229;
+			public const int more_local_image = 2131690229;
 			
 			// aapt resource value: 0x7F0F02F6
-			public const int password_et_hint = 2131690230;
+			public const int more_setting = 2131690230;
 			
 			// aapt resource value: 0x7F0F02F7
-			public const int password_security_txt = 2131690231;
+			public const int more_settings = 2131690231;
 			
 			// aapt resource value: 0x7F0F02F8
-			public const int password_toggle_content_description = 2131690232;
+			public const int my_collect = 2131690232;
 			
 			// aapt resource value: 0x7F0F02F9
-			public const int path_password_eye = 2131690233;
+			public const int my_devices = 2131690233;
 			
 			// aapt resource value: 0x7F0F02FA
-			public const int path_password_eye_mask_strike_through = 2131690234;
+			public const int network_error_retry_prompt = 2131690234;
 			
 			// aapt resource value: 0x7F0F02FB
-			public const int path_password_eye_mask_visible = 2131690235;
+			public const int network_exception = 2131690235;
 			
 			// aapt resource value: 0x7F0F02FC
-			public const int path_password_strike_through = 2131690236;
+			public const int network_video_recorder = 2131690236;
 			
 			// aapt resource value: 0x7F0F02FD
-			public const int phone_not_match_tip = 2131690237;
+			public const int newest_version = 2131690237;
 			
 			// aapt resource value: 0x7F0F02FE
-			public const int pickerview_cancel = 2131690238;
-			
-			// aapt resource value: 0x7F0F02FF
-			public const int pickerview_day = 2131690239;
-			
-			// aapt resource value: 0x7F0F0300
-			public const int pickerview_hours = 2131690240;
-			
-			// aapt resource value: 0x7F0F0301
-			public const int pickerview_minutes = 2131690241;
-			
-			// aapt resource value: 0x7F0F0302
-			public const int pickerview_month = 2131690242;
-			
-			// aapt resource value: 0x7F0F0303
-			public const int pickerview_seconds = 2131690243;
-			
-			// aapt resource value: 0x7F0F0304
-			public const int pickerview_submit = 2131690244;
+			public const int next_button_txt = 2131690238;
 			
 			// aapt resource value: 0x7F0F0305
-			public const int pickerview_year = 2131690245;
-			
-			// aapt resource value: 0x7F0F0307
-			public const int platform_login_button_txt = 2131690247;
+			public const int nomore_loading = 2131690245;
 			
 			// aapt resource value: 0x7F0F0306
-			public const int plat_connected = 2131690246;
+			public const int not_find_any_devices = 2131690246;
+			
+			// aapt resource value: 0x7F0F0307
+			public const int not_now = 2131690247;
 			
 			// aapt resource value: 0x7F0F0308
-			public const int play_hour = 2131690248;
+			public const int not_recognized_fingerprint_hint = 2131690248;
+			
+			// aapt resource value: 0x7F0F02FF
+			public const int no_event_device_prompt = 2131690239;
+			
+			// aapt resource value: 0x7F0F0300
+			public const int no_leave_device_prompt = 2131690240;
+			
+			// aapt resource value: 0x7F0F0301
+			public const int no_more_alarm_tip = 2131690241;
+			
+			// aapt resource value: 0x7F0F0302
+			public const int no_more_leave_tip = 2131690242;
+			
+			// aapt resource value: 0x7F0F0303
+			public const int no_remote_data = 2131690243;
+			
+			// aapt resource value: 0x7F0F0304
+			public const int no_result_text = 2131690244;
 			
 			// aapt resource value: 0x7F0F0309
-			public const int please_connect_the_power = 2131690249;
+			public const int offline_warn_text = 2131690249;
 			
 			// aapt resource value: 0x7F0F030B
-			public const int please_input_phonenumber_txt = 2131690251;
+			public const int online_time = 2131690251;
 			
 			// aapt resource value: 0x7F0F030A
-			public const int please_input_phone_txt = 2131690250;
+			public const int on_the_phone = 2131690250;
 			
 			// aapt resource value: 0x7F0F030C
-			public const int please_input_platform_accesstoken_txt = 2131690252;
+			public const int open_camera_fail = 2131690252;
 			
 			// aapt resource value: 0x7F0F030D
-			public const int please_input_sign_get_sms_txt = 2131690253;
+			public const int open_camera_lens = 2131690253;
 			
 			// aapt resource value: 0x7F0F030E
-			public const int please_input_sign_txt = 2131690254;
+			public const int open_source_localization = 2131690254;
 			
 			// aapt resource value: 0x7F0F030F
-			public const int please_input_userid_txt = 2131690255;
+			public const int open_ys_service = 2131690255;
 			
 			// aapt resource value: 0x7F0F0310
-			public const int please_open_wifi_network = 2131690256;
+			public const int open_ys_service_fail = 2131690256;
 			
 			// aapt resource value: 0x7F0F0311
-			public const int please_open_wifi_network_sadp = 2131690257;
+			public const int open_ys_service_success = 2131690257;
 			
 			// aapt resource value: 0x7F0F0312
-			public const int please_operate_after_select_any_record = 2131690258;
+			public const int operational_fail = 2131690258;
 			
 			// aapt resource value: 0x7F0F0313
-			public const int please_try_connect_device_hotspot_manually = 2131690259;
+			public const int option_support_web = 2131690259;
 			
 			// aapt resource value: 0x7F0F0314
-			public const int plug = 2131690260;
+			public const int password_et_hint = 2131690260;
 			
 			// aapt resource value: 0x7F0F0315
-			public const int pm = 2131690261;
+			public const int password_security_txt = 2131690261;
 			
 			// aapt resource value: 0x7F0F0316
-			public const int press_again_to_exit = 2131690262;
+			public const int password_toggle_content_description = 2131690262;
 			
 			// aapt resource value: 0x7F0F0317
-			public const int press_to_talk_release_to_listen = 2131690263;
+			public const int path_password_eye = 2131690263;
 			
 			// aapt resource value: 0x7F0F0318
-			public const int privacy_policy_and_service_agreement = 2131690264;
+			public const int path_password_eye_mask_strike_through = 2131690264;
 			
 			// aapt resource value: 0x7F0F0319
-			public const int probe_not_support_tip = 2131690265;
+			public const int path_password_eye_mask_visible = 2131690265;
 			
 			// aapt resource value: 0x7F0F031A
-			public const int promptUserToActivate = 2131690266;
+			public const int path_password_strike_through = 2131690266;
 			
 			// aapt resource value: 0x7F0F031B
-			public const int ptz = 2131690267;
+			public const int phone_not_match_tip = 2131690267;
 			
 			// aapt resource value: 0x7F0F031C
-			public const int ptz_control_timeout_cruise_track_failed = 2131690268;
+			public const int pickerview_cancel = 2131690268;
 			
 			// aapt resource value: 0x7F0F031D
-			public const int ptz_control_timeout_sound_lacalization_failed = 2131690269;
+			public const int pickerview_day = 2131690269;
 			
 			// aapt resource value: 0x7F0F031E
-			public const int ptz_is_preseting = 2131690270;
+			public const int pickerview_hours = 2131690270;
 			
 			// aapt resource value: 0x7F0F031F
-			public const int ptz_mirroring_failed = 2131690271;
+			public const int pickerview_minutes = 2131690271;
 			
 			// aapt resource value: 0x7F0F0320
-			public const int ptz_operation_failed = 2131690272;
+			public const int pickerview_month = 2131690272;
 			
 			// aapt resource value: 0x7F0F0321
-			public const int ptz_operation_too_frequently = 2131690273;
+			public const int pickerview_seconds = 2131690273;
 			
 			// aapt resource value: 0x7F0F0322
-			public const int ptz_preset_current_position_failed = 2131690274;
+			public const int pickerview_submit = 2131690274;
 			
 			// aapt resource value: 0x7F0F0323
-			public const int ptz_preset_exceed_maxnum_failed = 2131690275;
-			
-			// aapt resource value: 0x7F0F0324
-			public const int ptz_preset_invalid_position_failed = 2131690276;
+			public const int pickerview_year = 2131690275;
 			
 			// aapt resource value: 0x7F0F0325
-			public const int ptz_preset_sound_localization_failed = 2131690277;
+			public const int platform_login_button_txt = 2131690277;
+			
+			// aapt resource value: 0x7F0F0324
+			public const int plat_connected = 2131690276;
 			
 			// aapt resource value: 0x7F0F0326
-			public const int ptz_privacying_failed = 2131690278;
+			public const int play_hour = 2131690278;
 			
 			// aapt resource value: 0x7F0F0327
-			public const int pull_to_refresh_from_bottom_pull_label = 2131690279;
-			
-			// aapt resource value: 0x7F0F0328
-			public const int pull_to_refresh_from_bottom_refreshing_label = 2131690280;
+			public const int please_connect_the_power = 2131690279;
 			
 			// aapt resource value: 0x7F0F0329
-			public const int pull_to_refresh_from_bottom_release_label = 2131690281;
+			public const int please_input_phonenumber_txt = 2131690281;
+			
+			// aapt resource value: 0x7F0F0328
+			public const int please_input_phone_txt = 2131690280;
 			
 			// aapt resource value: 0x7F0F032A
-			public const int pull_to_refresh_pull_label = 2131690282;
+			public const int please_input_platform_accesstoken_txt = 2131690282;
 			
 			// aapt resource value: 0x7F0F032B
-			public const int pull_to_refresh_refreshing_label = 2131690283;
+			public const int please_input_sign_get_sms_txt = 2131690283;
 			
 			// aapt resource value: 0x7F0F032C
-			public const int pull_to_refresh_release_label = 2131690284;
+			public const int please_input_sign_txt = 2131690284;
 			
 			// aapt resource value: 0x7F0F032D
-			public const int push_cat_body = 2131690285;
+			public const int please_input_userid_txt = 2131690285;
 			
 			// aapt resource value: 0x7F0F032E
-			public const int push_cat_head = 2131690286;
+			public const int please_open_wifi_network = 2131690286;
 			
 			// aapt resource value: 0x7F0F032F
-			public const int push_event_alarm_title = 2131690287;
+			public const int please_open_wifi_network_sadp = 2131690287;
 			
 			// aapt resource value: 0x7F0F0330
-			public const int push_event_from = 2131690288;
+			public const int please_operate_after_select_any_record = 2131690288;
 			
 			// aapt resource value: 0x7F0F0331
-			public const int push_event_get = 2131690289;
+			public const int please_try_connect_device_hotspot_manually = 2131690289;
 			
 			// aapt resource value: 0x7F0F0332
-			public const int push_event_get_count = 2131690290;
+			public const int plug = 2131690290;
 			
 			// aapt resource value: 0x7F0F0333
-			public const int push_out_event_alarm_title = 2131690291;
+			public const int pm = 2131690291;
 			
 			// aapt resource value: 0x7F0F0334
-			public const int pwd_not_contain_chinese = 2131690292;
+			public const int press_again_to_exit = 2131690292;
 			
 			// aapt resource value: 0x7F0F0335
-			public const int qrcode_card = 2131690293;
+			public const int press_to_talk_release_to_listen = 2131690293;
 			
 			// aapt resource value: 0x7F0F0336
-			public const int quality_balanced = 2131690294;
+			public const int privacy_policy_and_service_agreement = 2131690294;
 			
 			// aapt resource value: 0x7F0F0337
-			public const int quality_flunet = 2131690295;
+			public const int probe_not_support_tip = 2131690295;
 			
 			// aapt resource value: 0x7F0F0338
-			public const int quality_hd = 2131690296;
+			public const int promptUserToActivate = 2131690296;
 			
 			// aapt resource value: 0x7F0F0339
-			public const int quality_super_hd = 2131690297;
-			
-			// aapt resource value: 0x7F0F0340
-			public const int querying_camera_text = 2131690304;
+			public const int ptz = 2131690297;
 			
 			// aapt resource value: 0x7F0F033A
-			public const int query_camera_fail = 2131690298;
+			public const int ptz_control_timeout_cruise_track_failed = 2131690298;
 			
 			// aapt resource value: 0x7F0F033B
-			public const int query_camera_fail_network_exception = 2131690299;
+			public const int ptz_control_timeout_sound_lacalization_failed = 2131690299;
 			
 			// aapt resource value: 0x7F0F033C
-			public const int query_camera_fail_network_exception_or_server_exception = 2131690300;
+			public const int ptz_is_preseting = 2131690300;
 			
 			// aapt resource value: 0x7F0F033D
-			public const int query_camera_fail_not_exit = 2131690301;
+			public const int ptz_mirroring_failed = 2131690301;
 			
 			// aapt resource value: 0x7F0F033E
-			public const int query_camera_fail_repeat_error = 2131690302;
+			public const int ptz_operation_failed = 2131690302;
 			
 			// aapt resource value: 0x7F0F033F
-			public const int query_camera_fail_server_exception = 2131690303;
+			public const int ptz_operation_too_frequently = 2131690303;
 			
-			// aapt resource value: 0x7F0F0342
-			public const int readed = 2131690306;
+			// aapt resource value: 0x7F0F0340
+			public const int ptz_preset_current_position_failed = 2131690304;
 			
 			// aapt resource value: 0x7F0F0341
-			public const int read_privacy_policy_and_service_agreement_tip = 2131690305;
+			public const int ptz_preset_exceed_maxnum_failed = 2131690305;
+			
+			// aapt resource value: 0x7F0F0342
+			public const int ptz_preset_invalid_position_failed = 2131690306;
 			
 			// aapt resource value: 0x7F0F0343
-			public const int realplay = 2131690307;
+			public const int ptz_preset_sound_localization_failed = 2131690307;
 			
 			// aapt resource value: 0x7F0F0344
-			public const int realplay_close_sound_localization_fail = 2131690308;
+			public const int ptz_privacying_failed = 2131690308;
 			
 			// aapt resource value: 0x7F0F0345
-			public const int realplay_encrypt_password_error_message = 2131690309;
+			public const int pull_to_refresh_from_bottom_pull_label = 2131690309;
 			
 			// aapt resource value: 0x7F0F0346
-			public const int realplay_encrypt_password_error_title = 2131690310;
+			public const int pull_to_refresh_from_bottom_refreshing_label = 2131690310;
 			
 			// aapt resource value: 0x7F0F0347
-			public const int realplay_fail_connect_device = 2131690311;
+			public const int pull_to_refresh_from_bottom_release_label = 2131690311;
 			
 			// aapt resource value: 0x7F0F0348
-			public const int realplay_fail_device_not_exist = 2131690312;
+			public const int pull_to_refresh_pull_label = 2131690312;
 			
 			// aapt resource value: 0x7F0F0349
-			public const int realplay_full_talk_start_tip = 2131690313;
+			public const int pull_to_refresh_refreshing_label = 2131690313;
 			
 			// aapt resource value: 0x7F0F034A
-			public const int realplay_loading = 2131690314;
+			public const int pull_to_refresh_release_label = 2131690314;
 			
 			// aapt resource value: 0x7F0F034B
-			public const int realplay_login_password_error = 2131690315;
+			public const int push_cat_body = 2131690315;
 			
 			// aapt resource value: 0x7F0F034C
-			public const int realplay_login_password_msg = 2131690316;
+			public const int push_cat_head = 2131690316;
 			
 			// aapt resource value: 0x7F0F034D
-			public const int realplay_no_encrypt_password_error = 2131690317;
+			public const int push_event_alarm_title = 2131690317;
 			
 			// aapt resource value: 0x7F0F034E
-			public const int realplay_no_permission = 2131690318;
+			public const int push_event_from = 2131690318;
 			
 			// aapt resource value: 0x7F0F034F
-			public const int realplay_open_sound_localization_fail = 2131690319;
+			public const int push_event_get = 2131690319;
 			
 			// aapt resource value: 0x7F0F0350
-			public const int realplay_password_error_message1 = 2131690320;
+			public const int push_event_get_count = 2131690320;
 			
 			// aapt resource value: 0x7F0F0351
-			public const int realplay_password_error_message3 = 2131690321;
+			public const int push_out_event_alarm_title = 2131690321;
 			
 			// aapt resource value: 0x7F0F0352
-			public const int realplay_password_error_message4 = 2131690322;
+			public const int pwd_not_contain_chinese = 2131690322;
 			
 			// aapt resource value: 0x7F0F0353
-			public const int realplay_password_error_title = 2131690323;
+			public const int qrcode_card = 2131690323;
 			
 			// aapt resource value: 0x7F0F0354
-			public const int realplay_play_fail = 2131690324;
+			public const int quality_balanced = 2131690324;
 			
 			// aapt resource value: 0x7F0F0355
-			public const int realplay_play_fail_becauseof_network = 2131690325;
+			public const int quality_flunet = 2131690325;
 			
 			// aapt resource value: 0x7F0F0356
-			public const int realplay_play_no_video_source = 2131690326;
+			public const int quality_hd = 2131690326;
 			
 			// aapt resource value: 0x7F0F0357
-			public const int realplay_play_talkback_fail = 2131690327;
-			
-			// aapt resource value: 0x7F0F0358
-			public const int realplay_play_talkback_fail_ison = 2131690328;
-			
-			// aapt resource value: 0x7F0F0359
-			public const int realplay_play_talkback_fail_privacy = 2131690329;
-			
-			// aapt resource value: 0x7F0F035A
-			public const int realplay_play_talkback_network_exception = 2131690330;
-			
-			// aapt resource value: 0x7F0F035B
-			public const int realplay_play_talkback_request_timeout = 2131690331;
-			
-			// aapt resource value: 0x7F0F035C
-			public const int realplay_set_fail_network = 2131690332;
-			
-			// aapt resource value: 0x7F0F035D
-			public const int realplay_set_fail_status = 2131690333;
+			public const int quality_super_hd = 2131690327;
 			
 			// aapt resource value: 0x7F0F035E
-			public const int realplay_set_vediomode_fail = 2131690334;
+			public const int querying_camera_text = 2131690334;
 			
-			// aapt resource value: 0x7F0F035F
-			public const int realplay_share_no_permission = 2131690335;
+			// aapt resource value: 0x7F0F0358
+			public const int query_camera_fail = 2131690328;
+			
+			// aapt resource value: 0x7F0F0359
+			public const int query_camera_fail_network_exception = 2131690329;
+			
+			// aapt resource value: 0x7F0F035A
+			public const int query_camera_fail_network_exception_or_server_exception = 2131690330;
+			
+			// aapt resource value: 0x7F0F035B
+			public const int query_camera_fail_not_exit = 2131690331;
+			
+			// aapt resource value: 0x7F0F035C
+			public const int query_camera_fail_repeat_error = 2131690332;
+			
+			// aapt resource value: 0x7F0F035D
+			public const int query_camera_fail_server_exception = 2131690333;
 			
 			// aapt resource value: 0x7F0F0360
-			public const int realplay_share_time_over = 2131690336;
+			public const int readed = 2131690336;
+			
+			// aapt resource value: 0x7F0F035F
+			public const int read_privacy_policy_and_service_agreement_tip = 2131690335;
 			
 			// aapt resource value: 0x7F0F0361
-			public const int realplay_verifycode_error_message0 = 2131690337;
+			public const int realplay = 2131690337;
 			
 			// aapt resource value: 0x7F0F0362
-			public const int realplay_verifycode_error_placehold = 2131690338;
+			public const int realplay_close_sound_localization_fail = 2131690338;
 			
 			// aapt resource value: 0x7F0F0363
-			public const int receice_leave_msg_audio = 2131690339;
+			public const int realplay_encrypt_password_error_message = 2131690339;
 			
 			// aapt resource value: 0x7F0F0364
-			public const int receice_leave_msg_video = 2131690340;
+			public const int realplay_encrypt_password_error_title = 2131690340;
 			
 			// aapt resource value: 0x7F0F0365
-			public const int record = 2131690341;
+			public const int realplay_fail_connect_device = 2131690341;
 			
 			// aapt resource value: 0x7F0F0366
-			public const int refresh = 2131690342;
+			public const int realplay_fail_device_not_exist = 2131690342;
 			
 			// aapt resource value: 0x7F0F0367
-			public const int refresh_empty_hint = 2131690343;
+			public const int realplay_full_talk_start_tip = 2131690343;
 			
 			// aapt resource value: 0x7F0F0368
-			public const int refresh_fail_hint = 2131690344;
-			
-			// aapt resource value: 0x7F0F036A
-			public const int remoteplayback_capture_fail = 2131690346;
-			
-			// aapt resource value: 0x7F0F036B
-			public const int remoteplayback_capture_fail_for_memory = 2131690347;
-			
-			// aapt resource value: 0x7F0F036C
-			public const int remoteplayback_connect_device_error = 2131690348;
-			
-			// aapt resource value: 0x7F0F036D
-			public const int remoteplayback_connect_server_error = 2131690349;
-			
-			// aapt resource value: 0x7F0F036E
-			public const int remoteplayback_fail = 2131690350;
-			
-			// aapt resource value: 0x7F0F036F
-			public const int remoteplayback_norecordfile = 2131690351;
-			
-			// aapt resource value: 0x7F0F0370
-			public const int remoteplayback_norecordfile_alarm = 2131690352;
-			
-			// aapt resource value: 0x7F0F0371
-			public const int remoteplayback_over_link = 2131690353;
-			
-			// aapt resource value: 0x7F0F0372
-			public const int remoteplayback_record_fail = 2131690354;
-			
-			// aapt resource value: 0x7F0F0373
-			public const int remoteplayback_record_fail_for_memory = 2131690355;
+			public const int realplay_loading = 2131690344;
 			
 			// aapt resource value: 0x7F0F0369
-			public const int remoteplayback_SDCard_disable_use = 2131690345;
+			public const int realplay_login_password_error = 2131690345;
+			
+			// aapt resource value: 0x7F0F036A
+			public const int realplay_login_password_msg = 2131690346;
+			
+			// aapt resource value: 0x7F0F036B
+			public const int realplay_no_encrypt_password_error = 2131690347;
+			
+			// aapt resource value: 0x7F0F036C
+			public const int realplay_no_permission = 2131690348;
+			
+			// aapt resource value: 0x7F0F036D
+			public const int realplay_open_sound_localization_fail = 2131690349;
+			
+			// aapt resource value: 0x7F0F036E
+			public const int realplay_password_error_message1 = 2131690350;
+			
+			// aapt resource value: 0x7F0F036F
+			public const int realplay_password_error_message3 = 2131690351;
+			
+			// aapt resource value: 0x7F0F0370
+			public const int realplay_password_error_message4 = 2131690352;
+			
+			// aapt resource value: 0x7F0F0371
+			public const int realplay_password_error_title = 2131690353;
+			
+			// aapt resource value: 0x7F0F0372
+			public const int realplay_play_fail = 2131690354;
+			
+			// aapt resource value: 0x7F0F0373
+			public const int realplay_play_fail_becauseof_network = 2131690355;
 			
 			// aapt resource value: 0x7F0F0374
-			public const int remoteplayback_searchfile_fail_for_device = 2131690356;
+			public const int realplay_play_no_video_source = 2131690356;
 			
 			// aapt resource value: 0x7F0F0375
-			public const int remoteplayback_searchfile_fail_for_network = 2131690357;
+			public const int realplay_play_talkback_fail = 2131690357;
 			
 			// aapt resource value: 0x7F0F0376
-			public const int reset_10_sec_to_release = 2131690358;
+			public const int realplay_play_talkback_fail_ison = 2131690358;
 			
 			// aapt resource value: 0x7F0F0377
-			public const int reset_device = 2131690359;
+			public const int realplay_play_talkback_fail_privacy = 2131690359;
 			
 			// aapt resource value: 0x7F0F0378
-			public const int result_txt = 2131690360;
+			public const int realplay_play_talkback_network_exception = 2131690360;
 			
 			// aapt resource value: 0x7F0F0379
-			public const int retry = 2131690361;
-			
-			// aapt resource value: 0x7F0F037B
-			public const int router = 2131690363;
+			public const int realplay_play_talkback_request_timeout = 2131690361;
 			
 			// aapt resource value: 0x7F0F037A
-			public const int route_status_light = 2131690362;
+			public const int realplay_set_fail_network = 2131690362;
+			
+			// aapt resource value: 0x7F0F037B
+			public const int realplay_set_fail_status = 2131690363;
 			
 			// aapt resource value: 0x7F0F037C
-			public const int sadp_activate_state1 = 2131690364;
+			public const int realplay_set_vediomode_fail = 2131690364;
 			
 			// aapt resource value: 0x7F0F037D
-			public const int sadp_activate_state2 = 2131690365;
+			public const int realplay_share_no_permission = 2131690365;
 			
 			// aapt resource value: 0x7F0F037E
-			public const int sadp_password_input_hint = 2131690366;
+			public const int realplay_share_time_over = 2131690366;
 			
 			// aapt resource value: 0x7F0F037F
-			public const int sadp_password_toast = 2131690367;
+			public const int realplay_verifycode_error_message0 = 2131690367;
 			
 			// aapt resource value: 0x7F0F0380
-			public const int sadp_password_too_weak = 2131690368;
+			public const int realplay_verifycode_error_placehold = 2131690368;
 			
 			// aapt resource value: 0x7F0F0381
-			public const int sadp_quit_activate = 2131690369;
+			public const int receice_leave_msg_audio = 2131690369;
 			
 			// aapt resource value: 0x7F0F0382
-			public const int save_encrypt_password_fail_network_exception = 2131690370;
+			public const int receice_leave_msg_video = 2131690370;
 			
 			// aapt resource value: 0x7F0F0383
-			public const int scan_add = 2131690371;
+			public const int record = 2131690371;
 			
 			// aapt resource value: 0x7F0F0384
-			public const int scan_connet_network = 2131690372;
-			
-			// aapt resource value: 0x7F0F0385
-			public const int scan_cue_txt = 2131690373;
-			
-			// aapt resource value: 0x7F0F0386
-			public const int scan_device_add_by_others = 2131690374;
-			
-			// aapt resource value: 0x7F0F0387
-			public const int scan_device_search = 2131690375;
+			public const int refresh = 2131690372;
 			
 			// aapt resource value: 0x7F0F0388
-			public const int scan_device_serial_no = 2131690376;
+			public const int refreshing = 2131690376;
 			
-			// aapt resource value: 0x7F0F0389
-			public const int scan_network_unavailible = 2131690377;
+			// aapt resource value: 0x7F0F0385
+			public const int refresh_done = 2131690373;
+			
+			// aapt resource value: 0x7F0F0386
+			public const int refresh_empty_hint = 2131690374;
+			
+			// aapt resource value: 0x7F0F0387
+			public const int refresh_fail_hint = 2131690375;
 			
 			// aapt resource value: 0x7F0F038A
-			public const int scan_probe_qrcode_error = 2131690378;
+			public const int remoteplayback_capture_fail = 2131690378;
 			
 			// aapt resource value: 0x7F0F038B
-			public const int scan_search_probe_qrcode = 2131690379;
+			public const int remoteplayback_capture_fail_for_memory = 2131690379;
 			
 			// aapt resource value: 0x7F0F038C
-			public const int scan_title = 2131690380;
+			public const int remoteplayback_connect_device_error = 2131690380;
 			
 			// aapt resource value: 0x7F0F038D
-			public const int scan_title_txt = 2131690381;
+			public const int remoteplayback_connect_server_error = 2131690381;
 			
 			// aapt resource value: 0x7F0F038E
-			public const int screenshot_fail = 2131690382;
+			public const int remoteplayback_fail = 2131690382;
 			
 			// aapt resource value: 0x7F0F038F
-			public const int screenshot_success = 2131690383;
+			public const int remoteplayback_norecordfile = 2131690383;
 			
 			// aapt resource value: 0x7F0F0390
-			public const int sdk_is_init = 2131690384;
+			public const int remoteplayback_norecordfile_alarm = 2131690384;
 			
 			// aapt resource value: 0x7F0F0391
-			public const int search = 2131690385;
+			public const int remoteplayback_over_link = 2131690385;
 			
 			// aapt resource value: 0x7F0F0392
-			public const int search_menu_title = 2131690386;
+			public const int remoteplayback_record_fail = 2131690386;
 			
 			// aapt resource value: 0x7F0F0393
-			public const int secure_validate = 2131690387;
+			public const int remoteplayback_record_fail_for_memory = 2131690387;
 			
-			// aapt resource value: 0x7F0F0395
-			public const int secure_validatee_fail = 2131690389;
+			// aapt resource value: 0x7F0F0389
+			public const int remoteplayback_SDCard_disable_use = 2131690377;
 			
 			// aapt resource value: 0x7F0F0394
-			public const int secure_validate_success = 2131690388;
+			public const int remoteplayback_searchfile_fail_for_device = 2131690388;
+			
+			// aapt resource value: 0x7F0F0395
+			public const int remoteplayback_searchfile_fail_for_network = 2131690389;
 			
 			// aapt resource value: 0x7F0F0396
-			public const int seek_camera_fail_device_not_support_shipin7 = 2131690390;
+			public const int reset_10_sec_to_release = 2131690390;
 			
 			// aapt resource value: 0x7F0F0397
-			public const int select_all = 2131690391;
+			public const int reset_device = 2131690391;
 			
 			// aapt resource value: 0x7F0F0398
-			public const int select_date = 2131690392;
+			public const int result_txt = 2131690392;
 			
 			// aapt resource value: 0x7F0F0399
-			public const int serial_add_hint = 2131690393;
-			
-			// aapt resource value: 0x7F0F039A
-			public const int serial_add_password_error_title = 2131690394;
+			public const int retry = 2131690393;
 			
 			// aapt resource value: 0x7F0F039B
-			public const int serial_input_text = 2131690395;
+			public const int router = 2131690395;
+			
+			// aapt resource value: 0x7F0F039A
+			public const int route_status_light = 2131690394;
 			
 			// aapt resource value: 0x7F0F039C
-			public const int serial_number_error = 2131690396;
+			public const int sadp_activate_state1 = 2131690396;
 			
 			// aapt resource value: 0x7F0F039D
-			public const int serial_number_is_null = 2131690397;
+			public const int sadp_activate_state2 = 2131690397;
 			
 			// aapt resource value: 0x7F0F039E
-			public const int serial_number_put_the_right_no = 2131690398;
+			public const int sadp_password_input_hint = 2131690398;
 			
 			// aapt resource value: 0x7F0F039F
-			public const int server_area = 2131690399;
-			
-			// aapt resource value: 0x7F0F03A4
-			public const int setting = 2131690404;
-			
-			// aapt resource value: 0x7F0F03A5
-			public const int setting_video_level = 2131690405;
+			public const int sadp_password_toast = 2131690399;
 			
 			// aapt resource value: 0x7F0F03A0
-			public const int set_defence_plan = 2131690400;
+			public const int sadp_password_too_weak = 2131690400;
 			
 			// aapt resource value: 0x7F0F03A1
-			public const int set_device_wifi_network_need_reset_the_device = 2131690401;
+			public const int sadp_quit_activate = 2131690401;
 			
 			// aapt resource value: 0x7F0F03A2
-			public const int set_ptz_flip_fail = 2131690402;
+			public const int save_encrypt_password_fail_network_exception = 2131690402;
 			
 			// aapt resource value: 0x7F0F03A3
-			public const int set_ptz_flip_success = 2131690403;
+			public const int scan_add = 2131690403;
+			
+			// aapt resource value: 0x7F0F03A4
+			public const int scan_connet_network = 2131690404;
+			
+			// aapt resource value: 0x7F0F03A5
+			public const int scan_cue_txt = 2131690405;
 			
 			// aapt resource value: 0x7F0F03A6
-			public const int share_devices = 2131690406;
+			public const int scan_device_add_by_others = 2131690406;
 			
 			// aapt resource value: 0x7F0F03A7
-			public const int sms_verify_bind_error = 2131690407;
+			public const int scan_device_search = 2131690407;
 			
 			// aapt resource value: 0x7F0F03A8
-			public const int sms_verify_code_received = 2131690408;
+			public const int scan_device_serial_no = 2131690408;
 			
 			// aapt resource value: 0x7F0F03A9
-			public const int source_detection_off = 2131690409;
+			public const int scan_network_unavailible = 2131690409;
 			
 			// aapt resource value: 0x7F0F03AA
-			public const int source_detection_on = 2131690410;
+			public const int scan_probe_qrcode_error = 2131690410;
 			
 			// aapt resource value: 0x7F0F03AB
-			public const int specified_device = 2131690411;
+			public const int scan_search_probe_qrcode = 2131690411;
 			
 			// aapt resource value: 0x7F0F03AC
-			public const int srl_component_falsify = 2131690412;
+			public const int scan_title = 2131690412;
 			
 			// aapt resource value: 0x7F0F03AD
-			public const int srl_content_empty = 2131690413;
+			public const int scan_title_txt = 2131690413;
 			
 			// aapt resource value: 0x7F0F03AE
-			public const int srl_footer_failed = 2131690414;
+			public const int screenshot_fail = 2131690414;
 			
 			// aapt resource value: 0x7F0F03AF
-			public const int srl_footer_finish = 2131690415;
+			public const int screenshot_success = 2131690415;
 			
 			// aapt resource value: 0x7F0F03B0
-			public const int srl_footer_loading = 2131690416;
+			public const int sdk_is_init = 2131690416;
 			
 			// aapt resource value: 0x7F0F03B1
-			public const int srl_footer_nothing = 2131690417;
+			public const int search = 2131690417;
 			
 			// aapt resource value: 0x7F0F03B2
-			public const int srl_footer_pulling = 2131690418;
+			public const int search_menu_title = 2131690418;
 			
 			// aapt resource value: 0x7F0F03B3
-			public const int srl_footer_refreshing = 2131690419;
-			
-			// aapt resource value: 0x7F0F03B4
-			public const int srl_footer_release = 2131690420;
+			public const int secure_validate = 2131690419;
 			
 			// aapt resource value: 0x7F0F03B5
-			public const int srl_header_failed = 2131690421;
+			public const int secure_validatee_fail = 2131690421;
+			
+			// aapt resource value: 0x7F0F03B4
+			public const int secure_validate_success = 2131690420;
 			
 			// aapt resource value: 0x7F0F03B6
-			public const int srl_header_finish = 2131690422;
+			public const int seek_camera_fail_device_not_support_shipin7 = 2131690422;
 			
 			// aapt resource value: 0x7F0F03B7
-			public const int srl_header_loading = 2131690423;
+			public const int select_all = 2131690423;
 			
 			// aapt resource value: 0x7F0F03B8
-			public const int srl_header_pulling = 2131690424;
+			public const int select_date = 2131690424;
 			
 			// aapt resource value: 0x7F0F03B9
-			public const int srl_header_refreshing = 2131690425;
+			public const int select_set_parameters = 2131690425;
 			
 			// aapt resource value: 0x7F0F03BA
-			public const int srl_header_release = 2131690426;
+			public const int select_set_wifi = 2131690426;
 			
 			// aapt resource value: 0x7F0F03BB
-			public const int srl_header_secondary = 2131690427;
+			public const int serial_add_hint = 2131690427;
 			
 			// aapt resource value: 0x7F0F03BC
-			public const int srl_header_update = 2131690428;
+			public const int serial_add_password_error_title = 2131690428;
 			
 			// aapt resource value: 0x7F0F03BD
-			public const int start_cloud = 2131690429;
+			public const int serial_input_text = 2131690429;
 			
 			// aapt resource value: 0x7F0F03BE
-			public const int start_to_experience = 2131690430;
+			public const int serial_number_error = 2131690430;
 			
 			// aapt resource value: 0x7F0F03BF
-			public const int start_voice_talk = 2131690431;
+			public const int serial_number_is_null = 2131690431;
 			
 			// aapt resource value: 0x7F0F03C0
-			public const int status_bar_notification_info_overflow = 2131690432;
+			public const int serial_number_put_the_right_no = 2131690432;
 			
 			// aapt resource value: 0x7F0F03C1
-			public const int step3_adding_device_to_account = 2131690433;
-			
-			// aapt resource value: 0x7F0F03C2
-			public const int storage_status = 2131690434;
-			
-			// aapt resource value: 0x7F0F03C3
-			public const int stream_type = 2131690435;
+			public const int server_area = 2131690433;
 			
 			// aapt resource value: 0x7F0F03C6
-			public const int string_apiurl = 2131690438;
-			
-			// aapt resource value: 0x7F0F03C4
-			public const int string_ap_connection = 2131690436;
-			
-			// aapt resource value: 0x7F0F03C5
-			public const int string_ap_connection_normal = 2131690437;
+			public const int setting = 2131690438;
 			
 			// aapt resource value: 0x7F0F03C7
-			public const int string_authurl = 2131690439;
+			public const int setting_video_level = 2131690439;
 			
-			// aapt resource value: 0x7F0F03C9
-			public const int string_deviceserial = 2131690441;
+			// aapt resource value: 0x7F0F03C2
+			public const int set_defence_plan = 2131690434;
+			
+			// aapt resource value: 0x7F0F03C3
+			public const int set_device_wifi_network_need_reset_the_device = 2131690435;
+			
+			// aapt resource value: 0x7F0F03C4
+			public const int set_ptz_flip_fail = 2131690436;
+			
+			// aapt resource value: 0x7F0F03C5
+			public const int set_ptz_flip_success = 2131690437;
 			
 			// aapt resource value: 0x7F0F03C8
-			public const int string_device_network_mode = 2131690440;
+			public const int share_devices = 2131690440;
+			
+			// aapt resource value: 0x7F0F03C9
+			public const int sms_verify_bind_error = 2131690441;
 			
 			// aapt resource value: 0x7F0F03CA
-			public const int string_ezopenurl = 2131690442;
+			public const int sms_verify_code_received = 2131690442;
 			
 			// aapt resource value: 0x7F0F03CB
-			public const int string_get_device_version_fail = 2131690443;
+			public const int source_detection_off = 2131690443;
 			
 			// aapt resource value: 0x7F0F03CC
-			public const int string_smart_and_sound_wave_connection = 2131690444;
+			public const int source_detection_on = 2131690444;
 			
 			// aapt resource value: 0x7F0F03CD
-			public const int string_smart_connection = 2131690445;
+			public const int specified_device = 2131690445;
 			
 			// aapt resource value: 0x7F0F03CE
-			public const int string_smart_connection_normal = 2131690446;
+			public const int srl_component_falsify = 2131690446;
 			
 			// aapt resource value: 0x7F0F03CF
-			public const int string_sound_wave_connection = 2131690447;
+			public const int srl_content_empty = 2131690447;
 			
 			// aapt resource value: 0x7F0F03D0
-			public const int string_wired_connection = 2131690448;
+			public const int srl_footer_failed = 2131690448;
 			
 			// aapt resource value: 0x7F0F03D1
-			public const int submit_secure_validate = 2131690449;
+			public const int srl_footer_finish = 2131690449;
 			
 			// aapt resource value: 0x7F0F03D2
-			public const int submit_sms_code = 2131690450;
+			public const int srl_footer_loading = 2131690450;
 			
 			// aapt resource value: 0x7F0F03D3
-			public const int switch_to_handset = 2131690451;
+			public const int srl_footer_nothing = 2131690451;
 			
 			// aapt resource value: 0x7F0F03D4
-			public const int switch_to_speaker = 2131690452;
+			public const int srl_footer_pulling = 2131690452;
 			
 			// aapt resource value: 0x7F0F03D5
-			public const int system_default_channel = 2131690453;
+			public const int srl_footer_refreshing = 2131690453;
 			
 			// aapt resource value: 0x7F0F03D6
-			public const int tab_more = 2131690454;
+			public const int srl_footer_release = 2131690454;
 			
 			// aapt resource value: 0x7F0F03D7
-			public const int talk = 2131690455;
-			
-			// aapt resource value: 0x7F0F03DA
-			public const int talking = 2131690458;
+			public const int srl_header_failed = 2131690455;
 			
 			// aapt resource value: 0x7F0F03D8
-			public const int talk_open_failed = 2131690456;
+			public const int srl_header_finish = 2131690456;
 			
 			// aapt resource value: 0x7F0F03D9
-			public const int talk_open_success = 2131690457;
+			public const int srl_header_loading = 2131690457;
+			
+			// aapt resource value: 0x7F0F03DA
+			public const int srl_header_pulling = 2131690458;
 			
 			// aapt resource value: 0x7F0F03DB
-			public const int tip_heard_voice = 2131690459;
+			public const int srl_header_refreshing = 2131690459;
 			
 			// aapt resource value: 0x7F0F03DC
-			public const int tip_login_out = 2131690460;
+			public const int srl_header_release = 2131690460;
 			
 			// aapt resource value: 0x7F0F03DD
-			public const int tip_of_added_by_yourself_and_online = 2131690461;
+			public const int srl_header_secondary = 2131690461;
 			
 			// aapt resource value: 0x7F0F03DE
-			public const int tip_of_bad_net = 2131690462;
+			public const int srl_header_update = 2131690462;
 			
 			// aapt resource value: 0x7F0F03DF
-			public const int tip_playback_again = 2131690463;
+			public const int start_cloud = 2131690463;
 			
 			// aapt resource value: 0x7F0F03E0
-			public const int tip_specified_device = 2131690464;
+			public const int start_to_experience = 2131690464;
 			
 			// aapt resource value: 0x7F0F03E1
-			public const int title_activate_device = 2131690465;
+			public const int start_voice_talk = 2131690465;
 			
 			// aapt resource value: 0x7F0F03E2
-			public const int title_activate_device_fail = 2131690466;
+			public const int status_bar_notification_info_overflow = 2131690466;
 			
 			// aapt resource value: 0x7F0F03E3
-			public const int title_activity_connect_device_wifi = 2131690467;
+			public const int step3_adding_device_to_account = 2131690467;
 			
 			// aapt resource value: 0x7F0F03E4
-			public const int title_activity_ezupgrade_device = 2131690468;
-			
-			// aapt resource value: 0x7F0F03E5
-			public const int today = 2131690469;
-			
-			// aapt resource value: 0x7F0F03E6
-			public const int touch_fingerprint_sensor_hint = 2131690470;
-			
-			// aapt resource value: 0x7F0F03E7
-			public const int touch_to_load = 2131690471;
-			
-			// aapt resource value: 0x7F0F03E8
-			public const int try_again = 2131690472;
-			
-			// aapt resource value: 0x7F0F03E9
-			public const int ui_call_demo_txt = 2131690473;
-			
-			// aapt resource value: 0x7F0F03EA
-			public const int unable_identify_two_dimensional_code_tip = 2131690474;
-			
-			// aapt resource value: 0x7F0F03EB
-			public const int unbind_to_bind = 2131690475;
-			
-			// aapt resource value: 0x7F0F03EC
-			public const int unknow_ssid = 2131690476;
-			
-			// aapt resource value: 0x7F0F03ED
-			public const int unlock_fail = 2131690477;
-			
-			// aapt resource value: 0x7F0F03EE
-			public const int unlock_success = 2131690478;
-			
-			// aapt resource value: 0x7F0F03EF
-			public const int unnamed = 2131690479;
-			
-			// aapt resource value: 0x7F0F03F0
-			public const int update_exit = 2131690480;
-			
-			// aapt resource value: 0x7F0F03F1
-			public const int upgrade = 2131690481;
-			
-			// aapt resource value: 0x7F0F03F2
-			public const int upgrade_fail = 2131690482;
-			
-			// aapt resource value: 0x7F0F03F3
-			public const int upgrade_progress = 2131690483;
-			
-			// aapt resource value: 0x7F0F03F4
-			public const int upgrade_success = 2131690484;
-			
-			// aapt resource value: 0x7F0F03F5
-			public const int upgrade_success_progress = 2131690485;
-			
-			// aapt resource value: 0x7F0F03FA
-			public const int upsdk_appstore_install = 2131690490;
-			
-			// aapt resource value: 0x7F0F03FB
-			public const int upsdk_apptouch_store_url = 2131690491;
-			
-			// aapt resource value: 0x7F0F03F6
-			public const int upsdk_app_download_info_new = 2131690486;
-			
-			// aapt resource value: 0x7F0F03F7
-			public const int upsdk_app_download_installing = 2131690487;
-			
-			// aapt resource value: 0x7F0F03F8
-			public const int upsdk_app_size = 2131690488;
-			
-			// aapt resource value: 0x7F0F03F9
-			public const int upsdk_app_version = 2131690489;
-			
-			// aapt resource value: 0x7F0F03FC
-			public const int upsdk_cancel = 2131690492;
+			public const int storage_status = 2131690468;
 			
 			// aapt resource value: 0x7F0F03FD
-			public const int upsdk_checking_update_prompt = 2131690493;
-			
-			// aapt resource value: 0x7F0F03FE
-			public const int upsdk_choice_update = 2131690494;
-			
-			// aapt resource value: 0x7F0F03FF
-			public const int upsdk_detail = 2131690495;
+			public const int stream_type = 2131690493;
 			
 			// aapt resource value: 0x7F0F0400
-			public const int upsdk_getting_message_fail_prompt_toast = 2131690496;
+			public const int string_apiurl = 2131690496;
+			
+			// aapt resource value: 0x7F0F03FE
+			public const int string_ap_connection = 2131690494;
+			
+			// aapt resource value: 0x7F0F03FF
+			public const int string_ap_connection_normal = 2131690495;
 			
 			// aapt resource value: 0x7F0F0401
-			public const int upsdk_mobile_dld_warn = 2131690497;
-			
-			// aapt resource value: 0x7F0F0402
-			public const int upsdk_no_available_network_prompt_toast = 2131690498;
+			public const int string_authurl = 2131690497;
 			
 			// aapt resource value: 0x7F0F0403
-			public const int upsdk_ota_app_name = 2131690499;
+			public const int string_deviceserial = 2131690499;
+			
+			// aapt resource value: 0x7F0F0402
+			public const int string_device_network_mode = 2131690498;
 			
 			// aapt resource value: 0x7F0F0404
-			public const int upsdk_ota_cancel = 2131690500;
+			public const int string_ezopenurl = 2131690500;
 			
 			// aapt resource value: 0x7F0F0405
-			public const int upsdk_ota_force_cancel_new = 2131690501;
+			public const int string_get_device_version_fail = 2131690501;
 			
 			// aapt resource value: 0x7F0F0406
-			public const int upsdk_ota_notify_updatebtn = 2131690502;
+			public const int string_smart_and_sound_wave_connection = 2131690502;
 			
 			// aapt resource value: 0x7F0F0407
-			public const int upsdk_ota_title = 2131690503;
+			public const int string_smart_connection = 2131690503;
 			
 			// aapt resource value: 0x7F0F0408
-			public const int upsdk_storage_utils = 2131690504;
+			public const int string_smart_connection_normal = 2131690504;
 			
 			// aapt resource value: 0x7F0F0409
-			public const int upsdk_store_url = 2131690505;
+			public const int string_sound_wave_connection = 2131690505;
 			
 			// aapt resource value: 0x7F0F040A
-			public const int upsdk_third_app_dl_cancel_download_prompt_ex = 2131690506;
+			public const int string_wired_connection = 2131690506;
+			
+			// aapt resource value: 0x7F0F03E5
+			public const int strNetworkTipsCancelBtn = 2131690469;
+			
+			// aapt resource value: 0x7F0F03E6
+			public const int strNetworkTipsConfirmBtn = 2131690470;
+			
+			// aapt resource value: 0x7F0F03E7
+			public const int strNetworkTipsMessage = 2131690471;
+			
+			// aapt resource value: 0x7F0F03E8
+			public const int strNetworkTipsTitle = 2131690472;
+			
+			// aapt resource value: 0x7F0F03E9
+			public const int strNotificationClickToContinue = 2131690473;
+			
+			// aapt resource value: 0x7F0F03EA
+			public const int strNotificationClickToInstall = 2131690474;
+			
+			// aapt resource value: 0x7F0F03EB
+			public const int strNotificationClickToRetry = 2131690475;
+			
+			// aapt resource value: 0x7F0F03EC
+			public const int strNotificationClickToView = 2131690476;
+			
+			// aapt resource value: 0x7F0F03ED
+			public const int strNotificationDownloadError = 2131690477;
+			
+			// aapt resource value: 0x7F0F03EF
+			public const int strNotificationDownloading = 2131690479;
+			
+			// aapt resource value: 0x7F0F03EE
+			public const int strNotificationDownloadSucc = 2131690478;
+			
+			// aapt resource value: 0x7F0F03F0
+			public const int strNotificationHaveNewVersion = 2131690480;
+			
+			// aapt resource value: 0x7F0F03F2
+			public const int strToastCheckingUpgrade = 2131690482;
+			
+			// aapt resource value: 0x7F0F03F1
+			public const int strToastCheckUpgradeError = 2131690481;
+			
+			// aapt resource value: 0x7F0F03F3
+			public const int strToastYourAreTheLatestVersion = 2131690483;
+			
+			// aapt resource value: 0x7F0F03F4
+			public const int strUpgradeDialogCancelBtn = 2131690484;
+			
+			// aapt resource value: 0x7F0F03F5
+			public const int strUpgradeDialogContinueBtn = 2131690485;
+			
+			// aapt resource value: 0x7F0F03F6
+			public const int strUpgradeDialogFeatureLabel = 2131690486;
+			
+			// aapt resource value: 0x7F0F03F7
+			public const int strUpgradeDialogFileSizeLabel = 2131690487;
+			
+			// aapt resource value: 0x7F0F03F8
+			public const int strUpgradeDialogInstallBtn = 2131690488;
+			
+			// aapt resource value: 0x7F0F03F9
+			public const int strUpgradeDialogRetryBtn = 2131690489;
+			
+			// aapt resource value: 0x7F0F03FA
+			public const int strUpgradeDialogUpdateTimeLabel = 2131690490;
+			
+			// aapt resource value: 0x7F0F03FB
+			public const int strUpgradeDialogUpgradeBtn = 2131690491;
+			
+			// aapt resource value: 0x7F0F03FC
+			public const int strUpgradeDialogVersionLabel = 2131690492;
 			
 			// aapt resource value: 0x7F0F040B
-			public const int upsdk_third_app_dl_install_failed = 2131690507;
+			public const int submit_secure_validate = 2131690507;
 			
 			// aapt resource value: 0x7F0F040C
-			public const int upsdk_third_app_dl_sure_cancel_download = 2131690508;
+			public const int submit_sms_code = 2131690508;
 			
 			// aapt resource value: 0x7F0F040D
-			public const int upsdk_update_check_no_new_version = 2131690509;
+			public const int switch_to_handset = 2131690509;
 			
 			// aapt resource value: 0x7F0F040E
-			public const int user_input_name = 2131690510;
+			public const int switch_to_speaker = 2131690510;
 			
 			// aapt resource value: 0x7F0F040F
-			public const int user_login_title = 2131690511;
+			public const int system_default_channel = 2131690511;
 			
 			// aapt resource value: 0x7F0F0410
-			public const int user_name_txt = 2131690512;
+			public const int tab_more = 2131690512;
 			
 			// aapt resource value: 0x7F0F0411
-			public const int user_pwd_login_login = 2131690513;
-			
-			// aapt resource value: 0x7F0F0412
-			public const int user_register = 2131690514;
-			
-			// aapt resource value: 0x7F0F0413
-			public const int user_register_btn = 2131690515;
+			public const int talk = 2131690513;
 			
 			// aapt resource value: 0x7F0F0414
-			public const int valid_code_retrieve_valid_num = 2131690516;
+			public const int talking = 2131690516;
+			
+			// aapt resource value: 0x7F0F0412
+			public const int talk_open_failed = 2131690514;
+			
+			// aapt resource value: 0x7F0F0413
+			public const int talk_open_success = 2131690515;
 			
 			// aapt resource value: 0x7F0F0415
-			public const int verify_code_error = 2131690517;
+			public const int text_day_ago = 2131690517;
 			
 			// aapt resource value: 0x7F0F0416
-			public const int verify_sms_code_fail = 2131690518;
+			public const int text_end_time_hint = 2131690518;
 			
 			// aapt resource value: 0x7F0F0417
-			public const int verify_sms_code_success = 2131690519;
+			public const int text_hour_ago = 2131690519;
 			
 			// aapt resource value: 0x7F0F0418
-			public const int version_newest = 2131690520;
+			public const int text_just = 2131690520;
 			
 			// aapt resource value: 0x7F0F0419
-			public const int video_answer = 2131690521;
+			public const int text_minute_ago = 2131690521;
 			
 			// aapt resource value: 0x7F0F041A
-			public const int video_box = 2131690522;
+			public const int text_month_ago = 2131690522;
 			
 			// aapt resource value: 0x7F0F041B
-			public const int video_confirm = 2131690523;
+			public const int text_press_to_copy = 2131690523;
 			
 			// aapt resource value: 0x7F0F041C
-			public const int video_device = 2131690524;
+			public const int text_seconds_ago = 2131690524;
 			
 			// aapt resource value: 0x7F0F041D
-			public const int video_fail = 2131690525;
+			public const int text_start_time_hint = 2131690525;
 			
 			// aapt resource value: 0x7F0F041E
-			public const int video_hang_up = 2131690526;
+			public const int text_year_ago = 2131690526;
 			
 			// aapt resource value: 0x7F0F041F
-			public const int video_icon = 2131690527;
+			public const int tip_confirm_unlock = 2131690527;
 			
 			// aapt resource value: 0x7F0F0420
-			public const int video_not_answer = 2131690528;
+			public const int tip_heard_voice = 2131690528;
 			
 			// aapt resource value: 0x7F0F0421
-			public const int video_screenshot = 2131690529;
+			public const int tip_login_out = 2131690529;
 			
 			// aapt resource value: 0x7F0F0422
-			public const int video_square = 2131690530;
+			public const int tip_of_added_by_yourself_and_online = 2131690530;
 			
 			// aapt resource value: 0x7F0F0423
-			public const int video_success = 2131690531;
+			public const int tip_of_bad_net = 2131690531;
 			
 			// aapt resource value: 0x7F0F0424
-			public const int video_talk_call_cancel = 2131690532;
+			public const int tip_playback_again = 2131690532;
 			
 			// aapt resource value: 0x7F0F0425
-			public const int video_talk_call_is_accepted = 2131690533;
+			public const int tip_specified_device = 2131690533;
 			
 			// aapt resource value: 0x7F0F0426
-			public const int video_talk_is_playing = 2131690534;
+			public const int title_activate_device = 2131690534;
 			
 			// aapt resource value: 0x7F0F0427
-			public const int video_talk_sdk_toast_hang_up = 2131690535;
+			public const int title_activate_device_fail = 2131690535;
 			
 			// aapt resource value: 0x7F0F0428
-			public const int video_talk_sdk_toast_nobody = 2131690536;
+			public const int title_activity_connect_device_wifi = 2131690536;
 			
 			// aapt resource value: 0x7F0F0429
-			public const int video_talk_signal_weak = 2131690537;
+			public const int title_activity_ezupgrade_device = 2131690537;
 			
 			// aapt resource value: 0x7F0F042A
-			public const int video_talk_watch_is_busy = 2131690538;
+			public const int today = 2131690538;
 			
 			// aapt resource value: 0x7F0F042B
-			public const int video_talk_watch_temperature_high_hang = 2131690539;
+			public const int touch_fingerprint_sensor_hint = 2131690539;
 			
 			// aapt resource value: 0x7F0F042C
-			public const int video_talk_watch_temperature_high_hint = 2131690540;
+			public const int touch_to_load = 2131690540;
 			
 			// aapt resource value: 0x7F0F042D
-			public const int video_talk_watch_temperature_high_reject = 2131690541;
+			public const int try_again = 2131690541;
 			
 			// aapt resource value: 0x7F0F042E
-			public const int video_talk_watch_temperature_high_warn = 2131690542;
+			public const int ui_call_demo_txt = 2131690542;
 			
 			// aapt resource value: 0x7F0F042F
-			public const int video_tip = 2131690543;
+			public const int unable_identify_two_dimensional_code_tip = 2131690543;
 			
 			// aapt resource value: 0x7F0F0430
-			public const int video_unlock = 2131690544;
+			public const int unbind_to_bind = 2131690544;
 			
 			// aapt resource value: 0x7F0F0431
-			public const int wait = 2131690545;
+			public const int unblanking = 2131690545;
 			
 			// aapt resource value: 0x7F0F0432
-			public const int web_login_button_txt = 2131690546;
+			public const int unknow_ssid = 2131690546;
 			
 			// aapt resource value: 0x7F0F0433
-			public const int wechat_interconnect = 2131690547;
+			public const int unlock_fail = 2131690547;
 			
 			// aapt resource value: 0x7F0F0434
-			public const int wifi_connected = 2131690548;
+			public const int unlock_success = 2131690548;
 			
 			// aapt resource value: 0x7F0F0435
-			public const int wifi_connection_finish_need_refresh = 2131690549;
+			public const int unnamed = 2131690549;
 			
 			// aapt resource value: 0x7F0F0436
-			public const int wifi_set = 2131690550;
+			public const int update_exit = 2131690550;
 			
 			// aapt resource value: 0x7F0F0437
-			public const int wifi_setting = 2131690551;
+			public const int upgrade = 2131690551;
 			
 			// aapt resource value: 0x7F0F0438
-			public const int wired_connection = 2131690552;
-			
-			// aapt resource value: 0x7F0F043A
-			public const int xlistview_footer_hint_normal = 2131690554;
+			public const int upgrade_fail = 2131690552;
 			
 			// aapt resource value: 0x7F0F0439
-			public const int xlistview_footer_hint_no_more_device = 2131690553;
+			public const int upgrade_progress = 2131690553;
+			
+			// aapt resource value: 0x7F0F043A
+			public const int upgrade_success = 2131690554;
 			
 			// aapt resource value: 0x7F0F043B
-			public const int xlistview_footer_hint_ready = 2131690555;
+			public const int upgrade_success_progress = 2131690555;
 			
 			// aapt resource value: 0x7F0F043C
-			public const int xlistview_footer_no_more = 2131690556;
+			public const int user_input_name = 2131690556;
 			
 			// aapt resource value: 0x7F0F043D
-			public const int xlistview_footer_no_more_msg = 2131690557;
+			public const int user_login_title = 2131690557;
 			
 			// aapt resource value: 0x7F0F043E
-			public const int xlistview_header_hint_loading = 2131690558;
+			public const int user_name_txt = 2131690558;
 			
 			// aapt resource value: 0x7F0F043F
-			public const int xlistview_header_hint_more = 2131690559;
+			public const int user_pwd_login_login = 2131690559;
 			
 			// aapt resource value: 0x7F0F0440
-			public const int xlistview_header_hint_normal = 2131690560;
+			public const int user_register = 2131690560;
 			
 			// aapt resource value: 0x7F0F0441
-			public const int xlistview_header_hint_ready = 2131690561;
+			public const int user_register_btn = 2131690561;
 			
 			// aapt resource value: 0x7F0F0442
-			public const int xlistview_header_last_time = 2131690562;
+			public const int valid_code_retrieve_valid_num = 2131690562;
 			
 			// aapt resource value: 0x7F0F0443
-			public const int zxing_app_name = 2131690563;
+			public const int verify_camera_fail_network_exception = 2131690563;
 			
 			// aapt resource value: 0x7F0F0444
-			public const int zxing_button_ok = 2131690564;
+			public const int verify_code_error = 2131690564;
 			
 			// aapt resource value: 0x7F0F0445
-			public const int zxing_msg_camera_framework_bug = 2131690565;
+			public const int verify_sms_code_fail = 2131690565;
 			
 			// aapt resource value: 0x7F0F0446
-			public const int zxing_msg_default_status = 2131690566;
+			public const int verify_sms_code_success = 2131690566;
 			
 			// aapt resource value: 0x7F0F0447
-			public const int zxing_scan_tips = 2131690567;
+			public const int version_newest = 2131690567;
+			
+			// aapt resource value: 0x7F0F0448
+			public const int video_answer = 2131690568;
+			
+			// aapt resource value: 0x7F0F0449
+			public const int video_box = 2131690569;
+			
+			// aapt resource value: 0x7F0F044A
+			public const int video_confirm = 2131690570;
+			
+			// aapt resource value: 0x7F0F044B
+			public const int video_device = 2131690571;
+			
+			// aapt resource value: 0x7F0F044C
+			public const int video_fail = 2131690572;
+			
+			// aapt resource value: 0x7F0F044D
+			public const int video_hang_up = 2131690573;
+			
+			// aapt resource value: 0x7F0F044E
+			public const int video_icon = 2131690574;
+			
+			// aapt resource value: 0x7F0F044F
+			public const int video_not_answer = 2131690575;
+			
+			// aapt resource value: 0x7F0F0450
+			public const int video_screenshot = 2131690576;
+			
+			// aapt resource value: 0x7F0F0451
+			public const int video_square = 2131690577;
+			
+			// aapt resource value: 0x7F0F0452
+			public const int video_success = 2131690578;
+			
+			// aapt resource value: 0x7F0F0453
+			public const int video_talk_call_cancel = 2131690579;
+			
+			// aapt resource value: 0x7F0F0454
+			public const int video_talk_call_is_accepted = 2131690580;
+			
+			// aapt resource value: 0x7F0F0455
+			public const int video_talk_is_playing = 2131690581;
+			
+			// aapt resource value: 0x7F0F0456
+			public const int video_talk_sdk_toast_hang_up = 2131690582;
+			
+			// aapt resource value: 0x7F0F0457
+			public const int video_talk_sdk_toast_nobody = 2131690583;
+			
+			// aapt resource value: 0x7F0F0458
+			public const int video_talk_signal_weak = 2131690584;
+			
+			// aapt resource value: 0x7F0F0459
+			public const int video_talk_watch_is_busy = 2131690585;
+			
+			// aapt resource value: 0x7F0F045A
+			public const int video_talk_watch_temperature_high_hang = 2131690586;
+			
+			// aapt resource value: 0x7F0F045B
+			public const int video_talk_watch_temperature_high_hint = 2131690587;
+			
+			// aapt resource value: 0x7F0F045C
+			public const int video_talk_watch_temperature_high_reject = 2131690588;
+			
+			// aapt resource value: 0x7F0F045D
+			public const int video_talk_watch_temperature_high_warn = 2131690589;
+			
+			// aapt resource value: 0x7F0F045E
+			public const int video_tip = 2131690590;
+			
+			// aapt resource value: 0x7F0F045F
+			public const int video_unlock = 2131690591;
+			
+			// aapt resource value: 0x7F0F0460
+			public const int wait = 2131690592;
+			
+			// aapt resource value: 0x7F0F0461
+			public const int web_login_button_txt = 2131690593;
+			
+			// aapt resource value: 0x7F0F0462
+			public const int wechat_interconnect = 2131690594;
+			
+			// aapt resource value: 0x7F0F0463
+			public const int wifi_connected = 2131690595;
+			
+			// aapt resource value: 0x7F0F0464
+			public const int wifi_connection_finish_need_refresh = 2131690596;
+			
+			// aapt resource value: 0x7F0F0465
+			public const int wifi_set = 2131690597;
+			
+			// aapt resource value: 0x7F0F0466
+			public const int wifi_setting = 2131690598;
+			
+			// aapt resource value: 0x7F0F0467
+			public const int wired_connection = 2131690599;
+			
+			// aapt resource value: 0x7F0F0469
+			public const int xlistview_footer_hint_normal = 2131690601;
+			
+			// aapt resource value: 0x7F0F0468
+			public const int xlistview_footer_hint_no_more_device = 2131690600;
+			
+			// aapt resource value: 0x7F0F046A
+			public const int xlistview_footer_hint_ready = 2131690602;
+			
+			// aapt resource value: 0x7F0F046B
+			public const int xlistview_footer_no_more = 2131690603;
+			
+			// aapt resource value: 0x7F0F046C
+			public const int xlistview_footer_no_more_msg = 2131690604;
+			
+			// aapt resource value: 0x7F0F046D
+			public const int xlistview_header_hint_loading = 2131690605;
+			
+			// aapt resource value: 0x7F0F046E
+			public const int xlistview_header_hint_more = 2131690606;
+			
+			// aapt resource value: 0x7F0F046F
+			public const int xlistview_header_hint_normal = 2131690607;
+			
+			// aapt resource value: 0x7F0F0470
+			public const int xlistview_header_hint_ready = 2131690608;
+			
+			// aapt resource value: 0x7F0F0471
+			public const int xlistview_header_last_time = 2131690609;
+			
+			// aapt resource value: 0x7F0F0472
+			public const int zxing_app_name = 2131690610;
+			
+			// aapt resource value: 0x7F0F0473
+			public const int zxing_button_ok = 2131690611;
+			
+			// aapt resource value: 0x7F0F0474
+			public const int zxing_msg_camera_framework_bug = 2131690612;
+			
+			// aapt resource value: 0x7F0F0475
+			public const int zxing_msg_default_status = 2131690613;
+			
+			// aapt resource value: 0x7F0F0476
+			public const int zxing_scan_tips = 2131690614;
 			
 			static String()
 			{
@@ -20183,1364 +20954,1379 @@
 		public partial class Style
 		{
 			
-			// aapt resource value: 0x7F1001A2
-			public const int add_device_btn_style = 2131755426;
-			
-			// aapt resource value: 0x7F1001A3
-			public const int add_device_common_16dp_2c2c2c = 2131755427;
-			
-			// aapt resource value: 0x7F1001A4
-			public const int add_device_help_style = 2131755428;
-			
-			// aapt resource value: 0x7F1001A1
-			public const int add_Device_timeout_btn_style = 2131755425;
-			
-			// aapt resource value: 0x7F100000
-			public const int AlertDialog_AppCompat = 2131755008;
-			
-			// aapt resource value: 0x7F100001
-			public const int AlertDialog_AppCompat_Light = 2131755009;
-			
-			// aapt resource value: 0x7F100002
-			public const int Animation_AppCompat_Dialog = 2131755010;
-			
-			// aapt resource value: 0x7F100003
-			public const int Animation_AppCompat_DropDownUp = 2131755011;
-			
-			// aapt resource value: 0x7F100004
-			public const int Animation_AppCompat_Tooltip = 2131755012;
-			
-			// aapt resource value: 0x7F100005
-			public const int Animation_Design_BottomSheetDialog = 2131755013;
-			
-			// aapt resource value: 0x7F100006
-			public const int AppBaseTheme = 2131755014;
-			
-			// aapt resource value: 0x7F100007
-			public const int AppTheme = 2131755015;
-			
-			// aapt resource value: 0x7F10000A
-			public const int AppThemeLc = 2131755018;
-			
-			// aapt resource value: 0x7F100008
-			public const int AppTheme_Base = 2131755016;
-			
-			// aapt resource value: 0x7F100009
-			public const int AppTheme_NoActionBar = 2131755017;
-			
-			// aapt resource value: 0x7F1001A5
-			public const int auto_wifi_status_style_normal = 2131755429;
-			
-			// aapt resource value: 0x7F10000B
-			public const int Base_AlertDialog_AppCompat = 2131755019;
-			
-			// aapt resource value: 0x7F10000C
-			public const int Base_AlertDialog_AppCompat_Light = 2131755020;
-			
-			// aapt resource value: 0x7F10000D
-			public const int Base_Animation_AppCompat_Dialog = 2131755021;
-			
-			// aapt resource value: 0x7F10000E
-			public const int Base_Animation_AppCompat_DropDownUp = 2131755022;
-			
-			// aapt resource value: 0x7F10000F
-			public const int Base_Animation_AppCompat_Tooltip = 2131755023;
-			
-			// aapt resource value: 0x7F100011
-			public const int Base_DialogWindowTitleBackground_AppCompat = 2131755025;
-			
-			// aapt resource value: 0x7F100010
-			public const int Base_DialogWindowTitle_AppCompat = 2131755024;
-			
-			// aapt resource value: 0x7F100012
-			public const int Base_TextAppearance_AppCompat = 2131755026;
-			
-			// aapt resource value: 0x7F100013
-			public const int Base_TextAppearance_AppCompat_Body1 = 2131755027;
-			
-			// aapt resource value: 0x7F100014
-			public const int Base_TextAppearance_AppCompat_Body2 = 2131755028;
-			
-			// aapt resource value: 0x7F100015
-			public const int Base_TextAppearance_AppCompat_Button = 2131755029;
-			
-			// aapt resource value: 0x7F100016
-			public const int Base_TextAppearance_AppCompat_Caption = 2131755030;
-			
-			// aapt resource value: 0x7F100017
-			public const int Base_TextAppearance_AppCompat_Display1 = 2131755031;
-			
-			// aapt resource value: 0x7F100018
-			public const int Base_TextAppearance_AppCompat_Display2 = 2131755032;
-			
-			// aapt resource value: 0x7F100019
-			public const int Base_TextAppearance_AppCompat_Display3 = 2131755033;
-			
-			// aapt resource value: 0x7F10001A
-			public const int Base_TextAppearance_AppCompat_Display4 = 2131755034;
-			
-			// aapt resource value: 0x7F10001B
-			public const int Base_TextAppearance_AppCompat_Headline = 2131755035;
-			
-			// aapt resource value: 0x7F10001C
-			public const int Base_TextAppearance_AppCompat_Inverse = 2131755036;
-			
-			// aapt resource value: 0x7F10001D
-			public const int Base_TextAppearance_AppCompat_Large = 2131755037;
-			
-			// aapt resource value: 0x7F10001E
-			public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131755038;
-			
-			// aapt resource value: 0x7F10001F
-			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131755039;
-			
-			// aapt resource value: 0x7F100020
-			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131755040;
-			
-			// aapt resource value: 0x7F100021
-			public const int Base_TextAppearance_AppCompat_Medium = 2131755041;
-			
-			// aapt resource value: 0x7F100022
-			public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131755042;
-			
-			// aapt resource value: 0x7F100023
-			public const int Base_TextAppearance_AppCompat_Menu = 2131755043;
-			
-			// aapt resource value: 0x7F100024
-			public const int Base_TextAppearance_AppCompat_SearchResult = 2131755044;
-			
-			// aapt resource value: 0x7F100025
-			public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131755045;
-			
-			// aapt resource value: 0x7F100026
-			public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131755046;
-			
-			// aapt resource value: 0x7F100027
-			public const int Base_TextAppearance_AppCompat_Small = 2131755047;
-			
-			// aapt resource value: 0x7F100028
-			public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131755048;
-			
-			// aapt resource value: 0x7F100029
-			public const int Base_TextAppearance_AppCompat_Subhead = 2131755049;
-			
-			// aapt resource value: 0x7F10002A
-			public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131755050;
-			
-			// aapt resource value: 0x7F10002B
-			public const int Base_TextAppearance_AppCompat_Title = 2131755051;
-			
-			// aapt resource value: 0x7F10002C
-			public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131755052;
-			
-			// aapt resource value: 0x7F10002D
-			public const int Base_TextAppearance_AppCompat_Tooltip = 2131755053;
-			
-			// aapt resource value: 0x7F10002E
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131755054;
-			
-			// aapt resource value: 0x7F10002F
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131755055;
-			
-			// aapt resource value: 0x7F100030
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131755056;
-			
-			// aapt resource value: 0x7F100031
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131755057;
-			
-			// aapt resource value: 0x7F100032
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131755058;
-			
-			// aapt resource value: 0x7F100033
-			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131755059;
-			
-			// aapt resource value: 0x7F100034
-			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131755060;
-			
-			// aapt resource value: 0x7F100035
-			public const int Base_TextAppearance_AppCompat_Widget_Button = 2131755061;
-			
-			// aapt resource value: 0x7F100036
-			public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131755062;
-			
-			// aapt resource value: 0x7F100037
-			public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131755063;
-			
-			// aapt resource value: 0x7F100038
-			public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131755064;
-			
-			// aapt resource value: 0x7F100039
-			public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131755065;
-			
-			// aapt resource value: 0x7F10003A
-			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131755066;
-			
-			// aapt resource value: 0x7F10003B
-			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131755067;
-			
-			// aapt resource value: 0x7F10003C
-			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131755068;
-			
-			// aapt resource value: 0x7F10003D
-			public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131755069;
-			
-			// aapt resource value: 0x7F10003E
-			public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131755070;
-			
-			// aapt resource value: 0x7F10003F
-			public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131755071;
-			
-			// aapt resource value: 0x7F100040
-			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131755072;
-			
-			// aapt resource value: 0x7F100041
-			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131755073;
-			
-			// aapt resource value: 0x7F100050
-			public const int Base_ThemeOverlay_AppCompat = 2131755088;
-			
-			// aapt resource value: 0x7F100051
-			public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131755089;
-			
-			// aapt resource value: 0x7F100052
-			public const int Base_ThemeOverlay_AppCompat_Dark = 2131755090;
-			
-			// aapt resource value: 0x7F100053
-			public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131755091;
-			
-			// aapt resource value: 0x7F100054
-			public const int Base_ThemeOverlay_AppCompat_Dialog = 2131755092;
-			
-			// aapt resource value: 0x7F100055
-			public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131755093;
-			
-			// aapt resource value: 0x7F100056
-			public const int Base_ThemeOverlay_AppCompat_Light = 2131755094;
-			
-			// aapt resource value: 0x7F100042
-			public const int Base_Theme_AppCompat = 2131755074;
-			
-			// aapt resource value: 0x7F100043
-			public const int Base_Theme_AppCompat_CompactMenu = 2131755075;
-			
-			// aapt resource value: 0x7F100044
-			public const int Base_Theme_AppCompat_Dialog = 2131755076;
-			
-			// aapt resource value: 0x7F100048
-			public const int Base_Theme_AppCompat_DialogWhenLarge = 2131755080;
-			
-			// aapt resource value: 0x7F100045
-			public const int Base_Theme_AppCompat_Dialog_Alert = 2131755077;
-			
-			// aapt resource value: 0x7F100046
-			public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131755078;
-			
-			// aapt resource value: 0x7F100047
-			public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131755079;
-			
-			// aapt resource value: 0x7F100049
-			public const int Base_Theme_AppCompat_Light = 2131755081;
-			
-			// aapt resource value: 0x7F10004A
-			public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131755082;
-			
-			// aapt resource value: 0x7F10004B
-			public const int Base_Theme_AppCompat_Light_Dialog = 2131755083;
-			
-			// aapt resource value: 0x7F10004F
-			public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131755087;
-			
-			// aapt resource value: 0x7F10004C
-			public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131755084;
-			
-			// aapt resource value: 0x7F10004D
-			public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131755085;
-			
-			// aapt resource value: 0x7F10004E
-			public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131755086;
-			
-			// aapt resource value: 0x7F100059
-			public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131755097;
-			
-			// aapt resource value: 0x7F100057
-			public const int Base_V11_Theme_AppCompat_Dialog = 2131755095;
-			
-			// aapt resource value: 0x7F100058
-			public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131755096;
-			
-			// aapt resource value: 0x7F10005A
-			public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131755098;
-			
-			// aapt resource value: 0x7F10005B
-			public const int Base_V12_Widget_AppCompat_EditText = 2131755099;
-			
-			// aapt resource value: 0x7F10005C
-			public const int Base_V14_Widget_Design_AppBarLayout = 2131755100;
-			
-			// aapt resource value: 0x7F100061
-			public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131755105;
-			
-			// aapt resource value: 0x7F10005D
-			public const int Base_V21_Theme_AppCompat = 2131755101;
-			
-			// aapt resource value: 0x7F10005E
-			public const int Base_V21_Theme_AppCompat_Dialog = 2131755102;
-			
-			// aapt resource value: 0x7F10005F
-			public const int Base_V21_Theme_AppCompat_Light = 2131755103;
-			
-			// aapt resource value: 0x7F100060
-			public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131755104;
-			
-			// aapt resource value: 0x7F100062
-			public const int Base_V21_Widget_Design_AppBarLayout = 2131755106;
-			
-			// aapt resource value: 0x7F100063
-			public const int Base_V22_Theme_AppCompat = 2131755107;
-			
-			// aapt resource value: 0x7F100064
-			public const int Base_V22_Theme_AppCompat_Light = 2131755108;
-			
-			// aapt resource value: 0x7F100065
-			public const int Base_V23_Theme_AppCompat = 2131755109;
-			
-			// aapt resource value: 0x7F100066
-			public const int Base_V23_Theme_AppCompat_Light = 2131755110;
-			
-			// aapt resource value: 0x7F100067
-			public const int Base_V26_Theme_AppCompat = 2131755111;
-			
-			// aapt resource value: 0x7F100068
-			public const int Base_V26_Theme_AppCompat_Light = 2131755112;
-			
-			// aapt resource value: 0x7F100069
-			public const int Base_V26_Widget_AppCompat_Toolbar = 2131755113;
-			
-			// aapt resource value: 0x7F10006A
-			public const int Base_V26_Widget_Design_AppBarLayout = 2131755114;
-			
-			// aapt resource value: 0x7F10006F
-			public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131755119;
-			
-			// aapt resource value: 0x7F10006B
-			public const int Base_V7_Theme_AppCompat = 2131755115;
-			
-			// aapt resource value: 0x7F10006C
-			public const int Base_V7_Theme_AppCompat_Dialog = 2131755116;
-			
-			// aapt resource value: 0x7F10006D
-			public const int Base_V7_Theme_AppCompat_Light = 2131755117;
-			
-			// aapt resource value: 0x7F10006E
-			public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131755118;
-			
-			// aapt resource value: 0x7F100070
-			public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131755120;
-			
-			// aapt resource value: 0x7F100071
-			public const int Base_V7_Widget_AppCompat_EditText = 2131755121;
-			
-			// aapt resource value: 0x7F100072
-			public const int Base_V7_Widget_AppCompat_Toolbar = 2131755122;
-			
-			// aapt resource value: 0x7F100073
-			public const int Base_Widget_AppCompat_ActionBar = 2131755123;
-			
-			// aapt resource value: 0x7F100074
-			public const int Base_Widget_AppCompat_ActionBar_Solid = 2131755124;
-			
-			// aapt resource value: 0x7F100075
-			public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131755125;
-			
-			// aapt resource value: 0x7F100076
-			public const int Base_Widget_AppCompat_ActionBar_TabText = 2131755126;
-			
-			// aapt resource value: 0x7F100077
-			public const int Base_Widget_AppCompat_ActionBar_TabView = 2131755127;
-			
-			// aapt resource value: 0x7F100078
-			public const int Base_Widget_AppCompat_ActionButton = 2131755128;
-			
-			// aapt resource value: 0x7F100079
-			public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131755129;
-			
-			// aapt resource value: 0x7F10007A
-			public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131755130;
-			
-			// aapt resource value: 0x7F10007B
-			public const int Base_Widget_AppCompat_ActionMode = 2131755131;
-			
-			// aapt resource value: 0x7F10007C
-			public const int Base_Widget_AppCompat_ActivityChooserView = 2131755132;
-			
-			// aapt resource value: 0x7F10007D
-			public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131755133;
-			
-			// aapt resource value: 0x7F10007E
-			public const int Base_Widget_AppCompat_Button = 2131755134;
-			
-			// aapt resource value: 0x7F100084
-			public const int Base_Widget_AppCompat_ButtonBar = 2131755140;
-			
-			// aapt resource value: 0x7F100085
-			public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131755141;
-			
-			// aapt resource value: 0x7F10007F
-			public const int Base_Widget_AppCompat_Button_Borderless = 2131755135;
-			
-			// aapt resource value: 0x7F100080
-			public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131755136;
-			
-			// aapt resource value: 0x7F100081
-			public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131755137;
-			
-			// aapt resource value: 0x7F100082
-			public const int Base_Widget_AppCompat_Button_Colored = 2131755138;
-			
-			// aapt resource value: 0x7F100083
-			public const int Base_Widget_AppCompat_Button_Small = 2131755139;
-			
-			// aapt resource value: 0x7F100086
-			public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131755142;
-			
-			// aapt resource value: 0x7F100087
-			public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131755143;
-			
-			// aapt resource value: 0x7F100088
-			public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131755144;
-			
-			// aapt resource value: 0x7F100089
-			public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131755145;
-			
-			// aapt resource value: 0x7F10008A
-			public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131755146;
-			
-			// aapt resource value: 0x7F10008B
-			public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131755147;
-			
-			// aapt resource value: 0x7F10008C
-			public const int Base_Widget_AppCompat_EditText = 2131755148;
-			
-			// aapt resource value: 0x7F10008D
-			public const int Base_Widget_AppCompat_ImageButton = 2131755149;
-			
-			// aapt resource value: 0x7F10008E
-			public const int Base_Widget_AppCompat_Light_ActionBar = 2131755150;
-			
-			// aapt resource value: 0x7F10008F
-			public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131755151;
-			
-			// aapt resource value: 0x7F100090
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131755152;
-			
-			// aapt resource value: 0x7F100091
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131755153;
-			
-			// aapt resource value: 0x7F100092
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131755154;
-			
-			// aapt resource value: 0x7F100093
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131755155;
-			
-			// aapt resource value: 0x7F100094
-			public const int Base_Widget_AppCompat_Light_PopupMenu = 2131755156;
-			
-			// aapt resource value: 0x7F100095
-			public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131755157;
-			
-			// aapt resource value: 0x7F100096
-			public const int Base_Widget_AppCompat_ListMenuView = 2131755158;
-			
-			// aapt resource value: 0x7F100097
-			public const int Base_Widget_AppCompat_ListPopupWindow = 2131755159;
-			
-			// aapt resource value: 0x7F100098
-			public const int Base_Widget_AppCompat_ListView = 2131755160;
-			
-			// aapt resource value: 0x7F100099
-			public const int Base_Widget_AppCompat_ListView_DropDown = 2131755161;
-			
-			// aapt resource value: 0x7F10009A
-			public const int Base_Widget_AppCompat_ListView_Menu = 2131755162;
-			
-			// aapt resource value: 0x7F10009B
-			public const int Base_Widget_AppCompat_PopupMenu = 2131755163;
-			
-			// aapt resource value: 0x7F10009C
-			public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131755164;
-			
-			// aapt resource value: 0x7F10009D
-			public const int Base_Widget_AppCompat_PopupWindow = 2131755165;
-			
-			// aapt resource value: 0x7F10009E
-			public const int Base_Widget_AppCompat_ProgressBar = 2131755166;
-			
-			// aapt resource value: 0x7F10009F
-			public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131755167;
-			
-			// aapt resource value: 0x7F1000A0
-			public const int Base_Widget_AppCompat_RatingBar = 2131755168;
-			
-			// aapt resource value: 0x7F1000A1
-			public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131755169;
-			
-			// aapt resource value: 0x7F1000A2
-			public const int Base_Widget_AppCompat_RatingBar_Small = 2131755170;
-			
-			// aapt resource value: 0x7F1000A3
-			public const int Base_Widget_AppCompat_SearchView = 2131755171;
-			
-			// aapt resource value: 0x7F1000A4
-			public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131755172;
-			
-			// aapt resource value: 0x7F1000A5
-			public const int Base_Widget_AppCompat_SeekBar = 2131755173;
-			
-			// aapt resource value: 0x7F1000A6
-			public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131755174;
-			
-			// aapt resource value: 0x7F1000A7
-			public const int Base_Widget_AppCompat_Spinner = 2131755175;
-			
-			// aapt resource value: 0x7F1000A8
-			public const int Base_Widget_AppCompat_Spinner_Underlined = 2131755176;
-			
-			// aapt resource value: 0x7F1000A9
-			public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131755177;
-			
-			// aapt resource value: 0x7F1000AA
-			public const int Base_Widget_AppCompat_Toolbar = 2131755178;
-			
-			// aapt resource value: 0x7F1000AB
-			public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131755179;
-			
-			// aapt resource value: 0x7F1000AC
-			public const int Base_Widget_Design_AppBarLayout = 2131755180;
-			
-			// aapt resource value: 0x7F1000AD
-			public const int Base_Widget_Design_TabLayout = 2131755181;
-			
-			// aapt resource value: 0x7F1000AE
-			public const int BottomSheetDialogAnimation = 2131755182;
-			
-			// aapt resource value: 0x7F1001A6
-			public const int cc_line_long = 2131755430;
-			
 			// aapt resource value: 0x7F1001A7
-			public const int checks_dialog = 2131755431;
-			
-			// aapt resource value: 0x7F1000AF
-			public const int CommonGroupLayout = 2131755183;
-			
-			// aapt resource value: 0x7F1000B0
-			public const int CommonListView = 2131755184;
+			public const int add_device_btn_style = 2131755431;
 			
 			// aapt resource value: 0x7F1001A8
-			public const int common_horizontal_line_style = 2131755432;
+			public const int add_device_common_16dp_2c2c2c = 2131755432;
 			
 			// aapt resource value: 0x7F1001A9
-			public const int common_input_style = 2131755433;
+			public const int add_device_help_style = 2131755433;
+			
+			// aapt resource value: 0x7F1001A6
+			public const int add_Device_timeout_btn_style = 2131755430;
+			
+			// aapt resource value: 0x7F100003
+			public const int AlertDialog_AppCompat = 2131755011;
+			
+			// aapt resource value: 0x7F100004
+			public const int AlertDialog_AppCompat_Light = 2131755012;
+			
+			// aapt resource value: 0x7F100005
+			public const int Animation_AppCompat_Dialog = 2131755013;
+			
+			// aapt resource value: 0x7F100006
+			public const int Animation_AppCompat_DropDownUp = 2131755014;
+			
+			// aapt resource value: 0x7F100007
+			public const int Animation_AppCompat_Tooltip = 2131755015;
+			
+			// aapt resource value: 0x7F100008
+			public const int Animation_Design_BottomSheetDialog = 2131755016;
+			
+			// aapt resource value: 0x7F100009
+			public const int AppTheme = 2131755017;
+			
+			// aapt resource value: 0x7F10000C
+			public const int AppThemeLc = 2131755020;
+			
+			// aapt resource value: 0x7F10000A
+			public const int AppTheme_Base = 2131755018;
+			
+			// aapt resource value: 0x7F10000B
+			public const int AppTheme_NoActionBar = 2131755019;
 			
 			// aapt resource value: 0x7F1001AA
-			public const int custom_dialog = 2131755434;
+			public const int auto_wifi_status_style_normal = 2131755434;
 			
-			// aapt resource value: 0x7F1001AB
-			public const int custom_dialog2 = 2131755435;
+			// aapt resource value: 0x7F100000
+			public const int AVLoadingIndicatorView = 2131755008;
 			
-			// aapt resource value: 0x7F1001AC
-			public const int dahua_wight_progressBar = 2131755436;
+			// aapt resource value: 0x7F100001
+			public const int AVLoadingIndicatorView_Large = 2131755009;
 			
-			// aapt resource value: 0x7F1001AD
-			public const int dev_detail_relativeLayout = 2131755437;
+			// aapt resource value: 0x7F100002
+			public const int AVLoadingIndicatorView_Small = 2131755010;
+			
+			// aapt resource value: 0x7F10000D
+			public const int Base_AlertDialog_AppCompat = 2131755021;
+			
+			// aapt resource value: 0x7F10000E
+			public const int Base_AlertDialog_AppCompat_Light = 2131755022;
+			
+			// aapt resource value: 0x7F10000F
+			public const int Base_Animation_AppCompat_Dialog = 2131755023;
+			
+			// aapt resource value: 0x7F100010
+			public const int Base_Animation_AppCompat_DropDownUp = 2131755024;
+			
+			// aapt resource value: 0x7F100011
+			public const int Base_Animation_AppCompat_Tooltip = 2131755025;
+			
+			// aapt resource value: 0x7F100013
+			public const int Base_DialogWindowTitleBackground_AppCompat = 2131755027;
+			
+			// aapt resource value: 0x7F100012
+			public const int Base_DialogWindowTitle_AppCompat = 2131755026;
+			
+			// aapt resource value: 0x7F100014
+			public const int Base_TextAppearance_AppCompat = 2131755028;
+			
+			// aapt resource value: 0x7F100015
+			public const int Base_TextAppearance_AppCompat_Body1 = 2131755029;
+			
+			// aapt resource value: 0x7F100016
+			public const int Base_TextAppearance_AppCompat_Body2 = 2131755030;
+			
+			// aapt resource value: 0x7F100017
+			public const int Base_TextAppearance_AppCompat_Button = 2131755031;
+			
+			// aapt resource value: 0x7F100018
+			public const int Base_TextAppearance_AppCompat_Caption = 2131755032;
+			
+			// aapt resource value: 0x7F100019
+			public const int Base_TextAppearance_AppCompat_Display1 = 2131755033;
+			
+			// aapt resource value: 0x7F10001A
+			public const int Base_TextAppearance_AppCompat_Display2 = 2131755034;
+			
+			// aapt resource value: 0x7F10001B
+			public const int Base_TextAppearance_AppCompat_Display3 = 2131755035;
+			
+			// aapt resource value: 0x7F10001C
+			public const int Base_TextAppearance_AppCompat_Display4 = 2131755036;
+			
+			// aapt resource value: 0x7F10001D
+			public const int Base_TextAppearance_AppCompat_Headline = 2131755037;
+			
+			// aapt resource value: 0x7F10001E
+			public const int Base_TextAppearance_AppCompat_Inverse = 2131755038;
+			
+			// aapt resource value: 0x7F10001F
+			public const int Base_TextAppearance_AppCompat_Large = 2131755039;
+			
+			// aapt resource value: 0x7F100020
+			public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131755040;
+			
+			// aapt resource value: 0x7F100021
+			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131755041;
+			
+			// aapt resource value: 0x7F100022
+			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131755042;
+			
+			// aapt resource value: 0x7F100023
+			public const int Base_TextAppearance_AppCompat_Medium = 2131755043;
+			
+			// aapt resource value: 0x7F100024
+			public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131755044;
+			
+			// aapt resource value: 0x7F100025
+			public const int Base_TextAppearance_AppCompat_Menu = 2131755045;
+			
+			// aapt resource value: 0x7F100026
+			public const int Base_TextAppearance_AppCompat_SearchResult = 2131755046;
+			
+			// aapt resource value: 0x7F100027
+			public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131755047;
+			
+			// aapt resource value: 0x7F100028
+			public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131755048;
+			
+			// aapt resource value: 0x7F100029
+			public const int Base_TextAppearance_AppCompat_Small = 2131755049;
+			
+			// aapt resource value: 0x7F10002A
+			public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131755050;
+			
+			// aapt resource value: 0x7F10002B
+			public const int Base_TextAppearance_AppCompat_Subhead = 2131755051;
+			
+			// aapt resource value: 0x7F10002C
+			public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131755052;
+			
+			// aapt resource value: 0x7F10002D
+			public const int Base_TextAppearance_AppCompat_Title = 2131755053;
+			
+			// aapt resource value: 0x7F10002E
+			public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131755054;
+			
+			// aapt resource value: 0x7F10002F
+			public const int Base_TextAppearance_AppCompat_Tooltip = 2131755055;
+			
+			// aapt resource value: 0x7F100030
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131755056;
+			
+			// aapt resource value: 0x7F100031
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131755057;
+			
+			// aapt resource value: 0x7F100032
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131755058;
+			
+			// aapt resource value: 0x7F100033
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131755059;
+			
+			// aapt resource value: 0x7F100034
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131755060;
+			
+			// aapt resource value: 0x7F100035
+			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131755061;
+			
+			// aapt resource value: 0x7F100036
+			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131755062;
+			
+			// aapt resource value: 0x7F100037
+			public const int Base_TextAppearance_AppCompat_Widget_Button = 2131755063;
+			
+			// aapt resource value: 0x7F100038
+			public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131755064;
+			
+			// aapt resource value: 0x7F100039
+			public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131755065;
+			
+			// aapt resource value: 0x7F10003A
+			public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131755066;
+			
+			// aapt resource value: 0x7F10003B
+			public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131755067;
+			
+			// aapt resource value: 0x7F10003C
+			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131755068;
+			
+			// aapt resource value: 0x7F10003D
+			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131755069;
+			
+			// aapt resource value: 0x7F10003E
+			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131755070;
+			
+			// aapt resource value: 0x7F10003F
+			public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131755071;
+			
+			// aapt resource value: 0x7F100040
+			public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131755072;
+			
+			// aapt resource value: 0x7F100041
+			public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131755073;
+			
+			// aapt resource value: 0x7F100042
+			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131755074;
+			
+			// aapt resource value: 0x7F100043
+			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131755075;
+			
+			// aapt resource value: 0x7F100052
+			public const int Base_ThemeOverlay_AppCompat = 2131755090;
+			
+			// aapt resource value: 0x7F100053
+			public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131755091;
+			
+			// aapt resource value: 0x7F100054
+			public const int Base_ThemeOverlay_AppCompat_Dark = 2131755092;
+			
+			// aapt resource value: 0x7F100055
+			public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131755093;
+			
+			// aapt resource value: 0x7F100056
+			public const int Base_ThemeOverlay_AppCompat_Dialog = 2131755094;
+			
+			// aapt resource value: 0x7F100057
+			public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131755095;
+			
+			// aapt resource value: 0x7F100058
+			public const int Base_ThemeOverlay_AppCompat_Light = 2131755096;
+			
+			// aapt resource value: 0x7F100044
+			public const int Base_Theme_AppCompat = 2131755076;
+			
+			// aapt resource value: 0x7F100045
+			public const int Base_Theme_AppCompat_CompactMenu = 2131755077;
+			
+			// aapt resource value: 0x7F100046
+			public const int Base_Theme_AppCompat_Dialog = 2131755078;
+			
+			// aapt resource value: 0x7F10004A
+			public const int Base_Theme_AppCompat_DialogWhenLarge = 2131755082;
+			
+			// aapt resource value: 0x7F100047
+			public const int Base_Theme_AppCompat_Dialog_Alert = 2131755079;
+			
+			// aapt resource value: 0x7F100048
+			public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131755080;
+			
+			// aapt resource value: 0x7F100049
+			public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131755081;
+			
+			// aapt resource value: 0x7F10004B
+			public const int Base_Theme_AppCompat_Light = 2131755083;
+			
+			// aapt resource value: 0x7F10004C
+			public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131755084;
+			
+			// aapt resource value: 0x7F10004D
+			public const int Base_Theme_AppCompat_Light_Dialog = 2131755085;
+			
+			// aapt resource value: 0x7F100051
+			public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131755089;
+			
+			// aapt resource value: 0x7F10004E
+			public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131755086;
+			
+			// aapt resource value: 0x7F10004F
+			public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131755087;
+			
+			// aapt resource value: 0x7F100050
+			public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131755088;
+			
+			// aapt resource value: 0x7F1000B0
+			public const int Base_Translucent = 2131755184;
+			
+			// aapt resource value: 0x7F10005B
+			public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131755099;
+			
+			// aapt resource value: 0x7F100059
+			public const int Base_V11_Theme_AppCompat_Dialog = 2131755097;
+			
+			// aapt resource value: 0x7F10005A
+			public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131755098;
+			
+			// aapt resource value: 0x7F10005C
+			public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131755100;
+			
+			// aapt resource value: 0x7F10005D
+			public const int Base_V12_Widget_AppCompat_EditText = 2131755101;
+			
+			// aapt resource value: 0x7F10005E
+			public const int Base_V14_Widget_Design_AppBarLayout = 2131755102;
+			
+			// aapt resource value: 0x7F100063
+			public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131755107;
+			
+			// aapt resource value: 0x7F10005F
+			public const int Base_V21_Theme_AppCompat = 2131755103;
+			
+			// aapt resource value: 0x7F100060
+			public const int Base_V21_Theme_AppCompat_Dialog = 2131755104;
+			
+			// aapt resource value: 0x7F100061
+			public const int Base_V21_Theme_AppCompat_Light = 2131755105;
+			
+			// aapt resource value: 0x7F100062
+			public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131755106;
+			
+			// aapt resource value: 0x7F100064
+			public const int Base_V21_Widget_Design_AppBarLayout = 2131755108;
+			
+			// aapt resource value: 0x7F100065
+			public const int Base_V22_Theme_AppCompat = 2131755109;
+			
+			// aapt resource value: 0x7F100066
+			public const int Base_V22_Theme_AppCompat_Light = 2131755110;
+			
+			// aapt resource value: 0x7F100067
+			public const int Base_V23_Theme_AppCompat = 2131755111;
+			
+			// aapt resource value: 0x7F100068
+			public const int Base_V23_Theme_AppCompat_Light = 2131755112;
+			
+			// aapt resource value: 0x7F100069
+			public const int Base_V26_Theme_AppCompat = 2131755113;
+			
+			// aapt resource value: 0x7F10006A
+			public const int Base_V26_Theme_AppCompat_Light = 2131755114;
+			
+			// aapt resource value: 0x7F10006B
+			public const int Base_V26_Widget_AppCompat_Toolbar = 2131755115;
+			
+			// aapt resource value: 0x7F10006C
+			public const int Base_V26_Widget_Design_AppBarLayout = 2131755116;
+			
+			// aapt resource value: 0x7F100071
+			public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131755121;
+			
+			// aapt resource value: 0x7F10006D
+			public const int Base_V7_Theme_AppCompat = 2131755117;
+			
+			// aapt resource value: 0x7F10006E
+			public const int Base_V7_Theme_AppCompat_Dialog = 2131755118;
+			
+			// aapt resource value: 0x7F10006F
+			public const int Base_V7_Theme_AppCompat_Light = 2131755119;
+			
+			// aapt resource value: 0x7F100070
+			public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131755120;
+			
+			// aapt resource value: 0x7F100072
+			public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131755122;
+			
+			// aapt resource value: 0x7F100073
+			public const int Base_V7_Widget_AppCompat_EditText = 2131755123;
+			
+			// aapt resource value: 0x7F100074
+			public const int Base_V7_Widget_AppCompat_Toolbar = 2131755124;
+			
+			// aapt resource value: 0x7F100075
+			public const int Base_Widget_AppCompat_ActionBar = 2131755125;
+			
+			// aapt resource value: 0x7F100076
+			public const int Base_Widget_AppCompat_ActionBar_Solid = 2131755126;
+			
+			// aapt resource value: 0x7F100077
+			public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131755127;
+			
+			// aapt resource value: 0x7F100078
+			public const int Base_Widget_AppCompat_ActionBar_TabText = 2131755128;
+			
+			// aapt resource value: 0x7F100079
+			public const int Base_Widget_AppCompat_ActionBar_TabView = 2131755129;
+			
+			// aapt resource value: 0x7F10007A
+			public const int Base_Widget_AppCompat_ActionButton = 2131755130;
+			
+			// aapt resource value: 0x7F10007B
+			public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131755131;
+			
+			// aapt resource value: 0x7F10007C
+			public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131755132;
+			
+			// aapt resource value: 0x7F10007D
+			public const int Base_Widget_AppCompat_ActionMode = 2131755133;
+			
+			// aapt resource value: 0x7F10007E
+			public const int Base_Widget_AppCompat_ActivityChooserView = 2131755134;
+			
+			// aapt resource value: 0x7F10007F
+			public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131755135;
+			
+			// aapt resource value: 0x7F100080
+			public const int Base_Widget_AppCompat_Button = 2131755136;
+			
+			// aapt resource value: 0x7F100086
+			public const int Base_Widget_AppCompat_ButtonBar = 2131755142;
+			
+			// aapt resource value: 0x7F100087
+			public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131755143;
+			
+			// aapt resource value: 0x7F100081
+			public const int Base_Widget_AppCompat_Button_Borderless = 2131755137;
+			
+			// aapt resource value: 0x7F100082
+			public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131755138;
+			
+			// aapt resource value: 0x7F100083
+			public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131755139;
+			
+			// aapt resource value: 0x7F100084
+			public const int Base_Widget_AppCompat_Button_Colored = 2131755140;
+			
+			// aapt resource value: 0x7F100085
+			public const int Base_Widget_AppCompat_Button_Small = 2131755141;
+			
+			// aapt resource value: 0x7F100088
+			public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131755144;
+			
+			// aapt resource value: 0x7F100089
+			public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131755145;
+			
+			// aapt resource value: 0x7F10008A
+			public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131755146;
+			
+			// aapt resource value: 0x7F10008B
+			public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131755147;
+			
+			// aapt resource value: 0x7F10008C
+			public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131755148;
+			
+			// aapt resource value: 0x7F10008D
+			public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131755149;
+			
+			// aapt resource value: 0x7F10008E
+			public const int Base_Widget_AppCompat_EditText = 2131755150;
+			
+			// aapt resource value: 0x7F10008F
+			public const int Base_Widget_AppCompat_ImageButton = 2131755151;
+			
+			// aapt resource value: 0x7F100090
+			public const int Base_Widget_AppCompat_Light_ActionBar = 2131755152;
+			
+			// aapt resource value: 0x7F100091
+			public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131755153;
+			
+			// aapt resource value: 0x7F100092
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131755154;
+			
+			// aapt resource value: 0x7F100093
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131755155;
+			
+			// aapt resource value: 0x7F100094
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131755156;
+			
+			// aapt resource value: 0x7F100095
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131755157;
+			
+			// aapt resource value: 0x7F100096
+			public const int Base_Widget_AppCompat_Light_PopupMenu = 2131755158;
+			
+			// aapt resource value: 0x7F100097
+			public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131755159;
+			
+			// aapt resource value: 0x7F100098
+			public const int Base_Widget_AppCompat_ListMenuView = 2131755160;
+			
+			// aapt resource value: 0x7F100099
+			public const int Base_Widget_AppCompat_ListPopupWindow = 2131755161;
+			
+			// aapt resource value: 0x7F10009A
+			public const int Base_Widget_AppCompat_ListView = 2131755162;
+			
+			// aapt resource value: 0x7F10009B
+			public const int Base_Widget_AppCompat_ListView_DropDown = 2131755163;
+			
+			// aapt resource value: 0x7F10009C
+			public const int Base_Widget_AppCompat_ListView_Menu = 2131755164;
+			
+			// aapt resource value: 0x7F10009D
+			public const int Base_Widget_AppCompat_PopupMenu = 2131755165;
+			
+			// aapt resource value: 0x7F10009E
+			public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131755166;
+			
+			// aapt resource value: 0x7F10009F
+			public const int Base_Widget_AppCompat_PopupWindow = 2131755167;
+			
+			// aapt resource value: 0x7F1000A0
+			public const int Base_Widget_AppCompat_ProgressBar = 2131755168;
+			
+			// aapt resource value: 0x7F1000A1
+			public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131755169;
+			
+			// aapt resource value: 0x7F1000A2
+			public const int Base_Widget_AppCompat_RatingBar = 2131755170;
+			
+			// aapt resource value: 0x7F1000A3
+			public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131755171;
+			
+			// aapt resource value: 0x7F1000A4
+			public const int Base_Widget_AppCompat_RatingBar_Small = 2131755172;
+			
+			// aapt resource value: 0x7F1000A5
+			public const int Base_Widget_AppCompat_SearchView = 2131755173;
+			
+			// aapt resource value: 0x7F1000A6
+			public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131755174;
+			
+			// aapt resource value: 0x7F1000A7
+			public const int Base_Widget_AppCompat_SeekBar = 2131755175;
+			
+			// aapt resource value: 0x7F1000A8
+			public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131755176;
+			
+			// aapt resource value: 0x7F1000A9
+			public const int Base_Widget_AppCompat_Spinner = 2131755177;
+			
+			// aapt resource value: 0x7F1000AA
+			public const int Base_Widget_AppCompat_Spinner_Underlined = 2131755178;
+			
+			// aapt resource value: 0x7F1000AB
+			public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131755179;
+			
+			// aapt resource value: 0x7F1000AC
+			public const int Base_Widget_AppCompat_Toolbar = 2131755180;
+			
+			// aapt resource value: 0x7F1000AD
+			public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131755181;
+			
+			// aapt resource value: 0x7F1000AE
+			public const int Base_Widget_Design_AppBarLayout = 2131755182;
+			
+			// aapt resource value: 0x7F1000AF
+			public const int Base_Widget_Design_TabLayout = 2131755183;
 			
 			// aapt resource value: 0x7F1000B1
-			public const int DialogTheme = 2131755185;
+			public const int BottomSheetDialogAnimation = 2131755185;
+			
+			// aapt resource value: 0x7F1001AB
+			public const int cc_line_long = 2131755435;
+			
+			// aapt resource value: 0x7F1001AC
+			public const int checks_dialog = 2131755436;
 			
 			// aapt resource value: 0x7F1000B2
-			public const int FullAppTheme = 2131755186;
-			
-			// aapt resource value: 0x7F1001AE
-			public const int lc_bottom_button_style = 2131755438;
-			
-			// aapt resource value: 0x7F1001AF
-			public const int lc_demo_loading = 2131755439;
+			public const int CommonGroupLayout = 2131755186;
 			
 			// aapt resource value: 0x7F1000B3
-			public const int List = 2131755187;
+			public const int CommonListView = 2131755187;
+			
+			// aapt resource value: 0x7F1001AD
+			public const int common_horizontal_line_style = 2131755437;
+			
+			// aapt resource value: 0x7F1001AE
+			public const int common_input_style = 2131755438;
 			
 			// aapt resource value: 0x7F1000B4
-			public const int LoadingTextView = 2131755188;
+			public const int CustomAlertDialog = 2131755188;
 			
-			// aapt resource value: 0x7F1000B5
-			public const int LoadingTextView_Percent = 2131755189;
-			
-			// aapt resource value: 0x7F1001B1
-			public const int mobile_common_cam_text_edit = 2131755441;
-			
-			// aapt resource value: 0x7F1001B2
-			public const int mobile_common_cam_text_edit_enabled = 2131755442;
-			
-			// aapt resource value: 0x7F1001B3
-			public const int mobile_common_cam_text_name = 2131755443;
-			
-			// aapt resource value: 0x7F1001B4
-			public const int mobile_common_cam_text_name_enabled = 2131755444;
-			
-			// aapt resource value: 0x7F1001B5
-			public const int mobile_common_cam_text_sub = 2131755445;
-			
-			// aapt resource value: 0x7F1001B6
-			public const int mobile_common_checks_dialog = 2131755446;
-			
-			// aapt resource value: 0x7F1001B7
-			public const int mobile_common_common_title = 2131755447;
-			
-			// aapt resource value: 0x7F1001B8
-			public const int mobile_common_custom_dialog = 2131755448;
-			
-			// aapt resource value: 0x7F1001B9
-			public const int mobile_common_dahua_wight_progressBar = 2131755449;
-			
-			// aapt resource value: 0x7F1001BA
-			public const int mobile_common_dahua_wight_progressBar_Small = 2131755450;
-			
-			// aapt resource value: 0x7F1001BB
-			public const int mobile_common_dialog_anima = 2131755451;
+			// aapt resource value: 0x7F1001AF
+			public const int custom_dialog = 2131755439;
 			
 			// aapt resource value: 0x7F1001B0
-			public const int mobile_common_TextAppearance_22sp_black_bold = 2131755440;
+			public const int custom_dialog2 = 2131755440;
+			
+			// aapt resource value: 0x7F1001B1
+			public const int dahua_wight_progressBar = 2131755441;
+			
+			// aapt resource value: 0x7F1001B2
+			public const int dev_detail_relativeLayout = 2131755442;
+			
+			// aapt resource value: 0x7F1000B5
+			public const int DialogTheme = 2131755189;
 			
 			// aapt resource value: 0x7F1000B6
-			public const int MyDialogStyle = 2131755190;
+			public const int FullAppTheme = 2131755190;
 			
 			// aapt resource value: 0x7F1000B7
-			public const int MyTheme = 2131755191;
+			public const int JPushTheme = 2131755191;
+			
+			// aapt resource value: 0x7F1001B3
+			public const int lc_bottom_button_style = 2131755443;
+			
+			// aapt resource value: 0x7F1001B4
+			public const int lc_demo_loading = 2131755444;
 			
 			// aapt resource value: 0x7F1000B8
-			public const int MyTheme1 = 2131755192;
-			
-			// aapt resource value: 0x7F1001BC
-			public const int picker_view_scale_anim = 2131755452;
-			
-			// aapt resource value: 0x7F1001BD
-			public const int picker_view_slide_anim = 2131755453;
+			public const int List = 2131755192;
 			
 			// aapt resource value: 0x7F1000B9
-			public const int Platform_AppCompat = 2131755193;
+			public const int LoadingTextView = 2131755193;
 			
 			// aapt resource value: 0x7F1000BA
-			public const int Platform_AppCompat_Light = 2131755194;
+			public const int LoadingTextView_Percent = 2131755194;
 			
-			// aapt resource value: 0x7F1000BB
-			public const int Platform_ThemeOverlay_AppCompat = 2131755195;
+			// aapt resource value: 0x7F1001B6
+			public const int mobile_common_cam_text_edit = 2131755446;
 			
-			// aapt resource value: 0x7F1000BC
-			public const int Platform_ThemeOverlay_AppCompat_Dark = 2131755196;
+			// aapt resource value: 0x7F1001B7
+			public const int mobile_common_cam_text_edit_enabled = 2131755447;
 			
-			// aapt resource value: 0x7F1000BD
-			public const int Platform_ThemeOverlay_AppCompat_Light = 2131755197;
+			// aapt resource value: 0x7F1001B8
+			public const int mobile_common_cam_text_name = 2131755448;
 			
-			// aapt resource value: 0x7F1000BE
-			public const int Platform_V11_AppCompat = 2131755198;
+			// aapt resource value: 0x7F1001B9
+			public const int mobile_common_cam_text_name_enabled = 2131755449;
 			
-			// aapt resource value: 0x7F1000BF
-			public const int Platform_V11_AppCompat_Light = 2131755199;
+			// aapt resource value: 0x7F1001BA
+			public const int mobile_common_cam_text_sub = 2131755450;
 			
-			// aapt resource value: 0x7F1000C0
-			public const int Platform_V14_AppCompat = 2131755200;
+			// aapt resource value: 0x7F1001BB
+			public const int mobile_common_checks_dialog = 2131755451;
 			
-			// aapt resource value: 0x7F1000C1
-			public const int Platform_V14_AppCompat_Light = 2131755201;
+			// aapt resource value: 0x7F1001BC
+			public const int mobile_common_common_title = 2131755452;
 			
-			// aapt resource value: 0x7F1000C2
-			public const int Platform_V21_AppCompat = 2131755202;
-			
-			// aapt resource value: 0x7F1000C3
-			public const int Platform_V21_AppCompat_Light = 2131755203;
-			
-			// aapt resource value: 0x7F1000C4
-			public const int Platform_V25_AppCompat = 2131755204;
-			
-			// aapt resource value: 0x7F1000C5
-			public const int Platform_V25_AppCompat_Light = 2131755205;
-			
-			// aapt resource value: 0x7F1000C6
-			public const int Platform_Widget_AppCompat_Spinner = 2131755206;
+			// aapt resource value: 0x7F1001BD
+			public const int mobile_common_custom_dialog = 2131755453;
 			
 			// aapt resource value: 0x7F1001BE
-			public const int popwindowUpAnim = 2131755454;
-			
-			// aapt resource value: 0x7F1000C7
-			public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131755207;
-			
-			// aapt resource value: 0x7F1000C8
-			public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131755208;
-			
-			// aapt resource value: 0x7F1000C9
-			public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131755209;
-			
-			// aapt resource value: 0x7F1000CA
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131755210;
-			
-			// aapt resource value: 0x7F1000CB
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131755211;
-			
-			// aapt resource value: 0x7F1000CC
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131755212;
-			
-			// aapt resource value: 0x7F1000D2
-			public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131755218;
-			
-			// aapt resource value: 0x7F1000CD
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131755213;
-			
-			// aapt resource value: 0x7F1000CE
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131755214;
-			
-			// aapt resource value: 0x7F1000CF
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131755215;
-			
-			// aapt resource value: 0x7F1000D0
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131755216;
-			
-			// aapt resource value: 0x7F1000D1
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131755217;
-			
-			// aapt resource value: 0x7F1000D3
-			public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131755219;
-			
-			// aapt resource value: 0x7F1000D4
-			public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131755220;
+			public const int mobile_common_dahua_wight_progressBar = 2131755454;
 			
 			// aapt resource value: 0x7F1001BF
-			public const int sign_dialog = 2131755455;
-			
-			// aapt resource value: 0x7F1000D5
-			public const int SplashTheme = 2131755221;
-			
-			// aapt resource value: 0x7F1000D6
-			public const int TextAppearance_17sp_lc_black_color = 2131755222;
-			
-			// aapt resource value: 0x7F1000D7
-			public const int TextAppearance_AppCompat = 2131755223;
-			
-			// aapt resource value: 0x7F1000D8
-			public const int TextAppearance_AppCompat_Body1 = 2131755224;
-			
-			// aapt resource value: 0x7F1000D9
-			public const int TextAppearance_AppCompat_Body2 = 2131755225;
-			
-			// aapt resource value: 0x7F1000DA
-			public const int TextAppearance_AppCompat_Button = 2131755226;
-			
-			// aapt resource value: 0x7F1000DB
-			public const int TextAppearance_AppCompat_Caption = 2131755227;
-			
-			// aapt resource value: 0x7F1000DC
-			public const int TextAppearance_AppCompat_Display1 = 2131755228;
-			
-			// aapt resource value: 0x7F1000DD
-			public const int TextAppearance_AppCompat_Display2 = 2131755229;
-			
-			// aapt resource value: 0x7F1000DE
-			public const int TextAppearance_AppCompat_Display3 = 2131755230;
-			
-			// aapt resource value: 0x7F1000DF
-			public const int TextAppearance_AppCompat_Display4 = 2131755231;
-			
-			// aapt resource value: 0x7F1000E0
-			public const int TextAppearance_AppCompat_Headline = 2131755232;
-			
-			// aapt resource value: 0x7F1000E1
-			public const int TextAppearance_AppCompat_Inverse = 2131755233;
-			
-			// aapt resource value: 0x7F1000E2
-			public const int TextAppearance_AppCompat_Large = 2131755234;
-			
-			// aapt resource value: 0x7F1000E3
-			public const int TextAppearance_AppCompat_Large_Inverse = 2131755235;
-			
-			// aapt resource value: 0x7F1000E4
-			public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131755236;
-			
-			// aapt resource value: 0x7F1000E5
-			public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131755237;
-			
-			// aapt resource value: 0x7F1000E6
-			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131755238;
-			
-			// aapt resource value: 0x7F1000E7
-			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131755239;
-			
-			// aapt resource value: 0x7F1000E8
-			public const int TextAppearance_AppCompat_Medium = 2131755240;
-			
-			// aapt resource value: 0x7F1000E9
-			public const int TextAppearance_AppCompat_Medium_Inverse = 2131755241;
-			
-			// aapt resource value: 0x7F1000EA
-			public const int TextAppearance_AppCompat_Menu = 2131755242;
-			
-			// aapt resource value: 0x7F1000EB
-			public const int TextAppearance_AppCompat_Notification = 2131755243;
-			
-			// aapt resource value: 0x7F1000EC
-			public const int TextAppearance_AppCompat_Notification_Info = 2131755244;
-			
-			// aapt resource value: 0x7F1000ED
-			public const int TextAppearance_AppCompat_Notification_Info_Media = 2131755245;
-			
-			// aapt resource value: 0x7F1000EE
-			public const int TextAppearance_AppCompat_Notification_Line2 = 2131755246;
-			
-			// aapt resource value: 0x7F1000EF
-			public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131755247;
-			
-			// aapt resource value: 0x7F1000F0
-			public const int TextAppearance_AppCompat_Notification_Media = 2131755248;
-			
-			// aapt resource value: 0x7F1000F1
-			public const int TextAppearance_AppCompat_Notification_Time = 2131755249;
-			
-			// aapt resource value: 0x7F1000F2
-			public const int TextAppearance_AppCompat_Notification_Time_Media = 2131755250;
-			
-			// aapt resource value: 0x7F1000F3
-			public const int TextAppearance_AppCompat_Notification_Title = 2131755251;
-			
-			// aapt resource value: 0x7F1000F4
-			public const int TextAppearance_AppCompat_Notification_Title_Media = 2131755252;
-			
-			// aapt resource value: 0x7F1000F5
-			public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131755253;
-			
-			// aapt resource value: 0x7F1000F6
-			public const int TextAppearance_AppCompat_SearchResult_Title = 2131755254;
-			
-			// aapt resource value: 0x7F1000F7
-			public const int TextAppearance_AppCompat_Small = 2131755255;
-			
-			// aapt resource value: 0x7F1000F8
-			public const int TextAppearance_AppCompat_Small_Inverse = 2131755256;
-			
-			// aapt resource value: 0x7F1000F9
-			public const int TextAppearance_AppCompat_Subhead = 2131755257;
-			
-			// aapt resource value: 0x7F1000FA
-			public const int TextAppearance_AppCompat_Subhead_Inverse = 2131755258;
-			
-			// aapt resource value: 0x7F1000FB
-			public const int TextAppearance_AppCompat_Title = 2131755259;
-			
-			// aapt resource value: 0x7F1000FC
-			public const int TextAppearance_AppCompat_Title_Inverse = 2131755260;
-			
-			// aapt resource value: 0x7F1000FD
-			public const int TextAppearance_AppCompat_Tooltip = 2131755261;
-			
-			// aapt resource value: 0x7F1000FE
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131755262;
-			
-			// aapt resource value: 0x7F1000FF
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131755263;
-			
-			// aapt resource value: 0x7F100100
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131755264;
-			
-			// aapt resource value: 0x7F100101
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131755265;
-			
-			// aapt resource value: 0x7F100102
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131755266;
-			
-			// aapt resource value: 0x7F100103
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131755267;
-			
-			// aapt resource value: 0x7F100104
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131755268;
-			
-			// aapt resource value: 0x7F100105
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131755269;
-			
-			// aapt resource value: 0x7F100106
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131755270;
-			
-			// aapt resource value: 0x7F100107
-			public const int TextAppearance_AppCompat_Widget_Button = 2131755271;
-			
-			// aapt resource value: 0x7F100108
-			public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131755272;
-			
-			// aapt resource value: 0x7F100109
-			public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131755273;
-			
-			// aapt resource value: 0x7F10010A
-			public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131755274;
-			
-			// aapt resource value: 0x7F10010B
-			public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131755275;
-			
-			// aapt resource value: 0x7F10010C
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131755276;
-			
-			// aapt resource value: 0x7F10010D
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131755277;
-			
-			// aapt resource value: 0x7F10010E
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131755278;
-			
-			// aapt resource value: 0x7F10010F
-			public const int TextAppearance_AppCompat_Widget_Switch = 2131755279;
-			
-			// aapt resource value: 0x7F100110
-			public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131755280;
-			
-			// aapt resource value: 0x7F100111
-			public const int TextAppearance_Compat_Notification = 2131755281;
-			
-			// aapt resource value: 0x7F100112
-			public const int TextAppearance_Compat_Notification_Info = 2131755282;
-			
-			// aapt resource value: 0x7F100113
-			public const int TextAppearance_Compat_Notification_Info_Media = 2131755283;
-			
-			// aapt resource value: 0x7F100114
-			public const int TextAppearance_Compat_Notification_Line2 = 2131755284;
-			
-			// aapt resource value: 0x7F100115
-			public const int TextAppearance_Compat_Notification_Line2_Media = 2131755285;
-			
-			// aapt resource value: 0x7F100116
-			public const int TextAppearance_Compat_Notification_Media = 2131755286;
-			
-			// aapt resource value: 0x7F100117
-			public const int TextAppearance_Compat_Notification_Time = 2131755287;
-			
-			// aapt resource value: 0x7F100118
-			public const int TextAppearance_Compat_Notification_Time_Media = 2131755288;
-			
-			// aapt resource value: 0x7F100119
-			public const int TextAppearance_Compat_Notification_Title = 2131755289;
-			
-			// aapt resource value: 0x7F10011A
-			public const int TextAppearance_Compat_Notification_Title_Media = 2131755290;
-			
-			// aapt resource value: 0x7F10011B
-			public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131755291;
-			
-			// aapt resource value: 0x7F10011C
-			public const int TextAppearance_Design_Counter = 2131755292;
-			
-			// aapt resource value: 0x7F10011D
-			public const int TextAppearance_Design_Counter_Overflow = 2131755293;
-			
-			// aapt resource value: 0x7F10011E
-			public const int TextAppearance_Design_Error = 2131755294;
-			
-			// aapt resource value: 0x7F10011F
-			public const int TextAppearance_Design_Hint = 2131755295;
-			
-			// aapt resource value: 0x7F100120
-			public const int TextAppearance_Design_Snackbar_Message = 2131755296;
-			
-			// aapt resource value: 0x7F100121
-			public const int TextAppearance_Design_Tab = 2131755297;
-			
-			// aapt resource value: 0x7F100122
-			public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131755298;
-			
-			// aapt resource value: 0x7F100123
-			public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131755299;
-			
-			// aapt resource value: 0x7F100124
-			public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131755300;
-			
-			// aapt resource value: 0x7F100125
-			public const int TextView = 2131755301;
-			
-			// aapt resource value: 0x7F100142
-			public const int ThemeOverlay_AppCompat = 2131755330;
-			
-			// aapt resource value: 0x7F100143
-			public const int ThemeOverlay_AppCompat_ActionBar = 2131755331;
-			
-			// aapt resource value: 0x7F100144
-			public const int ThemeOverlay_AppCompat_Dark = 2131755332;
-			
-			// aapt resource value: 0x7F100145
-			public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131755333;
-			
-			// aapt resource value: 0x7F100146
-			public const int ThemeOverlay_AppCompat_Dialog = 2131755334;
-			
-			// aapt resource value: 0x7F100147
-			public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131755335;
-			
-			// aapt resource value: 0x7F100148
-			public const int ThemeOverlay_AppCompat_Light = 2131755336;
-			
-			// aapt resource value: 0x7F100126
-			public const int Theme_AppCompat = 2131755302;
-			
-			// aapt resource value: 0x7F100127
-			public const int Theme_AppCompat_CompactMenu = 2131755303;
-			
-			// aapt resource value: 0x7F100128
-			public const int Theme_AppCompat_DayNight = 2131755304;
-			
-			// aapt resource value: 0x7F100129
-			public const int Theme_AppCompat_DayNight_DarkActionBar = 2131755305;
-			
-			// aapt resource value: 0x7F10012A
-			public const int Theme_AppCompat_DayNight_Dialog = 2131755306;
-			
-			// aapt resource value: 0x7F10012D
-			public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131755309;
-			
-			// aapt resource value: 0x7F10012B
-			public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131755307;
-			
-			// aapt resource value: 0x7F10012C
-			public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131755308;
-			
-			// aapt resource value: 0x7F10012E
-			public const int Theme_AppCompat_DayNight_NoActionBar = 2131755310;
-			
-			// aapt resource value: 0x7F10012F
-			public const int Theme_AppCompat_Dialog = 2131755311;
-			
-			// aapt resource value: 0x7F100132
-			public const int Theme_AppCompat_DialogWhenLarge = 2131755314;
-			
-			// aapt resource value: 0x7F100130
-			public const int Theme_AppCompat_Dialog_Alert = 2131755312;
-			
-			// aapt resource value: 0x7F100131
-			public const int Theme_AppCompat_Dialog_MinWidth = 2131755313;
-			
-			// aapt resource value: 0x7F100133
-			public const int Theme_AppCompat_Light = 2131755315;
-			
-			// aapt resource value: 0x7F100134
-			public const int Theme_AppCompat_Light_DarkActionBar = 2131755316;
-			
-			// aapt resource value: 0x7F100135
-			public const int Theme_AppCompat_Light_Dialog = 2131755317;
-			
-			// aapt resource value: 0x7F100138
-			public const int Theme_AppCompat_Light_DialogWhenLarge = 2131755320;
-			
-			// aapt resource value: 0x7F100136
-			public const int Theme_AppCompat_Light_Dialog_Alert = 2131755318;
-			
-			// aapt resource value: 0x7F100137
-			public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131755319;
-			
-			// aapt resource value: 0x7F100139
-			public const int Theme_AppCompat_Light_NoActionBar = 2131755321;
-			
-			// aapt resource value: 0x7F10013A
-			public const int Theme_AppCompat_NoActionBar = 2131755322;
-			
-			// aapt resource value: 0x7F10013B
-			public const int Theme_BiometricPromptDialog = 2131755323;
-			
-			// aapt resource value: 0x7F10013C
-			public const int Theme_Design = 2131755324;
-			
-			// aapt resource value: 0x7F10013D
-			public const int Theme_Design_BottomSheetDialog = 2131755325;
-			
-			// aapt resource value: 0x7F10013E
-			public const int Theme_Design_Light = 2131755326;
-			
-			// aapt resource value: 0x7F10013F
-			public const int Theme_Design_Light_BottomSheetDialog = 2131755327;
-			
-			// aapt resource value: 0x7F100140
-			public const int Theme_Design_Light_NoActionBar = 2131755328;
-			
-			// aapt resource value: 0x7F100141
-			public const int Theme_Design_NoActionBar = 2131755329;
+			public const int mobile_common_dahua_wight_progressBar_Small = 2131755455;
 			
 			// aapt resource value: 0x7F1001C0
-			public const int time_picker_style = 2131755456;
+			public const int mobile_common_dialog_anima = 2131755456;
 			
-			// aapt resource value: 0x7F100149
-			public const int TitleBar_Dark = 2131755337;
+			// aapt resource value: 0x7F1001B5
+			public const int mobile_common_TextAppearance_22sp_black_bold = 2131755445;
 			
-			// aapt resource value: 0x7F10014A
-			public const int TitleBar_Light = 2131755338;
+			// aapt resource value: 0x7F1000BB
+			public const int MyDialogStyle = 2131755195;
 			
-			// aapt resource value: 0x7F10014B
-			public const int TitleBar_Light_Web = 2131755339;
+			// aapt resource value: 0x7F1000BC
+			public const int MyTheme = 2131755196;
+			
+			// aapt resource value: 0x7F1000BD
+			public const int MyTheme1 = 2131755197;
 			
 			// aapt resource value: 0x7F1001C1
-			public const int translucent = 2131755457;
+			public const int picker_view_scale_anim = 2131755457;
 			
 			// aapt resource value: 0x7F1001C2
-			public const int user_module_edittext = 2131755458;
+			public const int picker_view_slide_anim = 2131755458;
+			
+			// aapt resource value: 0x7F1000BE
+			public const int Platform_AppCompat = 2131755198;
+			
+			// aapt resource value: 0x7F1000BF
+			public const int Platform_AppCompat_Light = 2131755199;
+			
+			// aapt resource value: 0x7F1000C0
+			public const int Platform_ThemeOverlay_AppCompat = 2131755200;
+			
+			// aapt resource value: 0x7F1000C1
+			public const int Platform_ThemeOverlay_AppCompat_Dark = 2131755201;
+			
+			// aapt resource value: 0x7F1000C2
+			public const int Platform_ThemeOverlay_AppCompat_Light = 2131755202;
+			
+			// aapt resource value: 0x7F1000C3
+			public const int Platform_V11_AppCompat = 2131755203;
+			
+			// aapt resource value: 0x7F1000C4
+			public const int Platform_V11_AppCompat_Light = 2131755204;
+			
+			// aapt resource value: 0x7F1000C5
+			public const int Platform_V14_AppCompat = 2131755205;
+			
+			// aapt resource value: 0x7F1000C6
+			public const int Platform_V14_AppCompat_Light = 2131755206;
+			
+			// aapt resource value: 0x7F1000C7
+			public const int Platform_V21_AppCompat = 2131755207;
+			
+			// aapt resource value: 0x7F1000C8
+			public const int Platform_V21_AppCompat_Light = 2131755208;
+			
+			// aapt resource value: 0x7F1000C9
+			public const int Platform_V25_AppCompat = 2131755209;
+			
+			// aapt resource value: 0x7F1000CA
+			public const int Platform_V25_AppCompat_Light = 2131755210;
+			
+			// aapt resource value: 0x7F1000CB
+			public const int Platform_Widget_AppCompat_Spinner = 2131755211;
 			
 			// aapt resource value: 0x7F1001C3
-			public const int video_dialog = 2131755459;
+			public const int popwindowUpAnim = 2131755459;
 			
-			// aapt resource value: 0x7F10014C
-			public const int Widget_AppCompat_ActionBar = 2131755340;
+			// aapt resource value: 0x7F1000CC
+			public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131755212;
 			
-			// aapt resource value: 0x7F10014D
-			public const int Widget_AppCompat_ActionBar_Solid = 2131755341;
+			// aapt resource value: 0x7F1000CD
+			public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131755213;
 			
-			// aapt resource value: 0x7F10014E
-			public const int Widget_AppCompat_ActionBar_TabBar = 2131755342;
+			// aapt resource value: 0x7F1000CE
+			public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131755214;
 			
-			// aapt resource value: 0x7F10014F
-			public const int Widget_AppCompat_ActionBar_TabText = 2131755343;
+			// aapt resource value: 0x7F1000CF
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131755215;
 			
-			// aapt resource value: 0x7F100150
-			public const int Widget_AppCompat_ActionBar_TabView = 2131755344;
+			// aapt resource value: 0x7F1000D0
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131755216;
 			
-			// aapt resource value: 0x7F100151
-			public const int Widget_AppCompat_ActionButton = 2131755345;
+			// aapt resource value: 0x7F1000D1
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131755217;
 			
-			// aapt resource value: 0x7F100152
-			public const int Widget_AppCompat_ActionButton_CloseMode = 2131755346;
+			// aapt resource value: 0x7F1000D7
+			public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131755223;
 			
-			// aapt resource value: 0x7F100153
-			public const int Widget_AppCompat_ActionButton_Overflow = 2131755347;
+			// aapt resource value: 0x7F1000D2
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131755218;
 			
-			// aapt resource value: 0x7F100154
-			public const int Widget_AppCompat_ActionMode = 2131755348;
+			// aapt resource value: 0x7F1000D3
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131755219;
 			
-			// aapt resource value: 0x7F100155
-			public const int Widget_AppCompat_ActivityChooserView = 2131755349;
+			// aapt resource value: 0x7F1000D4
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131755220;
 			
-			// aapt resource value: 0x7F100156
-			public const int Widget_AppCompat_AutoCompleteTextView = 2131755350;
+			// aapt resource value: 0x7F1000D5
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131755221;
 			
-			// aapt resource value: 0x7F100157
-			public const int Widget_AppCompat_Button = 2131755351;
+			// aapt resource value: 0x7F1000D6
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131755222;
 			
-			// aapt resource value: 0x7F10015D
-			public const int Widget_AppCompat_ButtonBar = 2131755357;
+			// aapt resource value: 0x7F1000D8
+			public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131755224;
 			
-			// aapt resource value: 0x7F10015E
-			public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131755358;
-			
-			// aapt resource value: 0x7F100158
-			public const int Widget_AppCompat_Button_Borderless = 2131755352;
-			
-			// aapt resource value: 0x7F100159
-			public const int Widget_AppCompat_Button_Borderless_Colored = 2131755353;
-			
-			// aapt resource value: 0x7F10015A
-			public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131755354;
-			
-			// aapt resource value: 0x7F10015B
-			public const int Widget_AppCompat_Button_Colored = 2131755355;
-			
-			// aapt resource value: 0x7F10015C
-			public const int Widget_AppCompat_Button_Small = 2131755356;
-			
-			// aapt resource value: 0x7F10015F
-			public const int Widget_AppCompat_CompoundButton_CheckBox = 2131755359;
-			
-			// aapt resource value: 0x7F100160
-			public const int Widget_AppCompat_CompoundButton_RadioButton = 2131755360;
-			
-			// aapt resource value: 0x7F100161
-			public const int Widget_AppCompat_CompoundButton_Switch = 2131755361;
-			
-			// aapt resource value: 0x7F100162
-			public const int Widget_AppCompat_DrawerArrowToggle = 2131755362;
-			
-			// aapt resource value: 0x7F100163
-			public const int Widget_AppCompat_DropDownItem_Spinner = 2131755363;
-			
-			// aapt resource value: 0x7F100164
-			public const int Widget_AppCompat_EditText = 2131755364;
-			
-			// aapt resource value: 0x7F100165
-			public const int Widget_AppCompat_ImageButton = 2131755365;
-			
-			// aapt resource value: 0x7F100166
-			public const int Widget_AppCompat_Light_ActionBar = 2131755366;
-			
-			// aapt resource value: 0x7F100167
-			public const int Widget_AppCompat_Light_ActionBar_Solid = 2131755367;
-			
-			// aapt resource value: 0x7F100168
-			public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131755368;
-			
-			// aapt resource value: 0x7F100169
-			public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131755369;
-			
-			// aapt resource value: 0x7F10016A
-			public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131755370;
-			
-			// aapt resource value: 0x7F10016B
-			public const int Widget_AppCompat_Light_ActionBar_TabText = 2131755371;
-			
-			// aapt resource value: 0x7F10016C
-			public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131755372;
-			
-			// aapt resource value: 0x7F10016D
-			public const int Widget_AppCompat_Light_ActionBar_TabView = 2131755373;
-			
-			// aapt resource value: 0x7F10016E
-			public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131755374;
-			
-			// aapt resource value: 0x7F10016F
-			public const int Widget_AppCompat_Light_ActionButton = 2131755375;
-			
-			// aapt resource value: 0x7F100170
-			public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131755376;
-			
-			// aapt resource value: 0x7F100171
-			public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131755377;
-			
-			// aapt resource value: 0x7F100172
-			public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131755378;
-			
-			// aapt resource value: 0x7F100173
-			public const int Widget_AppCompat_Light_ActivityChooserView = 2131755379;
-			
-			// aapt resource value: 0x7F100174
-			public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131755380;
-			
-			// aapt resource value: 0x7F100175
-			public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131755381;
-			
-			// aapt resource value: 0x7F100176
-			public const int Widget_AppCompat_Light_ListPopupWindow = 2131755382;
-			
-			// aapt resource value: 0x7F100177
-			public const int Widget_AppCompat_Light_ListView_DropDown = 2131755383;
-			
-			// aapt resource value: 0x7F100178
-			public const int Widget_AppCompat_Light_PopupMenu = 2131755384;
-			
-			// aapt resource value: 0x7F100179
-			public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131755385;
-			
-			// aapt resource value: 0x7F10017A
-			public const int Widget_AppCompat_Light_SearchView = 2131755386;
-			
-			// aapt resource value: 0x7F10017B
-			public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131755387;
-			
-			// aapt resource value: 0x7F10017C
-			public const int Widget_AppCompat_ListMenuView = 2131755388;
-			
-			// aapt resource value: 0x7F10017D
-			public const int Widget_AppCompat_ListPopupWindow = 2131755389;
-			
-			// aapt resource value: 0x7F10017E
-			public const int Widget_AppCompat_ListView = 2131755390;
-			
-			// aapt resource value: 0x7F10017F
-			public const int Widget_AppCompat_ListView_DropDown = 2131755391;
-			
-			// aapt resource value: 0x7F100180
-			public const int Widget_AppCompat_ListView_Menu = 2131755392;
-			
-			// aapt resource value: 0x7F100181
-			public const int Widget_AppCompat_PopupMenu = 2131755393;
-			
-			// aapt resource value: 0x7F100182
-			public const int Widget_AppCompat_PopupMenu_Overflow = 2131755394;
-			
-			// aapt resource value: 0x7F100183
-			public const int Widget_AppCompat_PopupWindow = 2131755395;
-			
-			// aapt resource value: 0x7F100184
-			public const int Widget_AppCompat_ProgressBar = 2131755396;
-			
-			// aapt resource value: 0x7F100185
-			public const int Widget_AppCompat_ProgressBar_Horizontal = 2131755397;
-			
-			// aapt resource value: 0x7F100186
-			public const int Widget_AppCompat_RatingBar = 2131755398;
-			
-			// aapt resource value: 0x7F100187
-			public const int Widget_AppCompat_RatingBar_Indicator = 2131755399;
-			
-			// aapt resource value: 0x7F100188
-			public const int Widget_AppCompat_RatingBar_Small = 2131755400;
-			
-			// aapt resource value: 0x7F100189
-			public const int Widget_AppCompat_SearchView = 2131755401;
-			
-			// aapt resource value: 0x7F10018A
-			public const int Widget_AppCompat_SearchView_ActionBar = 2131755402;
-			
-			// aapt resource value: 0x7F10018B
-			public const int Widget_AppCompat_SeekBar = 2131755403;
-			
-			// aapt resource value: 0x7F10018C
-			public const int Widget_AppCompat_SeekBar_Discrete = 2131755404;
-			
-			// aapt resource value: 0x7F10018D
-			public const int Widget_AppCompat_Spinner = 2131755405;
-			
-			// aapt resource value: 0x7F10018E
-			public const int Widget_AppCompat_Spinner_DropDown = 2131755406;
-			
-			// aapt resource value: 0x7F10018F
-			public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131755407;
-			
-			// aapt resource value: 0x7F100190
-			public const int Widget_AppCompat_Spinner_Underlined = 2131755408;
-			
-			// aapt resource value: 0x7F100191
-			public const int Widget_AppCompat_TextView_SpinnerItem = 2131755409;
-			
-			// aapt resource value: 0x7F100192
-			public const int Widget_AppCompat_Toolbar = 2131755410;
-			
-			// aapt resource value: 0x7F100193
-			public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131755411;
-			
-			// aapt resource value: 0x7F100194
-			public const int Widget_Compat_NotificationActionContainer = 2131755412;
-			
-			// aapt resource value: 0x7F100195
-			public const int Widget_Compat_NotificationActionText = 2131755413;
-			
-			// aapt resource value: 0x7F100196
-			public const int Widget_Design_AppBarLayout = 2131755414;
-			
-			// aapt resource value: 0x7F100197
-			public const int Widget_Design_BottomNavigationView = 2131755415;
-			
-			// aapt resource value: 0x7F100198
-			public const int Widget_Design_BottomSheet_Modal = 2131755416;
-			
-			// aapt resource value: 0x7F100199
-			public const int Widget_Design_CollapsingToolbar = 2131755417;
-			
-			// aapt resource value: 0x7F10019A
-			public const int Widget_Design_CoordinatorLayout = 2131755418;
-			
-			// aapt resource value: 0x7F10019B
-			public const int Widget_Design_FloatingActionButton = 2131755419;
-			
-			// aapt resource value: 0x7F10019C
-			public const int Widget_Design_NavigationView = 2131755420;
-			
-			// aapt resource value: 0x7F10019D
-			public const int Widget_Design_ScrimInsetsFrameLayout = 2131755421;
-			
-			// aapt resource value: 0x7F10019E
-			public const int Widget_Design_Snackbar = 2131755422;
-			
-			// aapt resource value: 0x7F10019F
-			public const int Widget_Design_TabLayout = 2131755423;
-			
-			// aapt resource value: 0x7F1001A0
-			public const int Widget_Design_TextInputLayout = 2131755424;
+			// aapt resource value: 0x7F1000D9
+			public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131755225;
 			
 			// aapt resource value: 0x7F1001C4
-			public const int zxing_CaptureTheme = 2131755460;
+			public const int sign_dialog = 2131755460;
+			
+			// aapt resource value: 0x7F1000DA
+			public const int SplashTheme = 2131755226;
+			
+			// aapt resource value: 0x7F1000DB
+			public const int TextAppearance_17sp_lc_black_color = 2131755227;
+			
+			// aapt resource value: 0x7F1000DC
+			public const int TextAppearance_AppCompat = 2131755228;
+			
+			// aapt resource value: 0x7F1000DD
+			public const int TextAppearance_AppCompat_Body1 = 2131755229;
+			
+			// aapt resource value: 0x7F1000DE
+			public const int TextAppearance_AppCompat_Body2 = 2131755230;
+			
+			// aapt resource value: 0x7F1000DF
+			public const int TextAppearance_AppCompat_Button = 2131755231;
+			
+			// aapt resource value: 0x7F1000E0
+			public const int TextAppearance_AppCompat_Caption = 2131755232;
+			
+			// aapt resource value: 0x7F1000E1
+			public const int TextAppearance_AppCompat_Display1 = 2131755233;
+			
+			// aapt resource value: 0x7F1000E2
+			public const int TextAppearance_AppCompat_Display2 = 2131755234;
+			
+			// aapt resource value: 0x7F1000E3
+			public const int TextAppearance_AppCompat_Display3 = 2131755235;
+			
+			// aapt resource value: 0x7F1000E4
+			public const int TextAppearance_AppCompat_Display4 = 2131755236;
+			
+			// aapt resource value: 0x7F1000E5
+			public const int TextAppearance_AppCompat_Headline = 2131755237;
+			
+			// aapt resource value: 0x7F1000E6
+			public const int TextAppearance_AppCompat_Inverse = 2131755238;
+			
+			// aapt resource value: 0x7F1000E7
+			public const int TextAppearance_AppCompat_Large = 2131755239;
+			
+			// aapt resource value: 0x7F1000E8
+			public const int TextAppearance_AppCompat_Large_Inverse = 2131755240;
+			
+			// aapt resource value: 0x7F1000E9
+			public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131755241;
+			
+			// aapt resource value: 0x7F1000EA
+			public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131755242;
+			
+			// aapt resource value: 0x7F1000EB
+			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131755243;
+			
+			// aapt resource value: 0x7F1000EC
+			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131755244;
+			
+			// aapt resource value: 0x7F1000ED
+			public const int TextAppearance_AppCompat_Medium = 2131755245;
+			
+			// aapt resource value: 0x7F1000EE
+			public const int TextAppearance_AppCompat_Medium_Inverse = 2131755246;
+			
+			// aapt resource value: 0x7F1000EF
+			public const int TextAppearance_AppCompat_Menu = 2131755247;
+			
+			// aapt resource value: 0x7F1000F0
+			public const int TextAppearance_AppCompat_Notification = 2131755248;
+			
+			// aapt resource value: 0x7F1000F1
+			public const int TextAppearance_AppCompat_Notification_Info = 2131755249;
+			
+			// aapt resource value: 0x7F1000F2
+			public const int TextAppearance_AppCompat_Notification_Info_Media = 2131755250;
+			
+			// aapt resource value: 0x7F1000F3
+			public const int TextAppearance_AppCompat_Notification_Line2 = 2131755251;
+			
+			// aapt resource value: 0x7F1000F4
+			public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131755252;
+			
+			// aapt resource value: 0x7F1000F5
+			public const int TextAppearance_AppCompat_Notification_Media = 2131755253;
+			
+			// aapt resource value: 0x7F1000F6
+			public const int TextAppearance_AppCompat_Notification_Time = 2131755254;
+			
+			// aapt resource value: 0x7F1000F7
+			public const int TextAppearance_AppCompat_Notification_Time_Media = 2131755255;
+			
+			// aapt resource value: 0x7F1000F8
+			public const int TextAppearance_AppCompat_Notification_Title = 2131755256;
+			
+			// aapt resource value: 0x7F1000F9
+			public const int TextAppearance_AppCompat_Notification_Title_Media = 2131755257;
+			
+			// aapt resource value: 0x7F1000FA
+			public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131755258;
+			
+			// aapt resource value: 0x7F1000FB
+			public const int TextAppearance_AppCompat_SearchResult_Title = 2131755259;
+			
+			// aapt resource value: 0x7F1000FC
+			public const int TextAppearance_AppCompat_Small = 2131755260;
+			
+			// aapt resource value: 0x7F1000FD
+			public const int TextAppearance_AppCompat_Small_Inverse = 2131755261;
+			
+			// aapt resource value: 0x7F1000FE
+			public const int TextAppearance_AppCompat_Subhead = 2131755262;
+			
+			// aapt resource value: 0x7F1000FF
+			public const int TextAppearance_AppCompat_Subhead_Inverse = 2131755263;
+			
+			// aapt resource value: 0x7F100100
+			public const int TextAppearance_AppCompat_Title = 2131755264;
+			
+			// aapt resource value: 0x7F100101
+			public const int TextAppearance_AppCompat_Title_Inverse = 2131755265;
+			
+			// aapt resource value: 0x7F100102
+			public const int TextAppearance_AppCompat_Tooltip = 2131755266;
+			
+			// aapt resource value: 0x7F100103
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131755267;
+			
+			// aapt resource value: 0x7F100104
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131755268;
+			
+			// aapt resource value: 0x7F100105
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131755269;
+			
+			// aapt resource value: 0x7F100106
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131755270;
+			
+			// aapt resource value: 0x7F100107
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131755271;
+			
+			// aapt resource value: 0x7F100108
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131755272;
+			
+			// aapt resource value: 0x7F100109
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131755273;
+			
+			// aapt resource value: 0x7F10010A
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131755274;
+			
+			// aapt resource value: 0x7F10010B
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131755275;
+			
+			// aapt resource value: 0x7F10010C
+			public const int TextAppearance_AppCompat_Widget_Button = 2131755276;
+			
+			// aapt resource value: 0x7F10010D
+			public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131755277;
+			
+			// aapt resource value: 0x7F10010E
+			public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131755278;
+			
+			// aapt resource value: 0x7F10010F
+			public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131755279;
+			
+			// aapt resource value: 0x7F100110
+			public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131755280;
+			
+			// aapt resource value: 0x7F100111
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131755281;
+			
+			// aapt resource value: 0x7F100112
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131755282;
+			
+			// aapt resource value: 0x7F100113
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131755283;
+			
+			// aapt resource value: 0x7F100114
+			public const int TextAppearance_AppCompat_Widget_Switch = 2131755284;
+			
+			// aapt resource value: 0x7F100115
+			public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131755285;
+			
+			// aapt resource value: 0x7F100116
+			public const int TextAppearance_Compat_Notification = 2131755286;
+			
+			// aapt resource value: 0x7F100117
+			public const int TextAppearance_Compat_Notification_Info = 2131755287;
+			
+			// aapt resource value: 0x7F100118
+			public const int TextAppearance_Compat_Notification_Info_Media = 2131755288;
+			
+			// aapt resource value: 0x7F100119
+			public const int TextAppearance_Compat_Notification_Line2 = 2131755289;
+			
+			// aapt resource value: 0x7F10011A
+			public const int TextAppearance_Compat_Notification_Line2_Media = 2131755290;
+			
+			// aapt resource value: 0x7F10011B
+			public const int TextAppearance_Compat_Notification_Media = 2131755291;
+			
+			// aapt resource value: 0x7F10011C
+			public const int TextAppearance_Compat_Notification_Time = 2131755292;
+			
+			// aapt resource value: 0x7F10011D
+			public const int TextAppearance_Compat_Notification_Time_Media = 2131755293;
+			
+			// aapt resource value: 0x7F10011E
+			public const int TextAppearance_Compat_Notification_Title = 2131755294;
+			
+			// aapt resource value: 0x7F10011F
+			public const int TextAppearance_Compat_Notification_Title_Media = 2131755295;
+			
+			// aapt resource value: 0x7F100120
+			public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131755296;
+			
+			// aapt resource value: 0x7F100121
+			public const int TextAppearance_Design_Counter = 2131755297;
+			
+			// aapt resource value: 0x7F100122
+			public const int TextAppearance_Design_Counter_Overflow = 2131755298;
+			
+			// aapt resource value: 0x7F100123
+			public const int TextAppearance_Design_Error = 2131755299;
+			
+			// aapt resource value: 0x7F100124
+			public const int TextAppearance_Design_Hint = 2131755300;
+			
+			// aapt resource value: 0x7F100125
+			public const int TextAppearance_Design_Snackbar_Message = 2131755301;
+			
+			// aapt resource value: 0x7F100126
+			public const int TextAppearance_Design_Tab = 2131755302;
+			
+			// aapt resource value: 0x7F100127
+			public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131755303;
+			
+			// aapt resource value: 0x7F100128
+			public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131755304;
+			
+			// aapt resource value: 0x7F100129
+			public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131755305;
+			
+			// aapt resource value: 0x7F10012A
+			public const int TextView = 2131755306;
+			
+			// aapt resource value: 0x7F100147
+			public const int ThemeOverlay_AppCompat = 2131755335;
+			
+			// aapt resource value: 0x7F100148
+			public const int ThemeOverlay_AppCompat_ActionBar = 2131755336;
+			
+			// aapt resource value: 0x7F100149
+			public const int ThemeOverlay_AppCompat_Dark = 2131755337;
+			
+			// aapt resource value: 0x7F10014A
+			public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131755338;
+			
+			// aapt resource value: 0x7F10014B
+			public const int ThemeOverlay_AppCompat_Dialog = 2131755339;
+			
+			// aapt resource value: 0x7F10014C
+			public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131755340;
+			
+			// aapt resource value: 0x7F10014D
+			public const int ThemeOverlay_AppCompat_Light = 2131755341;
+			
+			// aapt resource value: 0x7F10012B
+			public const int Theme_AppCompat = 2131755307;
+			
+			// aapt resource value: 0x7F10012C
+			public const int Theme_AppCompat_CompactMenu = 2131755308;
+			
+			// aapt resource value: 0x7F10012D
+			public const int Theme_AppCompat_DayNight = 2131755309;
+			
+			// aapt resource value: 0x7F10012E
+			public const int Theme_AppCompat_DayNight_DarkActionBar = 2131755310;
+			
+			// aapt resource value: 0x7F10012F
+			public const int Theme_AppCompat_DayNight_Dialog = 2131755311;
+			
+			// aapt resource value: 0x7F100132
+			public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131755314;
+			
+			// aapt resource value: 0x7F100130
+			public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131755312;
+			
+			// aapt resource value: 0x7F100131
+			public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131755313;
+			
+			// aapt resource value: 0x7F100133
+			public const int Theme_AppCompat_DayNight_NoActionBar = 2131755315;
+			
+			// aapt resource value: 0x7F100134
+			public const int Theme_AppCompat_Dialog = 2131755316;
+			
+			// aapt resource value: 0x7F100137
+			public const int Theme_AppCompat_DialogWhenLarge = 2131755319;
+			
+			// aapt resource value: 0x7F100135
+			public const int Theme_AppCompat_Dialog_Alert = 2131755317;
+			
+			// aapt resource value: 0x7F100136
+			public const int Theme_AppCompat_Dialog_MinWidth = 2131755318;
+			
+			// aapt resource value: 0x7F100138
+			public const int Theme_AppCompat_Light = 2131755320;
+			
+			// aapt resource value: 0x7F100139
+			public const int Theme_AppCompat_Light_DarkActionBar = 2131755321;
+			
+			// aapt resource value: 0x7F10013A
+			public const int Theme_AppCompat_Light_Dialog = 2131755322;
+			
+			// aapt resource value: 0x7F10013D
+			public const int Theme_AppCompat_Light_DialogWhenLarge = 2131755325;
+			
+			// aapt resource value: 0x7F10013B
+			public const int Theme_AppCompat_Light_Dialog_Alert = 2131755323;
+			
+			// aapt resource value: 0x7F10013C
+			public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131755324;
+			
+			// aapt resource value: 0x7F10013E
+			public const int Theme_AppCompat_Light_NoActionBar = 2131755326;
+			
+			// aapt resource value: 0x7F10013F
+			public const int Theme_AppCompat_NoActionBar = 2131755327;
+			
+			// aapt resource value: 0x7F100140
+			public const int Theme_BiometricPromptDialog = 2131755328;
+			
+			// aapt resource value: 0x7F100141
+			public const int Theme_Design = 2131755329;
+			
+			// aapt resource value: 0x7F100142
+			public const int Theme_Design_BottomSheetDialog = 2131755330;
+			
+			// aapt resource value: 0x7F100143
+			public const int Theme_Design_Light = 2131755331;
+			
+			// aapt resource value: 0x7F100144
+			public const int Theme_Design_Light_BottomSheetDialog = 2131755332;
+			
+			// aapt resource value: 0x7F100145
+			public const int Theme_Design_Light_NoActionBar = 2131755333;
+			
+			// aapt resource value: 0x7F100146
+			public const int Theme_Design_NoActionBar = 2131755334;
+			
+			// aapt resource value: 0x7F1001C5
+			public const int time_picker_style = 2131755461;
+			
+			// aapt resource value: 0x7F10014E
+			public const int TitleBar_Dark = 2131755342;
+			
+			// aapt resource value: 0x7F10014F
+			public const int TitleBar_Light = 2131755343;
+			
+			// aapt resource value: 0x7F100150
+			public const int TitleBar_Light_Web = 2131755344;
+			
+			// aapt resource value: 0x7F1001C6
+			public const int translucent = 2131755462;
+			
+			// aapt resource value: 0x7F1001C7
+			public const int user_module_edittext = 2131755463;
+			
+			// aapt resource value: 0x7F1001C8
+			public const int video_dialog = 2131755464;
+			
+			// aapt resource value: 0x7F100151
+			public const int Widget_AppCompat_ActionBar = 2131755345;
+			
+			// aapt resource value: 0x7F100152
+			public const int Widget_AppCompat_ActionBar_Solid = 2131755346;
+			
+			// aapt resource value: 0x7F100153
+			public const int Widget_AppCompat_ActionBar_TabBar = 2131755347;
+			
+			// aapt resource value: 0x7F100154
+			public const int Widget_AppCompat_ActionBar_TabText = 2131755348;
+			
+			// aapt resource value: 0x7F100155
+			public const int Widget_AppCompat_ActionBar_TabView = 2131755349;
+			
+			// aapt resource value: 0x7F100156
+			public const int Widget_AppCompat_ActionButton = 2131755350;
+			
+			// aapt resource value: 0x7F100157
+			public const int Widget_AppCompat_ActionButton_CloseMode = 2131755351;
+			
+			// aapt resource value: 0x7F100158
+			public const int Widget_AppCompat_ActionButton_Overflow = 2131755352;
+			
+			// aapt resource value: 0x7F100159
+			public const int Widget_AppCompat_ActionMode = 2131755353;
+			
+			// aapt resource value: 0x7F10015A
+			public const int Widget_AppCompat_ActivityChooserView = 2131755354;
+			
+			// aapt resource value: 0x7F10015B
+			public const int Widget_AppCompat_AutoCompleteTextView = 2131755355;
+			
+			// aapt resource value: 0x7F10015C
+			public const int Widget_AppCompat_Button = 2131755356;
+			
+			// aapt resource value: 0x7F100162
+			public const int Widget_AppCompat_ButtonBar = 2131755362;
+			
+			// aapt resource value: 0x7F100163
+			public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131755363;
+			
+			// aapt resource value: 0x7F10015D
+			public const int Widget_AppCompat_Button_Borderless = 2131755357;
+			
+			// aapt resource value: 0x7F10015E
+			public const int Widget_AppCompat_Button_Borderless_Colored = 2131755358;
+			
+			// aapt resource value: 0x7F10015F
+			public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131755359;
+			
+			// aapt resource value: 0x7F100160
+			public const int Widget_AppCompat_Button_Colored = 2131755360;
+			
+			// aapt resource value: 0x7F100161
+			public const int Widget_AppCompat_Button_Small = 2131755361;
+			
+			// aapt resource value: 0x7F100164
+			public const int Widget_AppCompat_CompoundButton_CheckBox = 2131755364;
+			
+			// aapt resource value: 0x7F100165
+			public const int Widget_AppCompat_CompoundButton_RadioButton = 2131755365;
+			
+			// aapt resource value: 0x7F100166
+			public const int Widget_AppCompat_CompoundButton_Switch = 2131755366;
+			
+			// aapt resource value: 0x7F100167
+			public const int Widget_AppCompat_DrawerArrowToggle = 2131755367;
+			
+			// aapt resource value: 0x7F100168
+			public const int Widget_AppCompat_DropDownItem_Spinner = 2131755368;
+			
+			// aapt resource value: 0x7F100169
+			public const int Widget_AppCompat_EditText = 2131755369;
+			
+			// aapt resource value: 0x7F10016A
+			public const int Widget_AppCompat_ImageButton = 2131755370;
+			
+			// aapt resource value: 0x7F10016B
+			public const int Widget_AppCompat_Light_ActionBar = 2131755371;
+			
+			// aapt resource value: 0x7F10016C
+			public const int Widget_AppCompat_Light_ActionBar_Solid = 2131755372;
+			
+			// aapt resource value: 0x7F10016D
+			public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131755373;
+			
+			// aapt resource value: 0x7F10016E
+			public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131755374;
+			
+			// aapt resource value: 0x7F10016F
+			public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131755375;
+			
+			// aapt resource value: 0x7F100170
+			public const int Widget_AppCompat_Light_ActionBar_TabText = 2131755376;
+			
+			// aapt resource value: 0x7F100171
+			public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131755377;
+			
+			// aapt resource value: 0x7F100172
+			public const int Widget_AppCompat_Light_ActionBar_TabView = 2131755378;
+			
+			// aapt resource value: 0x7F100173
+			public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131755379;
+			
+			// aapt resource value: 0x7F100174
+			public const int Widget_AppCompat_Light_ActionButton = 2131755380;
+			
+			// aapt resource value: 0x7F100175
+			public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131755381;
+			
+			// aapt resource value: 0x7F100176
+			public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131755382;
+			
+			// aapt resource value: 0x7F100177
+			public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131755383;
+			
+			// aapt resource value: 0x7F100178
+			public const int Widget_AppCompat_Light_ActivityChooserView = 2131755384;
+			
+			// aapt resource value: 0x7F100179
+			public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131755385;
+			
+			// aapt resource value: 0x7F10017A
+			public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131755386;
+			
+			// aapt resource value: 0x7F10017B
+			public const int Widget_AppCompat_Light_ListPopupWindow = 2131755387;
+			
+			// aapt resource value: 0x7F10017C
+			public const int Widget_AppCompat_Light_ListView_DropDown = 2131755388;
+			
+			// aapt resource value: 0x7F10017D
+			public const int Widget_AppCompat_Light_PopupMenu = 2131755389;
+			
+			// aapt resource value: 0x7F10017E
+			public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131755390;
+			
+			// aapt resource value: 0x7F10017F
+			public const int Widget_AppCompat_Light_SearchView = 2131755391;
+			
+			// aapt resource value: 0x7F100180
+			public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131755392;
+			
+			// aapt resource value: 0x7F100181
+			public const int Widget_AppCompat_ListMenuView = 2131755393;
+			
+			// aapt resource value: 0x7F100182
+			public const int Widget_AppCompat_ListPopupWindow = 2131755394;
+			
+			// aapt resource value: 0x7F100183
+			public const int Widget_AppCompat_ListView = 2131755395;
+			
+			// aapt resource value: 0x7F100184
+			public const int Widget_AppCompat_ListView_DropDown = 2131755396;
+			
+			// aapt resource value: 0x7F100185
+			public const int Widget_AppCompat_ListView_Menu = 2131755397;
+			
+			// aapt resource value: 0x7F100186
+			public const int Widget_AppCompat_PopupMenu = 2131755398;
+			
+			// aapt resource value: 0x7F100187
+			public const int Widget_AppCompat_PopupMenu_Overflow = 2131755399;
+			
+			// aapt resource value: 0x7F100188
+			public const int Widget_AppCompat_PopupWindow = 2131755400;
+			
+			// aapt resource value: 0x7F100189
+			public const int Widget_AppCompat_ProgressBar = 2131755401;
+			
+			// aapt resource value: 0x7F10018A
+			public const int Widget_AppCompat_ProgressBar_Horizontal = 2131755402;
+			
+			// aapt resource value: 0x7F10018B
+			public const int Widget_AppCompat_RatingBar = 2131755403;
+			
+			// aapt resource value: 0x7F10018C
+			public const int Widget_AppCompat_RatingBar_Indicator = 2131755404;
+			
+			// aapt resource value: 0x7F10018D
+			public const int Widget_AppCompat_RatingBar_Small = 2131755405;
+			
+			// aapt resource value: 0x7F10018E
+			public const int Widget_AppCompat_SearchView = 2131755406;
+			
+			// aapt resource value: 0x7F10018F
+			public const int Widget_AppCompat_SearchView_ActionBar = 2131755407;
+			
+			// aapt resource value: 0x7F100190
+			public const int Widget_AppCompat_SeekBar = 2131755408;
+			
+			// aapt resource value: 0x7F100191
+			public const int Widget_AppCompat_SeekBar_Discrete = 2131755409;
+			
+			// aapt resource value: 0x7F100192
+			public const int Widget_AppCompat_Spinner = 2131755410;
+			
+			// aapt resource value: 0x7F100193
+			public const int Widget_AppCompat_Spinner_DropDown = 2131755411;
+			
+			// aapt resource value: 0x7F100194
+			public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131755412;
+			
+			// aapt resource value: 0x7F100195
+			public const int Widget_AppCompat_Spinner_Underlined = 2131755413;
+			
+			// aapt resource value: 0x7F100196
+			public const int Widget_AppCompat_TextView_SpinnerItem = 2131755414;
+			
+			// aapt resource value: 0x7F100197
+			public const int Widget_AppCompat_Toolbar = 2131755415;
+			
+			// aapt resource value: 0x7F100198
+			public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131755416;
+			
+			// aapt resource value: 0x7F100199
+			public const int Widget_Compat_NotificationActionContainer = 2131755417;
+			
+			// aapt resource value: 0x7F10019A
+			public const int Widget_Compat_NotificationActionText = 2131755418;
+			
+			// aapt resource value: 0x7F10019B
+			public const int Widget_Design_AppBarLayout = 2131755419;
+			
+			// aapt resource value: 0x7F10019C
+			public const int Widget_Design_BottomNavigationView = 2131755420;
+			
+			// aapt resource value: 0x7F10019D
+			public const int Widget_Design_BottomSheet_Modal = 2131755421;
+			
+			// aapt resource value: 0x7F10019E
+			public const int Widget_Design_CollapsingToolbar = 2131755422;
+			
+			// aapt resource value: 0x7F10019F
+			public const int Widget_Design_CoordinatorLayout = 2131755423;
+			
+			// aapt resource value: 0x7F1001A0
+			public const int Widget_Design_FloatingActionButton = 2131755424;
+			
+			// aapt resource value: 0x7F1001A1
+			public const int Widget_Design_NavigationView = 2131755425;
+			
+			// aapt resource value: 0x7F1001A2
+			public const int Widget_Design_ScrimInsetsFrameLayout = 2131755426;
+			
+			// aapt resource value: 0x7F1001A3
+			public const int Widget_Design_Snackbar = 2131755427;
+			
+			// aapt resource value: 0x7F1001A4
+			public const int Widget_Design_TabLayout = 2131755428;
+			
+			// aapt resource value: 0x7F1001A5
+			public const int Widget_Design_TextInputLayout = 2131755429;
+			
+			// aapt resource value: 0x7F1001C9
+			public const int zxing_CaptureTheme = 2131755465;
 			
 			static Style()
 			{
@@ -21555,7 +22341,7 @@
 		public partial class Styleable
 		{
 			
-			// aapt resource value: { 0x7F040047,0x7F040048,0x7F040049,0x7F040091,0x7F040092,0x7F040093,0x7F040094,0x7F040095,0x7F040096,0x7F0400A4,0x7F0400B8,0x7F0400B9,0x7F0400C8,0x7F0400F9,0x7F0400FC,0x7F040101,0x7F040102,0x7F040103,0x7F040109,0x7F040116,0x7F04016E,0x7F040180,0x7F040192,0x7F040196,0x7F040197,0x7F04022C,0x7F04022F,0x7F040264,0x7F040270 }
+			// aapt resource value: { 0x7F040047,0x7F040048,0x7F040049,0x7F040091,0x7F040092,0x7F040093,0x7F040094,0x7F040095,0x7F040096,0x7F0400A5,0x7F0400B9,0x7F0400BA,0x7F0400C9,0x7F0400FA,0x7F0400FD,0x7F040102,0x7F040103,0x7F040104,0x7F04010A,0x7F040119,0x7F040173,0x7F040189,0x7F04019B,0x7F04019F,0x7F0401A0,0x7F040236,0x7F040239,0x7F04026E,0x7F04027A }
 			public static int[] ActionBar = new int[] {
 					2130968647,
 					2130968648,
@@ -21566,26 +22352,26 @@
 					2130968724,
 					2130968725,
 					2130968726,
-					2130968740,
-					2130968760,
+					2130968741,
 					2130968761,
-					2130968776,
-					2130968825,
-					2130968828,
-					2130968833,
+					2130968762,
+					2130968777,
+					2130968826,
+					2130968829,
 					2130968834,
 					2130968835,
-					2130968841,
-					2130968854,
-					2130968942,
-					2130968960,
-					2130968978,
-					2130968982,
-					2130968983,
-					2130969132,
-					2130969135,
-					2130969188,
-					2130969200};
+					2130968836,
+					2130968842,
+					2130968857,
+					2130968947,
+					2130968969,
+					2130968987,
+					2130968991,
+					2130968992,
+					2130969142,
+					2130969145,
+					2130969198,
+					2130969210};
 			
 			// aapt resource value: { 0x10100B3 }
 			public static int[] ActionBarLayout = new int[] {
@@ -21692,14 +22478,14 @@
 			public static int[] ActionMenuView = new int[] {
 					-1};
 			
-			// aapt resource value: { 0x7F040047,0x7F040048,0x7F040073,0x7F0400F9,0x7F04022F,0x7F040270 }
+			// aapt resource value: { 0x7F040047,0x7F040048,0x7F040073,0x7F0400FA,0x7F040239,0x7F04027A }
 			public static int[] ActionMode = new int[] {
 					2130968647,
 					2130968648,
 					2130968691,
-					2130968825,
-					2130969135,
-					2130969200};
+					2130968826,
+					2130969145,
+					2130969210};
 			
 			// aapt resource value: 0
 			public const int ActionMode_background = 0;
@@ -21719,10 +22505,10 @@
 			// aapt resource value: 5
 			public const int ActionMode_titleTextStyle = 5;
 			
-			// aapt resource value: { 0x7F0400CC,0x7F04010D }
+			// aapt resource value: { 0x7F0400CD,0x7F040110 }
 			public static int[] ActivityChooserView = new int[] {
-					2130968780,
-					2130968845};
+					2130968781,
+					2130968848};
 			
 			// aapt resource value: 0
 			public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 0;
@@ -21730,15 +22516,15 @@
 			// aapt resource value: 1
 			public const int ActivityChooserView_initialActivityCount = 1;
 			
-			// aapt resource value: { 0x10100F2,0x7F040064,0x7F040165,0x7F040166,0x7F04017D,0x7F0401DA,0x7F0401DC }
+			// aapt resource value: { 0x10100F2,0x7F040064,0x7F040169,0x7F04016A,0x7F040186,0x7F0401E4,0x7F0401E6 }
 			public static int[] AlertDialog = new int[] {
 					16842994,
 					2130968676,
-					2130968933,
-					2130968934,
-					2130968957,
-					2130969050,
-					2130969052};
+					2130968937,
+					2130968938,
+					2130968966,
+					2130969060,
+					2130969062};
 			
 			// aapt resource value: 0
 			public const int AlertDialog_android_layout = 0;
@@ -21761,18 +22547,18 @@
 			// aapt resource value: 6
 			public const int AlertDialog_singleChoiceItemLayout = 6;
 			
-			// aapt resource value: { 0x10100D4,0x101048F,0x1010540,0x7F0400C8,0x7F0400CD }
+			// aapt resource value: { 0x10100D4,0x101048F,0x1010540,0x7F0400C9,0x7F0400CE }
 			public static int[] AppBarLayout = new int[] {
 					16842964,
 					16843919,
 					16844096,
-					2130968776,
-					2130968781};
+					2130968777,
+					2130968782};
 			
-			// aapt resource value: { 0x7F040226,0x7F040227 }
+			// aapt resource value: { 0x7F040230,0x7F040231 }
 			public static int[] AppBarLayoutStates = new int[] {
-					2130969126,
-					2130969127};
+					2130969136,
+					2130969137};
 			
 			// aapt resource value: 0
 			public const int AppBarLayoutStates_state_collapsed = 0;
@@ -21795,10 +22581,10 @@
 			// aapt resource value: 4
 			public const int AppBarLayout_expanded = 4;
 			
-			// aapt resource value: { 0x7F04015C,0x7F04015D }
+			// aapt resource value: { 0x7F04015F,0x7F040160 }
 			public static int[] AppBarLayout_Layout = new int[] {
-					2130968924,
-					2130968925};
+					2130968927,
+					2130968928};
 			
 			// aapt resource value: 0
 			public const int AppBarLayout_Layout_layout_scrollFlags = 0;
@@ -21806,12 +22592,12 @@
 			// aapt resource value: 1
 			public const int AppBarLayout_Layout_layout_scrollInterpolator = 1;
 			
-			// aapt resource value: { 0x1010119,0x7F0401E2,0x7F040262,0x7F040263 }
+			// aapt resource value: { 0x1010119,0x7F0401EC,0x7F04026C,0x7F04026D }
 			public static int[] AppCompatImageView = new int[] {
 					16843033,
-					2130969058,
-					2130969186,
-					2130969187};
+					2130969068,
+					2130969196,
+					2130969197};
 			
 			// aapt resource value: 0
 			public const int AppCompatImageView_android_src = 0;
@@ -21825,12 +22611,12 @@
 			// aapt resource value: 3
 			public const int AppCompatImageView_tintMode = 3;
 			
-			// aapt resource value: { 0x1010142,0x7F04025F,0x7F040260,0x7F040261 }
+			// aapt resource value: { 0x1010142,0x7F040269,0x7F04026A,0x7F04026B }
 			public static int[] AppCompatSeekBar = new int[] {
 					16843074,
-					2130969183,
-					2130969184,
-					2130969185};
+					2130969193,
+					2130969194,
+					2130969195};
 			
 			// aapt resource value: 0
 			public const int AppCompatSeekBar_android_thumb = 0;
@@ -21875,7 +22661,7 @@
 			// aapt resource value: 0
 			public const int AppCompatTextHelper_android_textAppearance = 0;
 			
-			// aapt resource value: { 0x1010034,0x7F040041,0x7F040042,0x7F040043,0x7F040044,0x7F040045,0x7F0400E7,0x7F040245 }
+			// aapt resource value: { 0x1010034,0x7F040041,0x7F040042,0x7F040043,0x7F040044,0x7F040045,0x7F0400E8,0x7F04024F }
 			public static int[] AppCompatTextView = new int[] {
 					16842804,
 					2130968641,
@@ -21883,8 +22669,8 @@
 					2130968643,
 					2130968644,
 					2130968645,
-					2130968807,
-					2130969157};
+					2130968808,
+					2130969167};
 			
 			// aapt resource value: 0
 			public const int AppCompatTextView_android_textAppearance = 0;
@@ -21910,7 +22696,7 @@
 			// aapt resource value: 7
 			public const int AppCompatTextView_textAllCaps = 7;
 			
-			// aapt resource value: { 0x1010057,0x10100AE,0x7F040003,0x7F040004,0x7F040005,0x7F040006,0x7F040007,0x7F040008,0x7F040009,0x7F04000A,0x7F04000B,0x7F04000C,0x7F04000D,0x7F04000E,0x7F04000F,0x7F040011,0x7F040012,0x7F040013,0x7F040014,0x7F040015,0x7F040016,0x7F040017,0x7F040018,0x7F040019,0x7F04001A,0x7F04001B,0x7F04001C,0x7F04001D,0x7F04001E,0x7F04001F,0x7F040020,0x7F040021,0x7F040024,0x7F040025,0x7F040026,0x7F040027,0x7F040028,0x7F040040,0x7F04005B,0x7F04005E,0x7F04005F,0x7F040060,0x7F040061,0x7F040062,0x7F040065,0x7F040066,0x7F04006B,0x7F04006C,0x7F040079,0x7F04007A,0x7F04007B,0x7F04007C,0x7F04007D,0x7F04007E,0x7F040081,0x7F040084,0x7F040085,0x7F04008B,0x7F040098,0x7F0400B6,0x7F0400B7,0x7F0400BC,0x7F0400BE,0x7F0400C3,0x7F0400C4,0x7F0400C5,0x7F0400C6,0x7F0400C7,0x7F040101,0x7F040107,0x7F040163,0x7F040164,0x7F040167,0x7F040168,0x7F040169,0x7F04016A,0x7F04016B,0x7F04016C,0x7F04016D,0x7F040189,0x7F04018A,0x7F04018B,0x7F040191,0x7F040193,0x7F0401B0,0x7F0401B2,0x7F0401B3,0x7F0401B4,0x7F0401C4,0x7F0401CA,0x7F0401CB,0x7F0401CC,0x7F0401DF,0x7F0401E0,0x7F040233,0x7F040246,0x7F040247,0x7F040248,0x7F040249,0x7F04024A,0x7F04024B,0x7F04024C,0x7F04024D,0x7F04024F,0x7F040251,0x7F040273,0x7F040274,0x7F040275,0x7F040276,0x7F04029A,0x7F04029B,0x7F04029C,0x7F04029D,0x7F04029E,0x7F04029F,0x7F0402A0,0x7F0402A1,0x7F0402A2,0x7F0402A3 }
+			// aapt resource value: { 0x1010057,0x10100AE,0x7F040003,0x7F040004,0x7F040005,0x7F040006,0x7F040007,0x7F040008,0x7F040009,0x7F04000A,0x7F04000B,0x7F04000C,0x7F04000D,0x7F04000E,0x7F04000F,0x7F040011,0x7F040012,0x7F040013,0x7F040014,0x7F040015,0x7F040016,0x7F040017,0x7F040018,0x7F040019,0x7F04001A,0x7F04001B,0x7F04001C,0x7F04001D,0x7F04001E,0x7F04001F,0x7F040020,0x7F040021,0x7F040024,0x7F040025,0x7F040026,0x7F040027,0x7F040028,0x7F040040,0x7F04005B,0x7F04005E,0x7F04005F,0x7F040060,0x7F040061,0x7F040062,0x7F040065,0x7F040066,0x7F04006B,0x7F04006C,0x7F040079,0x7F04007A,0x7F04007B,0x7F04007C,0x7F04007D,0x7F04007E,0x7F040081,0x7F040084,0x7F040085,0x7F04008B,0x7F040099,0x7F0400B7,0x7F0400B8,0x7F0400BD,0x7F0400BF,0x7F0400C4,0x7F0400C5,0x7F0400C6,0x7F0400C7,0x7F0400C8,0x7F040102,0x7F040108,0x7F040167,0x7F040168,0x7F04016B,0x7F04016C,0x7F04016D,0x7F04016E,0x7F04016F,0x7F040170,0x7F040171,0x7F040192,0x7F040193,0x7F040194,0x7F04019A,0x7F04019C,0x7F0401B9,0x7F0401BB,0x7F0401BC,0x7F0401BD,0x7F0401CE,0x7F0401D4,0x7F0401D5,0x7F0401D6,0x7F0401E9,0x7F0401EA,0x7F04023D,0x7F040250,0x7F040251,0x7F040252,0x7F040253,0x7F040254,0x7F040255,0x7F040256,0x7F040257,0x7F040259,0x7F04025B,0x7F04027D,0x7F04027E,0x7F04027F,0x7F040280,0x7F0402A4,0x7F0402A5,0x7F0402A6,0x7F0402A7,0x7F0402A8,0x7F0402A9,0x7F0402AA,0x7F0402AB,0x7F0402AC,0x7F0402AD }
 			public static int[] AppCompatTheme = new int[] {
 					16842839,
 					16842926,
@@ -21970,67 +22756,67 @@
 					2130968708,
 					2130968709,
 					2130968715,
-					2130968728,
-					2130968758,
+					2130968729,
 					2130968759,
-					2130968764,
-					2130968766,
-					2130968771,
+					2130968760,
+					2130968765,
+					2130968767,
 					2130968772,
 					2130968773,
 					2130968774,
 					2130968775,
-					2130968833,
-					2130968839,
-					2130968931,
-					2130968932,
+					2130968776,
+					2130968834,
+					2130968840,
 					2130968935,
 					2130968936,
-					2130968937,
-					2130968938,
 					2130968939,
 					2130968940,
 					2130968941,
-					2130968969,
-					2130968970,
-					2130968971,
-					2130968977,
+					2130968942,
+					2130968943,
+					2130968944,
+					2130968945,
+					2130968978,
 					2130968979,
-					2130969008,
-					2130969010,
-					2130969011,
-					2130969012,
-					2130969028,
-					2130969034,
-					2130969035,
-					2130969036,
-					2130969055,
-					2130969056,
-					2130969139,
-					2130969158,
-					2130969159,
-					2130969160,
-					2130969161,
-					2130969162,
-					2130969163,
-					2130969164,
-					2130969165,
-					2130969167,
+					2130968980,
+					2130968986,
+					2130968988,
+					2130969017,
+					2130969019,
+					2130969020,
+					2130969021,
+					2130969038,
+					2130969044,
+					2130969045,
+					2130969046,
+					2130969065,
+					2130969066,
+					2130969149,
+					2130969168,
 					2130969169,
-					2130969203,
-					2130969204,
-					2130969205,
-					2130969206,
-					2130969242,
-					2130969243,
-					2130969244,
-					2130969245,
-					2130969246,
-					2130969247,
-					2130969248,
-					2130969249,
-					2130969250,
-					2130969251};
+					2130969170,
+					2130969171,
+					2130969172,
+					2130969173,
+					2130969174,
+					2130969175,
+					2130969177,
+					2130969179,
+					2130969213,
+					2130969214,
+					2130969215,
+					2130969216,
+					2130969252,
+					2130969253,
+					2130969254,
+					2130969255,
+					2130969256,
+					2130969257,
+					2130969258,
+					2130969259,
+					2130969260,
+					2130969261};
 			
 			// aapt resource value: 2
 			public const int AppCompatTheme_actionBarDivider = 2;
@@ -22389,11 +23175,38 @@
 			// aapt resource value: 118
 			public const int AppCompatTheme_windowNoTitle = 118;
 			
-			// aapt resource value: { 0x7F0401E4,0x7F0401E5,0x7F040214 }
+			// aapt resource value: { 0x7F04010B,0x7F04010C,0x7F040178,0x7F040179,0x7F04017D,0x7F04017E }
+			public static int[] AVLoadingIndicatorView = new int[] {
+					2130968843,
+					2130968844,
+					2130968952,
+					2130968953,
+					2130968957,
+					2130968958};
+			
+			// aapt resource value: 0
+			public const int AVLoadingIndicatorView_indicatorColor = 0;
+			
+			// aapt resource value: 1
+			public const int AVLoadingIndicatorView_indicatorName = 1;
+			
+			// aapt resource value: 2
+			public const int AVLoadingIndicatorView_maxHeight = 2;
+			
+			// aapt resource value: 3
+			public const int AVLoadingIndicatorView_maxWidth = 3;
+			
+			// aapt resource value: 4
+			public const int AVLoadingIndicatorView_minHeight = 4;
+			
+			// aapt resource value: 5
+			public const int AVLoadingIndicatorView_minWidth = 5;
+			
+			// aapt resource value: { 0x7F0401EE,0x7F0401EF,0x7F04021E }
 			public static int[] BallPulseFooter = new int[] {
-					2130969060,
-					2130969061,
-					2130969108};
+					2130969070,
+					2130969071,
+					2130969118};
 			
 			// aapt resource value: 0
 			public const int BallPulseFooter_srlAnimatingColor = 0;
@@ -22404,11 +23217,11 @@
 			// aapt resource value: 2
 			public const int BallPulseFooter_srlNormalColor = 2;
 			
-			// aapt resource value: { 0x7F0401E3,0x7F0401F6,0x7F040215 }
+			// aapt resource value: { 0x7F0401ED,0x7F040200,0x7F04021F }
 			public static int[] BezierRadarHeader = new int[] {
-					2130969059,
-					2130969078,
-					2130969109};
+					2130969069,
+					2130969088,
+					2130969119};
 			
 			// aapt resource value: 0
 			public const int BezierRadarHeader_srlAccentColor = 0;
@@ -22419,13 +23232,13 @@
 			// aapt resource value: 2
 			public const int BezierRadarHeader_srlPrimaryColor = 2;
 			
-			// aapt resource value: { 0x7F0400C8,0x7F040112,0x7F040114,0x7F040119,0x7F040175 }
+			// aapt resource value: { 0x7F0400C9,0x7F040115,0x7F040117,0x7F04011C,0x7F04017C }
 			public static int[] BottomNavigationView = new int[] {
-					2130968776,
-					2130968850,
-					2130968852,
-					2130968857,
-					2130968949};
+					2130968777,
+					2130968853,
+					2130968855,
+					2130968860,
+					2130968956};
 			
 			// aapt resource value: 0
 			public const int BottomNavigationView_elevation = 0;
@@ -22471,14 +23284,14 @@
 			// aapt resource value: 0
 			public const int CameraLivingView_aspect_ratio = 0;
 			
-			// aapt resource value: { 0x7F040099,0x7F040198,0x7F040199,0x7F0401BA,0x7F0401BB,0x7F0401BC }
+			// aapt resource value: { 0x7F04009A,0x7F0401A1,0x7F0401A2,0x7F0401C4,0x7F0401C5,0x7F0401C6 }
 			public static int[] CircleCountDownView = new int[] {
-					2130968729,
-					2130968984,
-					2130968985,
-					2130969018,
-					2130969019,
-					2130969020};
+					2130968730,
+					2130968993,
+					2130968994,
+					2130969028,
+					2130969029,
+					2130969030};
 			
 			// aapt resource value: 0
 			public const int CircleCountDownView_countdownTime = 0;
@@ -22521,26 +23334,26 @@
 			// aapt resource value: 4
 			public const int CircleImageView_civ_fill_color = 4;
 			
-			// aapt resource value: { 0x7F0401E3,0x7F0401E5,0x7F0401E9,0x7F0401EA,0x7F0401EB,0x7F0401EC,0x7F0401ED,0x7F0401EE,0x7F040204,0x7F040215,0x7F040218,0x7F040219,0x7F04021A,0x7F04021B,0x7F04021C,0x7F04021D,0x7F04021E,0x7F040221 }
+			// aapt resource value: { 0x7F0401ED,0x7F0401EF,0x7F0401F3,0x7F0401F4,0x7F0401F5,0x7F0401F6,0x7F0401F7,0x7F0401F8,0x7F04020E,0x7F04021F,0x7F040222,0x7F040223,0x7F040224,0x7F040225,0x7F040226,0x7F040227,0x7F040228,0x7F04022B }
 			public static int[] ClassicsFooter = new int[] {
-					2130969059,
-					2130969061,
-					2130969065,
-					2130969066,
-					2130969067,
-					2130969068,
 					2130969069,
-					2130969070,
-					2130969092,
-					2130969109,
-					2130969112,
-					2130969113,
-					2130969114,
-					2130969115,
-					2130969116,
-					2130969117,
-					2130969118,
-					2130969121};
+					2130969071,
+					2130969075,
+					2130969076,
+					2130969077,
+					2130969078,
+					2130969079,
+					2130969080,
+					2130969102,
+					2130969119,
+					2130969122,
+					2130969123,
+					2130969124,
+					2130969125,
+					2130969126,
+					2130969127,
+					2130969128,
+					2130969131};
 			
 			// aapt resource value: 0
 			public const int ClassicsFooter_srlAccentColor = 0;
@@ -22596,30 +23409,30 @@
 			// aapt resource value: 17
 			public const int ClassicsFooter_srlTextSizeTitle = 17;
 			
-			// aapt resource value: { 0x7F0401E3,0x7F0401E5,0x7F0401E9,0x7F0401EA,0x7F0401EB,0x7F0401EC,0x7F0401ED,0x7F0401EE,0x7F0401F7,0x7F040204,0x7F040215,0x7F040218,0x7F040219,0x7F04021A,0x7F04021C,0x7F04021D,0x7F04021E,0x7F04021F,0x7F040220,0x7F040221,0x7F040222,0x7F040223 }
+			// aapt resource value: { 0x7F0401ED,0x7F0401EF,0x7F0401F3,0x7F0401F4,0x7F0401F5,0x7F0401F6,0x7F0401F7,0x7F0401F8,0x7F040201,0x7F04020E,0x7F04021F,0x7F040222,0x7F040223,0x7F040224,0x7F040226,0x7F040227,0x7F040228,0x7F040229,0x7F04022A,0x7F04022B,0x7F04022C,0x7F04022D }
 			public static int[] ClassicsHeader = new int[] {
-					2130969059,
-					2130969061,
-					2130969065,
-					2130969066,
-					2130969067,
-					2130969068,
 					2130969069,
-					2130969070,
+					2130969071,
+					2130969075,
+					2130969076,
+					2130969077,
+					2130969078,
 					2130969079,
-					2130969092,
-					2130969109,
-					2130969112,
-					2130969113,
-					2130969114,
-					2130969116,
-					2130969117,
-					2130969118,
+					2130969080,
+					2130969089,
+					2130969102,
 					2130969119,
-					2130969120,
-					2130969121,
 					2130969122,
-					2130969123};
+					2130969123,
+					2130969124,
+					2130969126,
+					2130969127,
+					2130969128,
+					2130969129,
+					2130969130,
+					2130969131,
+					2130969132,
+					2130969133};
 			
 			// aapt resource value: 0
 			public const int ClassicsHeader_srlAccentColor = 0;
@@ -22687,24 +23500,24 @@
 			// aapt resource value: 21
 			public const int ClassicsHeader_srlTextUpdate = 21;
 			
-			// aapt resource value: { 0x7F040076,0x7F040077,0x7F040097,0x7F0400CE,0x7F0400CF,0x7F0400D0,0x7F0400D1,0x7F0400D2,0x7F0400D3,0x7F0400D4,0x7F0401C0,0x7F0401C1,0x7F040229,0x7F040264,0x7F040265,0x7F040272 }
+			// aapt resource value: { 0x7F040076,0x7F040077,0x7F040097,0x7F0400CF,0x7F0400D0,0x7F0400D1,0x7F0400D2,0x7F0400D3,0x7F0400D4,0x7F0400D5,0x7F0401CA,0x7F0401CB,0x7F040233,0x7F04026E,0x7F04026F,0x7F04027C }
 			public static int[] CollapsingToolbarLayout = new int[] {
 					2130968694,
 					2130968695,
 					2130968727,
-					2130968782,
 					2130968783,
 					2130968784,
 					2130968785,
 					2130968786,
 					2130968787,
 					2130968788,
-					2130969024,
-					2130969025,
-					2130969129,
-					2130969188,
-					2130969189,
-					2130969202};
+					2130968789,
+					2130969034,
+					2130969035,
+					2130969139,
+					2130969198,
+					2130969199,
+					2130969212};
 			
 			// aapt resource value: 0
 			public const int CollapsingToolbarLayout_collapsedTitleGravity = 0;
@@ -22736,10 +23549,10 @@
 			// aapt resource value: 9
 			public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 9;
 			
-			// aapt resource value: { 0x7F040125,0x7F040126 }
+			// aapt resource value: { 0x7F040128,0x7F040129 }
 			public static int[] CollapsingToolbarLayout_Layout = new int[] {
-					2130968869,
-					2130968870};
+					2130968872,
+					2130968873};
 			
 			// aapt resource value: 0
 			public const int CollapsingToolbarLayout_Layout_layout_collapseMode = 0;
@@ -22780,10 +23593,10 @@
 			// aapt resource value: 0
 			public const int ColorStateListItem_android_color = 0;
 			
-			// aapt resource value: { 0x7F0400FA,0x7F040299 }
+			// aapt resource value: { 0x7F0400FB,0x7F0402A3 }
 			public static int[] CommonRatioImageView = new int[] {
-					2130968826,
-					2130969241};
+					2130968827,
+					2130969251};
 			
 			// aapt resource value: 0
 			public const int CommonRatioImageView_height_relative = 0;
@@ -22791,14 +23604,14 @@
 			// aapt resource value: 1
 			public const int CommonRatioImageView_width_relative = 1;
 			
-			// aapt resource value: { 0x7F040161,0x7F040162,0x7F0401B8,0x7F0401B9,0x7F04026D,0x7F040271 }
+			// aapt resource value: { 0x7F040165,0x7F040166,0x7F0401C2,0x7F0401C3,0x7F040277,0x7F04027B }
 			public static int[] CommonTitle = new int[] {
-					2130968929,
-					2130968930,
-					2130969016,
-					2130969017,
-					2130969197,
-					2130969201};
+					2130968933,
+					2130968934,
+					2130969026,
+					2130969027,
+					2130969207,
+					2130969211};
 			
 			// aapt resource value: 0
 			public const int CommonTitle_left_selector = 0;
@@ -22833,7 +23646,7 @@
 			// aapt resource value: 2
 			public const int CompoundButton_buttonTintMode = 2;
 			
-			// aapt resource value: { 0x10100C4,0x101011F,0x1010120,0x101013F,0x1010140,0x7F04004E,0x7F04004F,0x7F04006A,0x7F04008D,0x7F04008E,0x7F040127,0x7F040128,0x7F040129,0x7F04012A,0x7F04012B,0x7F04012C,0x7F04012D,0x7F04012E,0x7F04012F,0x7F040130,0x7F040131,0x7F040132,0x7F040133,0x7F040134,0x7F040135,0x7F040136,0x7F040137,0x7F040138,0x7F040139,0x7F04013A,0x7F04013B,0x7F04013C,0x7F04013D,0x7F04013E,0x7F04013F,0x7F040140,0x7F040141,0x7F040142,0x7F040143,0x7F040144,0x7F040145,0x7F040146,0x7F040147,0x7F040148,0x7F040149,0x7F04014A,0x7F04014B,0x7F04014C,0x7F04014D,0x7F04014E,0x7F04014F,0x7F040151,0x7F040152,0x7F040153,0x7F040154,0x7F040155,0x7F040156,0x7F040157,0x7F040158,0x7F04015B }
+			// aapt resource value: { 0x10100C4,0x101011F,0x1010120,0x101013F,0x1010140,0x7F04004E,0x7F04004F,0x7F04006A,0x7F04008D,0x7F04008E,0x7F04012A,0x7F04012B,0x7F04012C,0x7F04012D,0x7F04012E,0x7F04012F,0x7F040130,0x7F040131,0x7F040132,0x7F040133,0x7F040134,0x7F040135,0x7F040136,0x7F040137,0x7F040138,0x7F040139,0x7F04013A,0x7F04013B,0x7F04013C,0x7F04013D,0x7F04013E,0x7F04013F,0x7F040140,0x7F040141,0x7F040142,0x7F040143,0x7F040144,0x7F040145,0x7F040146,0x7F040147,0x7F040148,0x7F040149,0x7F04014A,0x7F04014B,0x7F04014C,0x7F04014D,0x7F04014E,0x7F04014F,0x7F040150,0x7F040151,0x7F040152,0x7F040154,0x7F040155,0x7F040156,0x7F040157,0x7F040158,0x7F040159,0x7F04015A,0x7F04015B,0x7F04015E }
 			public static int[] ConstraintLayout_Layout = new int[] {
 					16842948,
 					16843039,
@@ -22845,9 +23658,6 @@
 					2130968682,
 					2130968717,
 					2130968718,
-					2130968871,
-					2130968872,
-					2130968873,
 					2130968874,
 					2130968875,
 					2130968876,
@@ -22886,15 +23696,18 @@
 					2130968909,
 					2130968910,
 					2130968911,
+					2130968912,
 					2130968913,
 					2130968914,
-					2130968915,
 					2130968916,
 					2130968917,
 					2130968918,
 					2130968919,
 					2130968920,
-					2130968923};
+					2130968921,
+					2130968922,
+					2130968923,
+					2130968926};
 			
 			// aapt resource value: 2
 			public const int ConstraintLayout_Layout_android_maxHeight = 2;
@@ -23076,10 +23889,10 @@
 			// aapt resource value: 59
 			public const int ConstraintLayout_Layout_layout_optimizationLevel = 59;
 			
-			// aapt resource value: { 0x7F04008F,0x7F0400C9 }
+			// aapt resource value: { 0x7F04008F,0x7F0400CA }
 			public static int[] ConstraintLayout_placeholder = new int[] {
 					2130968719,
-					2130968777};
+					2130968778};
 			
 			// aapt resource value: 0
 			public const int ConstraintLayout_placeholder_content = 0;
@@ -23087,7 +23900,7 @@
 			// aapt resource value: 1
 			public const int ConstraintLayout_placeholder_emptyVisibility = 1;
 			
-			// aapt resource value: { 0x10100C4,0x10100D0,0x10100DC,0x10100F4,0x10100F5,0x10100F7,0x10100F8,0x10100F9,0x10100FA,0x101031F,0x1010320,0x1010321,0x1010322,0x1010323,0x1010324,0x1010325,0x1010326,0x1010327,0x1010328,0x10103B5,0x10103B6,0x10103FA,0x1010440,0x7F040127,0x7F040128,0x7F040129,0x7F04012A,0x7F04012B,0x7F04012C,0x7F04012D,0x7F04012E,0x7F04012F,0x7F040130,0x7F040131,0x7F040132,0x7F040133,0x7F040134,0x7F040135,0x7F040136,0x7F040137,0x7F040138,0x7F040139,0x7F04013A,0x7F04013B,0x7F04013C,0x7F04013D,0x7F04013E,0x7F04013F,0x7F040140,0x7F040141,0x7F040142,0x7F040143,0x7F040144,0x7F040145,0x7F040146,0x7F040147,0x7F040148,0x7F040149,0x7F04014A,0x7F04014B,0x7F04014C,0x7F04014D,0x7F04014E,0x7F04014F,0x7F040151,0x7F040152,0x7F040153,0x7F040154,0x7F040155,0x7F040156,0x7F040157,0x7F040158 }
+			// aapt resource value: { 0x10100C4,0x10100D0,0x10100DC,0x10100F4,0x10100F5,0x10100F7,0x10100F8,0x10100F9,0x10100FA,0x101031F,0x1010320,0x1010321,0x1010322,0x1010323,0x1010324,0x1010325,0x1010326,0x1010327,0x1010328,0x10103B5,0x10103B6,0x10103FA,0x1010440,0x7F04012A,0x7F04012B,0x7F04012C,0x7F04012D,0x7F04012E,0x7F04012F,0x7F040130,0x7F040131,0x7F040132,0x7F040133,0x7F040134,0x7F040135,0x7F040136,0x7F040137,0x7F040138,0x7F040139,0x7F04013A,0x7F04013B,0x7F04013C,0x7F04013D,0x7F04013E,0x7F04013F,0x7F040140,0x7F040141,0x7F040142,0x7F040143,0x7F040144,0x7F040145,0x7F040146,0x7F040147,0x7F040148,0x7F040149,0x7F04014A,0x7F04014B,0x7F04014C,0x7F04014D,0x7F04014E,0x7F04014F,0x7F040150,0x7F040151,0x7F040152,0x7F040154,0x7F040155,0x7F040156,0x7F040157,0x7F040158,0x7F040159,0x7F04015A,0x7F04015B }
 			public static int[] ConstraintSet = new int[] {
 					16842948,
 					16842960,
@@ -23112,9 +23925,6 @@
 					16843702,
 					16843770,
 					16843840,
-					2130968871,
-					2130968872,
-					2130968873,
 					2130968874,
 					2130968875,
 					2130968876,
@@ -23153,14 +23963,17 @@
 					2130968909,
 					2130968910,
 					2130968911,
+					2130968912,
 					2130968913,
 					2130968914,
-					2130968915,
 					2130968916,
 					2130968917,
 					2130968918,
 					2130968919,
-					2130968920};
+					2130968920,
+					2130968921,
+					2130968922,
+					2130968923};
 			
 			// aapt resource value: 9
 			public const int ConstraintSet_android_alpha = 9;
@@ -23378,23 +24191,23 @@
 			// aapt resource value: 71
 			public const int ConstraintSet_layout_goneMarginTop = 71;
 			
-			// aapt resource value: { 0x7F04011E,0x7F040228 }
+			// aapt resource value: { 0x7F040121,0x7F040232 }
 			public static int[] CoordinatorLayout = new int[] {
-					2130968862,
-					2130969128};
+					2130968865,
+					2130969138};
 			
 			// aapt resource value: 0
 			public const int CoordinatorLayout_keylines = 0;
 			
-			// aapt resource value: { 0x10100B3,0x7F040122,0x7F040123,0x7F040124,0x7F040150,0x7F040159,0x7F04015A }
+			// aapt resource value: { 0x10100B3,0x7F040125,0x7F040126,0x7F040127,0x7F040153,0x7F04015C,0x7F04015D }
 			public static int[] CoordinatorLayout_Layout = new int[] {
 					16842931,
-					2130968866,
-					2130968867,
-					2130968868,
-					2130968912,
-					2130968921,
-					2130968922};
+					2130968869,
+					2130968870,
+					2130968871,
+					2130968915,
+					2130968924,
+					2130968925};
 			
 			// aapt resource value: 0
 			public const int CoordinatorLayout_Layout_android_layout_gravity = 0;
@@ -23420,7 +24233,7 @@
 			// aapt resource value: 1
 			public const int CoordinatorLayout_statusBarBackground = 1;
 			
-			// aapt resource value: { 0x7F040069,0x7F04007F,0x7F040080,0x7F040082,0x7F040083,0x7F040086,0x7F040087,0x7F040088,0x7F040089,0x7F04008A,0x7F0400C0,0x7F0400F8,0x7F04017C,0x7F0401CE,0x7F040255,0x7F040256,0x7F040257 }
+			// aapt resource value: { 0x7F040069,0x7F04007F,0x7F040080,0x7F040082,0x7F040083,0x7F040086,0x7F040087,0x7F040088,0x7F040089,0x7F04008A,0x7F0400C1,0x7F0400F9,0x7F040185,0x7F0401D8,0x7F04025F,0x7F040260,0x7F040261 }
 			public static int[] DayPickerView = new int[] {
 					2130968681,
 					2130968703,
@@ -23432,13 +24245,13 @@
 					2130968712,
 					2130968713,
 					2130968714,
-					2130968768,
-					2130968824,
-					2130968956,
-					2130969038,
-					2130969173,
-					2130969174,
-					2130969175};
+					2130968769,
+					2130968825,
+					2130968965,
+					2130969048,
+					2130969183,
+					2130969184,
+					2130969185};
 			
 			// aapt resource value: 0
 			public const int DayPickerView_calendarHeight = 0;
@@ -23491,11 +24304,11 @@
 			// aapt resource value: 16
 			public const int DayPickerView_textSizeMonth = 16;
 			
-			// aapt resource value: { 0x7F04005C,0x7F04005D,0x7F040250 }
+			// aapt resource value: { 0x7F04005C,0x7F04005D,0x7F04025A }
 			public static int[] DesignTheme = new int[] {
 					2130968668,
 					2130968669,
-					2130969168};
+					2130969178};
 			
 			// aapt resource value: 0
 			public const int DesignTheme_bottomSheetDialogTheme = 0;
@@ -23506,16 +24319,16 @@
 			// aapt resource value: 2
 			public const int DesignTheme_textColorError = 2;
 			
-			// aapt resource value: { 0x7F04003D,0x7F04003E,0x7F04004D,0x7F040078,0x7F0400C1,0x7F0400F1,0x7F0401DE,0x7F04025A }
+			// aapt resource value: { 0x7F04003D,0x7F04003E,0x7F04004D,0x7F040078,0x7F0400C2,0x7F0400F2,0x7F0401E8,0x7F040264 }
 			public static int[] DrawerArrowToggle = new int[] {
 					2130968637,
 					2130968638,
 					2130968653,
 					2130968696,
-					2130968769,
-					2130968817,
-					2130969054,
-					2130969178};
+					2130968770,
+					2130968818,
+					2130969064,
+					2130969188};
 			
 			// aapt resource value: 0
 			public const int DrawerArrowToggle_arrowHeadLength = 0;
@@ -23541,15 +24354,15 @@
 			// aapt resource value: 7
 			public const int DrawerArrowToggle_thickness = 7;
 			
-			// aapt resource value: { 0x7F0400E3,0x7F0400E4,0x7F0400E5,0x7F040108,0x7F0401C6,0x7F0401C7,0x7F0401C8 }
+			// aapt resource value: { 0x7F0400E4,0x7F0400E5,0x7F0400E6,0x7F040109,0x7F0401D0,0x7F0401D1,0x7F0401D2 }
 			public static int[] EmptyView = new int[] {
-					2130968803,
 					2130968804,
 					2130968805,
-					2130968840,
-					2130969030,
-					2130969031,
-					2130969032};
+					2130968806,
+					2130968841,
+					2130969040,
+					2130969041,
+					2130969042};
 			
 			// aapt resource value: 0
 			public const int EmptyView_first_text = 0;
@@ -23572,14 +24385,14 @@
 			// aapt resource value: 6
 			public const int EmptyView_second_text_size = 6;
 			
-			// aapt resource value: { 0x7F0400DD,0x7F0400DE,0x7F0400DF,0x7F0400E0,0x7F0400E1,0x7F0400E2 }
+			// aapt resource value: { 0x7F0400DE,0x7F0400DF,0x7F0400E0,0x7F0400E1,0x7F0400E2,0x7F0400E3 }
 			public static int[] FilletCornerImageView = new int[] {
-					2130968797,
 					2130968798,
 					2130968799,
 					2130968800,
 					2130968801,
-					2130968802};
+					2130968802,
+					2130968803};
 			
 			// aapt resource value: 0
 			public const int FilletCornerImageView_fillet_border_color = 0;
@@ -23599,16 +24412,16 @@
 			// aapt resource value: 5
 			public const int FilletCornerImageView_fillet_shape_type = 5;
 			
-			// aapt resource value: { 0x7F04004A,0x7F04004B,0x7F040056,0x7F0400C8,0x7F0400D5,0x7F040195,0x7F0401BD,0x7F04028A }
+			// aapt resource value: { 0x7F04004A,0x7F04004B,0x7F040056,0x7F0400C9,0x7F0400D6,0x7F04019E,0x7F0401C7,0x7F040294 }
 			public static int[] FloatingActionButton = new int[] {
 					2130968650,
 					2130968651,
 					2130968662,
-					2130968776,
-					2130968789,
-					2130968981,
-					2130969021,
-					2130969226};
+					2130968777,
+					2130968790,
+					2130968990,
+					2130969031,
+					2130969236};
 			
 			// aapt resource value: 0
 			public const int FloatingActionButton_backgroundTint = 0;
@@ -23641,20 +24454,20 @@
 			// aapt resource value: 7
 			public const int FloatingActionButton_useCompatPadding = 7;
 			
-			// aapt resource value: { 0x7F0400E8,0x7F0400E9,0x7F0400EA,0x7F0400EB,0x7F0400EC,0x7F0400ED }
+			// aapt resource value: { 0x7F0400E9,0x7F0400EA,0x7F0400EB,0x7F0400EC,0x7F0400ED,0x7F0400EE }
 			public static int[] FontFamily = new int[] {
-					2130968808,
 					2130968809,
 					2130968810,
 					2130968811,
 					2130968812,
-					2130968813};
+					2130968813,
+					2130968814};
 			
-			// aapt resource value: { 0x7F0400E6,0x7F0400EE,0x7F0400EF }
+			// aapt resource value: { 0x7F0400E7,0x7F0400EF,0x7F0400F0 }
 			public static int[] FontFamilyFont = new int[] {
-					2130968806,
-					2130968814,
-					2130968815};
+					2130968807,
+					2130968815,
+					2130968816};
 			
 			// aapt resource value: 0
 			public const int FontFamilyFont_font = 0;
@@ -23683,11 +24496,11 @@
 			// aapt resource value: 5
 			public const int FontFamily_fontProviderQuery = 5;
 			
-			// aapt resource value: { 0x1010109,0x1010200,0x7F0400F0 }
+			// aapt resource value: { 0x1010109,0x1010200,0x7F0400F1 }
 			public static int[] ForegroundLinearLayout = new int[] {
 					16843017,
 					16843264,
-					2130968816};
+					2130968817};
 			
 			// aapt resource value: 0
 			public const int ForegroundLinearLayout_android_foreground = 0;
@@ -23698,12 +24511,12 @@
 			// aapt resource value: 2
 			public const int ForegroundLinearLayout_foregroundInsidePadding = 2;
 			
-			// aapt resource value: { 0x7F0400BA,0x7F0400BB,0x7F0400BD,0x7F040117 }
+			// aapt resource value: { 0x7F0400BB,0x7F0400BC,0x7F0400BE,0x7F04011A }
 			public static int[] GroupLayout = new int[] {
-					2130968762,
 					2130968763,
-					2130968765,
-					2130968855};
+					2130968764,
+					2130968766,
+					2130968858};
 			
 			// aapt resource value: 0
 			public const int GroupLayout_dividerColor = 0;
@@ -23717,7 +24530,7 @@
 			// aapt resource value: 3
 			public const int GroupLayout_itemSelector = 3;
 			
-			// aapt resource value: { 0x7F04002C,0x7F04002D,0x7F04002E,0x7F04002F,0x7F040030,0x7F040031,0x7F040032,0x7F040033,0x7F040034,0x7F040035,0x7F040036,0x7F040037,0x7F040038,0x7F040039,0x7F04003A,0x7F04003B,0x7F04003C,0x7F0400F6 }
+			// aapt resource value: { 0x7F04002C,0x7F04002D,0x7F04002E,0x7F04002F,0x7F040030,0x7F040031,0x7F040032,0x7F040033,0x7F040034,0x7F040035,0x7F040036,0x7F040037,0x7F040038,0x7F040039,0x7F04003A,0x7F04003B,0x7F04003C,0x7F0400F7 }
 			public static int[] HDLArcSeekBar = new int[] {
 					2130968620,
 					2130968621,
@@ -23736,7 +24549,7 @@
 					2130968634,
 					2130968635,
 					2130968636,
-					2130968822};
+					2130968823};
 			
 			// aapt resource value: 0
 			public const int HDLArcSeekBar_arc_border_color = 0;
@@ -23792,14 +24605,14 @@
 			// aapt resource value: 17
 			public const int HDLArcSeekBar_hdl_arc_thumb_mode = 17;
 			
-			// aapt resource value: { 0x7F04009F,0x7F0400A0,0x7F0400A1,0x7F0400A2,0x7F0400A3,0x7F0401C5 }
+			// aapt resource value: { 0x7F0400A0,0x7F0400A1,0x7F0400A2,0x7F0400A3,0x7F0400A4,0x7F0401CF }
 			public static int[] HDLCurtainSeekBar = new int[] {
-					2130968735,
 					2130968736,
 					2130968737,
 					2130968738,
 					2130968739,
-					2130969029};
+					2130968740,
+					2130969039};
 			
 			// aapt resource value: 0
 			public const int HDLCurtainSeekBar_curtain_bar_bg_color = 0;
@@ -23819,14 +24632,14 @@
 			// aapt resource value: 5
 			public const int HDLCurtainSeekBar_second_curtain_bar_color = 5;
 			
-			// aapt resource value: { 0x7F0401C9,0x7F04028D,0x7F04028E,0x7F04028F,0x7F040290,0x7F040291 }
+			// aapt resource value: { 0x7F0401D3,0x7F040297,0x7F040298,0x7F040299,0x7F04029A,0x7F04029B }
 			public static int[] HDLWaveSeekBar = new int[] {
-					2130969033,
-					2130969229,
-					2130969230,
-					2130969231,
-					2130969232,
-					2130969233};
+					2130969043,
+					2130969239,
+					2130969240,
+					2130969241,
+					2130969242,
+					2130969243};
 			
 			// aapt resource value: 0
 			public const int HDLWaveSeekBar_second_wave_color = 0;
@@ -23846,19 +24659,19 @@
 			// aapt resource value: 5
 			public const int HDLWaveSeekBar_wave_width = 5;
 			
-			// aapt resource value: { 0x7F0401B5 }
+			// aapt resource value: { 0x7F0401BE }
 			public static int[] ImageViewFixedRatio = new int[] {
-					2130969013};
+					2130969022};
 			
 			// aapt resource value: 0
 			public const int ImageViewFixedRatio_ratio = 0;
 			
-			// aapt resource value: { 0x7F040000,0x7F040001,0x7F040182,0x7F040183 }
+			// aapt resource value: { 0x7F040000,0x7F040001,0x7F04018B,0x7F04018C }
 			public static int[] JazzyViewPager = new int[] {
 					2130968576,
 					2130968577,
-					2130968962,
-					2130968963};
+					2130968971,
+					2130968972};
 			
 			// aapt resource value: 0
 			public const int JazzyViewPager_FadeEnabled = 0;
@@ -23872,9 +24685,9 @@
 			// aapt resource value: 3
 			public const int JazzyViewPager_outlineEnabled = 3;
 			
-			// aapt resource value: { 0x7F04011F }
+			// aapt resource value: { 0x7F040122 }
 			public static int[] LcCloudRudderView = new int[] {
-					2130968863};
+					2130968866};
 			
 			// aapt resource value: 0
 			public const int LcCloudRudderView_landscape_only = 0;
@@ -23886,17 +24699,17 @@
 			// aapt resource value: 0
 			public const int LinearConstraintLayout_android_orientation = 0;
 			
-			// aapt resource value: { 0x10100AF,0x10100C4,0x1010126,0x1010127,0x1010128,0x7F0400B9,0x7F0400BD,0x7F040174,0x7F0401D8 }
+			// aapt resource value: { 0x10100AF,0x10100C4,0x1010126,0x1010127,0x1010128,0x7F0400BA,0x7F0400BE,0x7F04017B,0x7F0401E2 }
 			public static int[] LinearLayoutCompat = new int[] {
 					16842927,
 					16842948,
 					16843046,
 					16843047,
 					16843048,
-					2130968761,
-					2130968765,
-					2130968948,
-					2130969048};
+					2130968762,
+					2130968766,
+					2130968955,
+					2130969058};
 			
 			// aapt resource value: 2
 			public const int LinearLayoutCompat_android_baselineAligned = 2;
@@ -23944,9 +24757,9 @@
 			// aapt resource value: 8
 			public const int LinearLayoutCompat_showDividers = 8;
 			
-			// aapt resource value: { 0x7F0400F3 }
+			// aapt resource value: { 0x7F0400F4 }
 			public static int[] LineChart = new int[] {
-					2130968819};
+					2130968820};
 			
 			// aapt resource value: 0
 			public const int LineChart_god_mode = 0;
@@ -23962,14 +24775,21 @@
 			// aapt resource value: 1
 			public const int ListPopupWindow_android_dropDownVerticalOffset = 1;
 			
-			// aapt resource value: { 0x101014F,0x7F0400F4,0x7F04024E,0x7F040253,0x7F040254,0x7F040258 }
+			// aapt resource value: { 0x7F040172 }
+			public static int[] LiveplayPtzControlAngleView = new int[] {
+					2130968946};
+			
+			// aapt resource value: 0
+			public const int LiveplayPtzControlAngleView_liveplay_angle_style = 0;
+			
+			// aapt resource value: { 0x101014F,0x7F0400F5,0x7F040258,0x7F04025D,0x7F04025E,0x7F040262 }
 			public static int[] LoadingTextView = new int[] {
 					16843087,
-					2130968820,
-					2130969166,
-					2130969171,
-					2130969172,
-					2130969176};
+					2130968821,
+					2130969176,
+					2130969181,
+					2130969182,
+					2130969186};
 			
 			// aapt resource value: 0
 			public const int LoadingTextView_android_text = 0;
@@ -24016,7 +24836,7 @@
 			// aapt resource value: 2
 			public const int MenuGroup_android_visible = 2;
 			
-			// aapt resource value: { 0x1010002,0x101000E,0x10100D0,0x1010106,0x1010194,0x10101DE,0x10101DF,0x10101E1,0x10101E2,0x10101E3,0x10101E4,0x10101E5,0x101026F,0x7F040010,0x7F040022,0x7F040023,0x7F04002B,0x7F040090,0x7F040104,0x7F040105,0x7F040181,0x7F0401D7,0x7F040277 }
+			// aapt resource value: { 0x1010002,0x101000E,0x10100D0,0x1010106,0x1010194,0x10101DE,0x10101DF,0x10101E1,0x10101E2,0x10101E3,0x10101E4,0x10101E5,0x101026F,0x7F040010,0x7F040022,0x7F040023,0x7F04002B,0x7F040090,0x7F040105,0x7F040106,0x7F04018A,0x7F0401E1,0x7F040281 }
 			public static int[] MenuItem = new int[] {
 					16842754,
 					16842766,
@@ -24036,11 +24856,11 @@
 					2130968611,
 					2130968619,
 					2130968720,
-					2130968836,
 					2130968837,
-					2130968961,
-					2130969047,
-					2130969207};
+					2130968838,
+					2130968970,
+					2130969057,
+					2130969217};
 			
 			// aapt resource value: 13
 			public const int MenuItem_actionLayout = 13;
@@ -24111,7 +24931,7 @@
 			// aapt resource value: 22
 			public const int MenuItem_tooltipText = 22;
 			
-			// aapt resource value: { 0x10100AE,0x101012C,0x101012D,0x101012E,0x101012F,0x1010130,0x1010131,0x7F040194,0x7F04022A }
+			// aapt resource value: { 0x10100AE,0x101012C,0x101012D,0x101012E,0x101012F,0x1010130,0x1010131,0x7F04019D,0x7F040234 }
 			public static int[] MenuView = new int[] {
 					16842926,
 					16843052,
@@ -24120,8 +24940,8 @@
 					16843055,
 					16843056,
 					16843057,
-					2130968980,
-					2130969130};
+					2130968989,
+					2130969140};
 			
 			// aapt resource value: 4
 			public const int MenuView_android_headerBackground = 4;
@@ -24150,14 +24970,14 @@
 			// aapt resource value: 8
 			public const int MenuView_subMenuArrow = 8;
 			
-			// aapt resource value: { 0x7F040057,0x7F040058,0x7F040059,0x7F04005A,0x7F0401B1,0x7F0401D6 }
+			// aapt resource value: { 0x7F040057,0x7F040058,0x7F040059,0x7F04005A,0x7F0401BA,0x7F0401E0 }
 			public static int[] MLBorderImageView = new int[] {
 					2130968663,
 					2130968664,
 					2130968665,
 					2130968666,
-					2130969009,
-					2130969046};
+					2130969018,
+					2130969056};
 			
 			// aapt resource value: 0
 			public const int MLBorderImageView_border_color = 0;
@@ -24177,14 +24997,14 @@
 			// aapt resource value: 5
 			public const int MLBorderImageView_shape_type = 5;
 			
-			// aapt resource value: { 0x7F040176,0x7F040177,0x7F040178,0x7F040179,0x7F04017A,0x7F04017B }
+			// aapt resource value: { 0x7F04017F,0x7F040180,0x7F040181,0x7F040182,0x7F040183,0x7F040184 }
 			public static int[] MLImageView = new int[] {
-					2130968950,
-					2130968951,
-					2130968952,
-					2130968953,
-					2130968954,
-					2130968955};
+					2130968959,
+					2130968960,
+					2130968961,
+					2130968962,
+					2130968963,
+					2130968964};
 			
 			// aapt resource value: 0
 			public const int MLImageView_ml_border_color = 0;
@@ -24204,17 +25024,17 @@
 			// aapt resource value: 5
 			public const int MLImageView_ml_shape_type = 5;
 			
-			// aapt resource value: { 0x7F04010F,0x7F040110,0x7F040115,0x7F04011C,0x7F04011D,0x7F0401D1,0x7F0401D2,0x7F0401D3,0x7F04028B }
+			// aapt resource value: { 0x7F040112,0x7F040113,0x7F040118,0x7F04011F,0x7F040120,0x7F0401DB,0x7F0401DC,0x7F0401DD,0x7F040295 }
 			public static int[] MobileCommonAbstractWheelView = new int[] {
-					2130968847,
-					2130968848,
-					2130968853,
-					2130968860,
-					2130968861,
-					2130969041,
-					2130969042,
-					2130969043,
-					2130969227};
+					2130968850,
+					2130968851,
+					2130968856,
+					2130968863,
+					2130968864,
+					2130969051,
+					2130969052,
+					2130969053,
+					2130969237};
 			
 			// aapt resource value: 0
 			public const int MobileCommonAbstractWheelView_isAllVisible = 0;
@@ -24243,32 +25063,32 @@
 			// aapt resource value: 8
 			public const int MobileCommonAbstractWheelView_visibleItems = 8;
 			
-			// aapt resource value: { 0x7F0401D5 }
+			// aapt resource value: { 0x7F0401DF }
 			public static int[] MobileCommonWheelHorizontalView = new int[] {
-					2130969045};
+					2130969055};
 			
 			// aapt resource value: 0
 			public const int MobileCommonWheelHorizontalView_selectionDividerWidth = 0;
 			
-			// aapt resource value: { 0x7F0401D4 }
+			// aapt resource value: { 0x7F0401DE }
 			public static int[] MobileCommonWheelVerticalView = new int[] {
-					2130969044};
+					2130969054};
 			
 			// aapt resource value: 0
 			public const int MobileCommonWheelVerticalView_selectionDividerHeight = 0;
 			
-			// aapt resource value: { 0x10100D4,0x10100DD,0x101011F,0x7F0400C8,0x7F0400F7,0x7F040112,0x7F040114,0x7F040118,0x7F040119,0x7F040175 }
+			// aapt resource value: { 0x10100D4,0x10100DD,0x101011F,0x7F0400C9,0x7F0400F8,0x7F040115,0x7F040117,0x7F04011B,0x7F04011C,0x7F04017C }
 			public static int[] NavigationView = new int[] {
 					16842964,
 					16842973,
 					16843039,
-					2130968776,
-					2130968823,
-					2130968850,
-					2130968852,
-					2130968856,
-					2130968857,
-					2130968949};
+					2130968777,
+					2130968824,
+					2130968853,
+					2130968855,
+					2130968859,
+					2130968860,
+					2130968956};
 			
 			// aapt resource value: 0
 			public const int NavigationView_android_background = 0;
@@ -24300,14 +25120,14 @@
 			// aapt resource value: 9
 			public const int NavigationView_menu = 9;
 			
-			// aapt resource value: { 0x7F040293,0x7F040294,0x7F040295,0x7F040296,0x7F040297,0x7F040298 }
+			// aapt resource value: { 0x7F04029D,0x7F04029E,0x7F04029F,0x7F0402A0,0x7F0402A1,0x7F0402A2 }
 			public static int[] pickerview = new int[] {
-					2130969235,
-					2130969236,
-					2130969237,
-					2130969238,
-					2130969239,
-					2130969240};
+					2130969245,
+					2130969246,
+					2130969247,
+					2130969248,
+					2130969249,
+					2130969250};
 			
 			// aapt resource value: 0
 			public const int pickerview_wheelview_dividerColor = 0;
@@ -24327,15 +25147,15 @@
 			// aapt resource value: 5
 			public const int pickerview_wheelview_textSize = 5;
 			
-			// aapt resource value: { 0x1010176,0x10102C9,0x7F040184 }
+			// aapt resource value: { 0x1010176,0x10102C9,0x7F04018D }
 			public static int[] PopupWindow = new int[] {
 					16843126,
 					16843465,
-					2130968964};
+					2130968973};
 			
-			// aapt resource value: { 0x7F040225 }
+			// aapt resource value: { 0x7F04022F }
 			public static int[] PopupWindowBackgroundState = new int[] {
-					2130969125};
+					2130969135};
 			
 			// aapt resource value: 0
 			public const int PopupWindowBackgroundState_state_above_anchor = 0;
@@ -24349,17 +25169,8 @@
 			// aapt resource value: 2
 			public const int PopupWindow_overlapAnchor = 2;
 			
-			// aapt resource value: { 0x7F04019A,0x7F04019B,0x7F04019C,0x7F04019D,0x7F04019E,0x7F04019F,0x7F0401A0,0x7F0401A1,0x7F0401A2,0x7F0401A3,0x7F0401A4,0x7F0401A5,0x7F0401A6,0x7F0401A7,0x7F0401A8,0x7F0401A9,0x7F0401AA,0x7F0401AB,0x7F0401AC,0x7F0401AD }
+			// aapt resource value: { 0x7F0401A3,0x7F0401A4,0x7F0401A5,0x7F0401A6,0x7F0401A7,0x7F0401A8,0x7F0401A9,0x7F0401AA,0x7F0401AB,0x7F0401AC,0x7F0401AD,0x7F0401AE,0x7F0401AF,0x7F0401B0,0x7F0401B1,0x7F0401B2,0x7F0401B3,0x7F0401B4,0x7F0401B5,0x7F0401B6 }
 			public static int[] PullToRefresh = new int[] {
-					2130968986,
-					2130968987,
-					2130968988,
-					2130968989,
-					2130968990,
-					2130968991,
-					2130968992,
-					2130968993,
-					2130968994,
 					2130968995,
 					2130968996,
 					2130968997,
@@ -24370,7 +25181,16 @@
 					2130969002,
 					2130969003,
 					2130969004,
-					2130969005};
+					2130969005,
+					2130969006,
+					2130969007,
+					2130969008,
+					2130969009,
+					2130969010,
+					2130969011,
+					2130969012,
+					2130969013,
+					2130969014};
 			
 			// aapt resource value: 0
 			public const int PullToRefresh_ptrAdapterViewBackground = 0;
@@ -24432,10 +25252,10 @@
 			// aapt resource value: 19
 			public const int PullToRefresh_ptrSubHeaderTextAppearance = 19;
 			
-			// aapt resource value: { 0x7F040185,0x7F040188 }
+			// aapt resource value: { 0x7F04018E,0x7F040191 }
 			public static int[] RecycleListView = new int[] {
-					2130968965,
-					2130968968};
+					2130968974,
+					2130968977};
 			
 			// aapt resource value: 0
 			public const int RecycleListView_paddingBottomNoButtons = 0;
@@ -24443,19 +25263,19 @@
 			// aapt resource value: 1
 			public const int RecycleListView_paddingTopNoTitle = 1;
 			
-			// aapt resource value: { 0x10100C4,0x10100F1,0x7F0400D6,0x7F0400D7,0x7F0400D8,0x7F0400D9,0x7F0400DA,0x7F040121,0x7F0401B6,0x7F0401DD,0x7F040224 }
+			// aapt resource value: { 0x10100C4,0x10100F1,0x7F0400D7,0x7F0400D8,0x7F0400D9,0x7F0400DA,0x7F0400DB,0x7F040124,0x7F0401BF,0x7F0401E7,0x7F04022E }
 			public static int[] RecyclerView = new int[] {
 					16842948,
 					16842993,
-					2130968790,
 					2130968791,
 					2130968792,
 					2130968793,
 					2130968794,
-					2130968865,
-					2130969014,
-					2130969053,
-					2130969124};
+					2130968795,
+					2130968868,
+					2130969023,
+					2130969063,
+					2130969134};
 			
 			// aapt resource value: 1
 			public const int RecyclerView_android_descendantFocusability = 1;
@@ -24490,9 +25310,8 @@
 			// aapt resource value: 10
 			public const int RecyclerView_stackFromEnd = 10;
 			
-			// aapt resource value: { 0x7F0400A8,0x7F0400A9,0x7F0400AA,0x7F0400AB,0x7F0400AC,0x7F0400AD,0x7F0400AE,0x7F0400AF,0x7F0400B0,0x7F0400B1,0x7F0400B2,0x7F0400B3,0x7F0400B4,0x7F0400B5 }
+			// aapt resource value: { 0x7F0400A9,0x7F0400AA,0x7F0400AB,0x7F0400AC,0x7F0400AD,0x7F0400AE,0x7F0400AF,0x7F0400B0,0x7F0400B1,0x7F0400B2,0x7F0400B3,0x7F0400B4,0x7F0400B5,0x7F0400B6 }
 			public static int[] ScannerStyleView = new int[] {
-					2130968744,
 					2130968745,
 					2130968746,
 					2130968747,
@@ -24505,7 +25324,8 @@
 					2130968754,
 					2130968755,
 					2130968756,
-					2130968757};
+					2130968757,
+					2130968758};
 			
 			// aapt resource value: 0
 			public const int ScannerStyleView_dhscanner_cornerColor = 0;
@@ -24549,9 +25369,9 @@
 			// aapt resource value: 13
 			public const int ScannerStyleView_dhscanner_scanRectWidth = 13;
 			
-			// aapt resource value: { 0x7F04010E }
+			// aapt resource value: { 0x7F040111 }
 			public static int[] ScrimInsetsFrameLayout = new int[] {
-					2130968846};
+					2130968849};
 			
 			// aapt resource value: 0
 			public const int ScrimInsetsFrameLayout_insetForeground = 0;
@@ -24563,7 +25383,7 @@
 			// aapt resource value: 0
 			public const int ScrollingViewBehavior_Layout_behavior_overlapTop = 0;
 			
-			// aapt resource value: { 0x10100DA,0x101011F,0x1010220,0x1010264,0x7F040072,0x7F04008C,0x7F0400A7,0x7F0400F2,0x7F040106,0x7F040120,0x7F0401AE,0x7F0401AF,0x7F0401C2,0x7F0401C3,0x7F04022B,0x7F040230,0x7F04028C }
+			// aapt resource value: { 0x10100DA,0x101011F,0x1010220,0x1010264,0x7F040072,0x7F04008C,0x7F0400A8,0x7F0400F3,0x7F040107,0x7F040123,0x7F0401B7,0x7F0401B8,0x7F0401CC,0x7F0401CD,0x7F040235,0x7F04023A,0x7F040296 }
 			public static int[] SearchView = new int[] {
 					16842970,
 					16843039,
@@ -24571,17 +25391,17 @@
 					16843364,
 					2130968690,
 					2130968716,
-					2130968743,
-					2130968818,
-					2130968838,
-					2130968864,
-					2130969006,
-					2130969007,
-					2130969026,
-					2130969027,
-					2130969131,
-					2130969136,
-					2130969228};
+					2130968744,
+					2130968819,
+					2130968839,
+					2130968867,
+					2130969015,
+					2130969016,
+					2130969036,
+					2130969037,
+					2130969141,
+					2130969146,
+					2130969238};
 			
 			// aapt resource value: 0
 			public const int SearchView_android_focusable = 0;
@@ -24634,20 +25454,20 @@
 			// aapt resource value: 16
 			public const int SearchView_voiceIcon = 16;
 			
-			// aapt resource value: { 0x7F04027E,0x7F04027F,0x7F040280,0x7F040281,0x7F040282,0x7F040283,0x7F040284,0x7F040285,0x7F040286,0x7F040287,0x7F040288,0x7F040289 }
+			// aapt resource value: { 0x7F040288,0x7F040289,0x7F04028A,0x7F04028B,0x7F04028C,0x7F04028D,0x7F04028E,0x7F04028F,0x7F040290,0x7F040291,0x7F040292,0x7F040293 }
 			public static int[] SlidingUpPanelLayout = new int[] {
-					2130969214,
-					2130969215,
-					2130969216,
-					2130969217,
-					2130969218,
-					2130969219,
-					2130969220,
-					2130969221,
-					2130969222,
-					2130969223,
 					2130969224,
-					2130969225};
+					2130969225,
+					2130969226,
+					2130969227,
+					2130969228,
+					2130969229,
+					2130969230,
+					2130969231,
+					2130969232,
+					2130969233,
+					2130969234,
+					2130969235};
 			
 			// aapt resource value: 0
 			public const int SlidingUpPanelLayout_umanoAnchorPoint = 0;
@@ -24685,45 +25505,45 @@
 			// aapt resource value: 11
 			public const int SlidingUpPanelLayout_umanoShadowHeight = 11;
 			
-			// aapt resource value: { 0x10100EA,0x10100EB,0x7F0401E3,0x7F0401E6,0x7F0401E7,0x7F0401E8,0x7F0401EF,0x7F0401F0,0x7F0401F1,0x7F0401F2,0x7F0401F3,0x7F0401F4,0x7F0401F5,0x7F0401F8,0x7F0401F9,0x7F0401FA,0x7F0401FB,0x7F0401FC,0x7F0401FD,0x7F0401FF,0x7F040200,0x7F040201,0x7F040202,0x7F040205,0x7F040206,0x7F040209,0x7F04020A,0x7F04020B,0x7F04020C,0x7F04020D,0x7F04020E,0x7F04020F,0x7F040210,0x7F040211,0x7F040212,0x7F040215,0x7F040216 }
+			// aapt resource value: { 0x10100EA,0x10100EB,0x7F0401ED,0x7F0401F0,0x7F0401F1,0x7F0401F2,0x7F0401F9,0x7F0401FA,0x7F0401FB,0x7F0401FC,0x7F0401FD,0x7F0401FE,0x7F0401FF,0x7F040202,0x7F040203,0x7F040204,0x7F040205,0x7F040206,0x7F040207,0x7F040209,0x7F04020A,0x7F04020B,0x7F04020C,0x7F04020F,0x7F040210,0x7F040213,0x7F040214,0x7F040215,0x7F040216,0x7F040217,0x7F040218,0x7F040219,0x7F04021A,0x7F04021B,0x7F04021C,0x7F04021F,0x7F040220 }
 			public static int[] SmartRefreshLayout = new int[] {
 					16842986,
 					16842987,
-					2130969059,
-					2130969062,
-					2130969063,
-					2130969064,
-					2130969071,
+					2130969069,
 					2130969072,
 					2130969073,
 					2130969074,
-					2130969075,
-					2130969076,
-					2130969077,
-					2130969080,
 					2130969081,
 					2130969082,
 					2130969083,
 					2130969084,
 					2130969085,
+					2130969086,
 					2130969087,
-					2130969088,
-					2130969089,
 					2130969090,
+					2130969091,
+					2130969092,
 					2130969093,
 					2130969094,
+					2130969095,
 					2130969097,
 					2130969098,
 					2130969099,
 					2130969100,
-					2130969101,
-					2130969102,
 					2130969103,
 					2130969104,
-					2130969105,
-					2130969106,
+					2130969107,
+					2130969108,
 					2130969109,
-					2130969110};
+					2130969110,
+					2130969111,
+					2130969112,
+					2130969113,
+					2130969114,
+					2130969115,
+					2130969116,
+					2130969119,
+					2130969120};
 			
 			// aapt resource value: 0
 			public const int SmartRefreshLayout_android_clipChildren = 0;
@@ -24731,10 +25551,10 @@
 			// aapt resource value: 1
 			public const int SmartRefreshLayout_android_clipToPadding = 1;
 			
-			// aapt resource value: { 0x7F04015E,0x7F04015F }
+			// aapt resource value: { 0x7F040161,0x7F040162 }
 			public static int[] SmartRefreshLayout_Layout = new int[] {
-					2130968926,
-					2130968927};
+					2130968929,
+					2130968930};
 			
 			// aapt resource value: 0
 			public const int SmartRefreshLayout_Layout_layout_srlBackgroundColor = 0;
@@ -24847,11 +25667,11 @@
 			// aapt resource value: 36
 			public const int SmartRefreshLayout_srlReboundDuration = 36;
 			
-			// aapt resource value: { 0x101011F,0x7F0400C8,0x7F040171 }
+			// aapt resource value: { 0x101011F,0x7F0400C9,0x7F040176 }
 			public static int[] SnackbarLayout = new int[] {
 					16843039,
-					2130968776,
-					2130968945};
+					2130968777,
+					2130968950};
 			
 			// aapt resource value: 0
 			public const int SnackbarLayout_android_maxWidth = 0;
@@ -24862,13 +25682,13 @@
 			// aapt resource value: 2
 			public const int SnackbarLayout_maxActionInlineWidth = 2;
 			
-			// aapt resource value: { 0x10100B2,0x1010176,0x101017B,0x1010262,0x7F040192 }
+			// aapt resource value: { 0x10100B2,0x1010176,0x101017B,0x1010262,0x7F04019B }
 			public static int[] Spinner = new int[] {
 					16842930,
 					16843126,
 					16843131,
 					16843362,
-					2130968978};
+					2130968987};
 			
 			// aapt resource value: 3
 			public const int Spinner_android_dropDownWidth = 3;
@@ -24885,10 +25705,10 @@
 			// aapt resource value: 4
 			public const int Spinner_popupTheme = 4;
 			
-			// aapt resource value: { 0x7F0400BF,0x7F0401DB }
+			// aapt resource value: { 0x7F0400C0,0x7F0401E5 }
 			public static int[] SwipeLayout = new int[] {
-					2130968767,
-					2130969051};
+					2130968768,
+					2130969061};
 			
 			// aapt resource value: 0
 			public const int SwipeLayout_drag_edge = 0;
@@ -24896,22 +25716,37 @@
 			// aapt resource value: 1
 			public const int SwipeLayout_show_mode = 1;
 			
-			// aapt resource value: { 0x1010124,0x1010125,0x1010142,0x7F0401D9,0x7F0401E1,0x7F040231,0x7F040232,0x7F040234,0x7F04025B,0x7F04025C,0x7F04025D,0x7F04027B,0x7F04027C,0x7F04027D }
+			// aapt resource value: { 0x7F040098,0x7F040164,0x7F0401C1 }
+			public static int[] SwipeMenuLayout = new int[] {
+					2130968728,
+					2130968932,
+					2130969025};
+			
+			// aapt resource value: 0
+			public const int SwipeMenuLayout_contentViewId = 0;
+			
+			// aapt resource value: 1
+			public const int SwipeMenuLayout_leftViewId = 1;
+			
+			// aapt resource value: 2
+			public const int SwipeMenuLayout_rightViewId = 2;
+			
+			// aapt resource value: { 0x1010124,0x1010125,0x1010142,0x7F0401E3,0x7F0401EB,0x7F04023B,0x7F04023C,0x7F04023E,0x7F040265,0x7F040266,0x7F040267,0x7F040285,0x7F040286,0x7F040287 }
 			public static int[] SwitchCompat = new int[] {
 					16843044,
 					16843045,
 					16843074,
-					2130969049,
-					2130969057,
-					2130969137,
-					2130969138,
-					2130969140,
-					2130969179,
-					2130969180,
-					2130969181,
-					2130969211,
-					2130969212,
-					2130969213};
+					2130969059,
+					2130969067,
+					2130969147,
+					2130969148,
+					2130969150,
+					2130969189,
+					2130969190,
+					2130969191,
+					2130969221,
+					2130969222,
+					2130969223};
 			
 			// aapt resource value: 1
 			public const int SwitchCompat_android_textOff = 1;
@@ -24970,24 +25805,24 @@
 			// aapt resource value: 2
 			public const int TabItem_android_text = 2;
 			
-			// aapt resource value: { 0x7F040235,0x7F040236,0x7F040237,0x7F040238,0x7F040239,0x7F04023A,0x7F04023B,0x7F04023C,0x7F04023D,0x7F04023E,0x7F04023F,0x7F040240,0x7F040241,0x7F040242,0x7F040243,0x7F040244 }
+			// aapt resource value: { 0x7F04023F,0x7F040240,0x7F040241,0x7F040242,0x7F040243,0x7F040244,0x7F040245,0x7F040246,0x7F040247,0x7F040248,0x7F040249,0x7F04024A,0x7F04024B,0x7F04024C,0x7F04024D,0x7F04024E }
 			public static int[] TabLayout = new int[] {
-					2130969141,
-					2130969142,
-					2130969143,
-					2130969144,
-					2130969145,
-					2130969146,
-					2130969147,
-					2130969148,
-					2130969149,
-					2130969150,
 					2130969151,
 					2130969152,
 					2130969153,
 					2130969154,
 					2130969155,
-					2130969156};
+					2130969156,
+					2130969157,
+					2130969158,
+					2130969159,
+					2130969160,
+					2130969161,
+					2130969162,
+					2130969163,
+					2130969164,
+					2130969165,
+					2130969166};
 			
 			// aapt resource value: 0
 			public const int TabLayout_tabBackground = 0;
@@ -25037,7 +25872,7 @@
 			// aapt resource value: 15
 			public const int TabLayout_tabTextColor = 15;
 			
-			// aapt resource value: { 0x1010095,0x1010096,0x1010097,0x1010098,0x101009A,0x101009B,0x1010161,0x1010162,0x1010163,0x1010164,0x10103AC,0x7F0400E7,0x7F040245 }
+			// aapt resource value: { 0x1010095,0x1010096,0x1010097,0x1010098,0x101009A,0x101009B,0x1010161,0x1010162,0x1010163,0x1010164,0x10103AC,0x7F0400E8,0x7F04024F }
 			public static int[] TextAppearance = new int[] {
 					16842901,
 					16842902,
@@ -25050,8 +25885,8 @@
 					16843107,
 					16843108,
 					16843692,
-					2130968807,
-					2130969157};
+					2130968808,
+					2130969167};
 			
 			// aapt resource value: 10
 			public const int TextAppearance_android_fontFamily = 10;
@@ -25092,24 +25927,24 @@
 			// aapt resource value: 12
 			public const int TextAppearance_textAllCaps = 12;
 			
-			// aapt resource value: { 0x101009A,0x1010150,0x7F04009A,0x7F04009B,0x7F04009C,0x7F04009D,0x7F0400CA,0x7F0400CB,0x7F0400FE,0x7F0400FF,0x7F040100,0x7F04018C,0x7F04018D,0x7F04018E,0x7F04018F,0x7F040190 }
+			// aapt resource value: { 0x101009A,0x1010150,0x7F04009B,0x7F04009C,0x7F04009D,0x7F04009E,0x7F0400CB,0x7F0400CC,0x7F0400FF,0x7F040100,0x7F040101,0x7F040195,0x7F040196,0x7F040197,0x7F040198,0x7F040199 }
 			public static int[] TextInputLayout = new int[] {
 					16842906,
 					16843088,
-					2130968730,
 					2130968731,
 					2130968732,
 					2130968733,
-					2130968778,
+					2130968734,
 					2130968779,
-					2130968830,
+					2130968780,
 					2130968831,
 					2130968832,
-					2130968972,
-					2130968973,
-					2130968974,
-					2130968975,
-					2130968976};
+					2130968833,
+					2130968981,
+					2130968982,
+					2130968983,
+					2130968984,
+					2130968985};
 			
 			// aapt resource value: 1
 			public const int TextInputLayout_android_hint = 1;
@@ -25159,17 +25994,17 @@
 			// aapt resource value: 15
 			public const int TextInputLayout_passwordToggleTintMode = 15;
 			
-			// aapt resource value: { 0x7F04004C,0x7F0400A5,0x7F0400A6,0x7F0400DB,0x7F0400DC,0x7F040173,0x7F0401BE,0x7F0401BF,0x7F04025E }
+			// aapt resource value: { 0x7F04004C,0x7F0400A6,0x7F0400A7,0x7F0400DC,0x7F0400DD,0x7F04017A,0x7F0401C8,0x7F0401C9,0x7F040268 }
 			public static int[] TimeBar = new int[] {
 					2130968652,
-					2130968741,
 					2130968742,
-					2130968795,
+					2130968743,
 					2130968796,
-					2130968947,
-					2130969022,
-					2130969023,
-					2130969182};
+					2130968797,
+					2130968954,
+					2130969032,
+					2130969033,
+					2130969192};
 			
 			// aapt resource value: 0
 			public const int TimeBar_background_color = 0;
@@ -25198,11 +26033,11 @@
 			// aapt resource value: 8
 			public const int TimeBar_thumb_color = 8;
 			
-			// aapt resource value: { 0x7F040046,0x7F040047,0x7F04024E }
+			// aapt resource value: { 0x7F040046,0x7F040047,0x7F040258 }
 			public static int[] TitleBar = new int[] {
 					2130968646,
 					2130968647,
-					2130969166};
+					2130969176};
 			
 			// aapt resource value: 0
 			public const int TitleBar_backButton = 0;
@@ -25213,7 +26048,7 @@
 			// aapt resource value: 2
 			public const int TitleBar_textColor = 2;
 			
-			// aapt resource value: { 0x10100AF,0x1010140,0x7F040063,0x7F040074,0x7F040075,0x7F040091,0x7F040092,0x7F040093,0x7F040094,0x7F040095,0x7F040096,0x7F04016E,0x7F04016F,0x7F040172,0x7F04017E,0x7F04017F,0x7F040192,0x7F04022C,0x7F04022D,0x7F04022E,0x7F040264,0x7F040267,0x7F040268,0x7F040269,0x7F04026A,0x7F04026B,0x7F04026C,0x7F04026E,0x7F04026F }
+			// aapt resource value: { 0x10100AF,0x1010140,0x7F040063,0x7F040074,0x7F040075,0x7F040091,0x7F040092,0x7F040093,0x7F040094,0x7F040095,0x7F040096,0x7F040173,0x7F040174,0x7F040177,0x7F040187,0x7F040188,0x7F04019B,0x7F040236,0x7F040237,0x7F040238,0x7F04026E,0x7F040271,0x7F040272,0x7F040273,0x7F040274,0x7F040275,0x7F040276,0x7F040278,0x7F040279 }
 			public static int[] Toolbar = new int[] {
 					16842927,
 					16843072,
@@ -25226,24 +26061,24 @@
 					2130968724,
 					2130968725,
 					2130968726,
-					2130968942,
-					2130968943,
-					2130968946,
-					2130968958,
-					2130968959,
-					2130968978,
-					2130969132,
-					2130969133,
-					2130969134,
-					2130969188,
-					2130969191,
-					2130969192,
-					2130969193,
-					2130969194,
-					2130969195,
-					2130969196,
+					2130968947,
+					2130968948,
+					2130968951,
+					2130968967,
+					2130968968,
+					2130968987,
+					2130969142,
+					2130969143,
+					2130969144,
 					2130969198,
-					2130969199};
+					2130969201,
+					2130969202,
+					2130969203,
+					2130969204,
+					2130969205,
+					2130969206,
+					2130969208,
+					2130969209};
 			
 			// aapt resource value: 0
 			public const int Toolbar_android_gravity = 0;
@@ -25332,15 +26167,15 @@
 			// aapt resource value: 28
 			public const int Toolbar_titleTextColor = 28;
 			
-			// aapt resource value: { 0x7F0400FB,0x7F0400FD,0x7F040160,0x7F0401B7,0x7F040278,0x7F040279,0x7F04027A }
+			// aapt resource value: { 0x7F0400FC,0x7F0400FE,0x7F040163,0x7F0401C0,0x7F040282,0x7F040283,0x7F040284 }
 			public static int[] TopBar = new int[] {
-					2130968827,
-					2130968829,
-					2130968928,
-					2130969015,
-					2130969208,
-					2130969209,
-					2130969210};
+					2130968828,
+					2130968830,
+					2130968931,
+					2130969024,
+					2130969218,
+					2130969219,
+					2130969220};
 			
 			// aapt resource value: 0
 			public const int TopBar_hideLeft = 0;
@@ -25363,14 +26198,14 @@
 			// aapt resource value: 6
 			public const int TopBar_topBarTitle = 6;
 			
-			// aapt resource value: { 0x7F0401FE,0x7F040203,0x7F040207,0x7F040208,0x7F040213,0x7F040217 }
+			// aapt resource value: { 0x7F040208,0x7F04020D,0x7F040211,0x7F040212,0x7F04021D,0x7F040221 }
 			public static int[] TwoLevelHeader = new int[] {
-					2130969086,
-					2130969091,
-					2130969095,
 					2130969096,
-					2130969107,
-					2130969111};
+					2130969101,
+					2130969105,
+					2130969106,
+					2130969117,
+					2130969121};
 			
 			// aapt resource value: 0
 			public const int TwoLevelHeader_srlEnablePullToCloseTwoLevel = 0;
@@ -25390,13 +26225,13 @@
 			// aapt resource value: 5
 			public const int TwoLevelHeader_srlRefreshRage = 5;
 			
-			// aapt resource value: { 0x1010000,0x10100DA,0x7F040186,0x7F040187,0x7F040259 }
+			// aapt resource value: { 0x1010000,0x10100DA,0x7F04018F,0x7F040190,0x7F040263 }
 			public static int[] View = new int[] {
 					16842752,
 					16842970,
-					2130968966,
-					2130968967,
-					2130969177};
+					2130968975,
+					2130968976,
+					2130969187};
 			
 			// aapt resource value: { 0x10100D4,0x7F04004A,0x7F04004B }
 			public static int[] ViewBackgroundHelper = new int[] {
@@ -25443,23 +26278,23 @@
 			// aapt resource value: 4
 			public const int View_theme = 4;
 			
-			// aapt resource value: { 0x7F04009E,0x7F0400F5,0x7F04010A,0x7F04010B,0x7F04010C,0x7F040113,0x7F040119,0x7F04011A,0x7F04011B,0x7F0401CD,0x7F0401CF,0x7F0401D0,0x7F040252,0x7F040292,0x7F0402A4 }
+			// aapt resource value: { 0x7F04009F,0x7F0400F6,0x7F04010D,0x7F04010E,0x7F04010F,0x7F040116,0x7F04011C,0x7F04011D,0x7F04011E,0x7F0401D7,0x7F0401D9,0x7F0401DA,0x7F04025C,0x7F04029C,0x7F0402AE }
 			public static int[] WheelPicker = new int[] {
-					2130968734,
-					2130968821,
-					2130968842,
-					2130968843,
-					2130968844,
-					2130968851,
-					2130968857,
-					2130968858,
-					2130968859,
-					2130969037,
-					2130969039,
-					2130969040,
-					2130969170,
-					2130969234,
-					2130969252};
+					2130968735,
+					2130968822,
+					2130968845,
+					2130968846,
+					2130968847,
+					2130968854,
+					2130968860,
+					2130968861,
+					2130968862,
+					2130969047,
+					2130969049,
+					2130969050,
+					2130969180,
+					2130969244,
+					2130969262};
 			
 			// aapt resource value: 0
 			public const int WheelPicker_currentItemPosition = 0;
@@ -25506,12 +26341,12 @@
 			// aapt resource value: 14
 			public const int WheelPicker_zoomInSelectedItem = 14;
 			
-			// aapt resource value: { 0x7F0402A5,0x7F0402A6,0x7F0402A8,0x7F0402AB }
+			// aapt resource value: { 0x7F0402AF,0x7F0402B0,0x7F0402B2,0x7F0402B5 }
 			public static int[] zxing_camera_preview = new int[] {
-					2130969253,
-					2130969254,
-					2130969256,
-					2130969259};
+					2130969263,
+					2130969264,
+					2130969266,
+					2130969269};
 			
 			// aapt resource value: 0
 			public const int zxing_camera_preview_zxing_framing_rect_height = 0;
@@ -25525,12 +26360,12 @@
 			// aapt resource value: 3
 			public const int zxing_camera_preview_zxing_use_texture_view = 3;
 			
-			// aapt resource value: { 0x7F0402A7,0x7F0402A9,0x7F0402AC,0x7F0402AD }
+			// aapt resource value: { 0x7F0402B1,0x7F0402B3,0x7F0402B6,0x7F0402B7 }
 			public static int[] zxing_finder = new int[] {
-					2130969255,
-					2130969257,
-					2130969260,
-					2130969261};
+					2130969265,
+					2130969267,
+					2130969270,
+					2130969271};
 			
 			// aapt resource value: 0
 			public const int zxing_finder_zxing_possible_result_points = 0;
@@ -25544,9 +26379,9 @@
 			// aapt resource value: 3
 			public const int zxing_finder_zxing_viewfinder_mask = 3;
 			
-			// aapt resource value: { 0x7F0402AA }
+			// aapt resource value: { 0x7F0402B4 }
 			public static int[] zxing_view = new int[] {
-					2130969258};
+					2130969268};
 			
 			// aapt resource value: 0
 			public const int zxing_view_zxing_scanner_layout = 0;
@@ -25571,10 +26406,16 @@
 			public const int hdl_filepaths = 2131886081;
 			
 			// aapt resource value: 0x7F120002
-			public const int network_security_config = 2131886082;
+			public const int jpush_file_paths = 2131886082;
 			
 			// aapt resource value: 0x7F120003
-			public const int xamarin_essentials_fileprovider_file_paths = 2131886083;
+			public const int network_security_config = 2131886083;
+			
+			// aapt resource value: 0x7F120004
+			public const int provider_paths = 2131886084;
+			
+			// aapt resource value: 0x7F120005
+			public const int xamarin_essentials_fileprovider_file_paths = 2131886085;
 			
 			static Xml()
 			{
diff --git a/HDL-ON_Android/Resources/drawable/btn_disagree.xml b/HDL-ON_Android/Resources/drawable/btn_disagree.xml
index c129eee..b6d14b6 100644
--- a/HDL-ON_Android/Resources/drawable/btn_disagree.xml
+++ b/HDL-ON_Android/Resources/drawable/btn_disagree.xml
@@ -8,7 +8,7 @@
 
     <!-- 濉厖棰滆壊 -->
     <solid
-        android:color="@color/white"        />
+        android:color="#FFFFFF"/>
 
     <!--    杈规棰滆壊-->
     <stroke
diff --git a/HDL-ON_Android/Resources/drawable/dialog_background2.xml b/HDL-ON_Android/Resources/drawable/dialog_background2.xml
index 47caf57..197bb29 100644
--- a/HDL-ON_Android/Resources/drawable/dialog_background2.xml
+++ b/HDL-ON_Android/Resources/drawable/dialog_background2.xml
@@ -8,6 +8,6 @@
 
     <!-- 濉厖棰滆壊 -->
     <solid
-        android:color="@color/white"        />
+        android:color="#FFFFFF"/>
 
 </shape>
\ No newline at end of file
diff --git a/HDL-ON_Android/Resources/values/styles.xml b/HDL-ON_Android/Resources/values/styles.xml
index e025194..23825bc 100644
--- a/HDL-ON_Android/Resources/values/styles.xml
+++ b/HDL-ON_Android/Resources/values/styles.xml
@@ -2,7 +2,7 @@
 <resources >
 	<!-- 鍏朵腑parent鍙互涓� android:Theme 鎴� android:Theme.NoTitleBar; android:windowBackground鍙互涓鸿儗鏅浘 -->
 	<style name="MyTheme" parent="@android:style/Theme.NoTitleBar.Fullscreen">
-		<item name="android:windowBackground">@drawable/launchimage</item>
+		<item name="android:windowBackground">@drawable/loading</item>
 		<!-- 闅愯棌鐘舵�佹爮 -->
 		<item name="android:windowFullscreen">false</item>
 		<!-- 闅愯棌鏍囬鏍� -->
@@ -11,7 +11,7 @@
 
 	</style>
 	<style name="SplashTheme" parent="@android:style/Theme.NoTitleBar.Fullscreen">
-		<item name="android:windowBackground">@drawable/launchimage</item>
+		<item name="android:windowBackground">@drawable/loading</item>
 		<!-- 闅愯棌鐘舵�佹爮 -->
 		<item name="android:windowFullscreen">true</item>
 		<!-- 闅愯棌鏍囬鏍� -->
diff --git a/HDL-ON_Android/Scan.cs b/HDL-ON_Android/Scan.cs
index 5748cf2..ea1bf16 100644
--- a/HDL-ON_Android/Scan.cs
+++ b/HDL-ON_Android/Scan.cs
@@ -36,15 +36,6 @@
         public void OpenScan(Action<string> action)
         {
             resultAction = action;
-            //string cancel = "鍙栨秷";
-            //string flashText = "";
-            //string titleText = "浜岀淮鐮佹壂鎻�";
-            //if (Language.CurrentLanguage != "Chinese")
-            //{
-            //    cancel = "Cancel";
-            //    flashText = "";
-            //    titleText = "Scan";
-            //}
 
             ((BaseActivity)Shared.Application.Activity).SetCamera(async (obj) =>
             {
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index c6ae1b6..76e7e2b 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -16,7 +16,7 @@
 
 namespace HDL_ON_Android
 {
-    [Activity(Theme = "@style/SplashTheme", MainLauncher = true, Name = "com.hdl.onpro.SplashActivity",ScreenOrientation = ScreenOrientation.Portrait) ]
+    [Activity(Theme = "@style/SplashTheme", MainLauncher = true, LaunchMode = LaunchMode.SingleTask, Name = "com.hdl.onpro.SplashActivity", ScreenOrientation = ScreenOrientation.Portrait)]
     [IntentFilter(new string[] { "com.hdl.onpro.SplashActivity", Intent.ActionView })]
     public class SplashActivity : Activity
     {
@@ -46,21 +46,16 @@
         {
             base.OnCreate(savedInstanceState);
 
-          
-
             //Intent i = new Intent(this, typeof(BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
             //StartActivityForResult(i, 1);
             //OverridePendingTransition(0, 0);
             //initAll();
-
-
-
             if (HDL_ON.OnAppConfig.Instance.FirstRunApp || !HDL_ON.OnAppConfig.Instance.isAgreePrivacyPolicy)
             {
                 Language.CurrentLanguage = "Chinese";
                 Locale locale1 = Locale.Default;
                 var localeList = Resources.Configuration.Locale;
-                Console.WriteLine("褰撳墠璇█缂╁啓:"+localeList.Language);
+                Console.WriteLine("褰撳墠璇█缂╁啓:" + localeList.Language);
                 if (localeList.Language == "zh")
                 {
                     Language.CurrentLanguage = "Chinese";
@@ -83,7 +78,7 @@
                 }
 
                 Intent intent = new Intent(this, typeof(AgreementActivity));
-                StartActivityForResult(intent,99);
+                StartActivityForResult(intent, 99);
             }
             else
             {
@@ -95,7 +90,6 @@
                 initOhterSdk();
                 Finish();//鍏抽棴鑷繁
             }
-
         }
 
         void initOhterSdk()
@@ -108,6 +102,9 @@
             //CN.Jpush.Android.Api.JPushInterface.SetDebugMode(true);
             //#endif
             JPushInterface.Init(this);
+
+            Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "316a8f5d83");
+
 
 
             BaseActivity.OnCreateActoin += (activity, application) =>
@@ -167,12 +164,12 @@
                 Language.CurrentLanguage = "Chinese";
                 Locale locale1 = Locale.Default;
                 var localeList = Resources.Configuration.Locale;
-                Console.WriteLine("褰撳墠璇█缂栧彿"+ localeList.Language);
+                Console.WriteLine("褰撳墠璇█缂栧彿" + localeList.Language);
                 if (localeList.Language == "zh")
                 {
                     Language.CurrentLanguage = "Chinese";
                 }
-                else if(localeList.Language == "es")
+                else if (localeList.Language == "es")
                 {
                     Language.CurrentLanguage = "Spanish";
                 }
@@ -204,7 +201,7 @@
                     //}
                     //else
                     //{
-                        //Console.WriteLine("HHH 缃戠粶鍙樺寲浣嗗浜庡悗鍙�"+internetStatus);
+                    //Console.WriteLine("HHH 缃戠粶鍙樺寲浣嗗浜庡悗鍙�"+internetStatus);
                     //}
 
                     //缃戠粶鍙樺寲澶勭悊
@@ -255,20 +252,22 @@
             HDLUtils.SetAuthoritiesName("com.hdl.onpro.fileProvider");
 
             //Shared.Application.IsGpsEnable = true;
-            bool isfirst = true;
+            //bool isfirst = true;
+
+            
+
             //鑾峰彇缁忕含搴� 
             Shared.Application.LocationAction = (lon, lat) =>
             {
                 try
                 {
-
-                    if (isfirst)
-                    {
-                        //鍙Е鍙戜竴娆�
-                        //Shared.Application.LocationAction = null;
-                        new HDL_ON.DAL.Server.HttpServerRequest().GetCityWeatherInfo(lon.ToString().Replace(",", "."), lat.ToString().Replace(",", "."));
-                    }
-                    isfirst = false;
+                    //if (isfirst)
+                    //{
+                    //    //鍙Е鍙戜竴娆�
+                    //    //Shared.Application.LocationAction = null;
+                    //    new HDL_ON.DAL.Server.HttpServerRequest().GetCityWeatherInfo(lon.ToString().Replace(",", "."), lat.ToString().Replace(",", "."));
+                    //}
+                    //isfirst = false;
                     ///鐩戝惉缁忕含搴�
                     HDL_ON.UI.UI2.Intelligence.Automation.LogicMethod.Current.AppLatAndLonEvent(lon, lat);
                     //鍏抽棴瀹氫綅鏈嶅姟
@@ -281,6 +280,8 @@
                 MainPage.Log($"缁忕含搴�:::{lon}:{lat}");
             };
         }
+
+        
 
         /// <summary>
         /// 
@@ -330,7 +331,7 @@
         }
 
         public static bool IsShowTip = true;
- 
+
         void checkSomeInfo()
         {
             try
@@ -387,9 +388,8 @@
             return false;
         }
 
+
     }
 
-
-    
 
 }
\ No newline at end of file
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index af7af24..36f83cb 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -4,9 +4,6 @@
 using Shared;
 using UIKit;
 using UserNotifications;
-using Microsoft.AppCenter;
-using Microsoft.AppCenter.Analytics;
-using Microsoft.AppCenter.Crashes;
 using HDL_ON.UI;
 using HDL_ON.DAL.Server;
 using Intents;
@@ -189,8 +186,12 @@
         public override void OnResignActivation(UIApplication application)
         {
             //璁剧疆鍏ㄨ閫氱姸鎬�
-            Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
-
+            string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
+            string errorVersion = "16.2.0";
+            if (systemVersion.CompareTo(errorVersion) < 0)///鍏ㄨ閫氫笉鍏煎ios16浠ヤ笂鐨勭郴缁燂紝涓嶈鍔犺浇杩欎釜鍏�
+            {
+                Shared.IOS.HDLFVSDK.Video.FVapplicationWillResignActive(application);
+            }
             Console.WriteLine("OnResignActivation");
             UserInfo.Current.unlockTime = DateTime.Now;
         }
@@ -198,8 +199,12 @@
         public override void DidEnterBackground(UIApplication application)
         {
             //璁剧疆鍏ㄨ閫氱姸鎬�
-            Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
-
+            string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
+            string errorVersion = "16.2.0";
+            if (systemVersion.CompareTo(errorVersion) < 0)///鍏ㄨ閫氫笉鍏煎ios16浠ヤ笂鐨勭郴缁燂紝涓嶈鍔犺浇杩欎釜鍏�
+            {
+                Shared.IOS.HDLFVSDK.Video.FVapplicationDidEnterBackground(application);
+            }
             //SharedMethod.SharedMethod.IsBackground = true;
             //MainPage.IsEnterBackground = true;
             ////杩涘叆鍚庡彴mqtt姝e湪杩炴帴閲嶇疆鐘舵��
@@ -226,8 +231,12 @@
         public override void OnActivated(UIApplication application)
         {
             //璁剧疆鍏ㄨ閫氱姸鎬�
-            Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
-
+            string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
+            string errorVersion = "16.2.0";
+            if (systemVersion.CompareTo(errorVersion) < 0)///鍏ㄨ閫氫笉鍏煎ios16浠ヤ笂鐨勭郴缁燂紝涓嶈鍔犺浇杩欎釜鍏�
+            {
+                Shared.IOS.HDLFVSDK.Video.FVapplicationDidBecomeActive(application);
+            }
             Console.WriteLine("OnActivated");
             base.OnActivated(application);
             //HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
@@ -262,7 +271,7 @@
                 {
                     Language.CurrentLanguage = "russian";
                 }
-                else if (NSLocale.PreferredLanguages[0].Contains( "bul"))
+                else if (NSLocale.PreferredLanguages[0].Contains("bul"))
                 {
                     Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
                 }
@@ -285,12 +294,16 @@
         {
 
             //璁剧疆鍏ㄨ閫氱姸鎬�
-            Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());
-
+            string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
+            string errorVersion = "16.2.0";
+            if (systemVersion.CompareTo(errorVersion) < 0)///鍏ㄨ閫氫笉鍏煎ios16浠ヤ笂鐨勭郴缁燂紝涓嶈鍔犺浇杩欎釜鍏�
+            {
+                Shared.IOS.HDLFVSDK.Video.FVapplication(application, new NSDictionary());
+            }
             Console.WriteLine("111111111111");
             SetCurrentLanguage();
             //Shared.Application.FontSize = 12;
-            //Bugly.Bugly.StartWithAppId("b58fb35436");
+            Bugly.Bugly.StartWithAppId("1dc40c170a");
             //鍙栨秷EditText榛樿瀵嗙爜杈撳叆鏂瑰紡
             //Shared.Application.IsEditTextContentTypePassword = false;
             //榛樿浣跨敤鑻规柟瀛椾綋
@@ -304,8 +317,6 @@
             Window.RootViewController = rootViewController;
             Window.MakeKeyAndVisible();
 
-            AppCenter.Start("e1add75a-82c6-4a5c-a902-4705b195748e", typeof(Analytics), typeof(Crashes));
-
             SharedMethod.SharedMethod.sharedApp = application;
             //NSString* nsCount = [[NSLocale currentLocale] objectForKey: NSLocaleCountryCode];
             application.StatusBarStyle = UIStatusBarStyle.DarkContent;
@@ -318,14 +329,10 @@
             //    //RemoteInfo.Current.ReadMsgList(true);
             //}
 
-            //楂樺痉key
-            GDMapKit.setGDApiKey("f0635ea15c5d579c6e93d9f07a06da69");
-
-            //楂樺痉key
-            GDMapKit.setGDApiKey("f0635ea15c5d579c6e93d9f07a06da69");
             Console.WriteLine("FinishedLaunching");
             return true;
         }
+
 
         /// <summary>
         /// 澶勭悊閫氱煡娑堟伅
@@ -348,13 +355,14 @@
                     if (userInfo.ContainsKey(new NSString("expandData")))
                     {
                         var expandDataStr = userInfo["expandData"] as NSString;
-                        if(expandDataStr == null)
+                        if (expandDataStr == null)
                         {
                             var expandDataNSD = userInfo["expandData"] as NSDictionary;
                             if (expandDataNSD != null)
                             {
                                 expandData = expandDataNSD.ToString();
-                                if(expandDataNSD.ContainsKey(new NSString("messageType"))){
+                                if (expandDataNSD.ContainsKey(new NSString("messageType")))
+                                {
                                     messageType = expandDataNSD["messageType"] as NSString;
                                     Utlis.WriteLine("messageType: " + messageType);
                                 }
@@ -413,15 +421,17 @@
                             }
                             else
                             {
-                                HDLCommon.Current.AdjustPushMessage(pushMes);
+                                //HDLCommon.Current.AdjustPushMessage(pushMes);
+                                this.CommonAdjustPushMessage(pushMes);//2023骞�04鏈�13鏃�15:55:54 淇敼
                             }
                         }
                     }
                     else
                     {
-                        HDLCommon.Current.AdjustPushMessage(pushMes);
+                        //HDLCommon.Current.AdjustPushMessage(pushMes);
+                        this.CommonAdjustPushMessage(pushMes);
                     }
-                   
+
                 }
             }
             catch
@@ -494,12 +504,33 @@
 
             MainPage.IsEnterBackground = false;
             HDL_ON.DriverLayer.UdpSocket._BusSocket.Start();
+            //閲嶈繛mqtt闃叉mqtt杩涘叆鍋囨鐘舵�� 2023-05-03 22:55:12 wxr
+            HDL_ON.DAL.Mqtt.MqttClient.InitState();
+
+
             new AppUnlockPage().LoadPage();
             UIApplication.SharedApplication.ApplicationIconBadgeNumber = 0;
             HDL_ON.DriverLayer.Control.Ins.SearchLoaclGateway();
         }
 
 
+        public  void CommonAdjustPushMessage(JPushMessageInfo pushMes)
+        {
+            new System.Threading.Thread(new System.Threading.ThreadStart(() =>
+            {
+                while (MainPage.BasePageView == null)
+                {
+                    System.Threading.Thread.Sleep(300);
+                }
+                Shared.Application.RunOnMainThread(() =>
+                {
+                    HDLCommon.Current.AdjustPushMessage(pushMes);
+                });
+            })).Start();
+
+        }
+
+
     }
 
 }
diff --git a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
index 1502cbc..4332296 100644
--- a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,246 +1,288 @@
 {
-  "images": [
+  "images" : [
     {
-      "filename": "40x40.png",
-      "size": "20x20",
-      "scale": "2x",
-      "idiom": "iphone"
+      "filename" : "40x40.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "filename": "60x60.png",
-      "size": "20x20",
-      "scale": "3x",
-      "idiom": "iphone"
+      "filename" : "60x60.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
-      "filename": "58x58.png",
-      "size": "29x29",
-      "scale": "2x",
-      "idiom": "iphone"
+      "filename" : "58x58.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "filename": "87x87.png",
-      "size": "29x29",
-      "scale": "3x",
-      "idiom": "iphone"
+      "filename" : "87x87.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
-      "filename": "80x80.png",
-      "size": "40x40",
-      "scale": "2x",
-      "idiom": "iphone"
+      "filename" : "80x80.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "filename": "120x120.png",
-      "size": "40x40",
-      "scale": "3x",
-      "idiom": "iphone"
+      "filename" : "120x120.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
     },
     {
-      "filename": "120x120-1.png",
-      "size": "60x60",
-      "scale": "2x",
-      "idiom": "iphone"
+      "filename" : "120x120-1.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
     },
     {
-      "filename": "180.png",
-      "size": "60x60",
-      "scale": "3x",
-      "idiom": "iphone"
+      "filename" : "180.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
     },
     {
-      "filename": "20x20.png",
-      "size": "20x20",
-      "scale": "1x",
-      "idiom": "ipad"
+      "filename" : "20x20.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
     },
     {
-      "filename": "40x40-1.png",
-      "size": "20x20",
-      "scale": "2x",
-      "idiom": "ipad"
+      "filename" : "40x40-1.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "filename": "29x29.png",
-      "size": "29x29",
-      "scale": "1x",
-      "idiom": "ipad"
+      "filename" : "29x29.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
-      "filename": "58x58-1.png",
-      "size": "29x29",
-      "scale": "2x",
-      "idiom": "ipad"
+      "filename" : "58x58-1.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "filename": "40x40-2.png",
-      "size": "40x40",
-      "scale": "1x",
-      "idiom": "ipad"
+      "filename" : "40x40-2.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
     },
     {
-      "filename": "80x80-1.png",
-      "size": "40x40",
-      "scale": "2x",
-      "idiom": "ipad"
+      "filename" : "80x80-1.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size": "83.5x83.5",
-      "scale": "2x",
-      "idiom": "ipad"
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
     },
     {
-      "size": "76x76",
-      "scale": "1x",
-      "idiom": "ipad"
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
     },
     {
-      "size": "76x76",
-      "scale": "2x",
-      "idiom": "ipad"
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
     },
     {
-      "filename": "1024.png",
-      "size": "1024x1024",
-      "scale": "1x",
-      "idiom": "ios-marketing"
+      "idiom" : "car",
+      "scale" : "2x",
+      "size" : "60x60"
     },
     {
-      "size": "60x60",
-      "scale": "2x",
-      "idiom": "car"
+      "idiom" : "car",
+      "scale" : "3x",
+      "size" : "60x60"
     },
     {
-      "size": "60x60",
-      "scale": "3x",
-      "idiom": "car"
+      "filename" : "1024.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
     },
     {
-      "role": "notificationCenter",
-      "size": "24x24",
-      "subtype": "38mm",
-      "scale": "2x",
-      "idiom": "watch"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
     },
     {
-      "role": "notificationCenter",
-      "size": "27.5x27.5",
-      "subtype": "42mm",
-      "scale": "2x",
-      "idiom": "watch"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16"
     },
     {
-      "role": "companionSettings",
-      "size": "29x29",
-      "scale": "2x",
-      "idiom": "watch"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
     },
     {
-      "role": "companionSettings",
-      "size": "29x29",
-      "scale": "3x",
-      "idiom": "watch"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32"
     },
     {
-      "role": "appLauncher",
-      "size": "40x40",
-      "subtype": "38mm",
-      "scale": "2x",
-      "idiom": "watch"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
     },
     {
-      "role": "appLauncher",
-      "size": "44x44",
-      "subtype": "40mm",
-      "scale": "2x",
-      "idiom": "watch"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128"
     },
     {
-      "role": "appLauncher",
-      "size": "50x50",
-      "subtype": "44mm",
-      "scale": "2x",
-      "idiom": "watch"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
     },
     {
-      "role": "quickLook",
-      "size": "86x86",
-      "subtype": "38mm",
-      "scale": "2x",
-      "idiom": "watch"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256"
     },
     {
-      "role": "quickLook",
-      "size": "98x98",
-      "subtype": "42mm",
-      "scale": "2x",
-      "idiom": "watch"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
     },
     {
-      "role": "quickLook",
-      "size": "108x108",
-      "subtype": "44mm",
-      "scale": "2x",
-      "idiom": "watch"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512"
     },
     {
-      "size": "1024x1024",
-      "scale": "1x",
-      "idiom": "watch-marketing"
+      "idiom" : "watch",
+      "role" : "notificationCenter",
+      "scale" : "2x",
+      "size" : "24x24",
+      "subtype" : "38mm"
     },
     {
-      "size": "16x16",
-      "scale": "1x",
-      "idiom": "mac"
+      "idiom" : "watch",
+      "role" : "notificationCenter",
+      "scale" : "2x",
+      "size" : "27.5x27.5",
+      "subtype" : "42mm"
     },
     {
-      "size": "16x16",
-      "scale": "2x",
-      "idiom": "mac"
+      "idiom" : "watch",
+      "role" : "companionSettings",
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size": "32x32",
-      "scale": "1x",
-      "idiom": "mac"
+      "idiom" : "watch",
+      "role" : "companionSettings",
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
-      "size": "32x32",
-      "scale": "2x",
-      "idiom": "mac"
+      "idiom" : "watch",
+      "role" : "notificationCenter",
+      "scale" : "2x",
+      "size" : "33x33",
+      "subtype" : "45mm"
     },
     {
-      "size": "128x128",
-      "scale": "1x",
-      "idiom": "mac"
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "40x40",
+      "subtype" : "38mm"
     },
     {
-      "size": "128x128",
-      "scale": "2x",
-      "idiom": "mac"
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "44x44",
+      "subtype" : "40mm"
     },
     {
-      "size": "256x256",
-      "scale": "1x",
-      "idiom": "mac"
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "46x46",
+      "subtype" : "41mm"
     },
     {
-      "size": "256x256",
-      "scale": "2x",
-      "idiom": "mac"
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "50x50",
+      "subtype" : "44mm"
     },
     {
-      "size": "512x512",
-      "scale": "1x",
-      "idiom": "mac"
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "51x51",
+      "subtype" : "45mm"
     },
     {
-      "size": "512x512",
-      "scale": "2x",
-      "idiom": "mac"
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "54x54",
+      "subtype" : "49mm"
+    },
+    {
+      "idiom" : "watch",
+      "role" : "quickLook",
+      "scale" : "2x",
+      "size" : "86x86",
+      "subtype" : "38mm"
+    },
+    {
+      "idiom" : "watch",
+      "role" : "quickLook",
+      "scale" : "2x",
+      "size" : "98x98",
+      "subtype" : "42mm"
+    },
+    {
+      "idiom" : "watch",
+      "role" : "quickLook",
+      "scale" : "2x",
+      "size" : "108x108",
+      "subtype" : "44mm"
+    },
+    {
+      "idiom" : "watch",
+      "role" : "quickLook",
+      "scale" : "2x",
+      "size" : "117x117",
+      "subtype" : "45mm"
+    },
+    {
+      "idiom" : "watch",
+      "role" : "quickLook",
+      "scale" : "2x",
+      "size" : "129x129",
+      "subtype" : "49mm"
+    },
+    {
+      "idiom" : "watch-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
-  "info": {
-    "version": 1,
-    "author": "xcode"
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
index 1be8e68..66eb5c9 100644
--- a/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
+++ b/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json
@@ -1,255 +1,182 @@
 {
-  "images": [
+  "images" : [
     {
-      "orientation": "landscape",
-      "extent": "full-screen",
-      "size": "1920x1080",
-      "scale": "1x",
-      "idiom": "tv",
-      "minimum-system-version": "9.0"
+      "extent" : "full-screen",
+      "filename" : "11252436.png",
+      "idiom" : "iphone",
+      "minimum-system-version" : "11.0",
+      "orientation" : "portrait",
+      "scale" : "3x",
+      "subtype" : "2436h"
     },
     {
-      "orientation": "landscape",
-      "extent": "full-screen",
-      "size": "1920x1080",
-      "scale": "2x",
-      "idiom": "tv",
-      "minimum-system-version": "11.0"
+      "extent" : "full-screen",
+      "filename" : "24361125.png",
+      "idiom" : "iphone",
+      "minimum-system-version" : "11.0",
+      "orientation" : "landscape",
+      "scale" : "3x",
+      "subtype" : "2436h"
     },
     {
-      "minimum-system-version": "12.0",
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "filename": "12422688.png",
-      "size": "414x896",
-      "subtype": "1792",
-      "scale": "3x",
-      "idiom": "iphone"
+      "extent" : "full-screen",
+      "idiom" : "tv",
+      "minimum-system-version" : "11.0",
+      "orientation" : "landscape",
+      "scale" : "2x"
     },
     {
-      "minimum-system-version": "12.0",
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "filename": "8281792.png",
-      "size": "276x597.3",
-      "subtype": "2688",
-      "scale": "3x",
-      "idiom": "iphone"
+      "extent" : "full-screen",
+      "idiom" : "tv",
+      "minimum-system-version" : "9.0",
+      "orientation" : "landscape",
+      "scale" : "1x"
     },
     {
-      "minimum-system-version": "12.0",
-      "orientation": "landscape",
-      "extent": "full-screen",
-      "filename": "26881242.png",
-      "size": "896x414",
-      "subtype": "1792",
-      "scale": "3x",
-      "idiom": "iphone"
+      "extent" : "full-screen",
+      "filename" : "12422208.png",
+      "idiom" : "iphone",
+      "minimum-system-version" : "8.0",
+      "orientation" : "portrait",
+      "scale" : "3x",
+      "subtype" : "736h"
     },
     {
-      "minimum-system-version": "12.0",
-      "orientation": "landscape",
-      "extent": "full-screen",
-      "filename": "1792828.png",
-      "size": "597.3x276",
-      "subtype": "2688",
-      "scale": "3x",
-      "idiom": "iphone"
+      "extent" : "full-screen",
+      "filename" : "22081242.png",
+      "idiom" : "iphone",
+      "minimum-system-version" : "8.0",
+      "orientation" : "landscape",
+      "scale" : "3x",
+      "subtype" : "736h"
     },
     {
-      "minimum-system-version": "11.0",
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "filename": "11252436.png",
-      "size": "375x812",
-      "subtype": "2436h",
-      "scale": "3x",
-      "idiom": "iphone"
+      "extent" : "full-screen",
+      "filename" : "7501334.png",
+      "idiom" : "iphone",
+      "minimum-system-version" : "8.0",
+      "orientation" : "portrait",
+      "scale" : "2x",
+      "subtype" : "667h"
     },
     {
-      "minimum-system-version": "11.0",
-      "orientation": "landscape",
-      "extent": "full-screen",
-      "filename": "24361125.png",
-      "size": "812x375",
-      "subtype": "2436h",
-      "scale": "3x",
-      "idiom": "iphone"
+      "extent" : "full-screen",
+      "filename" : "640960.png",
+      "idiom" : "iphone",
+      "minimum-system-version" : "7.0",
+      "orientation" : "portrait",
+      "scale" : "2x"
     },
     {
-      "minimum-system-version": "8.0",
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "filename": "12422208.png",
-      "size": "414x736",
-      "subtype": "736h",
-      "scale": "3x",
-      "idiom": "iphone"
+      "extent" : "full-screen",
+      "filename" : "6401136.png",
+      "idiom" : "iphone",
+      "minimum-system-version" : "7.0",
+      "orientation" : "portrait",
+      "scale" : "2x",
+      "subtype" : "retina4"
     },
     {
-      "minimum-system-version": "8.0",
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "filename": "7501334.png",
-      "size": "375x667",
-      "subtype": "667h",
-      "scale": "2x",
-      "idiom": "iphone"
+      "extent" : "full-screen",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "orientation" : "portrait",
+      "scale" : "1x"
     },
     {
-      "minimum-system-version": "8.0",
-      "orientation": "landscape",
-      "extent": "full-screen",
-      "filename": "22081242.png",
-      "size": "736x414",
-      "subtype": "736h",
-      "scale": "3x",
-      "idiom": "iphone"
+      "extent" : "full-screen",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "orientation" : "landscape",
+      "scale" : "1x"
     },
     {
-      "minimum-system-version": "7.0",
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "filename": "2048x2732.png",
-      "size": "1024x1366",
-      "scale": "2x",
-      "idiom": "ipad"
+      "extent" : "full-screen",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "orientation" : "portrait",
+      "scale" : "2x"
     },
     {
-      "minimum-system-version": "7.0",
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "filename": "640960.png",
-      "size": "320x480",
-      "scale": "2x",
-      "idiom": "iphone"
+      "extent" : "full-screen",
+      "idiom" : "ipad",
+      "minimum-system-version" : "7.0",
+      "orientation" : "landscape",
+      "scale" : "2x"
     },
     {
-      "minimum-system-version": "7.0",
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "filename": "6401136.png",
-      "size": "320x568",
-      "subtype": "retina4",
-      "scale": "2x",
-      "idiom": "iphone"
+      "extent" : "full-screen",
+      "filename" : "320480.png",
+      "idiom" : "iphone",
+      "orientation" : "portrait",
+      "scale" : "1x"
     },
     {
-      "minimum-system-version": "7.0",
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "size": "768x1024",
-      "scale": "1x",
-      "idiom": "ipad"
+      "extent" : "full-screen",
+      "filename" : "640960-1.png",
+      "idiom" : "iphone",
+      "orientation" : "portrait",
+      "scale" : "2x"
     },
     {
-      "minimum-system-version": "7.0",
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "size": "768x1024",
-      "scale": "2x",
-      "idiom": "ipad"
+      "extent" : "full-screen",
+      "filename" : "6401136-1.png",
+      "idiom" : "iphone",
+      "orientation" : "portrait",
+      "scale" : "2x",
+      "subtype" : "retina4"
     },
     {
-      "minimum-system-version": "7.0",
-      "orientation": "landscape",
-      "extent": "full-screen",
-      "size": "1024x768",
-      "scale": "1x",
-      "idiom": "ipad"
+      "extent" : "to-status-bar",
+      "idiom" : "ipad",
+      "orientation" : "portrait",
+      "scale" : "1x"
     },
     {
-      "minimum-system-version": "7.0",
-      "orientation": "landscape",
-      "extent": "full-screen",
-      "size": "1024x768",
-      "scale": "2x",
-      "idiom": "ipad"
+      "extent" : "full-screen",
+      "idiom" : "ipad",
+      "orientation" : "portrait",
+      "scale" : "1x"
     },
     {
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "filename": "320480.png",
-      "size": "320x480",
-      "scale": "1x",
-      "idiom": "iphone"
+      "extent" : "to-status-bar",
+      "idiom" : "ipad",
+      "orientation" : "landscape",
+      "scale" : "1x"
     },
     {
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "filename": "640960-1.png",
-      "size": "320x480",
-      "scale": "2x",
-      "idiom": "iphone"
+      "extent" : "full-screen",
+      "idiom" : "ipad",
+      "orientation" : "landscape",
+      "scale" : "1x"
     },
     {
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "filename": "6401136-1.png",
-      "size": "320x568",
-      "subtype": "retina4",
-      "scale": "2x",
-      "idiom": "iphone"
+      "extent" : "to-status-bar",
+      "idiom" : "ipad",
+      "orientation" : "portrait",
+      "scale" : "2x"
     },
     {
-      "orientation": "portrait",
-      "extent": "to-status-bar",
-      "size": "768x1004",
-      "scale": "1x",
-      "idiom": "ipad"
+      "extent" : "full-screen",
+      "idiom" : "ipad",
+      "orientation" : "portrait",
+      "scale" : "2x"
     },
     {
-      "orientation": "portrait",
-      "extent": "to-status-bar",
-      "size": "768x1004",
-      "scale": "2x",
-      "idiom": "ipad"
+      "extent" : "to-status-bar",
+      "idiom" : "ipad",
+      "orientation" : "landscape",
+      "scale" : "2x"
     },
     {
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "size": "768x1024",
-      "scale": "1x",
-      "idiom": "ipad"
-    },
-    {
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "size": "768x1024",
-      "scale": "2x",
-      "idiom": "ipad"
-    },
-    {
-      "orientation": "landscape",
-      "extent": "to-status-bar",
-      "size": "1024x748",
-      "scale": "1x",
-      "idiom": "ipad"
-    },
-    {
-      "orientation": "landscape",
-      "extent": "to-status-bar",
-      "size": "1024x748",
-      "scale": "2x",
-      "idiom": "ipad"
-    },
-    {
-      "orientation": "landscape",
-      "extent": "full-screen",
-      "size": "1024x768",
-      "scale": "1x",
-      "idiom": "ipad"
-    },
-    {
-      "orientation": "landscape",
-      "extent": "full-screen",
-      "size": "1024x768",
-      "scale": "2x",
-      "idiom": "ipad"
+      "extent" : "full-screen",
+      "idiom" : "ipad",
+      "orientation" : "landscape",
+      "scale" : "2x"
     }
   ],
-  "info": {
-    "version": 1,
-    "author": "xcode"
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/HDL-ON_iOS/Assets.xcassets/device_bg.imageset/Contents.json b/HDL-ON_iOS/Assets.xcassets/device_bg.imageset/Contents.json
index 8254cff..b1bc3ee 100644
--- a/HDL-ON_iOS/Assets.xcassets/device_bg.imageset/Contents.json
+++ b/HDL-ON_iOS/Assets.xcassets/device_bg.imageset/Contents.json
@@ -1,528 +1,21 @@
 {
-  "images": [
+  "images" : [
     {
-      "idiom": "universal"
+      "idiom" : "universal",
+      "scale" : "1x"
     },
     {
-      "scale": "1x",
-      "idiom": "universal"
+      "filename" : "device_bg.png",
+      "idiom" : "universal",
+      "scale" : "2x"
     },
     {
-      "filename": "device_bg.png",
-      "scale": "2x",
-      "idiom": "universal"
-    },
-    {
-      "scale": "3x",
-      "idiom": "universal"
-    },
-    {
-      "idiom": "iphone"
-    },
-    {
-      "scale": "1x",
-      "idiom": "iphone"
-    },
-    {
-      "scale": "2x",
-      "idiom": "iphone"
-    },
-    {
-      "subtype": "retina4",
-      "scale": "2x",
-      "idiom": "iphone"
-    },
-    {
-      "scale": "3x",
-      "idiom": "iphone"
-    },
-    {
-      "idiom": "ipad"
-    },
-    {
-      "scale": "1x",
-      "idiom": "ipad"
-    },
-    {
-      "scale": "2x",
-      "idiom": "ipad"
-    },
-    {
-      "idiom": "watch"
-    },
-    {
-      "scale": "2x",
-      "idiom": "watch"
-    },
-    {
-      "screenWidth": "{130,145}",
-      "scale": "2x",
-      "idiom": "watch"
-    },
-    {
-      "screenWidth": "{146,165}",
-      "scale": "2x",
-      "idiom": "watch"
-    },
-    {
-      "idiom": "mac"
-    },
-    {
-      "scale": "1x",
-      "idiom": "mac"
-    },
-    {
-      "scale": "2x",
-      "idiom": "mac"
-    },
-    {
-      "idiom": "car"
-    },
-    {
-      "scale": "2x",
-      "idiom": "car"
-    },
-    {
-      "scale": "3x",
-      "idiom": "car"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "idiom": "universal"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "scale": "1x",
-      "idiom": "universal"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "scale": "2x",
-      "idiom": "universal"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "scale": "3x",
-      "idiom": "universal"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "idiom": "iphone"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "scale": "1x",
-      "idiom": "iphone"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "scale": "2x",
-      "idiom": "iphone"
-    },
-    {
-      "subtype": "retina4",
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "scale": "2x",
-      "idiom": "iphone"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "scale": "3x",
-      "idiom": "iphone"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "idiom": "ipad"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "scale": "1x",
-      "idiom": "ipad"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "scale": "2x",
-      "idiom": "ipad"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "idiom": "watch"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "scale": "2x",
-      "idiom": "watch"
-    },
-    {
-      "screenWidth": "{130,145}",
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "scale": "2x",
-      "idiom": "watch"
-    },
-    {
-      "screenWidth": "{146,165}",
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "scale": "2x",
-      "idiom": "watch"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "idiom": "mac"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "scale": "1x",
-      "idiom": "mac"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "scale": "2x",
-      "idiom": "mac"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "idiom": "car"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "scale": "2x",
-      "idiom": "car"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "dark"
-        }
-      ],
-      "scale": "3x",
-      "idiom": "car"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "idiom": "universal"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "scale": "1x",
-      "idiom": "universal"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "scale": "2x",
-      "idiom": "universal"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "scale": "3x",
-      "idiom": "universal"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "idiom": "iphone"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "scale": "1x",
-      "idiom": "iphone"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "scale": "2x",
-      "idiom": "iphone"
-    },
-    {
-      "subtype": "retina4",
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "scale": "2x",
-      "idiom": "iphone"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "scale": "3x",
-      "idiom": "iphone"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "idiom": "ipad"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "scale": "1x",
-      "idiom": "ipad"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "scale": "2x",
-      "idiom": "ipad"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "idiom": "watch"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "scale": "2x",
-      "idiom": "watch"
-    },
-    {
-      "screenWidth": "{130,145}",
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "scale": "2x",
-      "idiom": "watch"
-    },
-    {
-      "screenWidth": "{146,165}",
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "scale": "2x",
-      "idiom": "watch"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "idiom": "mac"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "scale": "1x",
-      "idiom": "mac"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "scale": "2x",
-      "idiom": "mac"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "idiom": "car"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "scale": "2x",
-      "idiom": "car"
-    },
-    {
-      "appearances": [
-        {
-          "appearance": "luminosity",
-          "value": "light"
-        }
-      ],
-      "scale": "3x",
-      "idiom": "car"
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
-  "info": {
-    "version": 1,
-    "author": "xcode"
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/HDL-ON_iOS/BlueWifi.cs b/HDL-ON_iOS/BlueWifi.cs
index aad7a0c..e0217f9 100644
--- a/HDL-ON_iOS/BlueWifi.cs
+++ b/HDL-ON_iOS/BlueWifi.cs
@@ -30,13 +30,14 @@
         //public string GetPer()
         //{
         //share.
-        //}
+        //}1
 
 
         /// <summary>
         /// 鎼滅储鍒拌摑鐗欒澶囦箣鍚庡埌浠g悊浜嬩欢
         /// </summary>
         FBYBleDeviceBackBlock getBlufiDeviceDelegate;
+
         /// <summary>
         /// 璁惧鎼滅储鍒拌摑鐗欒澶囦箣鍚庡埌浠g悊浜嬩欢
         /// </summary>
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index db8fc14..f55067f 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -26,7 +26,7 @@
         <MtouchLink>Full</MtouchLink>
         <MtouchDebug>true</MtouchDebug>
         <CodesignKey>iPhone Developer</CodesignKey>
-        <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
+        <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
         <CodesignProvision>On+Dev-20210616-1</CodesignProvision>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
@@ -51,7 +51,7 @@
         <ErrorReport>prompt</ErrorReport>
         <WarningLevel>4</WarningLevel>
         <MtouchArch>ARM64</MtouchArch>
-        <CodesignKey>iPhone Developer</CodesignKey>
+        <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
         <MtouchDebug>true</MtouchDebug>
         <MtouchI18n>cjk</MtouchI18n>
         <MtouchLink>SdkOnly</MtouchLink>
@@ -59,6 +59,7 @@
         <MtouchEnableSGenConc>false</MtouchEnableSGenConc>
 <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+<CodesignProvision>OnPro230417-1-Dev</CodesignProvision>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
         <DebugType>none</DebugType>
@@ -68,7 +69,7 @@
         <WarningLevel>4</WarningLevel>
         <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
         <MtouchArch>ARM64</MtouchArch>
-        <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
+        <CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
         <MtouchLink>SdkOnly</MtouchLink>
         <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
         <MtouchI18n>cjk</MtouchI18n>
@@ -79,36 +80,16 @@
         <Reference Include="System.Xml" />
         <Reference Include="System.Core" />
         <Reference Include="Xamarin.iOS" />
-        <Reference Include="System.Numerics" />
-        <Reference Include="System.Numerics.Vectors" />
         <Reference Include="System.Web.Services" />
         <Reference Include="Shared.IOS.TBL">
           <HintPath>..\DLL\Shared.IOS.TBL.dll</HintPath>
           <Private>False</Private>
         </Reference>
-        <Reference Include="MJRefresh_Xamarin">
-          <HintPath>..\DLL\IOS\MJRefresh_Xamarin.dll</HintPath>
-        </Reference>
         <Reference Include="Shared.IOS.JLCountryCode">
           <HintPath>..\DLL\IOS\Shared.IOS.JLCountryCode.dll</HintPath>
         </Reference>
-        <Reference Include="EZSDK.IOS">
-          <HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath>
-        </Reference>
-        <Reference Include="Shared.IOS.ESVideoOnSDK">
-          <HintPath>..\DLL\FL\iOS\Shared.IOS.ESVideoOnSDK.dll</HintPath>
-        </Reference>
-        <Reference Include="Shared.IOS.LCVideoOnSDK">
-          <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath>
-        </Reference>
         <Reference Include="Shared.IOS.HDLSceneSiri">
           <HintPath>..\DLL\IOS\Shared.IOS.HDLSceneSiri.dll</HintPath>
-        </Reference>
-        <Reference Include="Shared.IOS.HDLLinphoneSDK">
-          <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath>
-        </Reference>
-        <Reference Include="Shared.IOS.HDLFVSDK">
-          <HintPath>..\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath>
         </Reference>
         <Reference Include="HDL.Shared.IOS.ScanQRCode">
           <HintPath>..\DLL\IOS\HDL.Shared.IOS.ScanQRCode.dll</HintPath>
@@ -116,19 +97,31 @@
         <Reference Include="Shared.IOS">
           <HintPath>..\DLL\Shared.IOS.dll</HintPath>
         </Reference>
+        <Reference Include="Shared.IOS.HDLLinphoneSDK">
+          <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath>
+        </Reference>
+        <Reference Include="Shared.IOS.LCVideoOnSDK">
+          <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath>
+        </Reference>
+        <Reference Include="Shared.IOS.HDLCNVRSDK">
+          <HintPath>..\DLL\IOS\Shared.IOS.HDLCNVRSDK.dll</HintPath>
+        </Reference>
+        <Reference Include="Shared.IOS.ESVideoOnSDK">
+          <HintPath>..\DLL\FL\iOS\Shared.IOS.ESVideoOnSDK.dll</HintPath>
+        </Reference>
+        <Reference Include="Shared.IOS.HDLFVSDK">
+          <HintPath>..\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath>
+        </Reference>
+        <Reference Include="EZSDK.IOS">
+          <HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath>
+        </Reference>
     </ItemGroup>
     <ItemGroup>
       <PackageReference Include="Newtonsoft.Json">
-        <Version>13.0.1</Version>
+        <Version>13.0.3</Version>
       </PackageReference>
       <PackageReference Include="MQTTnet">
         <Version>3.1.0</Version>
-      </PackageReference>
-      <PackageReference Include="Microsoft.AppCenter.Analytics">
-        <Version>4.4.0</Version>
-      </PackageReference>
-      <PackageReference Include="Microsoft.AppCenter.Crashes">
-        <Version>4.4.0</Version>
       </PackageReference>
       <PackageReference Include="ZXing.Net.Mobile">
         <Version>2.4.1</Version>
@@ -141,6 +134,12 @@
       </PackageReference>
       <PackageReference Include="Xamarin.Essentials">
         <Version>1.7.0</Version>
+      </PackageReference>
+      <PackageReference Include="Xamarin.iOS.MJRefresh">
+        <Version>3.2.2</Version>
+      </PackageReference>
+      <PackageReference Include="Xamarin.iOS.SwiftRuntimeSupport">
+        <Version>0.2.1</Version>
       </PackageReference>
     </ItemGroup>
     <ItemGroup>
@@ -440,20 +439,14 @@
         <ImageAsset Include="Assets.xcassets\wifi_bg.imageset\wifi_bg.png" />
         <ImageAsset Include="Assets.xcassets\device_bg.imageset\Contents.json" />
         <ImageAsset Include="Assets.xcassets\device_bg.imageset\device_bg.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422688.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\8281792.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\26881242.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792828.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\11252436.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\24361125.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320480.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960-1.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136-1.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422208.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\7501334.png" />
-        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\22081242.png" />
+        <ImageAsset Include="Resources\Assets.xcassets\Contents.json" />
+        <ImageAsset Include="Resources\Assets.xcassets\launchIcon2.imageset\Contents.json" />
+        <ImageAsset Include="Resources\Assets.xcassets\launchIcon2.imageset\launchIcon2.png" />
+        <ImageAsset Include="Resources\Assets.xcassets\launchIcon.imageset\launchIcon.png" />
+        <ImageAsset Include="Resources\Assets.xcassets\launchIcon.imageset\Contents.json" />
+        <ImageAsset Include="Resources\Assets.xcassets\launchIcon1.imageset\launchIcon1.png" />
+        <ImageAsset Include="Resources\Assets.xcassets\launchIcon1.imageset\Contents.json" />
+        <ImageAsset Include="Resources\Assets.xcassets\.DS_Store" />
     </ItemGroup>
     <ItemGroup>
         <Folder Include="Resources\" />
@@ -1282,30 +1275,6 @@
       <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIcon.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIconOn.png" />
       <BundleResource Include="Resources\Phone\PersonalCenter\SmartSpeaker.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Redistribution.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorLock.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue2.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockManager.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue1.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon2.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\CrearPswBackgroud.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Editor.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon1.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Connect.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\History.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Screen.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\BindScene.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Shard.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Delete.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnConnect.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\More.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Mute.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Voice.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue1.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Hide.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" />
-      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" />
       <BundleResource Include="Resources\Phone\Public\BatteryEnough.png" />
       <BundleResource Include="Resources\Phone\Public\BatteryNot.png" />
       <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irpjt_blue.png" />
@@ -1562,6 +1531,42 @@
       <BundleResource Include="Resources\h5\static\img\equal-plant-ic.7ef6befa.png" />
       <BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" />
       <BundleResource Include="Resources\h5\static\font\SourceHanSansCN-Normal.otf" />
+      <BundleResource Include="Resources\Phone\MusicIcon\currentPlayList.png" />
+      <BundleResource Include="Resources\Phone\PersonalCenter\CombinedDimmingIcon.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Redistribution.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorLock.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\OneOpenLock.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue2.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockManager.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\RTV.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue1.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon2.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\CrearPswBackgroud.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Editor.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon1.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Connect.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Cell.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\History.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLocking.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\HistoryList.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Screen.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\BindScene.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Shard.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Delete.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnConnect.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\More.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Mute.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Voice.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLocked.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue1.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Hide.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\securitydoorezviz.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorlockClose1.png" />
+      <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen1.png" />
+      <BundleResource Include="Resources\Phone\LogicIcon\selectlocation.png" />
     </ItemGroup>
     <ItemGroup>
       <ITunesArtwork Include="iTunesArtwork" />
@@ -1583,15 +1588,9 @@
       <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58x58-1.png" />
       <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40x40-2.png" />
       <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80x80-1.png" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\.DS_Store" />
-      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" />
       <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024.png" />
     </ItemGroup>
     <ItemGroup>
-      <ProjectReference Include="..\HdlBluWi\Blufi.csproj">
-        <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project>
-        <Name>Blufi</Name>
-      </ProjectReference>
       <ProjectReference Include="..\SiriIntents\SiriIntents.csproj">
         <IsAppExtension>true</IsAppExtension>
         <Project>{760980F5-1CD3-4F4F-9134-34D87BECD790}</Project>
@@ -1606,6 +1605,10 @@
         <Project>{8B1652FA-5158-4D57-B90D-07BB91766625}</Project>
         <Name>SiriKit</Name>
       </ProjectReference>
+      <ProjectReference Include="..\HdlBluWi\Blufi.csproj">
+        <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project>
+        <Name>Blufi</Name>
+      </ProjectReference>
     </ItemGroup>
     <ItemGroup>
       <Content Include="Base.lproj\Intents.intentdefinition" />
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index cf97fe8..6313305 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -2,6 +2,16 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CFBundleAllowMixedLocalizations</key>
+	<true/>
+	<key>CFBundleDisplayName</key>
+	<string>On Pro</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.hdl.onpro</string>
+	<key>CFBundleName</key>
+	<string>On Pro</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.7.6</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -13,20 +23,36 @@
 			<string>AispeechMobile</string>
 		</dict>
 		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>hdlonpro</string>
 			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
 		</dict>
 		<dict>
 			<key>CFBundleURLName</key>
 			<string>qqmusic</string>
 		</dict>
 	</array>
+	<key>CFBundleVersion</key>
+	<string>1.7.6</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>weixinULAPI</string>
+		<string>weixin</string>
+		<string>xiaoduapp</string>
+		<string>AispeechMobile</string>
+		<string>qqmusic</string>
+	</array>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>MinimumOSVersion</key>
+	<string>12.2</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
 		<key>NSExceptionDomains</key>
 		<dict>
 			<key>NSExceptionDomains</key>
@@ -34,15 +60,52 @@
 			<key>NSExceptionMinimumTLSVersion</key>
 			<string>TLSv1.0</string>
 		</dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
 	</dict>
-	<key>CFBundleIdentifier</key>
-	<string>com.hdl.onpro</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>MinimumOSVersion</key>
-	<string>12.0</string>
+	<key>NSAppleMusicUsageDescription</key>
+	<string>App needs to access your music library to connect to an external player to play music.</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>NSBluetoothPeripheralUsageDescription</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>NSCameraUsageDescription</key>
+	<string>App wants to access your camera to set the background picture of the room</string>
+	<key>NSContactsUsageDescription</key>
+	<string>LC Video will be use</string>
+	<key>NSFaceIDUsageDescription</key>
+	<string>Need to use Face ID for unlock verification</string>
+	<key>NSLocalNetworkUsageDescription</key>
+	<string>APP wants to use local network access permissions for WiFi distribution.</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>LC Video will be use</string>
+	<key>NSLocationAlwaysUsageDescription</key>
+	<string>Use geographic location to provide services such as weather</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>EZ video will be use</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>APP wants to use the phone&apos;s microphone for voice intercom</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>App wants to access your photo library to set the background image of the room</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>App wants to access your photo library to set the background image of the room</string>
+	<key>NSSiriUsageDescription</key>
+	<string>On Pro data will be send to Siri.</string>
+	<key>NSUserActivityTypes</key>
+	<array>
+		<string>HDLRunSceneIntent</string>
+	</array>
+	<key>NSVoIPUsageDescription</key>
+	<string>Make audio/video calls</string>
+	<key>UIAppFonts</key>
+	<array>
+		<string>titilliumtext25l005.otf</string>
+	</array>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>audio</string>
+		<string>location</string>
+		<string>voip</string>
+		<string>remote-notification</string>
+	</array>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>1</integer>
@@ -53,28 +116,8 @@
 	</array>
 	<key>UIRequiresFullScreen</key>
 	<true/>
-	<key>NSCameraUsageDescription</key>
-	<string>App wants to access your camera to set the background picture of the room</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>App wants to access your photo library to set the background image of the room</string>
-	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>App wants to access your photo library to set the background image of the room</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>APP wants to use the phone&apos;s microphone for voice intercom</string>
-	<key>NSLocalNetworkUsageDescription</key>
-	<string>APP wants to use local network access permissions for WiFi distribution.</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-	</array>
-	<key>UIAppFonts</key>
-	<array>
-		<string>titilliumtext25l005.otf</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-	</array>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleLightContent</string>
 	<key>UIStatusBarTintParameters</key>
 	<dict>
 		<key>UINavigationBar</key>
@@ -85,58 +128,21 @@
 			<false/>
 		</dict>
 	</dict>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>XSLaunchImageAssets</key>
-	<string>Assets.xcassets/LaunchImage.launchimage</string>
-	<key>CFBundleName</key>
-	<string>On Pro</string>
 	<key>XSAppIconAssets</key>
 	<string>Assets.xcassets/AppIcon.appiconset</string>
-	<key>CFBundleDisplayName</key>
-	<string>On Pro</string>
-	<key>UIStatusBarStyle</key>
-	<string>UIStatusBarStyleLightContent</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.6.302302021</string>
-	<key>CFBundleVersion</key>
-	<string>1.6.302021</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>Use geographic location to provide services such as weather</string>
-	<key>NSAppleMusicUsageDescription</key>
-	<string>App needs to access your music library to connect to an external player to play music.</string>
-	<key>NSLocationAlwaysUsageDescription</key>
-	<string>Use geographic location to provide services such as weather</string>
-	<key>LSApplicationQueriesSchemes</key>
-	<array>
-		<string>weixinULAPI</string>
-		<string>weixin</string>
-		<string>xiaoduapp</string>
-		<string>AispeechMobile</string>
-		<string>qqmusic</string>
-	</array>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>audio</string>
-		<string>location</string>
-		<string>voip</string>
-		<string>remote-notification</string>
-	</array>
-	<key>NSFaceIDUsageDescription</key>
-	<string>Need to use Face ID for unlock verification</string>
-	<key>CFBundleAllowMixedLocalizations</key>
-	<true/>
-	<key>NSBluetoothPeripheralUsageDescription</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>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>
-	<key>NSSiriUsageDescription</key>
-	<string>On Pro data will be send to Siri.</string>
-	<key>NSUserActivityTypes</key>
-	<array>
-		<string>HDLRunSceneIntent</string>
-	</array>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 </dict>
 </plist>
diff --git a/HDL-ON_iOS/LaunchScreen.storyboard b/HDL-ON_iOS/LaunchScreen.storyboard
index c0e5c52..9a790b7 100644
--- a/HDL-ON_iOS/LaunchScreen.storyboard
+++ b/HDL-ON_iOS/LaunchScreen.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -18,12 +18,48 @@
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launchIcon1" translatesAutoresizingMaskIntoConstraints="NO" id="9nT-Fx-4qG">
+                                <rect key="frame" x="240" y="48" width="174" height="162"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="174" id="YFZ-tm-Sjh"/>
+                                    <constraint firstAttribute="height" constant="162" id="i7v-Bl-YJn"/>
+                                </constraints>
+                            </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launchIcon2" translatesAutoresizingMaskIntoConstraints="NO" id="dJG-xt-76U">
+                                <rect key="frame" x="0.0" y="663" width="103" height="165"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="103" id="Mee-eE-gBJ"/>
+                                    <constraint firstAttribute="height" constant="165" id="v86-9G-Ngl"/>
+                                </constraints>
+                            </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launchIcon" translatesAutoresizingMaskIntoConstraints="NO" id="gAz-Vf-lRO">
+                                <rect key="frame" x="101" y="362" width="212" height="172"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="172" id="1dy-BP-0hc"/>
+                                    <constraint firstAttribute="width" constant="212" id="IFI-Nv-6iF"/>
+                                </constraints>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="dJG-xt-76U" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="A1f-1j-aJ5"/>
+                            <constraint firstItem="gAz-Vf-lRO" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="GAY-53-0IG"/>
+                            <constraint firstAttribute="trailing" secondItem="9nT-Fx-4qG" secondAttribute="trailing" id="W0G-jB-s4B"/>
+                            <constraint firstItem="9nT-Fx-4qG" firstAttribute="top" secondItem="Llm-lL-Icb" secondAttribute="bottom" id="eg7-2m-rvD"/>
+                            <constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="dJG-xt-76U" secondAttribute="bottom" constant="34" id="mX9-qo-4vp"/>
+                            <constraint firstItem="gAz-Vf-lRO" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="oTs-PN-mAs"/>
+                        </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="53" y="375"/>
+            <point key="canvasLocation" x="52.173913043478265" y="375"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="launchIcon" width="550" height="550"/>
+        <image name="launchIcon1" width="610" height="570"/>
+        <image name="launchIcon2" width="326" height="578"/>
+    </resources>
 </document>
diff --git a/HDL-ON_iOS/Resources/Assets.xcassets/Contents.json b/HDL-ON_iOS/Resources/Assets.xcassets/Contents.json
new file mode 100644
index 0000000..73c0059
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/HDL-ON_iOS/Resources/Assets.xcassets/launchIcon.imageset/Contents.json b/HDL-ON_iOS/Resources/Assets.xcassets/launchIcon.imageset/Contents.json
new file mode 100644
index 0000000..fdc91da
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Assets.xcassets/launchIcon.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "launchIcon.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/HDL-ON_iOS/Resources/Assets.xcassets/launchIcon.imageset/launchIcon.png b/HDL-ON_iOS/Resources/Assets.xcassets/launchIcon.imageset/launchIcon.png
new file mode 100644
index 0000000..3ed7acf
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Assets.xcassets/launchIcon.imageset/launchIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Assets.xcassets/launchIcon1.imageset/Contents.json b/HDL-ON_iOS/Resources/Assets.xcassets/launchIcon1.imageset/Contents.json
new file mode 100644
index 0000000..5c29287
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Assets.xcassets/launchIcon1.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "launchIcon1.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/HDL-ON_iOS/Resources/Assets.xcassets/launchIcon1.imageset/launchIcon1.png b/HDL-ON_iOS/Resources/Assets.xcassets/launchIcon1.imageset/launchIcon1.png
new file mode 100644
index 0000000..1955d58
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Assets.xcassets/launchIcon1.imageset/launchIcon1.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Assets.xcassets/launchIcon2.imageset/Contents.json b/HDL-ON_iOS/Resources/Assets.xcassets/launchIcon2.imageset/Contents.json
new file mode 100644
index 0000000..0d12678
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Assets.xcassets/launchIcon2.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "launchIcon2.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/HDL-ON_iOS/Resources/Assets.xcassets/launchIcon2.imageset/launchIcon2.png b/HDL-ON_iOS/Resources/Assets.xcassets/launchIcon2.imageset/launchIcon2.png
new file mode 100644
index 0000000..1592b14
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Assets.xcassets/launchIcon2.imageset/launchIcon2.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard b/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
index f5af9fc..935b43a 100644
--- a/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
+++ b/HDL-ON_iOS/Resources/EZ/Base.lproj/AddDevice.storyboard
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="1Qq-y9-5Vr">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="1Qq-y9-5Vr">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -843,8 +844,15 @@
                     <navigationItem key="navigationItem" id="XkN-Um-DoE"/>
                     <connections>
                         <outlet property="addBtn" destination="b2S-tK-xqv" id="9pR-up-3TG"/>
+                        <outlet property="nameL" destination="bzO-cY-bUs" id="aYK-OL-VpJ"/>
+                        <outlet property="passwordLable" destination="BBf-mw-P8e" id="d3L-jP-uP1"/>
                         <outlet property="processingIndicator" destination="YrL-E6-3kA" id="uPy-Af-flm"/>
+                        <outlet property="step1TipLable" destination="0PQ-gp-JOK" id="nAm-9N-DTh"/>
+                        <outlet property="stepThreeLable" destination="Q0X-wy-A5B" id="DWX-OJ-YK3"/>
                         <outlet property="stepTwoLabel" destination="UGZ-ag-Osr" id="9F4-Kd-6rm"/>
+                        <outlet property="tipLable" destination="hz9-ZE-6rg" id="ptX-eG-7O7"/>
+                        <outlet property="toCopBtn" destination="iaq-GW-DZt" id="TnC-6F-kLV"/>
+                        <outlet property="toSetBtn" destination="hOb-L4-rkc" id="cYH-M0-bkA"/>
                         <outlet property="wifiNameLabel" destination="SOG-Vj-m3m" id="uq7-f2-ZQ8"/>
                         <outlet property="wifiPwdLabel" destination="gzp-iy-iES" id="Z9H-tO-3B5"/>
                         <segue destination="2Wn-Wh-fVL" kind="push" identifier="go2WifiConfigResult" id="Csk-KC-bfz"/>
@@ -984,7 +992,7 @@
     </scenes>
     <inferredMetricsTieBreakers>
         <segue reference="9TP-S2-hhI"/>
-        <segue reference="9Lc-Kx-oZS"/>
+        <segue reference="Lmt-j9-vhw"/>
         <segue reference="ikM-Zn-H8f"/>
     </inferredMetricsTieBreakers>
     <resources>
diff --git a/HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard b/HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard
index 0db5c3a..63dec62 100644
--- a/HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard
+++ b/HDL-ON_iOS/Resources/EZ/Base.lproj/EZMain.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="tPl-Go-Tmu">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="tPl-Go-Tmu">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment version="4352" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -35,7 +35,7 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="R2t-zM-WMl">
-                                <rect key="frame" x="0.0" y="28" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="44.5" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="R2t-zM-WMl" id="a02-NK-SeS">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
@@ -222,7 +222,7 @@
                         <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94509803920000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="EZDeviceCell" rowHeight="73" id="Xkg-Dw-w2X" customClass="DeviceListCell">
-                                <rect key="frame" x="0.0" y="28" width="375" height="73"/>
+                                <rect key="frame" x="0.0" y="44.5" width="375" height="73"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Xkg-Dw-w2X" id="Iet-JC-0rQ">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="73"/>
@@ -356,7 +356,7 @@
                     </tableView>
                     <navigationItem key="navigationItem" id="QiI-QE-qqY">
                         <rightBarButtonItems>
-                            <barButtonItem systemItem="add" id="yGh-cj-oPZ">
+                            <barButtonItem id="yGh-cj-oPZ">
                                 <connections>
                                     <action selector="go2AddDevice:" destination="PUV-T9-WXJ" id="D58-zZ-Ox4"/>
                                 </connections>
@@ -392,7 +392,7 @@
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="EZCameraCell" id="7Im-ni-l3z">
-                                <rect key="frame" x="0.0" y="28" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="44.5" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7Im-ni-l3z" id="DdN-J1-0fa">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
@@ -512,7 +512,7 @@
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="DemoAPICell" id="wpS-t4-02o">
-                                <rect key="frame" x="0.0" y="28" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="44.5" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="wpS-t4-02o" id="8mM-ux-z21">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
@@ -551,7 +551,7 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="UVM-wN-ME4">
-                                <rect key="frame" x="0.0" y="28" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="44.5" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UVM-wN-ME4" id="PFk-ak-8nJ">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
@@ -648,7 +648,7 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="VhH-MZ-U0P">
-                                <rect key="frame" x="0.0" y="28" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="44.5" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VhH-MZ-U0P" id="Kep-2I-4hb">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
@@ -1809,7 +1809,7 @@
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="MessageCell" rowHeight="75" id="St6-kz-bZE" customClass="MessageListCell">
-                                <rect key="frame" x="0.0" y="28" width="375" height="75"/>
+                                <rect key="frame" x="0.0" y="44.5" width="375" height="75"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="St6-kz-bZE" id="gqt-AI-8vk">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="75"/>
@@ -1927,7 +1927,7 @@
                         <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="EZSettingCell" id="Mk7-Ag-WW0">
-                                <rect key="frame" x="0.0" y="55.5" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="49.5" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Mk7-Ag-WW0" id="Pt3-DC-cCE">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
diff --git a/HDL-ON_iOS/Resources/EZ/Base.lproj/EZVideoTalkViewcontroller.xib b/HDL-ON_iOS/Resources/EZ/Base.lproj/EZVideoTalkViewcontroller.xib
index 3d57751..904768e 100644
--- a/HDL-ON_iOS/Resources/EZ/Base.lproj/EZVideoTalkViewcontroller.xib
+++ b/HDL-ON_iOS/Resources/EZ/Base.lproj/EZVideoTalkViewcontroller.xib
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment version="2304" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -26,7 +27,7 @@
                         <rect key="frame" x="195" y="64" width="160" height="160"/>
                         <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </view>
-                    <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9ko-k4-F0N">
+                    <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9ko-k4-F0N">
                         <rect key="frame" x="20" y="302" width="85" height="30"/>
                         <color key="backgroundColor" red="0.80782043147208116" green="0.80782043147208116" blue="0.80782043147208116" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <state key="normal" title="鍒涘缓鎴块棿">
@@ -42,7 +43,7 @@
                             <action selector="createRoomAction:" destination="333-bP-4tK" eventType="touchUpInside" id="rAq-LO-B2O"/>
                         </connections>
                     </button>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qiF-2z-Rwj">
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qiF-2z-Rwj">
                         <rect key="frame" x="145" y="302" width="85" height="30"/>
                         <color key="backgroundColor" red="0.80782043150000005" green="0.80782043150000005" blue="0.80782043150000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <state key="normal" title="鍔犲叆鎴块棿">
@@ -73,7 +74,7 @@
                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                         <textInputTraits key="textInputTraits"/>
                     </textField>
-                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YO9-MU-r4L">
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YO9-MU-r4L">
                         <rect key="frame" x="270" y="302" width="85" height="30"/>
                         <color key="backgroundColor" red="0.80782043150000005" green="0.80782043150000005" blue="0.80782043150000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <state key="normal" title="绂诲紑鎴块棿">
@@ -90,7 +91,8 @@
                         </connections>
                     </button>
                 </subviews>
-                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                <viewLayoutGuide key="safeArea" id="gRk-Lv-awz"/>
+                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                 <constraints>
                     <constraint firstItem="YO9-MU-r4L" firstAttribute="height" secondItem="9ko-k4-F0N" secondAttribute="height" id="3hn-CA-7hn"/>
                     <constraint firstItem="3UU-E8-PbA" firstAttribute="leading" secondItem="gRk-Lv-awz" secondAttribute="leading" constant="20" id="4Rd-ZV-SEq"/>
@@ -116,7 +118,6 @@
                     <constraint firstItem="6Wf-7i-TE6" firstAttribute="centerY" secondItem="jc8-E1-NYw" secondAttribute="centerY" id="r2S-JH-0Bo"/>
                     <constraint firstItem="qiF-2z-Rwj" firstAttribute="leading" secondItem="9ko-k4-F0N" secondAttribute="trailing" constant="40" id="rkn-HZ-QQp"/>
                 </constraints>
-                <viewLayoutGuide key="safeArea" id="gRk-Lv-awz"/>
             </view>
             <connections>
                 <outlet property="localView" destination="3UU-E8-PbA" id="JEa-Cq-Kuk"/>
@@ -126,4 +127,9 @@
             <point key="canvasLocation" x="-143.19999999999999" y="131.52709359605913"/>
         </viewController>
     </objects>
+    <resources>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 1b26f15..5edc896 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -20,7 +20,7 @@
 19=The phone number is incorrect. Please re-enter.
 20=The password and confirmation you typed do not match. Please re-enter your password.
 21=The password format does not comply with the requirements, please enter again.
-22=The user has existed, yo24-hour defenseu can sign in directly.
+22=The user has existed, you can sign in directly.
 23=Incorrect verification code, please re-enter.
 24=Incorrect account number, please enter the correct email address.
 25=Email address
@@ -375,7 +375,7 @@
 371=Can not use the function, please bind the gateway
 372=Can not create the scene, please bind the gateway
 373=Fail to add the floor
-374=The residential data has been deleted, APP will automatically swift to another residence.
+374=Residence has been delivered or deleted, APP will automatically swift to another residence.
 375=The gateway is not connected to the server, fail to create the scene.
 376=Can not enter special character
 377=The whole residence
@@ -434,7 +434,7 @@
 448=Fixed deployment
 449=*Undo defense does not affect
 450=Disaster defense
-451=24-hour defense
+451=24h defense
 452=Burglar alarm
 453=Alarm mute
 454=Deployment information
@@ -570,6 +570,51 @@
 583=EZVIZ
 584=Deployment status
 585=Failed to obtain third-party platform information
+586=Sort
+587=Face management
+588=Tip
+589=Disagree
+590=Residential delivery
+591=*Member name
+592=Member account
+593=Face photo
+594=Please enter member name
+595=Delete
+596=Group Name
+597=Please enter
+598=Select device
+599=Please input name
+600=Add combined dimming
+601=Please select two or more devices
+602=My Home
+603=   Please read it carefully
+604=    'On Pro Face Information Collection Protocol'
+605=   If you agree to this agreement, please click the [Agree] button.
+606=Account binding is successful.You can continue to complete the device association operation
+607=Previous page
+608=Next page
+609=*The smart entrance machine can automatically identify suspicious personnel at the entrance and initiate a wandering alarm record
+610=Unable to bind this device. Please purchase this type of product from HDL
+611=Load more
+612=Facial Information Collection Protocol
+613=Revoke Authorization
+614=Statement on account binding
+615=After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid
+616=Bind account
+617=Residential status
+618=To_Be_Debugged
+619=Debugging
+620=To_Be_Accepted
+621=INITIAL_TATE
+622=ACCEPTANCE
+623=Latitude and longitude
+624=Triggered range
+625=Residential unbound
+626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed?
+627=The set time needs to be later than the current time.
+628=Temporary password validity period cannot be greater than 24 hours.
+629=Successfully unbound the residence.
+
 
 
 2532=Visitor Invitation Record
@@ -692,7 +737,7 @@
 1095=Select Date
 1096=Generate
 1097=Temporary password has been copied
-1098=Clear Password?
+1098=Do you want to delete the temporary password?
 1099=The expire time must be later than the effective time
 1100=Unlock Method
 1101=It'll synchronize with actual lock, confirm to delete?
@@ -934,23 +979,6 @@
 
  
  
-6000=Rename
-6001=Please enter a name
-6002=Xiaodu
-6003=aispeech
-6004="Unbind requires a third-party APP for operation", "transfer to a third-party APP"
-6005=Unbind
-6006=Smart speaker
-6007=Control content
-6008=Failed to upload data
-6009=Failed to configure data
-6010="There is no speaker yet,", "Please go to the third-party APP to bind the smart speaker."
-6011=Modification of remarks is unsuccessful!
-6012=Do you want to unbind?
-6013=Unbinding...
-6014=transfer to third-party APP
-6015=Add speakers
- 
     
 7000=Create automation
 7001=Edit automation
@@ -1110,7 +1138,7 @@
 7155=Distress/Normal
 7156=Distress
 7157=whether to unlock
-7158=is
+7158=Is
 7159=Fall in the alarm
 7160=Someone called the police
 7161=Warning tone
@@ -1118,9 +1146,23 @@
 7163=Video call
 7164=Manipulator
 7165=Area intrusion alarm
-7166=camera
-7167=main switch
-7168=pm10
+7166=Camera
+7167=Main switch
+7168=PM10
+
+8501=Video door lock
+8502=Electric quantity
+8503=The door is now closed
+8504=The door is not closed
+8505=RVC
+8506=One click to open the lock
+8507=Temporary password
+8508=History
+8509=Fluorite video door lock
+8510=Call from the doorbell
+8511=Door opener
+8512=Serial number
+8513=Model
 
 
 
@@ -1616,7 +1658,7 @@
 371=鍔熻兘鏃犳硶浣跨敤锛岃缁戝畾缃戝叧
 372=鏃犳硶鍒涘缓鍦烘櫙锛岃缁戝畾缃戝叧
 373=娣诲姞妤煎眰澶辫触銆�
-374=浣忓畢鏁版嵁宸茶鍒犻櫎锛孉PP灏嗚嚜鍔ㄥ垏鎹㈠埌鍙︿竴浣忓畢銆�
+374=浣忓畢宸插垹闄ゆ垨宸蹭氦浠橈紝APP灏嗚嚜鍔ㄥ垏鎹㈠埌鍙︿竴浣忓畢銆�
 375=缃戝叧鏈繛鎺ユ湇鍔″櫒锛屾棤娉曞垱寤哄満鏅��
 376=鏃犳硶杈撳叆鐗规畩瀛楃
 377=鍏ㄥ畢鍖哄煙
@@ -1811,7 +1853,50 @@
 583=钀ょ煶鎽勫儚澶�
 584=甯冮槻鐘舵��
 585=鑾峰彇绗笁鏂瑰钩鍙颁俊鎭け璐�
-
+586=鎺掑簭
+587=浜鸿劯绠$悊
+588=浜鸿劯淇℃伅閲囬泦鍗忚鎻愮ず
+589=涓嶅悓鎰�
+590=浣忓畢浜や粯
+591=*鎴愬憳鍚嶇О
+592=鎴愬憳璐﹀彿
+593=浜鸿劯鐓х墖
+594=璇疯緭鍏ユ垚鍛樺悕绉�
+595=鍒犻櫎浜鸿劯鏁版嵁
+596=缁勫悕绉�
+597=璇疯緭鍏�
+598=閫夋嫨缇ゆ帶璁惧
+599=璇疯緭鍏ョ粍鍚嶇О
+600=娣诲姞缁勫悎璋冨厜
+601=璇烽�夋嫨涓や釜浠ヤ笂鐨勮澶�
+602=鎴戠殑瀹跺涵
+603=    涓轰繚鎶ゆ偍鐨勪釜浜洪殣绉佹潈鐩婏紝鐗瑰悜鎮ㄩ�氱煡骞剁敵璇锋槑纭悓鎰忔巿鏉冦�傝浣犱粩缁嗛槄璇�
+604=    銆奜n Pro浜鸿劯淇℃伅閲囬泦鍗忚銆�
+605=    鑻ュ悓鎰忚鍗忚锛岃鐐瑰嚮銆愬悓鎰忋�戞寜閿紝琛ㄧず鎮ㄥ凡缁忕悊瑙e苟鍚屾剰浜鸿劯淇℃伅閲囬泦鍗忚銆�
+606=璐︽埛缁戝畾鎴愬姛锛屾偍鍙互缁х画瀹屾垚璁惧鍏宠仈鎿嶄綔
+607=涓婁竴椤�
+608=涓嬩竴椤�
+609=*鍙瀵硅鍙互鑷姩璇嗗埆闂ㄥ彛鍙枒浜哄憳锛屽苟鍙戣捣寰樺緤鎶ヨ璁板綍
+610=鏃犳硶缁戝畾璇ヨ澶囷紝璇蜂粠娌充笢娓犻亾璐拱璇ョ被鍨嬩骇鍝�
+611=鍔犺浇鏇村
+612=浜鸿劯淇℃伅閲囬泦鍗忚
+613=鎾ゅ洖鎺堟潈
+614=鍏充簬璐﹀彿缁戝畾鐨勫0鏄�
+615=鎾ら攢鎺堟潈鍚庯紝璇ュ搧鐗屽叧鑱斿湪On Pro涓殑璁惧灏嗗叏閮ㄨ瑙g粦锛岀浉鍏充娇鐢ㄤ俊鎭悎璁惧鍊间篃灏嗗け鏁�
+616=缁戝畾璐﹀彿
+617=浣忓畢鐘舵��
+618=寰呰皟璇�
+619=璋冭瘯涓�
+620=寰呴獙鏀�
+621=鍒濆鎬�
+622=楠屾敹
+623=缁忕含搴�
+624=瑙﹀彂鑼冨洿
+625=浣忓畢瑙g粦
+626=浣忓畢瑙g粦涔嬪悗锛屼綇瀹呭皢浼氫粠浣犵殑璐﹀彿涓Щ闄わ紝纭畾瑕佹搷浣滃悧锛�
+627=璁剧疆鐨勬椂闂撮渶瑕佹櫄浜庡綋鍓嶆椂闂�
+628=涓存椂瀵嗙爜鏈夋晥鏈熶笉鑳藉ぇ浜�24灏忔椂銆�
+629=浣忓畢瑙g粦鎴愬姛銆�
 
 2532=璁垮閭�璇疯褰�
 2533=璁垮绠$悊
@@ -1942,8 +2027,8 @@
 1095=閫夋嫨鏃ユ湡
 1096=鐢熸垚
 1097=涓存椂瀵嗙爜宸茬粡澶嶅埗
-1098=娓呴櫎褰撳墠涓存椂瀵嗙爜锛�
-1099=鐢熸晥鏃堕棿蹇呴』澶т簬澶辨晥鏃堕棿
+1098=鏄惁鍒犻櫎涓存椂瀵嗙爜锛�
+1099=鐢熸晥鏃堕棿蹇呴』鏃╀簬澶辨晥鏃堕棿
 1100=寮�閿佹柟寮忕鐞�
 1101=鍒犻櫎鎿嶄綔灏嗚鍚屾浜庡疄浣撻攣涓妠0}鏄惁杩橀渶瑕佸垹闄わ紵
 1102=纭鍒犻櫎
@@ -2346,7 +2431,28 @@
 7165=鍖哄煙鍏ヤ镜鍛婅
 7166=鎽勫儚澶�
 7167=鎬绘帶寮�鍏�
-7168=pm10
+7168=PM10
+
+
+8501=瑙嗛闂ㄩ攣
+8502=鐢甸噺
+8503=褰撳墠闂ㄥ凡鍏�
+8504=褰撳墠闂ㄦ湭鍏�
+8505=瀹炴椂瑙嗛
+8506=涓�閿紑閿�
+8507=涓存椂瀵嗙爜
+8508=鍘嗗彶璁板綍
+8509=钀ょ煶瑙嗛闂ㄩ攣
+8510=鏉ヨ嚜鈥滈棬閾冣�濆懠鍙�
+8511=寮�闂ㄤ汉鍛�
+8512=搴忓垪鍙�
+8513=鍨嬪彿
+
+
+
+
+
+
 
 
 
@@ -3027,6 +3133,51 @@
 583=EZVIZ
 584=Deployment status
 585=Failed to obtain third-party platform information
+586=Sort
+587=Face management
+588=Tip
+589=Disagree
+590=Residential delivery
+591=*Member name
+592=Member account
+593=Face photo
+594=Please enter member name
+595=Delete
+596=Group Name
+597=Please enter
+598=Select device
+599=Please input name
+600=Add combined dimming
+601=Please select two or more devices
+602=My Home
+603=   In order to protect your personal privacy rights, we hereby notify you and apply for explicit consent authorization. Please read it carefully
+604=    'On Pro Face Information Collection Protocol'
+605=   If you agree to this agreement, please click the [Agree] button to indicate that you have understood and agreed to the face information collection agreement.
+606=Account binding is successful.You can continue to complete the device association operation
+607=Previous page
+608=Next page
+609=*The smart entrance machine can automatically identify suspicious personnel at the entrance and initiate a wandering alarm record
+610=Unable to bind this device. Please purchase this type of product from HDL
+611=Load more
+612=Facial Information Collection Protocol
+613=Revoke Authorization
+614=Statement on account binding
+615=After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid
+616=Bind account
+617=Residential status
+618=To_Be_Debugged
+619=Debugging
+620=To_Be_Accepted
+621=INITIAL_TATE
+622=ACCEPTANCE
+623=Latitude and longitude
+624=Triggered range
+625=Residential unbound
+626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed?
+627=The set time needs to be later than the current time.
+628=Temporary password validity period cannot be greater than 24 hours.
+629=Successfully unbound the residence.
+
 
 
 2532=Visitor Invitation Record
@@ -3288,6 +3439,8 @@
 5045=袨褋薪芯胁薪邪褟 谐褉芯屑泻芯褋褌褜
 5046=袪械谐褍谢懈褉芯胁泻邪 谐褉芯屑泻芯褋褌懈
 5047=小械褉胁懈褋"QQ music" 薪械 褍褋褌邪薪芯胁谢械薪 薪邪 胁邪褕械屑 屑芯斜懈谢褜薪芯屑 褌械谢械褎芯薪械, 锌芯卸邪谢褍泄褋褌邪, 锌械褉械泄写懈褌械 胁 褑械薪褌褉 锌褉懈谢芯卸械薪懈泄.
+5048= Progressive cycle
+5049=Single play
 
 6000=袧芯褉屑邪谢褜薪褘泄
 6001=小芯褋褌芯褟薪懈械 褍褋褌褉芯泄褋褌胁邪
@@ -3387,23 +3540,6 @@
 
 
 
-
-6000=袩械褉械懈屑械薪芯胁邪褌褜
-6001=袩芯卸邪谢褍泄褋褌邪, 胁胁械写懈褌械 薪邪蟹胁邪薪懈械
-6002=屑邪褉泻邪 Xiaodu
-6003=袪邪褋锌芯蟹薪邪胁邪褌械谢褜 褉械褔懈
-6004="袛谢褟 芯褌屑械薪褘 锌褉懈胁褟蟹泻懈 褌褉械斜褍械褌褋褟 褋褌芯褉芯薪薪械械 锌褉懈谢芯卸械薪懈械 ", "锌械褉械写邪褌褜 胁 褋褌芯褉芯薪薪械械 锌褉懈谢芯卸械薪懈械"
-6005=袨褌胁褟蟹邪褌褜
-6006=校屑薪褘泄 写懈薪邪屑懈泻
-6007=校锌褉邪胁谢械薪懈械 褋芯写械褉卸懈屑褘屑
-6008=袧械 褍写邪谢芯褋褜 蟹邪谐褉褍蟹懈褌褜 写邪薪薪褘械
-6009=袧械 褍写邪谢芯褋褜 薪邪褋褌褉芯懈褌褜 写邪薪薪褘械
-6010="袛懈薪邪屑懈泻 械褖械 薪械 褍褋褌邪薪芯胁谢械薪", "袩芯卸邪谢褍泄褋褌邪, 锌械褉械泄写懈褌械 胁 褋褌芯褉芯薪薪械械 锌褉懈谢芯卸械薪懈械, 褔褌芯斜褘 锌褉懈胁褟蟹邪褌褜 褋屑邪褉褌 写懈薪邪屑懈泻".
-6011=袠蟹屑械薪械薪懈械 锌褉懈屑械褔邪薪懈泄 薪械 褍写邪谢芯褋褜!
-6012=袙褘 褏芯褌懈褌械 芯褌屑械薪懈褌褜 锌褉懈胁褟蟹泻褍?
-6013=袨褌胁褟蟹褘胁邪薪懈械...
-6014=锌械褉械褏芯写 胁 褋褌芯褉芯薪薪械械 锌褉懈谢芯卸械薪懈械
-6015=袛芯斜邪胁懈褌褜 写懈薪邪屑懈泻懈
 
 
 7000=小芯蟹写邪褌褜 邪胁褌芯屑邪褌懈蟹邪褑懈褞
@@ -3561,6 +3697,34 @@
 7152=袩芯泻懈薪褍褌褜 懈谢懈 锌褉懈斜褘褌褜
 7153=袩芯泻懈薪褍褌褜
 7154=袩褉懈斜褘褌褜
+7155=Distress/Normal
+7156=Distress
+7157=whether to unlock
+7158=Is
+7159=Fall in the alarm
+7160=Someone called the police
+7161=Warning tone
+7162=Face to open the door
+7163=Video call
+7164=Manipulator
+7165=Area intrusion alarm
+7166=Camera
+7167=Main switch
+7168=PM10
+
+8501=Video door lock
+8502=Electric quantity
+8503=The door is now closed
+8504=The door is not closed
+8505=RVC
+8506=One click to open the lock
+8507=Temporary password
+8508=History
+8509=Fluorite video door lock
+8510=Call from the doorbell
+8511=Door opener
+8512=Serial number
+8513=Model
 
 
 
@@ -4246,6 +4410,52 @@
 583=EZVIZ
 584=Deployment status
 585=Failed to obtain third-party platform information
+586=Sort
+587=Face management
+588=Tip
+589=Disagree
+590=Residential delivery
+591=*Member name
+592=Member account
+593=Face photo
+594=Please enter member name
+595=Delete
+596=Group Name
+597=Please enter
+598=Select device
+599=Please input name
+600=Add combined dimming
+601=Please select two or more devices
+602=My Home
+603=   In order to protect your personal privacy rights, we hereby notify you and apply for explicit consent authorization. Please read it carefully
+604=    'On Pro Face Information Collection Protocol'
+605=   If you agree to this agreement, please click the [Agree] button to indicate that you have understood and agreed to the face information collection agreement.
+606=Account binding is successful.You can continue to complete the device association operation
+607=Previous page
+608=Next page
+609=*The smart entrance machine can automatically identify suspicious personnel at the entrance and initiate a wandering alarm record
+610=Unable to bind this device. Please purchase this type of product from HDL
+611=Load more
+612=Facial Information Collection Protocol
+613=Revoke Authorization
+614=Statement on account binding
+615=After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid
+616=Bind account
+617=Residential status
+618=To_Be_Debugged
+619=Debugging
+620=To_Be_Accepted
+621=INITIAL_TATE
+622=ACCEPTANCE
+623=Latitude and longitude
+624=Triggered range
+625=Residential unbound
+626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed?
+627=The set time needs to be later than the current time.
+628=Temporary password validity period cannot be greater than 24 hours.
+629=Successfully unbound the residence.
+
+
 
 
 
@@ -4508,6 +4718,8 @@
 5045=Volumen general
 5046=Ajustar volumen 
 5047="QQ music" no se ha instalado en su tel茅fono celular, proceda en el Centro de aplicaciones.
+5048= Progressive cycle
+5049=Single play
 
 6000=Normal 
 6001=Estado del dispositivo
@@ -4603,22 +4815,7 @@
 6093=El dispositivo no esta en linea
 6094=El dispositivo de puerta de enlace no existe
 6095=Mas de 30 botondes de adici贸n 
-6000=Renombrar
-6001=Introduzca el nombre
-6002=Xiaodu
-6003=aispeech
-6004=El sistema est谩 en mantenimiento ~ Int茅ntelo de nuevo m谩s tarde ~
-6005=Desvinculado
-6006=Altavoz inteligente
-6007=Controlar contenido
-6008=Error al cagar datos 
-6009=Error al configurar datos 
-6010="Todav铆a no hay altavoz", "Vaya a la aplicaci贸n de terceros para vincular el altavoz inteligente".
-6011=La modificaci贸n de los comentarios no tiene 茅xito
-6012=Quieres desvincularte? 
-6013=Desvinculaci贸n 
-6014=transferir a app de terceros 
-6015=A帽adir altavoces
+
 7000=Crear automatizaci贸n
 7001=Etidar automatizaci贸n
 7002=Si
@@ -4774,6 +4971,35 @@
 7152=Dejar o Arrivar a un lugar 
 7153=Salir 
 7154=Llegar 
+7155=Distress/Normal
+7156=Distress
+7157=whether to unlock
+7158=Is
+7159=Fall in the alarm
+7160=Someone called the police
+7161=Warning tone
+7162=Face to open the door
+7163=Video call
+7164=Manipulator
+7165=Area intrusion alarm
+7166=Camera
+7167=Main switch
+7168=PM10
+
+8501=Video door lock
+8502=Electric quantity
+8503=The door is now closed
+8504=The door is not closed
+8505=RVC
+8506=One click to open the lock
+8507=Temporary password
+8508=History
+8509=Fluorite video door lock
+8510=Call from the doorbell
+8511=Door opener
+8512=Serial number
+8513=Model
+
 9000=Inicio sesi贸n con un nuevo n煤mero de tel茅fono celular 
 9001=Inicie sesi贸n con una nueva direcci贸n de correo el茅ctr贸nico 
 9002=Nuevo numero de celular revisado
@@ -5451,6 +5677,74 @@
 583=EZVIZ
 584=Deployment status
 585=Failed to obtain third-party platform information
+586=Sort
+587=Face management
+588=Tip
+589=Disagree
+590=Residential delivery
+591=*Member name
+592=Member account
+593=Face photo
+594=Please enter member name
+595=Delete
+596=Group Name
+597=Please enter
+598=Select device
+599=Please input name
+600=Add combined dimming
+601=Please select two or more devices
+602=My Home
+603=   In order to protect your personal privacy rights, we hereby notify you and apply for explicit consent authorization. Please read it carefully
+604=    'On Pro Face Information Collection Protocol'
+605=   If you agree to this agreement, please click the [Agree] button to indicate that you have understood and agreed to the face information collection agreement.
+606=Account binding is successful.You can continue to complete the device association operation
+607=Previous page
+608=Next page
+609=*The smart entrance machine can automatically identify suspicious personnel at the entrance and initiate a wandering alarm record
+610=Unable to bind this device. Please purchase this type of product from HDL
+611=Load more
+612=Facial Information Collection Protocol
+613=Revoke Authorization
+614=Statement on account binding
+615=After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid
+616=Bind account
+617=Residential status
+618=To_Be_Debugged
+619=Debugging
+620=To_Be_Accepted
+621=INITIAL_TATE
+622=ACCEPTANCE
+623=Latitude and longitude
+624=Triggered range
+625=Residential unbound
+626=After unbinding the residence, the residence will be removed from your account. Are you sure you want to proceed?
+627=The set time needs to be later than the current time.
+628=Temporary password validity period cannot be greater than 24 hours.
+629=Successfully unbound the residence.
+
+
+
+2532=Visitor Invitation Record
+2533=Visitor management
+2534=Visitor Invitation
+2535=Record
+2536=*After you initiate the visitor certificate, you can  unlock the door by password or swipe the code  freely within the validity period you set. Please share the certificate carefully.
+2537=Input phone number of the visitor
+2538=Input 6-digits temporary password
+2539=Random Generation
+2540=After confirmation, the visitor QR code will be generated, and the 6-digit dynamic digital password SMS will also be sent to the visitor mobile phone.
+2541=Are you sure to delete visitor credentials?
+2542=Long press the QR code to save the QR code to the album
+2543=QR code is invalid
+2544=Generate Visitor Credentials
+2545=Cancle Visitor Credentials
+2546=Visitor QR Code
+2547=Phone Number
+2548=Please enter a correct phone number
+2549=Please select a effective time
+2550=Please select a expire time
+2551=Temporary password is invalid
+
 
 
 1000=袙谢邪卸薪芯褋褌 胁 褋褌邪褟褌邪
@@ -5691,6 +5985,8 @@
 5045=小懈谢邪 薪邪 芯褋薪芯胁薪懈褟 蟹胁褍泻
 5046=袪械谐褍谢懈褉邪薪械 薪邪 蟹胁褍泻邪
 5047="鈥濹Q Music鈥� 薪械 械 懈薪褋褌邪谢懈褉邪薪 薪邪 胁邪褕懈褟 屑芯斜懈谢械薪 褌械谢械褎芯薪{\r\n}袦芯谢褟, 懈薪褋褌邪谢懈褉邪泄褌械 谐芯.
+5048= Progressive cycle
+5049=Single play
 
 6000=袧芯褉屑邪谢薪芯
 6001=小褗褋褌芯褟薪懈械 薪邪 褍褋褌褉芯泄褋褌胁芯褌芯
@@ -5791,22 +6087,6 @@
 
 
 
-6000=袩褉械懈屑械薪褍胁邪薪械
-6001=袦芯谢褟, 胁褗胁械写械褌械 懈屑械
-6002=Xiaodu
-6003=aispeech
-6004="袨褌胁褗褉蟹胁邪薪械褌芯 懈蟹懈褋泻胁邪 锌褉懈谢芯卸械薪懈械 薪邪 褌褉械褌邪 褋褌褉邪薪邪 蟹邪 褉邪斜芯褌邪", "锌褉械褏胁褗褉谢褟薪械 泻褗屑 锌褉懈谢芯卸械薪懈械 薪邪 褌褉械褌邪 褋褌褉邪薪邪"
-6005=袨褌胁褗褉蟹邪薪芯
-6006=校屑械薪 胁懈褋芯泻芯谐芯胁芯褉懈褌械谢
-6007=袣芯薪褌褉芯谢 薪邪 褋褗写褗褉卸邪薪懈械褌芯
-6008=袧械褍褋锌械褕薪芯 泻邪褔胁邪薪械 薪邪 写邪薪薪懈
-6009=袧械褍褋锌械褕薪芯 泻芯薪褎懈谐褍褉懈褉邪薪械 薪邪 写邪薪薪懈褌械
-6010="袙褋械 芯褖械 薪褟屑邪 胁懈褋芯泻芯谐芯胁芯褉懈褌械谢,", "袦芯谢褟, 芯褌懈写械褌械 胁 锌褉懈谢芯卸械薪懈械褌芯 薪邪 褌褉械褌邪 褋褌褉邪薪邪, 蟹邪 写邪 褋胁褗褉卸械褌械 懈薪褌械谢懈谐械薪褌薪懈褟 胁懈褋芯泻芯谐芯胁芯褉懈褌械谢."
-6011=袩褉芯屑褟薪邪褌邪 薪邪 蟹邪斜械谢械卸泻懈褌械 械 薪械褍褋锌械褕薪邪!
-6012=袠褋泻邪褌械 谢懈 写邪 芯褌胁褗褉卸械褌械?
-6013=袨褌胁褗褉蟹胁邪薪械...
-6014=锌褉械褏胁褗褉谢褟薪械 泻褗屑 锌褉懈谢芯卸械薪懈械 薪邪 褌褉械褌邪 褋褌褉邪薪邪
-6015=袛芯斜邪胁械褌械 胁懈褋芯泻芯谐芯胁芯褉懈褌械谢懈
 
 
 7000=袧芯胁邪 邪胁褌芯屑邪褌懈蟹邪褑懈褟
@@ -5964,6 +6244,34 @@
 7152=孝褉褗谐薪械褌械 懈谢懈 锌褉懈褋褌懈谐薪械褌械 薪邪 屑褟褋褌芯
 7153=袧邪锌褍褋泻邪薪械
 7154=袩褉懈褋褌懈谐邪薪械
+7155=Distress/Normal
+7156=Distress
+7157=whether to unlock
+7158=Is
+7159=Fall in the alarm
+7160=Someone called the police
+7161=Warning tone
+7162=Face to open the door
+7163=Video call
+7164=Manipulator
+7165=Area intrusion alarm
+7166=Camera
+7167=Main switch
+7168=PM10
+
+8501=Video door lock
+8502=Electric quantity
+8503=The door is now closed
+8504=The door is not closed
+8505=RVC
+8506=One click to open the lock
+8507=Temporary password
+8508=History
+8509=Fluorite video door lock
+8510=Call from the doorbell
+8511=Door opener
+8512=Serial number
+8513=Model
 
 
 
diff --git a/HDL-ON_iOS/Resources/LaunchScreen.xib b/HDL-ON_iOS/Resources/LaunchScreen.xib
index 9131928..c3ef5db 100644
--- a/HDL-ON_iOS/Resources/LaunchScreen.xib
+++ b/HDL-ON_iOS/Resources/LaunchScreen.xib
@@ -1,43 +1,48 @@
-锘�<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207" />
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1" />
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" />
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder" />
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480" />
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" />
+            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2017 " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines"
-                    minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="20" y="439" width="441" height="21" />
-                    <fontDescription key="fontDescription" type="system" pointSize="17" />
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor" />
-                    <nil key="highlightedColor" />
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="  Copyright (c) 2017 " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                    <rect key="frame" x="20" y="439" width="441" height="21"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" systemColor="darkTextColor"/>
+                    <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="HDL_ON_iOS" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines"
-                    minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <rect key="frame" x="20" y="140" width="441" height="43" />
-                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36" />
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor" />
-                    <nil key="highlightedColor" />
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="HDL_ON_iOS" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
+                    <rect key="frame" x="20" y="140" width="441" height="43"/>
+                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
+                    <color key="textColor" systemColor="darkTextColor"/>
+                    <nil key="highlightedColor"/>
                 </label>
             </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite" />
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC" />
-                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk" />
-                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l" />
-                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0" />
-                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9" />
-                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g" />
+                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
+                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
+                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
+                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
+                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
+                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
             </constraints>
-            <nil key="simulatedStatusBarMetrics" />
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics" />
-            <point key="canvasLocation" x="548" y="455" />
+            <nil key="simulatedStatusBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="548" y="455"/>
         </view>
     </objects>
+    <resources>
+        <systemColor name="darkTextColor">
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
 </document>
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Cell.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Cell.png
new file mode 100644
index 0000000..5ae517b
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/Cell.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/HistoryList.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/HistoryList.png
new file mode 100644
index 0000000..0ad1a69
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/HistoryList.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/OneOpenLock.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/OneOpenLock.png
new file mode 100644
index 0000000..779d661
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/OneOpenLock.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/RTV.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/RTV.png
new file mode 100644
index 0000000..002d330
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/RTV.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLocked.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLocked.png
new file mode 100644
index 0000000..058119f
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLocked.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLocking.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLocking.png
new file mode 100644
index 0000000..6c15f4f
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/UnLocking.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorLockOpen1.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorLockOpen1.png
new file mode 100644
index 0000000..5d35a45
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorLockOpen1.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorlockClose1.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorlockClose1.png
new file mode 100644
index 0000000..e4d40fb
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/DoorLock/VideoDoorlockClose1.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/VideoDoorLockFunctionBg.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/VideoDoorLockFunctionBg.png
new file mode 100644
index 0000000..eeba7ab
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/VideoDoorLockFunctionBg.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/securitydoorezviz.png b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/securitydoorezviz.png
new file mode 100644
index 0000000..e4d40fb
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/securitydoorezviz.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/LogicIcon/selectlocation.png b/HDL-ON_iOS/Resources/Phone/LogicIcon/selectlocation.png
new file mode 100644
index 0000000..e424a54
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/LogicIcon/selectlocation.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/MusicIcon/currentPlayList.png b/HDL-ON_iOS/Resources/Phone/MusicIcon/currentPlayList.png
new file mode 100644
index 0000000..1cb04da
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/MusicIcon/currentPlayList.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PersonalCenter/CombinedDimmingIcon.png b/HDL-ON_iOS/Resources/Phone/PersonalCenter/CombinedDimmingIcon.png
new file mode 100644
index 0000000..52310e3
--- /dev/null
+++ b/HDL-ON_iOS/Resources/Phone/PersonalCenter/CombinedDimmingIcon.png
Binary files differ
diff --git a/HDL-ON_iOS/Resources/com.hri.hpc.mobile.ios.player.metallib b/HDL-ON_iOS/Resources/com.hri.hpc.mobile.ios.player.metallib
index 53bacd9..927d741 100644
--- a/HDL-ON_iOS/Resources/com.hri.hpc.mobile.ios.player.metallib
+++ b/HDL-ON_iOS/Resources/com.hri.hpc.mobile.ios.player.metallib
Binary files differ
diff --git a/HDL-ON_iOS/Resources/en.lproj/Localizable.strings b/HDL-ON_iOS/Resources/en.lproj/Localizable.strings
index 0e4e516..ac1100f 100644
--- a/HDL-ON_iOS/Resources/en.lproj/Localizable.strings
+++ b/HDL-ON_iOS/Resources/en.lproj/Localizable.strings
@@ -28,6 +28,9 @@
 "get_info_fail"="Searching for failed. Poor network.";
 "ad_input_manual"="Manual Input";
 
+"ad_result_verify_local_lock"="Please verify the added primary user fingerprint, key or sensor card within 2 minutes. Click the Verified button after verification";
+"ad_verified"="Verified";
+
 "device_camera_list_title"="Device Channel List";
 "device_input_vierify_code"="Input the device verification code.";
 "device_verify_code_wrong"="Incorrect verification code.";
@@ -63,6 +66,47 @@
 "device_password"="Password";
 "device_account_pw_empty"="The user name or password is required.";
 "device_lan_preview_title"="Live View via LAN";
+"device_add_device_qr_code"="Device QR Code";
+
+"device_open"="Open";
+"device_open_success"="Success to open the door!";
+"device_please_input_door_password"="Input the unlock password";
+"device_history"="History";
+"device_his_no_more_data"="No more data";
+"device_temp_pass"="Temporary password";
+"device_temp_year"=".";
+"device_temp_month"=".";
+"device_temp_date"=".";
+"device_temp_left"="Left";
+"device_temp_times"="times";
+"device_temp_save"="Save";
+"device_temp_valid_date"="Term of validity";
+"device_temp_valid_begin"="Begin";
+"device_temp_valid_end"="End";
+"device_temp_use_times"="Use times";
+"device_temp_user"="User";
+"device_temp_please_select"="Please select";
+"device_temp_unlimited_times"="Unlimited";
+"device_temp_sure"="Sure";
+"device_temp_cancle"="Cancle";
+"device_temp_please_input"="Please input";
+"device_temp_input_use_count_describe"="Enter an integer from 1 to 100. Null means unlimited times";
+"device_temp_input_pure_number"="Please enter a pure number";
+"device_temp_input_valid_number"="Please enter a number between 1-100";
+"device_temp_unit_year"="Y";
+"device_temp_unit_month"="M";
+"device_temp_unit_date"="D";
+"device_temp_unit_hour"="h";
+"device_temp_unit_minute"="m";
+"device_temp_please_input_user_name"="Please input a user name";
+"device_temp_please_select_begin_time"="Please select the start time";
+"device_temp_please_select_end_time"="Please select the end time";
+"device_temp_please_end_time_should_later"="The end time cannot be earlier than the start time";
+"device_temp_unlimited_use_times"="Unlimited times";
+"device_temp_total"="Total ";
+"device_temp_copied"="Copied";
+"device_temp_long_tap_copy"="Long press to copy";
+"device_temp_sure_to_delete"="Are you sure to delete the temporary password?";
 
 "dmessage_title"="Message";
 "message_read"="Mark as Read";
@@ -121,6 +165,25 @@
 "wifi_device_start_ready"="The device is already started and it is the first time to configure with network.";
 "wifi_config_wifi_ago"="This device is configured with network before.";
 
+"wifi_config_seria_num"="9-digit serial number on the device body";
+"wifi_config_verify_code"="Verification Code";
+"wifi_config_connected"="Connected";
+"wifi_config_select_set_param"="Select \"Set Parameters\"";
+"wifi_config_select_wifi"="Select \"Wi Fi\"";
+"wifi_config_net_work"="Configure Network";
+"wifi_config_name"="Name:";
+"wifi_config_copy_pwd"="Copy Pwd";
+"wifi_config_to_setting"="To Setting";
+"wifi_config_step_three"="Return to the app, wait for the device to connect, and automatically proceed to the next step after success.";
+"wifi_config_tip"="Please connect your phone to your device Wi Fi by following these steps:";
+"wifi_config_step_three_tip"="(Note: If the device WIFI name is not prefixed with \"EZVIZ\", please copy the password and manually modify the password prefix based on the new prefix name and connect. For example, \"SoftAP_XXXXXXX\")";
+"wifi_config_not_connected"="Not connected";
+"wifi_config_step_2_tips"="The Wi Fi information of the devices to be connected is as follows:";
+"wifi_config_step_2_tips"="If you are using a dual frequency router, please do not connect the camera to Wi Fi in the 5G frequency band";
+"wifi_config_step_2_next_step"="Next Step";
+"wifi_config_step_2_net"="Net:";
+"wifi_config_step_2_password"="Pwd:";
+
 "ui_last_update"="Last Updated:";
 "ui_last_update_empty"="Last Updated: No record.";
 "ui_just_now"="Recently";
@@ -158,3 +221,6 @@
 //2021-01-27 鏂板
 "Devicelist"="Device list";
 "Logout"="Log Out";
+
+//閫氱敤
+"hdl_ez_common_no_data"="No Data";
\ No newline at end of file
diff --git a/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings b/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings
index 941dd22..d2711a4 100644
--- a/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings
+++ b/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings
@@ -28,6 +28,9 @@
 "get_info_fail"="鏌ヨ澶辫触锛岀綉缁滀笉缁欏姏";
 "ad_input_manual"="鎵嬪姩杈撳叆";
 
+"ad_result_verify_local_lock"="璇峰湪2鍒嗛挓涔嬪唴鏍¢獙宸叉坊鍔犵殑涓荤敤鎴锋寚绾广�佸瘑閽ユ垨鎰熷簲鍗★紝鏍¢獙瀹屾垚璇风偣鍑诲凡鏍¢獙鎸夐挳";
+"ad_verified"="宸叉牎楠�";
+
 "device_camera_list_title"="璁惧閫氶亾鍒楄〃";
 "device_input_vierify_code"="璇疯緭鍏ヨ澶囬獙璇佺爜";
 "device_verify_code_wrong"="楠岃瘉鐮侀敊璇�";
@@ -63,6 +66,48 @@
 "device_password"="瀵嗙爜";
 "device_account_pw_empty"="甯愬彿鎴栧瘑鐮佷笉鑳戒负绌�";
 "device_lan_preview_title"="灞�鍩熺綉棰勮";
+"device_add_device_qr_code"="璁惧浜岀淮鐮�";
+
+"device_open"="寮�闂�";
+"device_open_success"="寮�闂ㄦ垚鍔燂紒";
+"device_please_input_door_password"="璇疯緭鍏ュ紑閿佸瘑鐮�";
+"device_history"="鍘嗗彶璁板綍";
+"device_his_no_more_data"="娌℃湁鏇村鏁版嵁";
+"device_temp_pass"="涓存椂瀵嗙爜";
+"device_temp_year"="骞�";
+"device_temp_month"="鏈�";
+"device_temp_date"="鏃�";
+"device_temp_left"="鍓╀綑";
+"device_temp_times"="娆�";
+"device_temp_save"="淇濆瓨";
+"device_temp_user"="浣跨敤浜�";
+"device_temp_valid_date"="鏈夋晥鏈�";
+"device_temp_valid_begin"="寮�濮�";
+"device_temp_valid_end"="缁撴潫";
+"device_temp_use_times"="浣跨敤娆℃暟";
+"device_temp_please_select"="璇烽�夋嫨";
+"device_temp_unlimited_times"="涓嶉檺";
+"device_temp_sure"="纭";
+"device_temp_cancle"="鍙栨秷";
+"device_temp_please_input"="璇疯緭鍏�";
+"device_temp_input_use_count_describe"="杈撳叆1鍒�100鐨勬暣鏁帮紝 涓虹┖琛ㄧず涓嶉檺娆℃暟";
+"device_temp_input_pure_number"="璇疯緭鍏ョ函鏁板瓧";
+"device_temp_input_valid_number"="璇疯緭鍏�1-100涔嬮棿鐨勬暟瀛�";
+"device_temp_unit_year"="骞�";
+"device_temp_unit_month"="鏈�";
+"device_temp_unit_date"="鏃�";
+"device_temp_unit_hour"="鏃�";
+"device_temp_unit_minute"="鍒�";
+"device_temp_please_input_user_name"="璇疯緭鍏ヤ娇鐢ㄤ汉";
+"device_temp_please_select_begin_time"="璇烽�夋嫨寮�濮嬫椂闂�";
+"device_temp_please_select_end_time"="璇烽�夋嫨缁撴潫鏃堕棿";
+"device_temp_please_end_time_should_later"="缁撴潫鏃堕棿涓嶅緱鏃╀簬寮�濮嬫椂闂�";
+"device_temp_unlimited_use_times"="涓嶉檺娆℃暟";
+"device_temp_total"="鎬绘暟";
+"device_temp_copied"="宸插鍒�";
+"device_temp_long_tap_copy"="闀挎寜澶嶅埗涓存椂瀵嗙爜";
+"device_temp_sure_to_delete"="纭鍒犻櫎涓存椂瀵嗙爜鍚楋紵";
+
 
 "dmessage_title"="娑堟伅";
 "message_read"="鏍囪宸茶";
@@ -121,6 +166,25 @@
 "wifi_device_start_ready"="璁惧宸插惎鍔ㄥソ锛屼笖鏄涓�娆¢厤缃綉缁�";
 "wifi_config_wifi_ago"="杩欏彴璁惧浠ュ墠閰嶈繃缃戠粶";
 
+"wifi_config_seria_num"="璁惧鏈鸿韩涓婄殑9浣嶅簭鍒楀彿";
+"wifi_config_verify_code"="楠岃瘉鐮�";
+"wifi_config_connected"="鎴戝凡杩炴帴濂�";
+"wifi_config_select_set_param"="閫夋嫨\"璁剧疆鍙傛暟\"";
+"wifi_config_select_wifi"="閫夋嫨\"Wi-Fi\"";
+"wifi_config_net_work"="閰嶇疆缃戠粶";
+"wifi_config_name"="鍚嶇О锛�";
+"wifi_config_copy_pwd"="澶嶅埗瀵嗙爜";
+"wifi_config_to_setting"="杩涘叆璁剧疆椤甸潰";
+"wifi_config_step_three"="杩斿洖APP锛岀瓑寰呬笌璁惧杩炴帴锛屾垚鍔熷悗鑷姩杩涘叆涓嬩竴姝ユ搷浣溿��";
+"wifi_config_tip"="璇烽�氳繃涓嬪垪姝ラ灏嗘墜鏈鸿繛鎺ュ埌璁惧Wi-Fi锛�";
+"wifi_config_step_three_tip"="(娉ㄦ剰锛氬鏋滆澶嘩IFI鍚嶇О涓嶆槸鈥淓ZVIZ鈥濆墠缂�鐨勶紝璇峰鍒跺瘑鐮佸悗鏍规嵁鏂扮殑鍓嶇紑鍚嶅瓧锛屾墜鍔ㄤ慨鏀瑰瘑鐮佺殑鍓嶇紑骞惰繛鎺ュ嵆鍙�備緥濡傗�淪oftAP_XXXXXXX鈥�)";
+"wifi_config_not_connected"="灏氭湭杩炴帴缃戠粶";
+"wifi_config_step_1_tips"="寰呰繛鎺ョ殑璁惧Wi-Fi淇℃伅濡備笅锛�";
+"wifi_config_step_2_tips"="濡傛灉浣犱娇鐢ㄧ殑鏄弻棰戣矾鐢卞櫒锛岃涓嶈璁╂憚鍍忔満杩炴帴5G棰戞鐨刉i-Fi";
+"wifi_config_step_2_next_step"="涓嬩竴姝�";
+"wifi_config_step_2_net"="缃戠粶锛�";
+"wifi_config_step_2_password"="瀵嗙爜锛�";
+
 "ui_last_update"="鏈�鍚庢洿鏂帮細";
 "ui_last_update_empty"="鏈�鍚庢洿鏂帮細鏃犺褰�";
 "ui_just_now"="鍒氬垰";
@@ -158,3 +222,6 @@
 //2021-01-27 鏂板
 "Devicelist"="璁惧鍒楄〃";
 "Logout"="娉ㄩ攢";
+
+//閫氱敤
+"hdl_ez_common_no_data"="鏆傛棤鏁版嵁";
diff --git a/HDL-ON_iOS/ViewController.cs b/HDL-ON_iOS/ViewController.cs
index fc4f4c5..7b984a0 100644
--- a/HDL-ON_iOS/ViewController.cs
+++ b/HDL-ON_iOS/ViewController.cs
@@ -26,7 +26,7 @@
         {
             base.ViewDidLoad();
 
-            HDL_ON.MainPage.Show();
+            HDL_ON.MainPage.ShowAsync();
 
             try
             {
@@ -62,6 +62,8 @@
                 }
             }) { IsBackground = true }.Start();
 
+            
+
         }
         public override UIStatusBarStyle PreferredStatusBarStyle()
         {
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 333788e..ae98d39 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -140,6 +140,7 @@
                 //    return;
                 //}
 
+                //return;
 
                 try
                 {
@@ -172,7 +173,7 @@
                             if (deviceResult.Code == StateCode.SUCCESS)
                             {
                                 FunctionList.List.ClearDatas();
-                                MainPage.Log($"============璁惧============寮�濮�" + FunctionList.List.Functions.Count);
+                                //MainPage.Log($"============璁惧============寮�濮�" + FunctionList.List.Functions.Count);
                                 //MainPage.Log($"璇诲彇璁惧淇℃伅鎴愬姛");
                                 //MainPage.Log($"sid鍒楄〃鑾峰彇====" + deviceResult.Data.ToString());
                                 var deviceList = JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
@@ -225,15 +226,14 @@
                                     }
                                 }
                                 //澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
-                                int iiii = 0;
+                                //int iiii = 0;
                                 foreach (var newFunction in deviceList.list)
                                 {
                                     newFunction.AssembleStatus();
-                                    newFunction.SaveFunctionFile();
+                                    newFunction.SaveFunctionFile(); 
                                     FunctionList.List.IniFunctionList(newFunction.savePath,true);
-                                    MainPage.Log($"============璁惧============{iiii++}");
+                                    //MainPage.Log($"============璁惧============{iiii++}");
                                 }
-
 
 
 
@@ -282,6 +282,7 @@
                                     }
                                 }
 
+
                                 //======================鑾峰彇Sip璐﹀彿骞朵笖鍒濆鍖朣DK鍙瀵硅璁惧鍒楄〃====================
                                 //濡傛灉妫�娴嬬嚎绋嬫病鍚姩锛屾墠缁х画涓嬮潰鎿嶄綔 鍥犱负App鏈夊彲鑳藉垰鍚姩椹笂鏀跺埌鎺ㄩ�佷簡锛岀劧鍚庢墠鎵ц鍒拌繖閲�
                                 if (HDLLinphone.Current.CheckIncomingCallThreadIsNull())
@@ -297,6 +298,7 @@
                                     }
                                     else if (isInterphoneType_FREEVIEW)
                                     {
+
                                         //HDLLinphone鍙瀵硅,鑾峰彇Sip璐﹀彿骞跺垵濮嬪寲SDK
                                         HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
                                         callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
@@ -311,12 +313,30 @@
                                     }
                                 }
 
+
+
                                 //======================鐧诲綍鍏ㄨ閫�====================
                                 if (isInterphoneType_FREEVIEW)
                                 {
+
 #if __IOS__
-                        //鐧诲綍鍏ㄨ閫�
-                        Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id);
+                                    string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
+                                    string errorVersion = "16.2.0";
+                                    if (systemVersion.CompareTo(errorVersion) < 0)///鍏ㄨ閫氫笉鍏煎ios16浠ヤ笂鐨勭郴缁燂紝涓嶈鍔犺浇杩欎釜鍏�
+                                    {
+                                        List<VisitorTempPassword> dataList = new List<VisitorTempPassword>();
+                                        Dictionary<string, object> dictionary = new Dictionary<string, object>();
+                                        dictionary.Add("homeId", Entity.DB_ResidenceData.Instance.CurrentRegion.id);
+                                        var requestJson = HttpUtil.GetSignRequestJson(dictionary);
+                                        ResponsePackNew pack = HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetExtMemberInfo, requestJson);
+                                        if (pack != null)
+                                        {
+                                            var data = JsonConvert.DeserializeObject<FreeviewMemberInfo>(pack.Data.ToString());
+                                            //鐧诲綍鍏ㄨ閫�
+                                            Shared.IOS.HDLFVSDK.Video.Init("", data.extUserId, DB_ResidenceData.Instance.CurrentRegion.id, "78FF1E4D-FC0A-4E71-9B79-0448E4460BD7", "T0001", "120.77.53.170:9700", "120.77.53.170:21664");
+
+                                        }
+                                    }
 #endif
                                 }
 
@@ -334,12 +354,71 @@
                             complateDevice = true;
                             MainPage.Log($"============璁惧============瀹屾垚" + FunctionList.List.Functions.Count);
                         }
-                    })
-                    { IsBackground = true }.Start();
 
-                    //===================鍦烘櫙==========================
-                    new System.Threading.Thread(() =>
-                    {
+
+                        if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
+                        {
+                            var pack = Ins.HttpRequest.GetGroupControlList();
+                            if (pack != null)
+                            {
+                                if (pack.Code == StateCode.SUCCESS)
+                                {
+                                    try
+                                    {
+                                        var groupControlList = JsonConvert.DeserializeObject<List<GroupControl>>(pack.Data.ToString());
+                                        var readSidList = new List<string>();
+                                        foreach(var temp in groupControlList)
+                                        {
+                                            FunctionList.List.groupControls.Clear();
+                                            readSidList.Add(temp.userDeviceGroupControlId);
+                                            if (readSidList.Count >= 20)
+                                            {
+                                                var data = Ins.httpRequest.GetGroupControInfo(readSidList);
+                                                if(data != null)
+                                                {
+                                                    if(data.Code == StateCode.SUCCESS)
+                                                    {
+                                                        var groupControlInfoList = JsonConvert.DeserializeObject<List<GroupControl>>(data.Data.ToString());
+                                                        FunctionList.List.groupControls.AddRange(groupControlInfoList);
+                                                    }
+                                                    else
+                                                    {
+                                                        IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+                                                    }
+                                                }
+                                                readSidList.Clear();
+                                            }
+                                        }
+                                        if (readSidList.Count > 0)
+                                        {
+                                            var data = Ins.httpRequest.GetGroupControInfo(readSidList);
+                                            if (data != null)
+                                            {
+                                                if (data.Code == StateCode.SUCCESS)
+                                                {
+                                                    var groupControlInfoList = JsonConvert.DeserializeObject<List<GroupControl>>(data.Data.ToString());
+                                                    FunctionList.List.groupControls.AddRange(groupControlInfoList);
+                                                }
+                                                else
+                                                {
+                                                    IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+                                                }
+                                            }
+                                            readSidList.Clear();
+                                        }
+                                    }
+                                    catch (Exception ex)
+                                    {
+                                        MainPage.Log($"璇诲彇缁勬帶鍒楄〃澶辫触:{ex.Message}");
+                                    }
+                                }
+                                else
+                                {
+                                    IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+                                }
+                            }
+                        }
+                        //======================鍦烘櫙====================
                         try
                         {
                             complateScene = false;
@@ -400,21 +479,17 @@
                         {
                             complateScene = true;
                         }
+
+                        //======================瀹夐槻====================
+                        GetSecurityList();
                     })
                     { IsBackground = true }.Start();
 
                     //===================璇诲彇閫昏緫鍒楄〃==========================
                     Logic.LogicList.Clear();//涓婚〉涓嬫媺寮哄埗鍒锋柊鑷姩鍖栧垪琛�
-                    //UI.UI2.Intelligence.Automation.MainView.GetLogicList();
 
-
-
-                    //======================瀹夐槻====================
-                    GetSecurityList();
                     //======================娉ㄥ唽鎺ㄩ��====================
                     httpRequest.RegisteredPush();
-
-
                 }
                 catch (Exception ex)
                 {
@@ -512,40 +587,43 @@
         /// </summary>
         public void GetSecurityList()
         {
-            var pack = Ins.HttpRequest.GetSecurityList();
-            if (pack.Code == StateCode.SUCCESS)
+            lock (FunctionList.List.securities)
             {
-                var packList = JsonConvert.DeserializeObject<List<SecurityAlarm>>(pack.Data.ToString());
-                var sidList = new List<string>();
-                foreach (var function in packList)
+                var pack = Ins.HttpRequest.GetSecurityList();
+                if (pack.Code == StateCode.SUCCESS)
                 {
-                    sidList.Add(function.sid);
-                }
-                var infoListPack = Ins.httpRequest.GetSecurityInfo(sidList, new List<string>());
-                var infoList = JsonConvert.DeserializeObject<List<SecurityAlarm>>(infoListPack.Data.ToString());
-                if (infoList != null)
-                {
-                    var filePathList = FileUtlis.Files.ReadFiles().FindAll((obj) => obj.StartsWith("SecurityData_"));
-                    if (filePathList != null)
+                    var packList = JsonConvert.DeserializeObject<List<SecurityAlarm>>(pack.Data.ToString());
+                    Console.WriteLine("瀹夐槻鎬绘暟锛�" + packList.Count);
+                    var sidList = new List<string>();
+                    foreach (var function in packList)
                     {
-                        foreach (var file in filePathList)
+                        sidList.Add(function.sid);
+                    }
+                    var infoListPack = Ins.httpRequest.GetSecurityInfo(sidList, new List<string>());
+                    var infoList = JsonConvert.DeserializeObject<List<SecurityAlarm>>(infoListPack.Data.ToString());
+                    if (infoList != null)
+                    {
+                        var filePathList = FileUtlis.Files.ReadFiles().FindAll((obj) => obj.StartsWith("SecurityData_"));
+                        if (filePathList != null)
                         {
-                            FileUtlis.Files.DeleteFile(file);
+                            foreach (var file in filePathList)
+                            {
+                                FileUtlis.Files.DeleteFile(file);
+                            }
+                        }
+                        FunctionList.List.securities.Clear();
+                        foreach (var function in infoList)
+                        {
+                            function.SaveFile();
+                            FunctionList.List.IniFunctionList(function.savePath, true);
                         }
                     }
-                    FunctionList.List.securities.Clear();
-                    foreach (var function in infoList)
-                    {
-                        function.SaveFile();
-                        FunctionList.List.IniFunctionList(function.savePath, true);
-                    }
                 }
-            } 
-            else
-            {
-                MainPage.Log($"璇诲彇瀹夐槻鍒楄〃澶辫触:Code:{pack.Code}; Msg:{pack.message}");
+                else
+                {
+                    MainPage.Log($"璇诲彇瀹夐槻鍒楄〃澶辫触:Code:{pack.Code}; Msg:{pack.message}");
+                }
             }
-
         }
 
         /// <summary>
diff --git a/HDL_ON/Common/Constant.cs b/HDL_ON/Common/Constant.cs
index 0dd7756..92b1527 100644
--- a/HDL_ON/Common/Constant.cs
+++ b/HDL_ON/Common/Constant.cs
@@ -309,6 +309,10 @@
         /// HDL鍙瀵硅
         /// </summary>
         HDL_INTERPHONE,
+        /// <summary>
+        /// 闂ㄩ搩鎺ㄩ��(钀ょ煶瑙嗛闂ㄩ攣)
+        /// </summary>
+        DOOR_BELL,
     }
 
     /// <summary>
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 7aa1087..8f7a34f 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -7,7 +7,6 @@
 using HDL_ON.Entity;
 using System.Threading;
 using HDL_ON.DriverLayer;
-
 namespace HDL_ON
 {
     /// <summary>
@@ -259,6 +258,8 @@
         {
             try
             {
+                MainPage.Log($"鎺ユ敹鍒版帹閫�");
+
                 //Extras涓虹┖涓嶅鐞�
                 if (string.IsNullOrEmpty(jpushMessageInfo.Extras)) return;
 
@@ -278,6 +279,8 @@
                     {
                         //鎶ヨ鎺ㄩ�佸脊绐楁彁绀�
                         ShowAlarmPushMessage(jpushMessageInfo, true);
+                        //钀ょ煶闂ㄩ攣鎺ㄩ��
+                        HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
                     }
                     else if (jpushMessageInfo.messageType.Contains(PushMessageType.FLCall.ToString()))
                     {
@@ -304,8 +307,9 @@
                     }
                     else if (jpushMessageInfo.messageType.Contains(PushMessageType.HDL_INTERPHONE.ToString()))
                     {
+
                         if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
-                        
+
                         //瀛楁鍏煎闂锛屽彧鑳界洿鎺ュ彇鍊间簡
                         var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
                         try
@@ -385,7 +389,16 @@
                     else if (jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString()))
                     {
                         ShowAlarmPushMessage(jpushMessageInfo, false);
+                        //钀ょ煶闂ㄩ攣鎺ㄩ��
+                        HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
                     }
+                    else if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
+                    {
+                        //钀ょ煶闂ㄩ攣鎺ㄩ��
+                        HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
+                    }
+
+                   
                 }
             }
             catch (Exception EX)
@@ -395,12 +408,12 @@
         }
         //{"code":0,"data":{"list":[{"createTime":"1625798305115","modifyTime":"1625798305115","region":"100000000000000001","id":"1413326644794294273","alarmId":"20210709103818-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709103818-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:38:17","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{"createTime":"1625798057197","modifyTime":"1625798057197","region":"100000000000000001","id":"1413325604946640898","alarmId":"20210709103413-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709103413-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:34:12","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797973320","modifyTime":"1625797973320","region":"100000000000000001","id":"1413325253141004289","alarmId":"20210709103236-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709103236-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:32:31","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797782136","modifyTime":"1625797782136","region":"100000000000000001","id":"1413324451261382658","alarmId":"20210709102937-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709102937-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:29:37","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797668771","modifyTime":"1625797668771","region":"100000000000000001","id":"1413323975769915394","alarmId":"20210709102743-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709102743-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:27:42","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797539846","modifyTime":"1625797539846","region":"100000000000000001","id":"1413323435023466498","alarmId":"20210709102534-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709102534-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:25:34","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625797530627","modifyTime":"1625797530627","region":"100000000000000001","id":"1413323396351983618","alarmId":"20210709102525-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709102525-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:25:25","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625796028089","modifyTime":"1625796028089","region":"100000000000000001","id":"1413317094255034369","alarmId":"20210709100024-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709100024-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T10:00:23","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625795974558","modifyTime":"1625795974558","region":"100000000000000001","id":"1413316869729746946","alarmId":"20210709095931-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709095931-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T09:59:31","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"},{ "createTime":"1625795966933","modifyTime":"1625795966933","region":"100000000000000001","id":"1413316837748178946","alarmId":"20210709095923-F41014762-1-10000","channelNo":1,"deviceSerial":"F41014762","alarmName":"浜轰綋鎰熷簲浜嬩欢","alarmPicUrl":"https://i.ys7.com/streamer/alarm/url/get?fileId=20210709095923-F41014762-1-10000-2-1&deviceSerialNo=F41014762&cn=1&isEncrypted=0&isCloudStored=0&ct=1&lc=7&bn=1_hikalarm&isDevVideo=0","alarmTime":"2021-07-09T09:59:22","homeId":"1396717478877241345","alarmType":"pir","isChecked":0,"isEncrypt":0,"deleted":0,"tenantId":"20"}],"totalCount":"13","totalPage":"2","pageNo":"1","pageSize":"10"},"timestamp":"1625807415164","isSuccess":true}
         //{"platform":"1","timestamp":"1625805660249","appKey":"HDL-HOME-APP-TEST","sign":"02e433c40485b30451ebdc5ca3cd959c","deviceSerial":"F41014762","homeId":"1396717478877241345"}
-    /// <summary>
-    /// 瑙f瀽涓版灄鍙瀵硅鎺ㄩ�佹暟鎹�
-    /// </summary>
-    /// <param name="jsonStr"></param>
-    /// <returns></returns>
-    ESVideoInfo GetESOnVideoJson(string jsonStr)
+        /// <summary>
+        /// 瑙f瀽涓版灄鍙瀵硅鎺ㄩ�佹暟鎹�
+        /// </summary>
+        /// <param name="jsonStr"></param>
+        /// <returns></returns>
+        ESVideoInfo GetESOnVideoJson(string jsonStr)
         {
             try
             {
@@ -423,6 +436,16 @@
         /// </summary>
         public void CheckLogout()
         {
+#if __IOS__
+            try{
+                HDL_ON_iOS.AppDelegate.rootViewController.PopToRootViewController(false);
+            }catch(Exception ex){
+                MainPage.Log($"鍥炲埌璺熺被澶辫触:{ex.Message}");
+            }
+#else
+            //Application.Activity.StartActivity()
+#endif
+
             //娴嬭瘯璐﹀彿锛屼笉鎸や笅绾�
             switch (UserInfo.Current.AccountString)
             {
@@ -437,7 +460,13 @@
             //璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
             new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
 
-            Logout();
+            try
+            {
+                Logout();
+            }catch (Exception ex)
+            {
+                MainPage.Log($"鎸や笅绾垮紓甯�:{ex.Message}");
+            }
         }
 
         /// <summary>
@@ -460,14 +489,16 @@
                     UserInfo.Current.LastTime = DateTime.MinValue;
                     UserInfo.Current.SaveUserInfo();
                     DB_ResidenceData.Instance.EixtAccount();
+                    MainPage.Log("閫�鍑鸿处鍙锋竻绌烘暟鎹�");
                     //4.娉ㄩ攢HDLSIP璐﹀彿鐧诲綍 2021-08-20
                     HDLLinphone.Current.LogoutAllAccount();
+                    MainPage.Log("娉ㄩ攢HDLSIP璐﹀彿鐧诲綍");
 
 #if __IOS__
                     //5.鍏ㄨ閫氱櫥鍑�
                     Shared.IOS.HDLFVSDK.Video.Logout();
                     //6.娓呯┖Siri鍏变韩鏁版嵁淇℃伅
-                    new Other.SkipControl().SetData(false, "", "", "","");
+                    new Other.SkipControl().SetData(false, "", "", "", "");
                     var sDM = new SiriKit.SceneDateManager();
                     Console.WriteLine($"IsLogin:{sDM.IsLgoin};accessToken:{sDM.AccessToken};refreshToken:{sDM.RefreshToken};RegionUrl:{sDM.RegionUrl};HomeId:{sDM.HomeId}");
 #endif
@@ -482,6 +513,7 @@
                     {
                         if (waitPage != null)
                         {
+                            waitPage.Hide();
                             waitPage.RemoveFromParent();
                             waitPage = null;
                         }
@@ -667,6 +699,7 @@
             {
                 try
                 {
+                    var list = UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockLockModelsList();
                     //鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken
                     var result = new HttpServerRequest().EZGetChildToken();
                     if (result.Code == StateCode.SUCCESS)
@@ -678,7 +711,9 @@
                         {
                             if (!string.IsNullOrEmpty(ezChildAccessToken))
                             {
+
 #if __IOS__
+
                                 //iOS
                                 //鍒濆鍖栬悿鐭充簯SDK锛屼腑鏂囧浗鍐卥ey銆佽嫳鏂囨捣澶杒ey 寮�鍙戣�呰处鍙蜂娇鐢ㄥ簲鐢ㄥ寘鍚嶇敵璇风殑APPKEY锛屼笉鍚屽寘鍚嶅簲鐢ㄩ渶閰嶇疆涓嶅悓鐨凙PPKEY
                                 EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
@@ -687,12 +722,25 @@
                                 EZSDK.IOS.EZSDK.SharedInstance().SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id);
                                 //2.璁剧疆钀ょ煶瀛愯处鍙风殑AccessToken鍒癝DK
                                 EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(ezChildAccessToken);
-                                ////3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
-                                EZSDK.IOS.EZSDK.SharedInstance().Go2EZvizMonitor();
+
+                                //////3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
+                                //EZSDK.IOS.EZSDK.SharedInstance().Go2EZvizMonitor();
 
                                 //EZSDK.IOS.EZDeviceInfo info = new EZSDK.IOS.EZDeviceInfo();
                                 //info.de
                                 //EZSDK.IOS.EZSDK.Play(info);
+
+                                //2023骞�03鏈�29鏃�13:08:35 淇敼
+                                Foundation.NSObject[] nSObject = new Foundation.NSObject[list.Count];
+                                for (int i = 0; i < list.Count; i++)
+                                {
+                                    string strValue = list[i];
+                                    nSObject[i] = new Foundation.NSString(strValue);
+                                }
+                                EZSDK.IOS.EZSDK.SharedInstance().ToEZDeviceListViewWithFilterTypes(nSObject);
+
+
+
 #else
                                 //Android
                                 //1.璁剧疆鎵�闇�娌充笢鐨則oken銆佸煙鍚嶅湴鍧�
@@ -704,21 +752,24 @@
                                     {
                                         ((BaseActivity)Shared.Application.Activity).SetPermission(result =>
                                         {
-                                            if(result)
-                                            { 
-                                            Android.Content.Intent intent = new Android.Content.Intent();
-                                            var bundle = new Android.OS.Bundle();
-                                            //浼犻�抧ame鍙傛暟涓簍inyphp
-                                            bundle.PutString("EzChildAccessToken", ezChildAccessToken);
-                                            bundle.PutString("HdlToken", UserInfo.Current.LoginTokenString);
-                                            bundle.PutString("Url", OnAppConfig.Instance.RequestHttpsHost);
-                                            bundle.PutString("EzvizAppKey", "1aa98a90489b4838b966b57018b4b04b");
-                                            bundle.PutInt("Platform", 1);
-                                            bundle.PutString("HomeId", DB_ResidenceData.Instance.CurrentRegion.id);
-                                            intent.PutExtras(bundle);
-                                            intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
-                                            Shared.Application.Activity.StartActivity(intent);
-                                            }
+                                            //2023骞�03鏈�29鏃�13:08:35 淇敼
+                                            Com.Videogo.Hdl.HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id);
+                                            Com.Videogo.Hdl.HDLEzvizSdk.Instance.JumpToCameraListActivity(Shared.Application.Activity, list);
+                                            //if (result)
+                                            //{
+                                            //    Android.Content.Intent intent = new Android.Content.Intent();
+                                            //    var bundle = new Android.OS.Bundle();
+                                            //    //浼犻�抧ame鍙傛暟涓簍inyphp
+                                            //    bundle.PutString("EzChildAccessToken", ezChildAccessToken);
+                                            //    bundle.PutString("HdlToken", UserInfo.Current.LoginTokenString);
+                                            //    bundle.PutString("Url", OnAppConfig.Instance.RequestHttpsHost);
+                                            //    bundle.PutString("EzvizAppKey", "1aa98a90489b4838b966b57018b4b04b");
+                                            //    bundle.PutInt("Platform", 1);
+                                            //    bundle.PutString("HomeId", DB_ResidenceData.Instance.CurrentRegion.id);
+                                            //    intent.PutExtras(bundle);
+                                            //    intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
+                                            //    Shared.Application.Activity.StartActivity(intent);
+                                            //}
                                         }, "android.permission.RECORD_AUDIO");
 
                                     }
diff --git a/HDL_ON/Common/ImageUtlis.cs b/HDL_ON/Common/ImageUtlis.cs
index 34c5bf5..253319b 100644
--- a/HDL_ON/Common/ImageUtlis.cs
+++ b/HDL_ON/Common/ImageUtlis.cs
@@ -181,7 +181,7 @@
         /// </summary>
         public byte[] GetImageDownloadUrl(string imageKey)
         {
-            if (imageKey.StartsWith("https:"))
+            if (imageKey.StartsWith("https:") || imageKey.StartsWith("http:"))
             {
                 return HttpUtil.HttpsDownload(imageKey);
             }
@@ -281,7 +281,6 @@
                                     if (imageView != null)
                                     {
                                         imageView.ImageBytes = imageBytes;
-                                        //Utlis.WriteLine("imageKey 鍔犺浇浜戠涓嬭浇鍥剧墖鎴愬姛");
                                     }
                                 });
                             }
diff --git a/HDL_ON/Common/OnAppConfig.cs b/HDL_ON/Common/OnAppConfig.cs
index 2bc3220..884c037 100644
--- a/HDL_ON/Common/OnAppConfig.cs
+++ b/HDL_ON/Common/OnAppConfig.cs
@@ -94,6 +94,10 @@
         /// 绗竴娆″惎鍔╝pp
         /// </summary>
         public bool FirstRunApp = true;
+        /// <summary>
+        /// 鏄惁鍚屾剰浜鸿劯閲囬泦鍗忚
+        /// </summary>
+        public bool FaceManagementTip = false;
 
         /// <summary>
         /// 蹇界暐鏇存柊鐨勭増鏈彿
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index b8519cc..1d4c2ab 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,7 +4,182 @@
 {
     public static class StringId
     {
-
+        /// <summary>
+        /// 浣忓畢瑙g粦鎴愬姛
+        /// </summary>
+        public const int SuccessfullyUnboundTheResidence = 629;
+        /// <summary>
+        /// 涓存椂瀵嗙爜鏈夋晥鏈熶笉鑳藉ぇ浜�24灏忔椂
+        /// </summary>
+        public const int TempPwdValidityTip = 628;
+        /// <summary>
+        /// 璁剧疆鐨勬椂闂撮渶瑕佹櫄浜庡綋鍓嶆椂闂�
+        /// </summary>
+        public const int TempPwdSettingTip = 627;
+        /// <summary>
+        /// 浣忓畢鍥炴粴鎻愮ず
+        /// </summary>
+        public const int RollBackTipMsg = 626;
+        /// <summary>
+        /// 浣忓畢鍥炴粴
+        /// </summary>
+        public const int RollBack = 625;
+        /// <summary>
+        /// 瑙﹀彂鑼冨洿
+        /// </summary>
+        public const int TriggeredRange = 624;
+        /// <summary>
+        /// 缁忕含搴�
+        /// </summary>
+        public const int LatAndLon= 623;
+        /// <summary>
+        /// 楠屾敹
+        /// </summary>
+        public const int ACCEPTANCE = 622;
+        /// <summary>
+        /// 鍒濆鎬�
+        /// </summary>
+        public const int INITIAL_TATE = 621;
+        /// <summary>
+        /// 寰呴獙鏀�
+        /// </summary>
+        public const int To_Be_Accepted = 620;
+        /// <summary>
+        /// 璋冭瘯涓�
+        /// </summary>
+        public const int Debugging = 619;
+        /// <summary>
+        /// 寰呰皟璇�
+        /// </summary>
+        public const int To_Be_Debugged = 618;
+        /// <summary>
+        /// 浣忓畢鐘舵��
+        /// </summary>
+        public const int HouseStatus = 617;
+        /// <summary>
+        /// 缁戝畾璐﹀彿
+        /// </summary>
+        public const int BindSubAccount = 616;
+        /// <summary>
+        /// 鎾ら攢鎺堟潈鍚庯紝璇ュ搧鐗屽叧鑱斿湪On Pro涓殑璁惧灏嗗叏閮ㄨ瑙g粦锛岀浉鍏充娇鐢ㄤ俊鎭悎璁惧鍊间篃灏嗗け鏁�
+        /// </summary>
+        public const int RevokeAuthorizationTip = 615;
+        /// <summary>
+        /// 鍏充簬璐﹀彿缁戝畾鐨勫0鏄�
+        /// </summary>
+        public const int AboutBindAcountTip = 614;
+        /// <summary>
+        /// 纭畾鎾ゅ洖鎺堟潈
+        /// </summary>
+        public const int ConfirmRevocationOfAuthorization = 613;
+        /// <summary>
+        /// 浜鸿劯閲囬泦鍗忚
+        /// </summary>
+        public const int GetFaceProtocol = 612;
+        /// <summary>
+        /// 鍔犺浇鏇村
+        /// </summary>
+        public const int LoadMore = 611;
+        /// <summary>
+        /// 鏃犳硶缁戝畾璇ヨ澶囷紝璇蜂粠娌充笢娓犻亾璐拱璇ョ被鍨嬩骇鍝�
+        /// </summary>
+        public const int UnableToBindThisDeviceTip = 610;
+        /// <summary>
+        /// "*鍙瀵硅鍙互鑷姩璇嗗埆闂ㄥ彛鍙枒浜哄憳锛屽苟鍙戣捣寰樺緤鎶ヨ璁板綍
+        /// </summary>
+        public const int SmartDoorstepMachineAlarmPrompt = 609;
+        /// <summary>
+        /// 涓婁竴椤�
+        /// </summary>
+        public const int NextPage = 608;
+        /// <summary>
+        /// 涓婁竴椤�
+        /// </summary>
+        public const int PreviousPage = 607;
+        /// <summary>
+        /// 璐︽埛缁戝畾鎴愬姛锛屾偍鍙互缁х画瀹屾垚璁惧鍏宠仈鎿嶄綔
+        /// </summary>
+        public const int BindIotAccountTip = 606;
+        /// <summary>
+        ///     鑻ュ悓鎰忚鍗忚锛岃鐐瑰嚮銆愬悓鎰忋�戞寜閿紝琛ㄧず鎮ㄥ凡缁忕悊瑙e苟鍚屾剰浜鸿劯淇℃伅閲囬泦鍗忚銆�
+        /// </summary>
+        public const int FaceProTipText3 = 605;
+        /// <summary>
+        ///     銆奜n Pro浜鸿劯淇℃伅閲囬泦鍗忚銆�
+        /// </summary>
+        public const int FaceProTipText2 = 604;
+        /// <summary>
+        ///     涓轰繚鎶ゆ偍鐨勪釜浜洪殣绉佹潈鐩婏紝鐗瑰悜鎮ㄩ�氱煡骞剁敵璇锋槑纭悓鎰忔巿鏉冦�傝浣犱粩缁嗛槄璇�
+        /// </summary>
+        public const int FaceProTipText1 = 603;
+        /// <summary>
+        /// 鎴戠殑瀹跺涵
+        /// </summary>
+        public const int MyHome = 602;
+        /// <summary>
+        /// 璇烽�夋嫨2涓互涓婄殑璁惧
+        /// </summary>
+        public const int PlsSelectMoreData = 601;
+        /// <summary>
+        /// 娣诲姞缁勫悎璋冨厜
+        /// </summary>
+        public const int AddGroupControl = 600;
+        /// <summary>
+        /// 璇疯緭鍏ョ粍鍚嶇О
+        /// </summary>
+        public const int PlsEntryGroupName = 599;
+        /// <summary>
+        /// 閫夋嫨缇ゆ帶璁惧
+        /// </summary>
+        public const int SelectGroupControlFunction = 598;
+        /// <summary>
+        /// 璇疯緭鍏�
+        /// </summary>
+        public const int PlsEntry = 597;
+        /// <summary>
+        /// 缁勫悕绉�
+        /// </summary>
+        public const int GroupNmae = 596;
+        /// <summary>
+        /// 鍒犻櫎浜鸿劯鏁版嵁
+        /// </summary>
+        public const int DeleteMemberFace = 595;
+        /// <summary>
+        /// 璇疯緭鍏ユ垚鍛樺娉�
+        /// </summary>
+        public const int PlsEntrySubAccountRemark = 594;
+        /// <summary>
+        /// 浜鸿劯鐓х墖
+        /// </summary>
+        public const int MemberFace = 593;
+        /// <summary>
+        /// 鎴愬憳璐﹀彿
+        /// </summary>
+        public const int MemberAccount = 592;
+        /// <summary>
+        /// 鎴愬憳鍚嶇О
+        /// </summary>
+        public const int MemberName = 591;
+        /// <summary>
+        /// 浣忓畢浜や粯
+        /// </summary>
+        public const int ResidentialDelivery = 590;
+        /// <summary>
+        /// 涓嶅悓鎰�
+        /// </summary>
+        public const int Disagree = 589;
+        /// <summary>
+        /// 浜鸿劯淇℃伅閲囬泦鍗忚鎻愮ず
+        /// </summary>
+        public const int FaceProtocolPrompt = 588;
+        /// <summary>
+        /// 浜鸿劯绠$悊
+        /// </summary>
+        public const int FaceManagemant = 587;
+        /// <summary>
+        /// 鎺掑簭
+        /// </summary>
+        public const int Sort = 586;
         /// <summary>
         /// 鑾峰彇绗笁鏂瑰钩鍙颁俊鎭け璐�
         /// </summary>
@@ -2002,11 +2177,11 @@
         /// <summary>
         /// 寰簭寰幆
         /// </summary>
-        public const int orderMode =5048;
+        public const int orderMode = 5048;
         /// <summary>
         /// 鍗曟洸鎾斁
         /// </summary>
-        public const int single =5049;
+        public const int single = 5049;
 
 
 
@@ -3062,7 +3237,69 @@
         /// <summary>
         /// PM210
         /// </summary>
-        public const int pm10= 7168;
+        public const int pm10 = 7168;
+
+        /// <summary>
+        /// 瑙嗛闂ㄩ攣
+        /// </summary>
+        public const int shipinmensuo = 8501;
+        /// <summary>
+        /// 鐢甸噺
+        /// </summary>
+        public const int dianliang = 8502;
+        /// <summary>
+        /// 褰撳墠闂ㄥ凡鍏�
+        /// </summary>
+        public const int dangqianmenyiguan = 8503;
+        /// <summary>
+        /// 褰撳墠闂ㄦ湭鍏�
+        /// </summary>
+        public const int dangqianmenweiguan = 8504;
+        /// <summary>
+        /// 瀹炴椂瑙嗛
+        /// </summary>
+        public const int shishishipin = 8505;
+        /// <summary>
+        /// 涓�閿紑閿�
+        /// </summary>
+        public const int yijiankaisuo = 8506;
+        /// <summary>
+        /// 涓存椂瀵嗙爜
+        /// </summary>
+        public const int linshimima1 = 8507;
+        /// <summary>
+        /// 鍘嗗彶璁板綍
+        /// </summary>
+        public const int lishijilu = 8508;
+        /// <summary>
+        /// 钀ょ煶瑙嗛闂ㄩ攣
+        /// </summary>
+        public const int yingshishipinmensuo = 8509;
+        /// <summary>
+        /// 鏉ヨ嚜鈥滈棬閾冣�濆懠鍙�
+        /// </summary>
+        public const int laizimenlinghujiao = 8510;
+        /// <summary>
+        /// 寮�闂ㄤ汉鍛�
+        /// </summary>
+        public const int kaimenrenyuan = 8511;
+        /// <summary>
+        /// 搴忓垪鍙�
+        /// </summary>
+        public const int xuliehao = 8512;
+        /// <summary>
+        /// 鍨嬪彿
+        /// </summary>
+        public const int xinghao = 8513;
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/HDL_ON/Common/Utlis/FloorRoomSelectPopupView.cs b/HDL_ON/Common/Utlis/FloorRoomSelectPopupView.cs
index b6c1cb3..704758b 100644
--- a/HDL_ON/Common/Utlis/FloorRoomSelectPopupView.cs
+++ b/HDL_ON/Common/Utlis/FloorRoomSelectPopupView.cs
@@ -131,7 +131,7 @@
         /// <param name="i_listAllFun">鍏ㄩ儴鐨勮澶囧垪琛�,闇�瑕佹墜鍔ㄦ寚瀹�</param>
         /// <param name="SelectEvent">鏍规嵁閫夋嫨鐨勬潯浠�,绛涢�変箣鍚庣殑璁惧鍒楄〃(绗竴涓弬鏁版槸閫夋嫨鐨刄ID,涓嶇鏈夋病鏈夌敤,鎬讳箣鍏堣繑鍥�)</param>
         /// <param name="i_defultSelectId">榛樿鍝釜涓洪�夋嫨鐘舵��</param>
-        public void ShowDeviceFunctionView(Button btnFloor, List<Function> i_listAllFun, Action<string, List<Function>> SelectEvent, string i_defultSelectId = null)
+        public void ShowDeviceFunctionView(Button btnFloor, List<Function> i_listAllFun, Action<string, List<Function>> SelectEvent, string i_defultSelectId = null, int offsetY = 0)
         {
             //娓呯紦瀛�
             this.ClearMemory();
@@ -155,7 +155,7 @@
                 SelectEvent?.Invoke(this.nowShowSelectId, listDevice);
                 SelectEvent = null;
 
-            }, i_defultSelectId);
+            }, i_defultSelectId, offsetY);
         }
 
         /// <summary>
diff --git a/HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs b/HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs
index 6c86100..020c744 100644
--- a/HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs
+++ b/HDL_ON/Common/Utlis/FloorSelectPopupDialog.cs
@@ -30,7 +30,7 @@
         /// </summary>
         /// <param name="selectAction">鍥炶皟閫変腑浜嬩欢锛屽洖璋冮�変腑鐨剈id</param>
         /// <param name="selectTag">璁剧疆閫変腑鐨則ga鏍囪</param>
-        public void ShowView(Action<string> selectAction, string selectTag = DiySelectPopupDialog.ALLSELECT)
+        public void ShowView(Action<string> selectAction, string selectTag = DiySelectPopupDialog.ALLSELECT, int offsetY = 0)
         {
             //妤煎眰闆嗗悎鏁版嵁
             var floorList = SpatialInfo.CurrentSpatial.FloorList;
@@ -54,7 +54,7 @@
                 }
                 //寮圭獥涓�绾ц仈鍔ㄩ�夋嫨绐楀彛
                 var roomSelectPopupDialog = new DiySelectPopupDialog();
-                roomSelectPopupDialog.ShowView(mFirstList, null, selectAction, selectTag);
+                roomSelectPopupDialog.ShowView(mFirstList, null, selectAction, selectTag,offsetY);
             }
             else
             {
@@ -80,7 +80,7 @@
                 }
                 //寮圭獥浜岀骇鑱斿姩閫夋嫨绐楀彛
                 var roomSelectPopupDialog = new DiySelectPopupDialog();
-                roomSelectPopupDialog.ShowView(mFirstList, mSecondList, selectAction, selectTag);
+                roomSelectPopupDialog.ShowView(mFirstList, mSecondList, selectAction, selectTag,offsetY);
 
             }
  
diff --git a/HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs b/HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs
index 98e640b..46b3fd4 100644
--- a/HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs
+++ b/HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs
@@ -90,6 +90,17 @@
             }
         }
         /// <summary>
+        /// 鏈湴鎺у埗缇ゆ帶涓婚
+        /// </summary>
+        public string ControlGroupControlTopic
+        {
+            get
+            {
+                return $"/user/{Control.Ins.GatewayId}/custom/device/group/control/down";
+            }
+        }
+
+        /// <summary>
         /// 鏈湴鎺у埗绾㈠璁惧鍔熻兘涓婚
         /// </summary>
         public string ControlIrFunctionTopic
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 87e6d3e..da0a7b2 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -83,8 +83,10 @@
         /// <summary>
         /// 鍒ゆ柇鏄惁鏈湴鍔犲瘑骞朵笖鍔犲瘑key涓嶄负绌�
         /// </summary>
-        public bool IsLocalEncryptAndGetAesKey {
-            get {
+        public bool IsLocalEncryptAndGetAesKey
+        {
+            get
+            {
                 return IsLocalEncrypt && (!string.IsNullOrEmpty(DB_ResidenceData.Instance.CurrentRegion.localSecret));
             }
         }
@@ -136,45 +138,51 @@
             }
             set
             {
-                if (_GatewayOnline_Cloud != value)
+                try
                 {
-                    _GatewayOnline_Cloud = value;
-                    if(GatewayOnline_Local)
+                    if (_GatewayOnline_Cloud != value)
                     {
-                        return;
-                    }
-                    if (value)
-                    {
-                        if (DB_ResidenceData.Instance.HomeGateway == null)
+                        _GatewayOnline_Cloud = value;
+                        if (GatewayOnline_Local)
                         {
                             return;
                         }
-                        if (!DB_ResidenceData.Instance.HomeGateway.gatewayStatus)//杩滅▼鎯呭喌涓嬶紝缃戝叧鏈摼鎺ユ湇鍔″櫒涓嶈兘淇敼涓婚〉缃戝叧鐘舵��
+                        if (value)
                         {
+                            if (DB_ResidenceData.Instance.HomeGateway == null)
+                            {
+                                return;
+                            }
+                            if (!DB_ResidenceData.Instance.HomeGateway.gatewayStatus)//杩滅▼鎯呭喌涓嬶紝缃戝叧鏈摼鎺ユ湇鍔″櫒涓嶈兘淇敼涓婚〉缃戝叧鐘舵��
+                            {
+                                new System.Threading.Thread(() =>
+                                {
+                                    System.Threading.Thread.Sleep(3000);
+                                    var pm = new DAL.Server.HttpServerRequest();
+                                    pm.GetGatewayInfo();
+                                })
+                                { IsBackground = true }.Start();
+                                return;
+                            }
+                            //淇敼涓婚〉杩炴帴鐘舵��
+                            HomePage.LoadEvent_CheckLinkStatus();
+                            MainPage.Log($"缃戝叧浜戠鍦ㄧ嚎锛屽埛鏂拌澶囩姸鎬�");
                             new System.Threading.Thread(() =>
                             {
-                                System.Threading.Thread.Sleep(3000);
-                                var pm = new DAL.Server.HttpServerRequest();
-                                pm.GetGatewayInfo();
+                                System.Threading.Thread.Sleep(1000);
+                                FunctionList.List.ReadAllFunctionStatus();
                             })
-                            { IsBackground = true }.Start();
-                            return;
+                            { IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
                         }
-                        //淇敼涓婚〉杩炴帴鐘舵��
-                        HomePage.LoadEvent_CheckLinkStatus();
-                        MainPage.Log($"缃戝叧浜戠鍦ㄧ嚎锛屽埛鏂拌澶囩姸鎬�");
-                        new System.Threading.Thread(() =>
+                        else
                         {
-                            System.Threading.Thread.Sleep(1000);
-                            FunctionList.List.ReadAllFunctionStatus();
-                        })
-                        { IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
+                            //淇敼涓婚〉杩炴帴鐘舵��
+                            HomePage.LoadEvent_CheckLinkStatus();
+                        }
                     }
-                    else
-                    {
-                        //淇敼涓婚〉杩炴帴鐘舵��
-                        HomePage.LoadEvent_CheckLinkStatus();
-                    }
+                }catch(Exception ex)
+                {
+                    MainPage.Log($"Set GatewayCloudOnline Error:{ex.Message}");
                 }
             }
         }
@@ -249,7 +257,8 @@
         public void SearchLoaclGateway()
         {
             //2021-01-15 : 浣忓畢娌℃湁缁戝畾缃戝叧鐨勬椂鍊欎笉鐢ㄦ悳绱紝骞朵笖涓嶈兘閾炬帴mqtt
-            if(DB_ResidenceData.Instance.HomeGateway == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.gatewayId))
+            if (DB_ResidenceData.Instance.HomeGateway == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.gatewayId) ||
+                    !UserInfo.Current.IsLogin)
             {
                 return;
             }
@@ -308,9 +317,10 @@
         /// </summary>
         public void LoginGateway()
         {
-            if(loginGatewayThread== null)
+            if (loginGatewayThread == null)
             {
-                loginGatewayThread = new System.Threading.Thread(() => {
+                loginGatewayThread = new System.Threading.Thread(() =>
+                {
                     while (!Ins.myTcpClient.isConnected)
                     {
                         if (Ins.GatewayOnline_Local && myTcpClient.isConnected)
@@ -337,7 +347,8 @@
                 try
                 {
                     loginGatewayThread?.Abort();
-                }catch (Exception ex)
+                }
+                catch (Exception ex)
                 {
                     MainPage.Log($"閲嶅惎鐧诲綍缃戝叧绾跨▼寮傚父:{ex.Message}");
                 }
@@ -347,7 +358,7 @@
                     LoginGateway();
                 }
             }
-            
+
         }
 
 
@@ -357,9 +368,9 @@
         public void ControlScene(Scene scene)
         {
             //浣撻獙妯″紡
-            if(MainPage.NoLoginMode)
+            if (MainPage.NoLoginMode)
             {
-                foreach(var sceneFunction in scene.functions)
+                foreach (var sceneFunction in scene.functions)
                 {
                     var revString = "";
                     var upDataObj = new AlinkFunctionStatusObj();
@@ -406,7 +417,7 @@
         /// <param name="function"></param>
         /// <param name="useRemote">鏄惁鐩存帴浣跨敤杩滅▼鍙戦��</param>
         /// <returns></returns>
-        public bool SendWriteCommand(Function function, Dictionary<string, string> commandDictionary, bool useRemote = false,int resend = 3)
+        public bool SendWriteCommand(Function function, Dictionary<string, string> commandDictionary, bool useRemote = false, int resend = 3)
         {
             function.controlCounter++;
             function.refreshTime = DateTime.Now;
@@ -453,7 +464,6 @@
                 UpdataFunctionStatus(revString, null, true);
                 return true;
             }
-
 
             //MainPage.Log($"鍙戦�佹暟鎹�:{Newtonsoft.Json.JsonConvert.SerializeObject(commandDictionary)}");
 
@@ -504,8 +514,9 @@
                         var functionControlDataObj = function.GetGatewayAlinkControlData(commandDictionary);
                         var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
                         var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
-                        new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id,resend);
+                        new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id, resend);
                         MainPage.Log($"鏈湴閫氳 鍙戦�丠DL-Link鏁版嵁:{functionControlDataJson}");
+                            Ins.myTcpClient.SendMessage(sendBytes);
                     }
                 }
                 //杩滅▼閫氳
@@ -522,7 +533,7 @@
                                 commandDictionary.Add(FunctionAttributeKey.OnOff, commandDictionary[FunctionAttributeKey.Brightness] == "0" ? "off" : "on");
                             }
                         }
-                        if(function.spk == SPK.LightCCT)
+                        if (function.spk == SPK.LightCCT)
                         {
                             if (!commandDictionary.ContainsKey(FunctionAttributeKey.CCT))
                             {
@@ -546,10 +557,10 @@
         /// <summary>
         /// 鍏ㄥ紑鍏ㄥ叧鍔熻兘
         /// </summary>
-        public void SwtichFunctions(bool open,List<Function> functions)
+        public void SwtichFunctions(bool open, List<Function> functions)
         {
             //dome妯″紡鎺у埗
-            if(MainPage.NoLoginMode)
+            if (MainPage.NoLoginMode)
             {
                 new System.Threading.Thread(() =>
                 {
@@ -557,7 +568,7 @@
                     {
                         Dictionary<string, string> d1 = new Dictionary<string, string>();
                         d1.Add(FunctionAttributeKey.OnOff, open ? "on" : "off");
-                         if (function.spk == SPK.PanelSocket)
+                        if (function.spk == SPK.PanelSocket)
                         {
                             if (function.attributes.Find((obj) => obj.key == "on_off_usb") != null)
                             {
@@ -623,16 +634,16 @@
         {
             var pm = new DAL.Server.HttpServerRequest();
             var pack = pm.GetDeviceInfoList(functionIds);
-            if(pack!= null&& pack.Data!=null)
+            if (pack != null && pack.Data != null)
             {
                 //寰呮祴璇�2021-03-04
                 var ddd = Newtonsoft.Json.JsonConvert.DeserializeObject<List<AlinkStatusData>>(pack.Data.ToString());
-                if(ddd!= null)
+                if (ddd != null)
                 {
-                    foreach(var function in ddd)
+                    foreach (var function in ddd)
                     {
                         var temp = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.deviceId == function.deviceId);
-                        if(temp!= null)
+                        if (temp != null)
                         {
                             if (SPK.Get3tySpk(SPK.BrandType.Tuya).Contains(temp.spk))
                             {
@@ -648,7 +659,7 @@
         /// 鍙戦�佽鍙栧懡浠�
         /// 鑷姩鍒ゆ柇鏄惁涓篈鍗忚璁惧
         /// </summary>
-        public void SendReadCommand(Function function ,bool forceRemote = false)
+        public void SendReadCommand(Function function, bool forceRemote = false)
         {
             function.refreshTime = DateTime.Now;
             if (forceRemote)
@@ -732,7 +743,7 @@
                             {
                                 busClient.ReadBusData(function);
                             }
-                            
+
                         }
                         catch (Exception ex)
                         {
@@ -776,7 +787,7 @@
         /// <summary>
         /// 瀹夐槻鎺у埗
         /// </summary>
-        public void ControlSecurity(SecurityAlarm securityAlarm,string state)
+        public void ControlSecurity(SecurityAlarm securityAlarm, string state)
         {
             if (!Ins.GatewayOnline_Local)//缃戝叧鏈湴涓嶅湪绾�
             {
@@ -834,7 +845,7 @@
                 };
                 var aLinkJson = Newtonsoft.Json.JsonConvert.SerializeObject(aLinkData);
                 var sendBytes = Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlScene, aLinkJson);
-                new Control_Udp().SendLocalHdlLinkData(sendBytes, aLinkData.id,0);
+                new Control_Udp().SendLocalHdlLinkData(sendBytes, aLinkData.id, 0);
             }
         }
 
@@ -928,10 +939,10 @@
         /// 杞崲鎺ユ敹鍒扮殑鏁版嵁
         /// </summary>
         /// <returns></returns>
-        public void ConvertReceiveData(byte[] receiveBytes,string ip)
+        public void ConvertReceiveData(byte[] receiveBytes, string ip)
         {
             var reString = Encoding.UTF8.GetString(receiveBytes);
-            AnalysisReceiveData(reString, receiveBytes,ip);
+            AnalysisReceiveData(reString, receiveBytes, ip);
         }
         /// <summary>
         /// 杞崲鎺ユ敹鍒扮殑鏁版嵁
@@ -939,7 +950,7 @@
         /// <param name="receiveString">杞琒tring鍚庣殑鏁版嵁</param>
         /// <param name="originalReceiveBytes"鍘熷Bytes鏁版嵁</param>
         /// <returns></returns>
-        public LocalCommunicationData AnalysisReceiveData(string receiveString, byte[] originalReceiveBytes , string sIp = null)
+        public LocalCommunicationData AnalysisReceiveData(string receiveString, byte[] originalReceiveBytes, string sIp = null)
         {
             LocalCommunicationData receiveObj = new LocalCommunicationData();
 
@@ -1078,7 +1089,8 @@
                     }
                 }
                 else if (receiveObj.Topic == CommunicationTopic.ct.ReadStatus + "_reply" ||
-                    receiveObj.Topic == CommunicationTopic.ct.ControlFunctionTopic + "_reply" ||
+                    receiveObj.Topic == CommunicationTopic.ct.ControlFunctionTopic + "_reply" || 
+                    receiveObj.Topic == CommunicationTopic.ct.ControlGroupControlTopic + "_reply" || 
                     receiveObj.Topic == CommunicationTopic.ct.GatewayUpStatus ||
                     receiveObj.Topic.Contains(CommunicationTopic.ct.GatewayUpSortTopic))
                 {
@@ -1118,7 +1130,8 @@
                         MainPage.Log($"瀹夐槻灞�鍩熺綉寮傚父锛歿ex.Message}");
                     }
                 }
-                else if (receiveObj.Topic == $"/user/{GatewayId}/custom/gateway/login_reply") {
+                else if (receiveObj.Topic == $"/user/{GatewayId}/custom/gateway/login_reply")
+                {
                     var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<JObject>(receiveObj.BodyDataString);
                     if (temp.GetValue("objects").ToString().Contains("success"))
                     {
@@ -1161,7 +1174,7 @@
             }
             else
             {
-                if(processedDataList.Count> 50)
+                if (processedDataList.Count > 50)
                 {
                     processedDataList.RemoveAt(0);
                 }
@@ -1170,12 +1183,63 @@
 
         }
 
+
         /// <summary>
         /// 鏇存柊璁惧鐘舵��
         /// A鍗忚鏁版嵁
         /// </summary>
-        /// <param name="updateBytes"></param>
-        public void UpdataFunctionStatus(string revString, byte[] usefulBytes,bool isCloudData = false)
+        public void UpdataGroupControlStatus(string revString, byte[] usefulBytes, bool isCloudData = false)
+        {
+            var temp = JsonConvert.DeserializeObject<AlinkFunctionStatusObj>(revString);
+            if (temp != null)
+            {
+                Control_Udp.ReceiveRepeatManager(temp.id, usefulBytes);
+                var allLocalFuntion = FunctionList.List.groupControls;
+                foreach (var updateTemp in temp.objects)
+                {
+                    try
+                    {
+                        var localFunction = allLocalFuntion.Find((obj) => obj.sid == updateTemp.sid);
+                        if (localFunction == null)
+                        {
+                            continue;
+                        }
+                        MainPage.Log($"鏀跺埌鏁版嵁:{revString}");
+                        foreach (var attr in updateTemp.status)
+                        {
+                            localFunction.time_stamp = temp.time_stamp;
+                            localFunction.SetAttrState(attr.key, attr.value);
+
+                        }
+
+                        //鏇存柊鐣岄潰鐘舵��
+                        switch (localFunction.spk)
+                        {
+                            case SPK.ElectricEnergy:
+                                EnergyMainPage.UpdataStatus(localFunction);
+                                break;
+                        }
+
+                        HomePage.UpdataFunctionStates(localFunction);
+                        RoomPage.UpdataStates(localFunction);
+                        FunctionPage.UpdataStates(localFunction);
+                        ClassificationPage.UpdataInfo(localFunction);
+
+                    }
+                    catch (Exception ex)
+                    {
+                        MainPage.Log($"A鍗忚鏇存柊鐘舵�佸紓甯�:{ex.Message}");
+                    }
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// 鏇存柊璁惧鐘舵��
+        /// A鍗忚鏁版嵁
+        /// </summary>
+        public void UpdataFunctionStatus(string revString, byte[] usefulBytes, bool isCloudData = false)
         {
             ////test 浜戠杩炴帴鎴愬姛鏃讹紝涓嶉�傜敤鏈湴鏁版嵁鏇存柊
             //if (Ins.GatewayOnline_Cloud && !isCloudData)
@@ -1218,7 +1282,7 @@
 
                         if (Ins.GatewayOnline_Local && isCloudData)//鏈湴閾炬帴锛岄櫎浜嗘秱楦﹁澶囨暟鎹箣澶栫殑浜戠鏁版嵁涓嶅鐞�
                         {
-                            if (!SPK.Get3tySpk(SPK.BrandType.All3tyBrand).Contains(localFunction.spk) && !SPK.MusicSpkList().Contains( localFunction.spk))
+                            if (!SPK.Get3tySpk(SPK.BrandType.All3tyBrand).Contains(localFunction.spk) && !SPK.MusicSpkList().Contains(localFunction.spk))
                             {
                                 //MainPage.Log($"A鍗忚鏇存柊鐘舵��:鏈湴閾炬帴锛岄櫎浜嗘秱楦﹁澶囨暟鎹箣澶栫殑浜戠鏁版嵁涓嶅鐞�........");
 
@@ -1235,12 +1299,11 @@
                         //        return;
                         //    }
                         //}
-                        //MainPage.Log($"A鍗忚鏇存柊鐘舵��:{revString}");
+                        MainPage.Log($"鏀跺埌鏁版嵁:{revString}");
                         foreach (var attr in updateTemp.status)
                         {
                             localFunction.time_stamp = temp.time_stamp;
                             localFunction.SetAttrState(attr.key, attr.value);
-                            //Console.WriteLine("闊充箰鎾斁鍣ㄦ坊鍔犵紦瀛樻暟鎹�=======" + revString);
 
                         }
 
@@ -1256,7 +1319,7 @@
                                 break;
                             case SPK.AirSwitch:
                                 AirSwitchPage.UpdataState(localFunction);
-                                if(localFunction.GetAttribute(FunctionAttributeKey.Power)!=null)//濡傛灉鏄甫鐢甸噺鐨勭┖寮�涔熻鏇存柊鑳芥簮鐣岄潰
+                                if (localFunction.GetAttribute(FunctionAttributeKey.Power) != null)//濡傛灉鏄甫鐢甸噺鐨勭┖寮�涔熻鏇存柊鑳芥簮鐣岄潰
                                 {
                                     EnergyMainPage.UpdataStatus(localFunction);
                                 }
@@ -1295,7 +1358,7 @@
                                 CurtainModulePage.UpdataState(localFunction);
                                 break;
                             case SPK.CurtainDream:
-                                if(localFunction.GetAttrState(FunctionAttributeKey.Percent) == "0")
+                                if (localFunction.GetAttrState(FunctionAttributeKey.Percent) == "0")
                                 {
                                     localFunction.SetAttrState(FunctionAttributeKey.OnOff, "off");
                                 }
@@ -1388,7 +1451,7 @@
                             case SPK.SensorTemperature:
                             case SPK.SensorHumidity:
                             case SPK.SensorHcho:
-                                if(localFunction.spk == SPK.SensorTemperature)
+                                if (localFunction.spk == SPK.SensorTemperature)
                                 {
                                     HomePage.LoadEvent_RefreshEnvirIndoorTemp();
                                 }
@@ -1399,7 +1462,7 @@
                                 EnvironmentalPage.LoadEvent_UpdataStatus(localFunction);
                                 //A_EnvironmentalDataCenter.LoadEvent_UpdataStatus(localFunction);
                                 break;
-                            case SPK.SensorEnvironment:
+                            case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
                             case SPK.SensorEnvironment2:
                             case SPK.SensorEnvironment3:
                                 if (localFunction.GetAttributes().Contains(FunctionAttributeKey.Temperature))
@@ -1490,7 +1553,7 @@
                             case SPK.AvMusic:
                             case SPK.MusicStandard:
                                 //UI.Music.MusicMain.mMusicMain.RefreshView(updateTemp);
-                                //Console.WriteLine("闊充箰鎾斁鍣ㄦ樉绀虹姸鎬�======="+ revString);
+                                Console.WriteLine("闊充箰鎾斁鍣ㄦ樉绀虹姸鎬�=======" + revString);
                                 //wjc
                                 break;
                             case SPK.Inverter:
@@ -1524,12 +1587,12 @@
         /// <summary>
         /// //涓�閿紙杩滅▼锛夊紑閿�
         /// </summary>
-        public void OneKeyUnlocking(Function doorlock,string extStr)
+        public void OneKeyUnlocking(Function doorlock, string extStr)
         {
             if (Ins.GatewayOnline_Local)
             {
                 Dictionary<string, string> dic = new Dictionary<string, string>();
-                var functionControlDataObj = doorlock.GetGatewayAlinkDoorlockData(UserInfo.Current.ID,extStr);
+                var functionControlDataObj = doorlock.GetGatewayAlinkDoorlockData(UserInfo.Current.ID, extStr);
                 var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
                 var sendBytes = Ins.ConvertSendBodyData($"/base/{Control.Ins.GatewayId}/thing/service/doorRemoteOpen/down", functionControlDataJson);
                 new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id, 0);
@@ -1544,7 +1607,7 @@
         /// </summary>
         /// <param name="functionId"></param>
         /// <param name="pwd"></param>
-        public void ConfirmUnlocking(string functionId,string pwd)
+        public void ConfirmUnlocking(string functionId, string pwd)
         {
             Loading loading = new Loading();
             MainPage.BaseView.AddChidren(loading);
@@ -1580,8 +1643,10 @@
                         //{
                         //    return false;
                         //}
-                        if (pack.Code != StateCode.SUCCESS) {
-                            Application.RunOnMainThread(() => {
+                        if (pack.Code != StateCode.SUCCESS)
+                        {
+                            Application.RunOnMainThread(() =>
+                            {
                                 new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), pack.message);
                                 UserInfo.Current.doorPasswordString = "";//
                                 UserInfo.Current.LastTimeOpenDoor = DateTime.MinValue;
@@ -1590,8 +1655,9 @@
                     }
                     if (pack.Code != StateCode.SUCCESS)
                     {
-                        Application.RunOnMainThread(() => {
-                            if(string.IsNullOrEmpty(pack.message))
+                        Application.RunOnMainThread(() =>
+                        {
+                            if (string.IsNullOrEmpty(pack.message))
                             {
                                 new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip),
                                     Language.StringByID(StringId.OperationFailed));
diff --git a/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs b/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs
index c90eac3..2c53a79 100644
--- a/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs
@@ -295,7 +295,10 @@
                     }
                     finally
                     {
-                        heartBeatThread = null;
+                        if (heartBeatThread != null)
+                        {
+                            heartBeatThread = null;
+                        }
                         HeartBeat();
                     }
                 }
@@ -317,54 +320,59 @@
                 {
                     receiveThread = new Thread(() =>
                     {
-                        while (isConnected)
+                        try
                         {
-                            if (_tcpClient == null)
+                            while (isConnected)
                             {
-                                try
+                                if (_tcpClient == null)
                                 {
-                                    receiveThread?.Abort();
-                                }
-                                catch { }
-                                finally
-                                {
-                                    receiveThread = null;
-                                }
-                                return;
-                            }
-                            if (!_tcpClient.Connected)
-                            {
-                                MainPage.Log("tcp瀹㈡埛绔柇寮�浜嗚繛鎺�...");
-                                isConnected = false;
-                                return;
-                            }
-                            try
-                            {
-                                // 瀹氫箟涓�涓�2M鐨勭紦瀛樺尯锛�
-                                byte[] arrMsgRec = new byte[1024 * 1024 * 2];
-                                try
-                                {
-                                    int size = _tcpClient.GetStream().Read(arrMsgRec, 0, arrMsgRec.Length);
-                                }
-                                catch (Exception ex)
-                                {
-                                    isConnected = false;
-                                    MainPage.Log($"灞�鍩熺綉tcp鏁版嵁鎺ユ敹寮傚父:{ex.Message}");
+                                    try
+                                    {
+                                        receiveThread?.Abort();
+                                    }
+                                    catch { }
+                                    finally
+                                    {
+                                        receiveThread = null;
+                                    }
                                     return;
                                 }
-                                var tcpDataString = System.Text.Encoding.UTF8.GetString(arrMsgRec, 0, arrMsgRec.Length);
-
-
-                                if (!string.IsNullOrEmpty(tcpDataString))
+                                if (!_tcpClient.Connected)
                                 {
-                                    MainPage.Log($"灞�鍩熺綉tcp鏁版嵁鎺ユ敹");
-                                    Control.Ins.ConvertReceiveData(arrMsgRec, null);
-
+                                    MainPage.Log("tcp瀹㈡埛绔柇寮�浜嗚繛鎺�...");
+                                    isConnected = false;
+                                    return;
                                 }
-                            }
-                            catch (Exception) { }
-                        }
+                                try
+                                {
+                                    // 瀹氫箟涓�涓�2M鐨勭紦瀛樺尯锛�
+                                    byte[] arrMsgRec = new byte[1024 * 1024 * 2];
+                                    try
+                                    {
+                                        int size = _tcpClient.GetStream().Read(arrMsgRec, 0, arrMsgRec.Length);
+                                    }
+                                    catch (Exception ex)
+                                    {
+                                        isConnected = false;
+                                        MainPage.Log($"灞�鍩熺綉tcp鏁版嵁鎺ユ敹寮傚父:{ex.Message}");
+                                        return;
+                                    }
+                                    var tcpDataString = System.Text.Encoding.UTF8.GetString(arrMsgRec, 0, arrMsgRec.Length);
 
+
+                                    if (!string.IsNullOrEmpty(tcpDataString))
+                                    {
+                                        MainPage.Log($"灞�鍩熺綉tcp鏁版嵁鎺ユ敹");
+                                        Control.Ins.ConvertReceiveData(arrMsgRec, null);
+
+                                    }
+                                }
+                                catch (Exception) { }
+                            }
+                        }catch (Exception ex)
+                        {
+                            MainPage.Log($"tcp ReceiveMessage error :{ex.Message}");
+                        }
                     });
                     //receiveThread.IsBackground = true;
                     receiveThread.Start();
diff --git a/HDL_ON/DAL/DriverLayer/UdpSocket.cs b/HDL_ON/DAL/DriverLayer/UdpSocket.cs
index f0893ff..f454bf1 100644
--- a/HDL_ON/DAL/DriverLayer/UdpSocket.cs
+++ b/HDL_ON/DAL/DriverLayer/UdpSocket.cs
@@ -50,8 +50,10 @@
 
 				busSocket.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.AddMembership, new MulticastOption(IPAddress.Parse("239.0.168.188")));
 			}
-			catch{
-                busSocket = null;
+			catch (Exception ex){
+				MainPage.Log ($"udp port bind error : {ex.Message}");
+
+				busSocket = null;
                 return;
             }
 
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 383bda8..d5cd85e 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -204,6 +204,12 @@
                         Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/irCodeStudyDone/up",
                         QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
                     };
+                    //App璁㈤槄缇ゆ帶鐘舵�佷富棰�
+                    var groupControlStatus = new MqttTopicFilter()
+                    {
+                        Topic = $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/device/group/control/property/send",
+                        QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce
+                    };
 
 
                     #region 鏁版嵁鏇存柊鎺ㄩ�佷富棰�
@@ -262,6 +268,11 @@
                         topicFilterPush2, topicAlinkStatus ,mqttkeyChange,
                         deviceOnlinePush,
                         securityStatusChange});
+                    //璁㈤槄缇ゆ帶鐘舵��
+                    if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
+                    {
+                        await RemoteMqttClient.SubscribeAsync(groupControlStatus);
+                    }
                     if (result.Items[0].ResultCode == MQTTnet.Client.Subscribing.MqttClientSubscribeResultCode.GrantedQoS0)
                     {
                         isSubscribeSuccess = true;
@@ -363,7 +374,7 @@
                             try
                             {
                                 var topic = e.ApplicationMessage.Topic;
-                                //MainPage.Log($"鏀跺埌mqtt涓婚:{topic}");
+                                MainPage.Log($"鏀跺埌mqtt涓婚:{topic}");
                                 //涓�绔彛涓婚澶勭悊
                                 if (DB_ResidenceData.Instance.GatewayType == 0 && !DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
                                 {
@@ -446,10 +457,10 @@
                                 }
                                 #region 鏁版嵁鏇存柊鎺ㄩ�佷富棰�
                                 //appHomeRefresh锛氫綇瀹呮暟鎹埛鏂伴�氱煡
-                                else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appHomeRefresh/up"
-                                        || topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appDeviceRefresh/up")
+                                else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/event/appHomeRefresh/up")
                                 {
                                     MainPage.Log("浣忓畢鏁版嵁鍒锋柊閫氱煡");
+                                    System.Threading.Thread.Sleep(2000);
                                     new HttpServerRequest().GetHomePager();
                                 }
                                 //appRoomRefresh锛氭埧闂存暟鎹埛鏂伴�氱煡
@@ -564,11 +575,18 @@
                                     }
                                 }
                                 #endregion
+                                //缇ゆ帶鐘舵��
+                                else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/device/group/control/property/send")
+                                {
+                                    var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, tuyaEncryptKey);
+                                    var revString = Encoding.UTF8.GetString(bytes);
+                                    MainPage.Log($"mqtt 缇ゆ帶鐘舵�佹洿鏂�:{revString}");
+                                    Control.Ins.UpdataGroupControlStatus(revString, null, true);
+                                }
                                 //A缃戝叧璁惧鐘舵��-鍖呭惈娑傞甫璁惧
                                 //Tag 缃戠粶鐘舵�佽В鏋�
                                 else if (topic == $"/user/{DB_ResidenceData.Instance.CurrentRegion.id}/app/thing/property/send")
                                 {
-
                                     var bytes = Securitys.EncryptionService.AesDecryptPayload(e.ApplicationMessage.Payload, tuyaEncryptKey);
                                     var revString = Encoding.UTF8.GetString(bytes);
                                     MainPage.Log($"mqtt 鐘舵�佹洿鏂�:{revString}");
@@ -853,7 +871,7 @@
         static void ReceiveNotifySqueezeAsync(string mMes)
         {
 #if DEBUG
-            return;
+            //return;
 #endif
             if (mMes == PushSignStr) return;//鏄嚜宸辩殑鐧诲綍鎺ㄩ�佷笉澶勭悊//鎴栬�呭綋鍓嶄笉鏄繙绋嬮摼鎺ョ姸鎬�
             //娴嬭瘯璐﹀彿锛屼笉鎸や笅绾�
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index 4ba45b6..8b4f77b 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -544,6 +544,13 @@
                 var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoRes>>(resultObj.Data.ToString());
                 if (homeList == null || homeList.Count == 0)
                 {
+                    if (DB_ResidenceData.Instance.CurrentRegion!=null && DB_ResidenceData.Instance.CurrentRegion.id != "")
+                    {
+                        Shared.Application.RunOnMainThread(() =>
+                        {
+                            MainPage.GoUserPage(false);
+                        });
+                    }
                 }
                 else
                 {
@@ -564,6 +571,10 @@
                     }
                     if (UserInfo.Current.regionList.Count == 0)
                     {
+                        Shared.Application.RunOnMainThread(() =>
+                        {
+                            MainPage.GoUserPage(false);
+                        });
                         return "null";
                     }
                     //-------濡傛灉璐﹀彿鏄娆$櫥褰�
@@ -686,6 +697,34 @@
             }
         }
         /// <summary>
+        /// 鑾峰彇浣忓畢浜や粯閾炬帴
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew GetHouseDeliveryUrl()
+        {
+            var d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            var jsonString = HttpUtil.GetSignRequestJson(d);
+            var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.APi_Post_GetHoserDeliverUrl, jsonString);
+            return revertObj;
+        }
+        /// <summary>
+        /// 浣忓畢浜や粯鍥炴粴
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew RollBack()
+        {
+            var d = new Dictionary<string, object>();
+            d.Add("houseId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("communityId", DB_ResidenceData.Instance.CurrentRegion.communityId);
+            d.Add("flowRecordContent", "onPro浜や粯鍥炴粴");
+            d.Add("projectFlowRecordActionEnum", "DELIVERY_ROLLBACK");
+            var jsonString = HttpUtil.GetSignRequestJson(d);
+            var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.APi_Post_UpdateProjectDebugStatus, jsonString);
+            return revertObj;
+        }
+
+        /// <summary>
         /// 鑾峰彇缃戝叧淇℃伅
         /// </summary>
         public string GetGatewayInfo()
@@ -726,7 +765,7 @@
         {
             var requestObj = new ChildDeleteObj()
             {
-                childAccountId = subaccount.childAccountId,
+                childId = subaccount.id,
                 homeId = subaccount.homeId
             };
             var requestJson = HttpUtil.GetSignRequestJson(requestObj);
@@ -741,12 +780,11 @@
         /// <returns></returns>
         public ResponsePackNew EditSubAccountNickName(string nickName, string childAccountId)
         {
-            var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildNickNameObj()
-            {
-                homeId = DB_ResidenceData.Instance.CurrentRegion.id,
-                childAccountId = childAccountId,
-                nickName = nickName,
-            });
+            var d = new Dictionary<string, string>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("childId", childAccountId);
+            d.Add("nickName", nickName);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
             return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Update, requestJson);
 
         }
@@ -761,7 +799,7 @@
             var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildAllowCreateSceneObj()
             {
                 homeId = DB_ResidenceData.Instance.CurrentRegion.id,
-                childAccountId = childAccountId,
+                childId = childAccountId,
                 isAllowCreateScene = isAllow,
             });
             return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Update, requestJson);
@@ -977,11 +1015,77 @@
         public ResponsePackNew BindResidenceMemberAccount(string subAccount, string nickName)
         {
             //娣诲姞瀛愯处鍙�
-            var requestObj = new ChildAddObj() { homeId = DB_ResidenceData.Instance.CurrentRegion.id, account = subAccount, nickName = nickName };
+            var requestObj = new ChildAddObj()
+            {
+                homeId = DB_ResidenceData.Instance.CurrentRegion.id,
+                account = subAccount,
+                nickName = nickName
+            };
             var requestJson = HttpUtil.GetSignRequestJson(requestObj);
             return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Add, requestJson);
-
         }
+        //v1.7鏇存柊鎺ュ彛
+        public ResponsePackNew BindResidenceMemberAccount(string subAccount, string nickName,string faceUrl)
+        {
+            //娣诲姞瀛愯处鍙�
+
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("nickName", nickName);
+            if (!string.IsNullOrEmpty(subAccount))
+            {
+                d.Add("account", subAccount);
+            }
+            if (!string.IsNullOrEmpty(faceUrl))
+            {
+                d.Add("faceUrl", @"data:image/jpg;base64," + faceUrl);
+            }
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Add, requestJson);
+        }
+        /// <summary>
+        /// 鍒犻櫎鎴愬憳璐﹀彿浜鸿劯鏁版嵁
+        /// </summary>
+        /// <param name="subAccount"></param>
+        /// <param name="nickName"></param>
+        /// <param name="faceUrl"></param>
+        /// <returns></returns>
+        public ResponsePackNew DeleteMemberFace( string childId)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("childId", childId);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_RemoveFace, requestJson);
+        }
+        /// <summary>
+        /// 鏇存柊鎴愬憳璐﹀彿浜鸿劯鏁版嵁
+        /// </summary>
+        public ResponsePackNew UpdataMemberFace(string childId, string faceUrl)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("childId", childId);
+            d.Add("userFace", @"data:image/jpg;base64," + faceUrl);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_UpdateFace, requestJson);
+        }
+        /// <summary>
+        /// 瀹跺涵鎴愬憳缁戝畾璐﹀彿
+        /// </summary>
+        /// <param name="childId"></param>
+        /// <param name="faceUrl"></param>
+        /// <returns></returns>
+        public ResponsePackNew SubChildBindAccount(string childId, string account)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("childId", childId);
+            d.Add("account", account);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_BindAccount, requestJson);
+        }
+        
 
         /// <summary>
         /// 淇敼浣忓畢璋冭瘯鏉冮檺
@@ -1405,6 +1509,8 @@
         /// </summary>
         public void GetCityWeatherInfo(string lon, string lat)
         {
+            if (lon == "0" || lat == "0")
+                return;
             MainPage.cityInfo.lon = lon;
             MainPage.cityInfo.lat = lat;
 
@@ -1450,6 +1556,7 @@
                             MainPage.cityInfo.lowestTemperature = jt.GetValue("lowestTemperature").ToString();
                             MainPage.cityInfo.highestTemperature = jt.GetValue("highestTemperature").ToString();
                             MainPage.CityWeatherAction?.Invoke();
+                            HDL_ON.UI.HomePage.LoadEvent_RefreshAir();
                             break;
                         }
                         catch (Exception ex)
@@ -1457,16 +1564,8 @@
                             MainPage.Log($"get weather error : {ex.Message}");
                         }
                     }
-                    System.Threading.Thread.Sleep(1000);
+                    System.Threading.Thread.Sleep(5000);
                 }
-                Shared.Application.RunOnMainThread(() =>
-                {
-                    try
-                    {
-                        HDL_ON.UI.HomePage.LoadEvent_RefreshAir();
-                    }
-                    catch { }
-                });
             });
         }
         ///// <summary>
@@ -2078,7 +2177,7 @@
         /// <param name="productPlatform"></param>
         /// <param name="productBrand"></param>
         /// <returns></returns>
-        public ResponsePackNew IndependentRegister3TyDevcie(string spk, string extDevId, string deviceName, string pairCode = "")
+        public ResponsePackNew IndependentRegister3TyDevcie(string spk, string extDevId, string deviceName,string productBrandIdentity, string pairCode = "")
         {
             Dictionary<string, object> d = new Dictionary<string, object>();
             d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
@@ -2086,6 +2185,7 @@
             d.Add("extDevId", extDevId);
             d.Add("name", deviceName);
             d.Add("code", pairCode);
+            d.Add("productBrandIdentity", productBrandIdentity);
 
 
             var requestJson = HttpUtil.GetSignRequestJson(d);
@@ -2326,7 +2426,7 @@
 
 #endregion
 
-#region Kaede --鍦烘櫙鍔熻兘--------------------------
+        #region Kaede --鍦烘櫙鍔熻兘--------------------------
         /// <summary>
         /// 鑾峰彇鍦烘櫙鍒楄〃
         /// 鎴块棿ID鍙┖锛岄粯璁ゆ煡璇綇瀹呬笅鎵�鏈夋埧闂�
@@ -2458,9 +2558,9 @@
             var requestJson = HttpUtil.GetSignRequestJson(d);
             return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectScene, requestJson).Code;
         }
-#endregion
+        #endregion
 
-#region Kaede --鎴块棿鍔熻兘--------------------------
+        #region Kaede --鎴块棿鍔熻兘--------------------------
         /// <summary>
         /// 鑾峰彇鎴块棿鍒楄〃
         /// </summary>
@@ -2535,10 +2635,10 @@
             return pack;
         }
 
-#endregion
+        #endregion
 
 
-#region Kaede -- 瀹夐槻鎺ュ彛____________________________
+        #region Kaede -- 瀹夐槻鎺ュ彛____________________________
         /// <summary>
         /// 鑾峰彇瀹夐槻鍒楄〃
         /// </summary>
@@ -2702,10 +2802,10 @@
             return pack;
         }
 
-#endregion
+        #endregion
 
 
-#region Kaede --绗笁鏂瑰搧鐗屽姛鑳�--------------------------
+        #region Kaede --绗笁鏂瑰搧鐗屽姛鑳�--------------------------
         /// <summary>
         /// 鑾峰彇绗笁鏂瑰搧鐗屽垪琛�
         /// </summary>
@@ -2735,13 +2835,11 @@
         /// <returns></returns>
         public ResponsePackNew Search3tyIotDevice(string companyId)
         {
-
             Dictionary<string, object> d = new Dictionary<string, object>();
             d.Add("companyId", companyId);
             var requestJson = HttpUtil.GetSignRequestJson(d);
 
             var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_Search3tyIotDevice, requestJson);
-
             return pack;
         }
 
@@ -2817,9 +2915,9 @@
             return pack;
         }
 
-#endregion
+        #endregion
 
-#region 鈻� 钀ょ煶浜慡DK鐩稿叧鎺ュ彛_________________________
+        #region 鈻� 钀ょ煶浜慡DK鐩稿叧鎺ュ彛_________________________
         /// <summary>
         /// 娌充笢鑾峰彇钀ょ煶浜戝瓙璐﹀彿token鐨勬帴鍙�
         /// 2021-07-07 鏂版柟妗堟帴鍙h皟鏁村鎺�
@@ -2832,10 +2930,10 @@
             var requestJson = HttpUtil.GetSignRequestJson(d);
             return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_EZ_GetChildToken, requestJson);
         }
-#endregion
+        #endregion
 
 
-#region 鈻� 鍙瀵硅_________________________
+        #region 鈻� 鍙瀵硅_________________________
         /// <summary>
         /// 妫�鏌ヤ綇瀹呮槸鍚︾粦瀹氫赴鏋�
         /// </summary>
@@ -2867,9 +2965,25 @@
 
         }
 
-#endregion
+        /// <summary>
+        /// 鑾峰彇绗笁鏂规敞鍐岀殑id
+        /// </summary>
+        /// <param homeId="homeId">浣忓畢id</param>
+        /// <returns></returns>
+        public ResponsePackNew GetExtUserId(string homeId)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", homeId);
 
-#region 鈻� 闂ㄩ攣鐩稿叧____________________________
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetExtUserId, requestJson);
+
+            return pack;
+        }
+
+        #endregion
+
+        #region 鈻� 闂ㄩ攣鐩稿叧____________________________
 
         /// <summary>
         /// 鑾峰彇闂ㄩ攣鍘嗗彶璁板綍(鎸夋棩鏈熼檷搴�)
@@ -2937,9 +3051,51 @@
             //IMessageCommon.Current.ShowErrorInfoAlter(responePack.Code);
             return listSortLog;
         }
+        /// <summary>
+        /// 鑾峰彇闂ㄩ攣涓存椂瀵嗙爜
+        /// </summary>
+        /// <param name="deviceId"></param>
+        /// <returns></returns>
+        public ResponsePackNew GetDoorTempPassword(string deviceId)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("deviceId", deviceId);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetTempPasswrod, requestJson);
+        }
+        /// <summary>
+        /// 鍒涘缓闂ㄩ攣涓存椂瀵嗙爜
+        /// </summary>
+        /// <param name="deviceId"></param>
+        /// <returns></returns>
+        public ResponsePackNew CreateDoorTempPassword(string deviceId,string beginTime,string endTime)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("deviceId", deviceId);
+            d.Add("beginTime", beginTime);
+            d.Add("endTime", endTime);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CreateTempPasswrod, requestJson);
+        }
+        /// <summary>
+        /// 鍒犻櫎闂ㄩ攣涓存椂瀵嗙爜
+        /// </summary>
+        /// <returns></returns>
+        public ResponsePackNew DelDoorTempPassword(string deviceId, string pwdId)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("deviceId", deviceId);
+            d.Add("pwdId", pwdId);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            return HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_DelTempPasswrod, requestJson);
+        }
 
-#endregion
-#region 鈻� 闊崇璇█鎺у埗鐩稿叧_________________________
+        #endregion
+
+        #region 鈻� 闊崇璇█鎺у埗鐩稿叧_________________________
         /// <summary>
         /// 鑾峰彇宸叉巿鏉冪殑闊崇鍒楄〃
         /// </summary>
@@ -3003,7 +3159,7 @@
             var requestJson = HttpUtil.GetSignRequestJson(updateSpeakerDeviceListObj);
             return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Speaker_DeviceList_Update, requestJson);
         }
-#endregion
+        #endregion
 
         /// <summary>
         /// 缁戝畾source闈㈡澘
@@ -3066,12 +3222,7 @@
         }
 
 
-
-
-
-
-
-#region 鍏変紡鍌ㄨ兘
+        #region 鍏変紡鍌ㄨ兘
         /// <summary>
         /// 鑾峰彇浣忓畢涓嬮�嗗彉鍣ㄥ垪琛�
         /// </summary>
@@ -3096,7 +3247,156 @@
             var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetInverter_StatisticsInfo, requestJson);
             return pack;
         }
-#endregion
+        #endregion
+
+
+        #region 缇ゆ帶锛岀粍鍚堣皟鍏�
+        /// <summary>
+        /// 鑾峰彇缇ゆ帶绫诲瀷
+        /// </summary>
+        /// <param name="spk"></param>
+        /// <returns></returns>
+        public ResponsePackNew GetGroupControlTypes(string spk)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("spk", spk);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetGroupControlTypes, requestJson);
+            return pack;
+        }
+        /// <summary>
+        /// 鑾峰彇缇ゆ帶鍒楄〃
+        /// </summary>
+        /// <param name="spk"></param>
+        /// <returns></returns>
+        public ResponsePackNew GetGroupControlList()
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetGroupControlListByHome, requestJson);
+            return pack;
+        }
+        /// <summary>
+        /// 鑾峰彇缇ゆ帶璇︽儏
+        /// </summary>
+        public ResponsePackNew GetGroupControInfo(string userDeviceGroupControlIds)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            var ids = new List<string>()
+            {
+                userDeviceGroupControlIds,
+            };
+            d.Add("userDeviceGroupControlIds", ids);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetGroupControlInfos, requestJson);
+            return pack;
+        }
+
+        /// <summary>
+        /// 鑾峰彇缇ゆ帶璇︽儏
+        /// </summary>
+        public ResponsePackNew GetGroupControInfo(List<string> ids)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("userDeviceGroupControlIds", ids);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_GetGroupControlInfos, requestJson);
+            return pack;
+        }
+
+        /// <summary>
+        /// 娣诲姞缇ゆ帶鍒楄〃
+        /// </summary>
+        public ResponsePackNew AddGroupControl(List<GroupControl> groupControls)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
+            d.Add("infos", groupControls);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddGroupControl, requestJson);
+            return pack;
+        }
+
+
+        /// <summary>
+        /// 娣诲姞缇ゆ帶鍒楄〃
+        /// </summary>
+        public ResponsePackNew DelGroupControl(string groupControlId)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("userDeviceGroupControlIds", new List<string>() { groupControlId });
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_DeleteGroupControl, requestJson);
+            return pack;
+        }
+
+        /// <summary>
+        /// 缂栬緫缇ゆ帶鍒楄〃
+        /// </summary>
+        /// <param name="spk"></param>
+        /// <returns></returns>
+        public ResponsePackNew EditGroupControl(List<GroupControl> groupControls)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            //d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
+            d.Add("infos", groupControls);
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_UpdateGroupControl, requestJson);
+            return pack;
+        }
+
+
+        /// <summary>
+        /// 缇ゆ帶鎺у埗
+        /// </summary>
+        public ResponsePackNew ControlGroupControl(string userDeviceGroupControlId, Dictionary<string, object> pair)
+        {
+            var d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("userDeviceGroupControlId", userDeviceGroupControlId);
+            List<Dictionary<string, object>> dd = new List<Dictionary<string, object>>();
+            dd.Add(pair);
+            d.Add("status",dd);
+
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_ControlGroupControl, requestJson);
+            return pack;
+        }
+
+        /// <summary>
+        /// 鏀惰棌缇ゆ帶
+        /// </summary>
+        public ResponsePackNew CollectGroupControl(string groupControlId)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("userDeviceGroupControlIds", new List<string>() { groupControlId });
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CollectGroupControl, requestJson);
+            return pack;
+        }
+
+
+        /// <summary>
+        /// 鍙栨秷鏀惰棌缇ゆ帶
+        /// </summary>
+        public ResponsePackNew CancelCollectGroupControl(string groupControlId)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("userDeviceGroupControlIds", new List<string>() { groupControlId });
+            var requestJson = HttpUtil.GetSignRequestJson(d);
+            var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_CancelCollectGroupControl, requestJson);
+            return pack;
+        }
+
+        #endregion
 
     }
 }
\ No newline at end of file
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index bf39c96..62b4b3f 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -6,6 +6,7 @@
 using System.Text;
 using HDL_ON.Entity;
 using RestSharp;
+using Shared;
 
 namespace HDL_ON.DAL.Server
 {
@@ -18,7 +19,12 @@
         /// 鍏叡鍩熷悕灏辫繎瑙f瀽
         /// </summary>
         //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
-        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+        const string APP_KEY = "HDL-HOME-APP-TEST";
+        const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
+        //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
+        //const string APP_KEY = "CPEVRLRT";
+        //const string SECRET_KEY = "CPEVRLSJCPEVRLSZ";
         /// <summary>
         /// RegionMark
         /// </summary>
@@ -167,6 +173,7 @@
                 RestRequest request = new RestRequest(method);
                 request.Timeout = mTimeout * 1000;
                 request.AddHeader("content-type", "application/json");
+                request.AddHeader("language", Language.CurrentLanguage == "Chinese" ? "cn" : "en");//澧炲姞璇█鏍囪瘑 wxr 2023-03-22 17:03:34
 
                 if (string.IsNullOrEmpty(replaceToken))
                 {
@@ -179,6 +186,7 @@
                 {
                     request.AddHeader("Authorization", replaceToken); 
                 }
+
            
                 if (bodyParameterJson != null)
                 {
@@ -230,7 +238,19 @@
                 }
                 else
                 {
-                    HDL_ON.Utlis.WriteLine(response.Content);
+                    HDL_ON.Utlis.WriteLine($"鎺ュ彛寮傚父:{requestFullUrl} \r\n"+response.Content);
+                    if(response.Content!= null)
+                    {
+                        try
+                        {
+                            var pack = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(response.Content);
+                            if (pack != null)
+                            {
+                                return pack;
+                            }
+                        }
+                        catch { }
+                    }
                     return new ResponsePackNew() { Code = StateCode.NETWORK_ERROR };
                 }
 
@@ -521,14 +541,6 @@
         #endregion
 
         #region **********绛惧悕鏍¢獙**********
-        /// <summary>
-        /// 
-        /// </summary>
-        const string APP_KEY = "HDL-HOME-APP-TEST";
-        /// <summary>
-        /// 
-        /// </summary>
-        const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
 
         /// <summary>
         /// 鑾峰彇褰撳墠鏃堕棿鎴冲��
diff --git a/HDL_ON/DAL/Server/IMessageCommon.cs b/HDL_ON/DAL/Server/IMessageCommon.cs
index c6d29f4..7626dff 100644
--- a/HDL_ON/DAL/Server/IMessageCommon.cs
+++ b/HDL_ON/DAL/Server/IMessageCommon.cs
@@ -164,6 +164,7 @@
             stateCodeDic["14007"] = StringId.ControlFailure;
             //缃戝叧绂荤嚎
             stateCodeDic["14005"] = StringId.GatewayOffline;
+            stateCodeDic["124005"] = StringId.GatewayOffline;
             //璁惧绂荤嚎
             stateCodeDic["14006"] = StringId.DeviceOffline;
 
@@ -272,6 +273,7 @@
                         {
                             var tip = new Tip()
                             {
+                                MaxWidth = Application.GetRealWidth(300),
                                 Text = mes,
                                 CloseTime = closeTime,
                                 Direction = AMPopTipDirection.None
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index e7e96bd..2b2a1a7 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -92,6 +92,10 @@
         /// 鑾峰彇涓存椂瀵嗙爜
         /// </summary>
         public const string API_POST_GET_TEMP_PASSWORD_LIST = "/community-wisdom/app/visitor/freeview/page";
+        /// <summary>
+        /// 鑾峰彇绗笁鏂规敞鍐岀殑鐢ㄦ埛淇℃伅
+        /// </summary>
+        public const string Api_Post_GetExtMemberInfo = "/community-wisdom/app/visitor/freeview/getExtMemberInfo";
         #endregion
 
         /// <summary>
@@ -106,6 +110,14 @@
         /// 缁戝畾浣忓畢
         /// </summary>
         public const string Api_Post_BindlingResidence = "/app/home/deliver";
+        /// <summary>
+        /// 鑾峰彇浣忓畢浜や粯閾炬帴
+        /// </summary>
+        public const string APi_Post_GetHoserDeliverUrl = "/home-wisdom/app/home/obtainDeliveryUrl";
+        /// <summary>
+        /// 鏇存柊椤圭洰鐘舵�� 锛堜氦浠樸�侀獙鏀躲�佹挙閿�浜や粯銆侀獙鏀舵湭閫氳繃銆侀噸鏂拌皟璇曘�佷氦浠樺洖婊氱瓑鎿嶄綔锛�
+        /// </summary>
+        public const string APi_Post_UpdateProjectDebugStatus = "/smart-footstone/mgmt/community/project/updateProjectDebugStatus";
         /// <summary>
         /// 鑾峰彇浣忓畢鍒嗛〉
         /// </summary>
@@ -154,6 +166,18 @@
         /// 鏇存柊杩滅▼鎺у埗
         /// </summary>
         public const string API_POST_Child_Update = "/home-wisdom/app/child/account/update";
+        /// <summary>
+        /// 鏇存柊鎴愬憳璐﹀彿浜鸿劯淇℃伅
+        /// </summary>
+        public const string API_POST_Child_UpdateFace = "/home-wisdom/app/child/account/updateFace";
+        /// <summary>
+        /// 瀛愯处鍙风粦瀹氳处鍙�
+        /// </summary>
+        public const string API_POST_Child_BindAccount = "/home-wisdom/app/child/account/accountBind";
+        /// <summary>
+        /// 鍒犻櫎鎴愬憳璐﹀彿浜鸿劯淇℃伅
+        /// </summary>
+        public const string API_POST_Child_RemoveFace = "/home-wisdom/app/child/account/removeFace";
         /// <summary>
         /// 瀛愯处鍙风鐞嗗憳鑾峰彇涓昏处鍙锋巿鏉僒oken
         /// </summary>
@@ -462,6 +486,47 @@
         /// 璁惧娑堟伅瑙勫垯閰嶇疆
         /// </summary>
         public const string Api_Post_DeviceMessageRulesSet = "/home-wisdom/app/device/deviceMessageRulesSet";
+
+        #endregion
+
+        #region Kaede -- 钀ょ煶瑙嗛闂ㄩ攣鎺ュ彛____________________________
+        /// <summary>
+        /// 鍒犻櫎璁惧锛堣悿鐭宠棰戦棬閿侊級
+        /// </summary>
+        public const string Api_Post_DeleteDevice = "/home-wisdom/platform/yingshi/child/deleteDevice";
+        /// <summary>
+        /// 鐢垫睜璇︽儏锛堣悿鐭宠棰戦棬閿侊級
+        /// </summary>
+        public const string Api_Post_Details = "/home-wisdom/platform/yingshi/lock/battery/details";
+        /// <summary>
+        /// 闂ㄩ攣鐢ㄦ埛鍒楄〃锛堣悿鐭宠棰戦棬閿侊級
+        /// </summary>
+        public const string Api_Post_UserList = "/home-wisdom/platform/yingshi/lock/user/list";
+        /// <summary>
+        /// 闂ㄩ攣鐘舵�侊紙钀ょ煶瑙嗛闂ㄩ攣锛�
+        /// </summary>
+        public const string Api_Post_Lockstatus = "/home-wisdom/platform/yingshi/lock/status";
+        /// <summary>
+        /// 鑾峰彇鎶ヨ鍒楄〃锛堣悿鐭宠棰戦棬閿侊級
+        /// </summary>
+        public const string Api_Post_Records = "/home-wisdom/platform/yingshi/alarm/records";
+        /// <summary>
+        /// 鍒犻櫎鎶ヨ璁板綍锛堣悿鐭宠棰戦棬閿侊級
+        /// </summary>
+        public const string Api_Post_AlarmDelet= "/home-wisdom/platform/yingshi/alarm/delete";
+        /// <summary>
+        /// 杩滅▼寮�閿侊紙钀ょ煶瑙嗛闂ㄩ攣锛�
+        /// </summary>
+        public const string Api_Post_OpenDoor = "/home-wisdom/platform/yingshi/lock/remote/open/door";
+        /// <summary>
+        /// 闂ㄩ攣鍨嬪彿鍒楄〃锛堣悿鐭宠棰戦棬閿侊級
+        /// </summary>
+        public const string Api_Post_Lock_Models = "/home-wisdom/platform/yingshi/lock/models"; 
+        
+
+
+
+
         #endregion
 
         #region Kaede -- 鍦烘櫙鎺ュ彛____________________________
@@ -644,6 +709,7 @@
         /// 瑙g粦绗笁鏂筰ot骞冲彴璐﹀彿
         /// </summary>
         public const string Api_Post_Unbound3tyIotAccount = "/smart-open/open-platform/tripartite/userUnbind";
+        #endregion
 
         #region 鈻�  -- 绾㈠瀹濇帴鍙__________________________
         /// <summary>
@@ -685,7 +751,6 @@
 
         #endregion
 
-        #endregion
 
 
         #region 鈻�  -- 钀ょ煶SDK鐩稿叧鎺ュ彛___________________________
@@ -790,7 +855,10 @@
         /// </summary>
         public const string Api_Post_GetListHomeFace = "/home-wisdom/app/logic/listHomeFace";
 
-       
+        /// <summary>
+        /// 鑾风涓夋柟娉ㄥ唽userId
+        /// </summary>
+        public const string Api_Post_GetExtUserId = "/community-wisdom/app/visitor/freeview/getExtMemberInfo";
         #endregion
 
 
@@ -816,6 +884,19 @@
         /// 闂ㄩ攣鐨勫巻鍙茶褰�
         /// </summary>
         public const string API_POST_DoorHistory = "/home-wisdom/app/device/door/logs";
+        /// <summary>
+        /// 鑾峰彇涓存椂瀵嗙爜
+        /// </summary>
+        public const string Api_Post_GetTempPasswrod = "/home-wisdom/app/device/door/getTempPwds";
+        /// <summary>
+        /// 鍒涘缓涓存椂瀵嗙爜
+        /// </summary>
+        public const string Api_Post_CreateTempPasswrod = "/home-wisdom/app/device/door/createTempPwd";
+        /// <summary>
+        /// 鍒犻櫎闂ㄩ攣涓存椂瀵嗙爜
+        /// </summary>
+        public const string Api_Post_DelTempPasswrod = "/home-wisdom/app/device/door/tempPwdDel";
+
 
         #endregion
 
@@ -859,6 +940,50 @@
         public const string Api_Post_GetInverter_StatisticsInfo = "/home-wisdom/app/device/inverter/allInfo";
         #endregion
 
+        #region 缇ゆ帶锛岀粍鍚堣皟鍏�
+        /// <summary>
+        /// 鑾峰彇缇ゆ帶绫诲瀷
+        /// </summary>
+        public const string Api_Post_GetGroupControlTypes = "/home-wisdom/app/device/groupcontrol/types";
+        /// <summary>
+        /// 鑾峰彇缇ゆ帶鍒楄〃
+        /// </summary>
+        public const string Api_Post_GetGroupControlListByHome = "/home-wisdom/app/device/groupcontrol/list";
+        /// <summary>
+        /// 鑾峰彇缇ゆ帶璇︽儏
+        /// </summary>
+        public const string Api_Post_GetGroupControlInfos = "/home-wisdom/app/device/groupcontrol/infos";
+        /// <summary>
+        /// 娣诲姞缇ゆ帶
+        /// </summary>
+        public const string Api_Post_AddGroupControl = "/home-wisdom/app/device/groupcontrol/add";
+        /// <summary>
+        /// 鏇存柊缇ゆ帶
+        /// </summary>
+        public const string Api_Post_UpdateGroupControl = "/home-wisdom/app/device/groupcontrol/update";
+        /// <summary>
+        /// 鍒犻櫎缇ゆ帶
+        /// </summary>
+        public const string Api_Post_DeleteGroupControl = "/home-wisdom/app/device/groupcontrol/deleted";
+        /// <summary>
+        /// 鏀惰棌缇ゆ帶
+        /// </summary>
+        public const string Api_Post_CollectGroupControl = "/home-wisdom/app/device/groupcontrol/collect";
+        /// <summary>
+        /// 鍙栨秷鏀惰棌缇ゆ帶
+        /// </summary>
+        public const string Api_Post_CancelCollectGroupControl = "/home-wisdom/app/device/groupcontrol/cancelCollect";
+        /// <summary>
+        /// 鎺у埗缇ゆ帶
+        /// </summary>
+        public const string Api_Post_ControlGroupControl = "/home-wisdom/app/device/groupcontrol/controlDown";
+        /// <summary>
+        /// 缇ゆ帶鐘舵�佸埛鏂�
+        /// </summary>
+        public const string Api_Post_ReadGroupControlStatus = "/home-wisdom/app/device/groupcontrol/statusRefresh";
+
+        #endregion
+
     }
 
     ///// <summary>
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 6bb1700..2d97f12 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -633,6 +633,11 @@
         /// </summary>
         public bool gatewayStatus;
 
+        /// <summary>
+        /// 鏄惁鏀寔缇ゆ帶
+        /// </summary>
+        public bool isSupportGroupControl = false;
+
         ///// <summary>
         ///// 
         ///// </summary>
@@ -885,7 +890,7 @@
         /// <summary>
         /// 瀛愯处鍙稩D childAccountId
         /// </summary>
-        public string childAccountId;
+        public string childId;
         /// <summary>
         /// 浣忓畢
         /// </summary>
@@ -908,7 +913,7 @@
         /// <summary>
         /// 瀛愯处鎴风被鍨� ORDINARY銆丏EBUG銆丄DMIN
         /// </summary>
-        public string childAccountType;
+        //public string childAccountType;
         ///// <summary>
         ///// 鏄惁鍏佽杩滅▼鎺у埗 0:鍏佽 1:涓嶅厑璁�
         ///// </summary>
@@ -1246,51 +1251,6 @@
         public string packageUrl;//": "http://hdl-hz-test.oss-cn-hangzhou.aliyuncs.com/20/2022/11/51b8b0b2-0ebc-4632-a3b5-0be1e5d104e4.apk",
         public string remark;
     }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    [System.Serializable]
-    public class AppVersionRes
-    {
-        /// <summary>
-        /// 搴旂敤甯傚満鍚嶇О
-        /// </summary>
-        public string appMarket;
-        /// <summary>
-        /// app鍚嶇О
-        /// </summary>
-        public string appName;
-        /// <summary>
-        /// ios涓嬭浇鍦板潃
-        /// </summary>
-        public string iosUrl;
-        /// <summary>
-        /// 瀹夊崜涓嬭浇鍦板潃
-        /// </summary>
-        public string androidUrl;
-        /// <summary>
-        /// 鏄惁鏄己鍒舵洿鏂�
-        /// </summary>
-        public bool isEnforce;
-        /// <summary>
-        /// 鍙戝竷绯荤粺锛孖OS銆丄ndroid
-        /// </summary>
-        public string releaseSystem;
-        /// <summary>
-        /// 澶囨敞
-        /// </summary>
-        public string remark;
-        /// <summary>
-        /// 鏇存柊璇存槑json锛屽璇█鏈夊鎴风瑙f瀽
-        /// </summary>
-        public string updateDescription;
-        /// <summary>
-        /// 鐗堟湰鍙�
-        /// </summary>
-        public string version;
-    }
-
     /// <summary>
     /// 鏇存柊璇存槑json锛屽璇█鏈夊鎴风瑙f瀽
     /// </summary>
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index 700f956..ca12ddc 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -82,7 +82,7 @@
             if (interphoneType == InterphoneType.IMOUVISIAL.ToString())
             {
                 //涔愭鍙瀵硅
-                //1.鍒濆鍖朙COpenSDK_Api
+                //1.鍒濆鍖朙COpenSDK_Api(Shared.IOS.LCVideoOnSDK)
                 LCApiKit.SharedInstance().IsChinaMainland = GetIsChinaMainland();
                 LCApiKit.SharedInstance().InitSDKOpenApi(mESVideoInfo.Lc_AccessToken);
                 LCApiKit.SharedInstance().CurrentDevicePlayToken = mESVideoInfo.Lc_PlayToken;
@@ -98,21 +98,17 @@
             }
             else if(interphoneType == InterphoneType.FLVI.ToString())
             {
-
+                //Shared.IOS.ESVideoOnSDK
                 ESOnMonitorViewController vc = new ESOnMonitorViewController();
                 vc.MESVideoID = mESVideoInfo.ESVideoUUID;
                 vc.MESRoomID = roomID;
                 vc.DeviceName = mESVideoInfo.DeviceName;
-                //vc.RoomName = mESVideoInfo.RoomName;
-                //vc.MESCallDelegate = new OnESCallDelegate(this);
                 Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
-            }else if (interphoneType == InterphoneType.HDL.ToString())
+            }
+            else if (interphoneType == InterphoneType.HDL.ToString())
             {
                 //HDLLinphone 鐙勮�愬厠
                 HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo, interphoneType);
-                ////鍏ㄨ閫�
-                //NSDictionary deviceInfo = new NSDictionary("deviceCode","3-1-11-2", "deviceName", mESVideoInfo.DeviceName);
-                //Shared.IOS.HDLFVSDK.Video.Monitor(deviceInfo);
             } else if (interphoneType == InterphoneType.FREEVIEW.ToString())
             {
                 //鍏ㄨ閫氱洃瑙�
@@ -191,7 +187,7 @@
             if (interphoneType == InterphoneType.IMOUVISIAL.ToString())
             {
                 //涔愭鍙瀵硅
-                //1.鍒濆鍖朙COpenSDK_Api
+                //1.鍒濆鍖朙COpenSDK_Api(Shared.IOS.LCVideoOnSDK)
                 LCApiKit.SharedInstance().IsChinaMainland = GetIsChinaMainland();
                 LCApiKit.SharedInstance().InitSDKOpenApi(mESVideoInfo.Lc_AccessToken);
                 //2021-05-18 鐩墠鎺ㄩ�佺殑PlayToken;鏈夐棶棰樹細瀵艰嚧SDK宕╂簝锛屾殏鏃朵笉浼�
@@ -229,7 +225,7 @@
             }
             else if (interphoneType == InterphoneType.FLVI.ToString())
             {
-
+                //Shared.IOS.ESVideoOnSDK
                 ESOnIntercomViewController vc = new ESOnIntercomViewController();
                 vc.MESVideoID = mESVideoInfo.ESVideoUUID;
                 vc.MESRoomID = roomID;
@@ -239,7 +235,8 @@
                 mOnESCallDelegate = new OnESCallDelegate(this);
                 vc.MESCallDelegate = mOnESCallDelegate;
                 Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
-            }else{
+            }
+            else{
                 HDLUtils.WriteLine("鏈敮鎸佺殑鍙瀵硅绫诲瀷");
 
             }
@@ -571,7 +568,7 @@
 #if __IOS__
         #region OnESCallDelegate
         /////// <summary>
-        /////// OnESCallDelegate 缁ф壙鍝嶅簲浜嬩欢
+        /////// OnESCallDelegate 缁ф壙鍝嶅簲浜嬩欢(Shared.IOS.ESVideoOnSDK)
         /////// </summary>
         OnESCallDelegate mOnESCallDelegate;
 
@@ -647,7 +644,7 @@
 
         #region OnLCCallDelegate
         /////// <summary>
-        /////// OnLCCallDelegate 缁ф壙鍝嶅簲浜嬩欢
+        /////// OnLCCallDelegate 缁ф壙鍝嶅簲浜嬩欢(Shared.IOS.LCVideoOnSDK)
         /////// </summary>
         OnLCCallDelegate mOnLCCallDelegate;
 
@@ -715,7 +712,7 @@
 
         #endregion
 
-       
+
 #endif
 
         ///// <summary>
diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index d7f4105..73c7e55 100644
--- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -95,7 +95,7 @@
             Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().InitalLinPhone();
             //璁剧疆鏀跺埌鏉ョ數鍚庛�佹槸鍚﹂渶鑷姩璺宠浆鍛煎彨椤甸潰鏂规
             Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().IsAutoJumpCallView = IsAutoJumpCallView;
-            //璁剧疆Listener鐩戝惉
+            //璁剧疆Listener鐩戝惉(Shared.IOS.HDLLinphoneSDK)
             mOnHDLLinphoneCallDelegate = new OnHDLLinphoneCallDelegate(this);
             Console.WriteLine(UserInfo.Current.ID);
             Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().HdlLinphoneCallDelegate = mOnHDLLinphoneCallDelegate;
@@ -125,8 +125,7 @@
 
 
 #if __IOS__
-            //Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().Login("1003", "123456", "192.168.31.194:5060");
-            //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
             if (mInterphoneType == InterphoneType.FREEVIEW.ToString())
@@ -135,7 +134,7 @@
                     mHDLSipInfo.sipAccount,
                     mHDLSipInfo.sipPasswd,
                     "139.159.157.75:47000",//mHDLSipInfo.realm,
-                    "sip:139.159.157.75:47000;transport=udp",
+                    //"sip:139.159.157.75:47000;transport=udp",
                     HDLLinphoneKit.InterPhoneTypeFreeview
                     );
             }
@@ -145,7 +144,8 @@
                    mHDLSipInfo.sipAccount,
                    mHDLSipInfo.sipPasswd,
                    mHDLSipInfo.realm,
-                   "sip:139.159.157.75:47000;transport=udp",
+                   //mHDLSipInfo.proxy+ ";transport=udp",
+                   //"sip:139.159.157.75:47000;transport=udp",
                    HDLLinphoneKit.InterPhoneTypeHdl
                    );
             }
@@ -163,9 +163,16 @@
             this.mHDLCallVideoInfo = null;
 #if __IOS__
 
-            HDLLinPhoneSDK.Instance().LogoutAllLinphoneUser();
+            Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().LogoutAllLinphoneUser();
 #else
-            HDLLinphoneKit.Instance.Logout();
+            if (HDLLinphoneKit.Instance != null)
+            {
+                HDLLinphoneKit.Instance.Logout();
+            }
+            else
+            {
+
+            }
 #endif
         }
 
@@ -176,7 +183,7 @@
         {
 #if __IOS__
 
-            HDLLinPhoneSDK.Instance().ClearAllConfigs();
+            Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().ClearAllConfigs();
 #else
             HDLLinphoneKit.Instance.ClearProxyConfig();
 #endif
@@ -243,7 +250,10 @@
                 }
                 else
                 {
-                    new Alert("", $"鑾峰彇Sip璐﹀彿淇℃伅澶辫触.", "纭畾").Show();
+                    //Application.RunOnMainThread(() =>
+                    //{
+                    //    new Alert("", $"鑾峰彇Sip璐﹀彿淇℃伅澶辫触.", "纭畾").Show();
+                    //});
                 }
             }
             catch { }
@@ -427,7 +437,7 @@
 
 #if __IOS__
 
-            HDLLinPhoneSDK.Instance().CallWithUserName(mHDLCallVideoInfo.DeviceSipAccount, mHDLCallVideoInfo.DeviceName);
+            Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().CallWithUserName(mHDLCallVideoInfo.DeviceSipAccount, mHDLCallVideoInfo.DeviceName);
 
 #else
             //1.鍏堝懠鍙澶�
@@ -495,7 +505,7 @@
             {
 #if __IOS__
                 //鑷爺鍙瀵硅
-                HDLLinPhoneSDK.Instance().GotoHDLSRLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName,mHDLCallVideoInfo.DeviceSipAccount);
+                Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().GotoHDLSRLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName, mHDLCallVideoInfo.DeviceSipAccount);
 #else
                 var intent = new Intent(Shared.Application.Activity, typeof(Com.Hdl.Hdllinphonesdk.Activity.HDLLinphoneReverseCallActivity));  
                 if (mHDLCallVideoInfo != null)
@@ -513,7 +523,7 @@
                 if (IsAutoJumpCallView) return;
                 //鍏堢粨鏉熸帀涔嬪墠鐨勭嚎绋�
                 EndCheckIncomingCallThread();
-                //妫�娴嬫槸鍚︽潵鐢典簡濡傛灉鏄洿鎺ヨ皟鏁村懠鍙〉闈㈠鏋滀笉鏄垯寮�鍚嚎绋嬬瓑寰呭垽鏂�
+                //妫�娴嬫槸鍚︽潵鐢典簡濡傛灉鏄洿鎺ヨ皟鏁村懠鍙〉闈㈠鏋滀笉鏄垯寮�鍚嚎绋嬬瓑寰呭垽鏂�(Shared.IOS.HDLLinphoneSDK)
                 if (IsIncomingReceivedCallState())
                 {
                     Utlis.WriteLine("CALL 宸茬粡鏉ョ數浜嗐�傘�傘�傛墦寮�鍛煎彨椤甸潰");
@@ -530,12 +540,13 @@
         }
 
         /// <summary>
-        /// 鏄惁鏉ョ數鐘舵��
+        /// 鏄惁鏉ョ數鐘舵��(Shared.IOS.HDLLinphoneSDK)
         /// </summary>
         /// <returns></returns>
-        bool IsIncomingReceivedCallState() {
+        bool IsIncomingReceivedCallState()
+        {
 #if __IOS__
-             return HDLLinPhoneSDK.Instance().IsIncomingReceivedCallState;
+            return Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().IsIncomingReceivedCallState;
 #else
             return HDLLinphoneKit.Instance.IsIncomingReceivedCallState;
 #endif
@@ -548,7 +559,7 @@
 
 #if __IOS__
 
-            HDLLinPhoneSDK.Instance().GotoHDLLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName);
+            Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().GotoHDLLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName);
 
 #else
             var intent = new Intent(Shared.Application.Activity, typeof(Com.Hdl.Hdllinphonesdk.Activity.HDLLinphoneIntercomActivity));
@@ -597,7 +608,7 @@
                                 threadTime--;
                                 Utlis.WriteLine("CALL 妫�娴嬩腑...." + threadTime);
                                 Thread.Sleep(1000);
-                                //鏉ョ數浜嗭紝璺宠浆鍛煎彨椤甸潰
+                                //鏉ョ數浜嗭紝璺宠浆鍛煎彨椤甸潰(Shared.IOS.HDLLinphoneSDK)
                                 if (IsIncomingReceivedCallState())
                                 {
                                     Utlis.WriteLine("CALL 鏉ョ數浜嗐�傘�傘�傛墦寮�鍛煎彨椤甸潰");
@@ -649,10 +660,10 @@
             return checkIncomingCallThread == null || checkIncomingCallThread.ThreadState != ThreadState.Running;
         }
 
-#endregion
+        #endregion
 
 
-#region 鈻�  --  Android鐩稿叧鎿嶄綔_______________________________
+        #region 鈻�  --  Android鐩稿叧鎿嶄綔_______________________________
 
 #if __Android__
 
@@ -747,23 +758,23 @@
         }
 
 #endif
-#endregion
+        #endregion
 
-#region 鈻�  --  iOS鐩稿叧鎿嶄綔_______________________________
+        #region 鈻�  --  iOS鐩稿叧鎿嶄綔_______________________________
 
 #if __IOS__
 
-#region OnHDLLinphoneCallDelegate
+        #region OnHDLLinphoneCallDelegate
         /// <summary>
         /// 
         /// </summary>
         OnHDLLinphoneCallDelegate mOnHDLLinphoneCallDelegate;
-     
+
         /// <summary>
         /// 
         /// </summary>
         public class OnHDLLinphoneCallDelegate : HDLLinphoneCallDelegate
-        { 
+        {
             [Weak] HDLLinphone hdlLinphone;
 
             public OnHDLLinphoneCallDelegate(HDLLinphone mHDLLinphone)
@@ -799,16 +810,16 @@
             /// <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);
-            //}
+            /// <param name = "image" ></ param >
+            public  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>
             /// 寮�閿佹垚鍔�
@@ -825,15 +836,13 @@
             {
                 Utlis.WriteLine("OnIncomingCall :" + userName);
             }
-            
-
 
         }
 
-#endregion
+        #endregion
 #endif
 
-#endregion
+        #endregion
 
     }
 
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 3a0e4ee..887d4a1 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -76,7 +76,9 @@
                                     ShowFunction.Sensor,ShowFunction.VideoIntercom,
                                     ShowFunction.SecurityCenter,ShowFunction.Acst,
                                     ShowFunction.MechanicalArm ,
-                                    ShowFunction.SecurityMonitoring,};
+                                    ShowFunction.SecurityMonitoring,
+                                    ShowFunction.VideoDoorLock,
+                    };
                 }
                 return dddd;
             }
@@ -183,7 +185,7 @@
         /// <summary>
         /// 缃戝叧璇︾粏淇℃伅
         /// </summary>
-        public HomeGatewayInfo HomeGateway;
+        public HomeGatewayInfo HomeGateway;// = new HomeGatewayInfo ();
 
         /// <summary>
         /// 0:涓�绔彛
@@ -504,5 +506,10 @@
             }
         }
 
+        /// <summary>
+        /// 绗竴娆$敵璇峰畾浣嶆潈闄愶紝鐢ㄦ埛鎷掔粷涔嬪悗锛屼笉鑳藉啀娆$敵璇凤紙Android锛�
+        /// </summary>
+        public bool CheckGPS_IsFirst = true;
+
     }
 }
diff --git a/HDL_ON/Entity/Enumerative/MyEnum.cs b/HDL_ON/Entity/Enumerative/MyEnum.cs
index a02276c..2fb5ccc 100644
--- a/HDL_ON/Entity/Enumerative/MyEnum.cs
+++ b/HDL_ON/Entity/Enumerative/MyEnum.cs
@@ -185,6 +185,10 @@
         /// ip鎽勫儚澶�
         /// </summary>
         IpCam = 0x25,
+        /// <summary>
+        /// 钀ょ煶瑙嗛闂ㄩ攣
+        /// </summary>
+        VideoDoorLock = 0x26,
 
 
     }
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 87f8863..6e468e9 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -277,6 +277,10 @@
         /// </summary>
         public string extDevId = string.Empty;
         /// <summary>
+        /// 鐗╃悊璁惧(妯″潡)鍨嬪彿
+        /// </summary>
+        public string omodel =string.Empty;
+        /// <summary>
         /// 璁惧spk
         /// </summary>
         public string spk = "";
@@ -523,6 +527,14 @@
                 SetAttrState(sta.key, sta.value);
             }
         }
+        /// <summary>
+        /// 鍔熻兘鍒楄〃鎺掑簭
+        /// </summary>
+        public int FunctionOrderNumber = 9999;
+        /// <summary>
+        /// 鎴块棿鍒楄〃鎺掑簭
+        /// </summary>
+        public int RoomOrderNumber = 9999;
 
 
         /// <summary>
@@ -553,13 +565,27 @@
 
             new System.Threading.Thread(() =>
             {
-                if (collect)
-                {
-                    result = ApiUtlis.Ins.HttpRequest.CollectDevice(deviceId).Code;
+                if (spk == SPK.GroupControl) {
+                    var groupControl = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
+                    if (collect)
+                    {
+                        result = ApiUtlis.Ins.HttpRequest.CollectGroupControl(groupControl.userDeviceGroupControlId).Code;
+                    }
+                    else
+                    {
+                        result = ApiUtlis.Ins.HttpRequest.CancelCollectGroupControl(groupControl.userDeviceGroupControlId).Code;
+                    }
                 }
                 else
                 {
-                    result = ApiUtlis.Ins.HttpRequest.CancelCollectDevice(deviceId).Code;
+                    if (collect)
+                    {
+                        result = ApiUtlis.Ins.HttpRequest.CollectDevice(deviceId).Code;
+                    }
+                    else
+                    {
+                        result = ApiUtlis.Ins.HttpRequest.CancelCollectDevice(deviceId).Code;
+                    }
                 }
                 //鎻愮ず閿欒
                 if (result != StateCode.SUCCESS)
@@ -742,6 +768,18 @@
             var sFunc = new SceneFunction();
             foreach (var attr in attributes)
             {
+                //绐楀笜鍚屾椂鍙戦�佸紑鍏宠窡鐧惧垎姣斾細鏈夐棶棰橈紝
+                if(spk == SPK.CurtainRoller || spk == SPK.CurtainTrietex || spk == SPK.CurtainDream)
+                {
+                    if (attr.key == FunctionAttributeKey.OnOff)
+                    {
+                        if (attributes.Find((obj) => obj.key == FunctionAttributeKey.Percent) != null)
+                        {
+                            continue;
+                        }
+                    }
+                }
+
                 switch (attr.key)
                 {
                     case FunctionAttributeKey.OnOff:
@@ -1336,6 +1374,10 @@
     public static class SPK
     {
         /// <summary>
+        /// 缇ゆ帶锛堣嚜瀹氫箟锛�
+        /// </summary>
+        public const string GroupControl = "GroupControl";
+        /// <summary>
         /// 閫氱敤寮�鍏�
         /// </summary>
         public const string OtherCommon = "other.common";
@@ -1362,6 +1404,7 @@
         /// 闂ㄩ攣
         /// </summary>
         public const string DoorLock = "security.door";
+        
         /// <summary>
         /// 闂ㄩ攣spk鍒楄〃
         /// </summary>
@@ -1372,8 +1415,41 @@
             list.Add(DoorLock);
             return list;
         }
+        
 
+        /// <summary>
+        /// 鐚溂
+        /// </summary>
+        public const string Peephole = "peephole";
+        /// <summary>
+        /// 钀ょ煶瑙嗛闂ㄩ攣
+        /// </summary>
+        public const string VideoDoorLock="security.door.ezviz";
+        /// <summary>
+        /// 钀ょ煶鎽勫儚澶�
+        /// </summary>
+        public const string Ev_Ipcam = "security.ipcam.ez";
+        /// <summary>
+        /// 钀ょ煶瑙嗛闂ㄩ攣spk鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> GetVideoDoorLockSPKList()
+        {
+            var list = new List<string>();
+            list.Add(VideoDoorLock);
+            return list;
+        }
 
+        /// <summary>
+        /// 钀ょ煶鎽勫儚澶磗pk鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> GetEvIpcamSPKList()
+        {
+            var list = new List<string>();
+            list.Add(Ev_Ipcam);
+            return list;
+        }
 
         #region 鐏厜
         /// <summary>
@@ -1466,7 +1542,7 @@
         public const string HvacAC = "hvac.ac";
         /// <summary>
         /// 姣涚粏绠$┖璋�
-        /// </summary>
+        /// </summaryc
         public const string HvacCac = "hvac.cac";
 
         /// <summary>
@@ -1748,7 +1824,7 @@
             spkList.Add(SensorCO2);
             spkList.Add(SensorTVOC);
             spkList.Add(SensorHumidity);
-            spkList.Add(SensorEnvironment);
+            spkList.Add(SensorEnvironment); spkList.Add(SensorEnvironmentHailin);
             spkList.Add(SensorEnvironment2);
             spkList.Add(SensorEnvironment3);
             spkList.Add(SensorHcho);
@@ -1778,7 +1854,7 @@
         public static List<string> EvironmentSensorList()
         {
             var spkList = new List<string>();
-            spkList.Add(SensorEnvironment);
+            spkList.Add(SensorEnvironment); spkList.Add(SensorEnvironmentHailin);
             spkList.Add(SensorEnvironment2);
             spkList.Add(SensorEnvironment3);
             return spkList;
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index a6b5568..492def1 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -624,7 +624,7 @@
             var perAngle = status.Find((obj) => obj.key == FunctionAttributeKey.Angle);
             if (perAngle != null)
             {
-                sceneFunctionInfo += " " + perState.value + "掳";
+                sceneFunctionInfo += " " + perAngle.value + "掳";
             }
             return sceneFunctionInfo;
         }
diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs
index b53b38a..b232cab 100644
--- a/HDL_ON/Entity/Function/Sensor.cs
+++ b/HDL_ON/Entity/Function/Sensor.cs
@@ -159,7 +159,7 @@
             switch (function.spk)
             {
                 case SPK.SensorPm25:
-                    unit = "ug/m虏";
+                    unit = "ug/m鲁";
                     break;
                 case SPK.SensorTemperature:
                     unit = "掳C";
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index f21e670..bb14283 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -14,20 +14,20 @@
     {
         static FunctionList _FunctionList;
 
-        public static void ClearData()
-        {
-            try
-            {
-                _FunctionList._IpCamImou = null;
-                _FunctionList.ClearDatas();
-                _FunctionList = null;
-            }
-            catch (Exception ex)
-            {
-                MainPage.Log($"娓呯悊FunctionList寮傚父:{ex.Message}");
-                _FunctionList = null;
-            }
-        }
+        //public static void ClearData()
+        //{
+        //    try
+        //    {
+        //        _FunctionList._IpCamImou = null;
+        //        _FunctionList.ClearDatas();
+        //        _FunctionList = null;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        MainPage.Log($"娓呯悊FunctionList寮傚父:{ex.Message}");
+        //        _FunctionList = null;
+        //    }
+        //}
 
         public static FunctionList List
         {
@@ -56,6 +56,12 @@
         /// </summary>
         public List<Function> Functions = new List<Function>();
         /// <summary>
+        /// 缇ゆ帶鍒楄〃
+        /// </summary>
+        public List<GroupControl> groupControls = new List<GroupControl>();
+
+
+        /// <summary>
         /// 鏈烘鑷傚垪琛�
         /// </summary>
         /// <returns></returns>
@@ -77,6 +83,17 @@
                 if (_IpCamImou.Count > 0)
                 {
 #if __IOS__
+                    //鍒濆鍖栧ぇ鍗庢憚鍍忓ごsdk
+                    Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().InitSDKWithAppKey("HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
+                    Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken = UserInfo.Current.LoginTokenString;
+                    Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshToken = UserInfo.Current.RefreshToken;
+                    Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
+                    Console.WriteLine("token锛�" + UserInfo.Current.LoginTokenString);
+                    Console.WriteLine("token锛�" + UserInfo.Current.RefreshToken);
+                    Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshDeviceList();
+
+
+
 #else
                     Com.Utils.HdlToLcUtils.Instance.InitData(Shared.Application.Activity, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
                     Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
@@ -94,7 +111,7 @@
         /// <returns></returns>
         public List<Function> GetAcstParentList()
         {
-            return Functions.FindAll((obj) => obj.spk == SPK.AcstParent);
+            return Functions.FindAll((obj) => obj.spk == SPK.AcstParent);//.OrderByDescending(o=>o.controlCounter).ToList()
         }
 
         /// <summary>
@@ -146,6 +163,15 @@
         public List<Function> GetDoorLockList()
         {
             var spkList = SPK.GetDoorLockSPKList();
+            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+        }
+        /// <summary>
+        /// 鑾峰彇钀ょ煶瑙嗛闂ㄩ攣
+        /// </summary>
+        /// <returns></returns>
+        public List<Function> GetVideoDoorLockList()
+        {
+            var spkList = SPK.GetVideoDoorLockSPKList();
             return Functions.FindAll((obj) => spkList.Contains(obj.spk));
         }
 
@@ -358,7 +384,7 @@
                     var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityAlarm>(dataString);
                     if (temp == null)
                     {
-                        MainPage.Log("null");
+                        MainPage.Log("SecurityData_null");
                         FileUtlis.Files.DeleteFile(filePath);
                         return;
                     }
diff --git a/HDL_ON/Entity/ResponseEntity/FreeviewMemberInfo.cs b/HDL_ON/Entity/ResponseEntity/FreeviewMemberInfo.cs
new file mode 100644
index 0000000..610ad6c
--- /dev/null
+++ b/HDL_ON/Entity/ResponseEntity/FreeviewMemberInfo.cs
@@ -0,0 +1,39 @@
+锘縰sing System;
+namespace HDL_ON.Entity
+{
+
+
+    /// <summary>
+	/// 鍏ㄨ閫氫俊鎭被
+	/// </summary>
+    public class FreeviewMemberInfo
+    {
+        public FreeviewMemberInfo()
+        {
+        }
+        /// <summary>
+        /// 绗笁鏂规敞鍐岀殑userid
+        /// </summary>
+        public string extUserId = string.Empty;
+        /// <summary>
+        /// 绗笁鏂瑰钩鍙�
+        /// </summary>
+        public string extPlatform = string.Empty;
+        /// <summary>
+        /// 绗笁鏂瑰钩鍙癐P
+        /// </summary>
+        public string extServerIp = string.Empty;
+        /// <summary>
+        /// 绗笁鏂圭鎴风紪鐮�
+        /// </summary>
+        public string extTenantCode = string.Empty;
+        /// <summary>
+        /// 绗笁鏂箄uid
+        /// </summary>
+        public string extUUID = string.Empty;
+        /// <summary>
+        /// 闄勫姞鏁版嵁
+        /// </summary>
+        public string extra = string.Empty;
+    }
+}
diff --git a/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs b/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs
index 5266a87..962b95c 100644
--- a/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs
+++ b/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs
@@ -56,6 +56,10 @@
         /// </summary>
         public string id { get; set; }
         /// <summary>
+        /// 椤圭洰id
+        /// </summary>
+        public string communityId = string.Empty;
+        /// <summary>
         /// 浣忓畢鍚嶇О
         /// </summary>
         public string homeName { get; set; }
@@ -88,8 +92,25 @@
         public double latitude;
         /// <summary>
         /// 浜や粯鐘舵��
+        /// To_Be_Debugged(0, "寰呰皟璇�"),
+        /// Debugging(1, "璋冭瘯涓�"),
+        /// To_Be_Accepted(2, "寰呴獙鏀�"),
+        /// Completed(3, "璋冭瘯瀹屾垚"),
+        /// WAIT_DELIVERED(3, "璋冭瘯瀹屾垚"),
+        /// Delivered(4, "宸蹭氦浠�"),
+        /// INITIAL_TATE(5,"鍒濆鎬�"),
+        /// ACCEPTANCE(6,"楠屾敹"),
+        /// SECONDARY_DEBUGGIN(7,"浜屾璋冭瘯"), 
         /// </summary>
-        public string deliverstatus;
+        public string deliverStatus
+        {
+            get
+            {
+                return debugStatus;
+            }
+        }
+
+        public string debugStatus;
         /// <summary>
         /// 浣忓畢绫诲瀷 Zigbee, Buspro, A
         /// </summary>
@@ -126,6 +147,11 @@
         /// 缃戝叧鏈湴閫氫俊鍔犲瘑Key锛屽悓涓�涓綇瀹� 瀵嗛挜鍒涘缓鍚庡氨涓嶅彉
         /// </summary>
         public string localSecret;
+
+        /// <summary>
+        /// 浜や粯閾炬帴
+        /// </summary>
+        public string deliverUrl;
     }
 
 }
diff --git a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
index 2c1680d..36b2dd1 100644
--- a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
+++ b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
@@ -13,6 +13,16 @@
         public ResidenceMemberInfo()
         {
         }
+        /// <summary>
+        /// 鏄惁铏氭嫙璐﹀彿
+        /// </summary>
+        public bool isVirtualAccount
+        {
+            get
+            {
+                return string.IsNullOrEmpty(childAccountId);
+            }
+        }
         //public string Account = "";
 
         //public string UserName = "";
@@ -101,6 +111,10 @@
         /// </summary>
         public string memberHeadIcon;
         /// <summary>
+        /// 浜鸿劯鐓х墖
+        /// </summary>
+        public string userFaceUrl;
+        /// <summary>
         /// 鐢ㄦ埛璐﹀彿
         /// 浼樺厛鏄剧ず鎵嬫満鍙凤紝濡傛灉鎵嬫満鍙蜂负绌哄垯鏄剧ず閭鍦板潃
         /// </summary>
@@ -174,4 +188,26 @@
 
 
     //}
+
+    /// <summary>
+    /// 绗笁鏂规敞鍐屼俊鎭�
+    /// </summary>
+    public class extUserInfo
+    {
+
+        public string extUserId = "";
+
+        public string extPlatform = "";
+
+        public string homeId = "";
+
+        public string extServerIp = "";
+
+        public string extTenantCode = "";
+
+        public string extUUID = "";
+
+        public string extra = "";
+
+    }
 }
diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs
index 609e788..2606c6c 100644
--- a/HDL_ON/Entity/Room.cs
+++ b/HDL_ON/Entity/Room.cs
@@ -504,6 +504,13 @@
                         functions.Add(f);
                     }
                 }
+                foreach(var g in FunctionList.List.groupControls)
+                {
+                    if (g.roomIds.Contains(roomId) && roomId != null)
+                    {
+                        functions.Add(g);
+                    }
+                }
             }
             return functions;
         }
@@ -568,5 +575,6 @@
             scenes.Remove(scenes.Find((obj) => obj.sid == scene.sid));
         }
     }
-  
+
+
 }
\ No newline at end of file
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index 47b415d..2943751 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -483,7 +483,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Music\View\MusicSourceView.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Music\View\SongView.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Music\View\MyListView.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Music\A31MusicFileList.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Music\A31SongPlay.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Music\MusicProperty.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AboutOn\SupportHomeKitNotesPage.cs" />
@@ -526,6 +525,32 @@
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Automation\ChooseIocate.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Automation\LogicView\ColorTemperature.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\MechanicalArmPage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Music\A31UsbMusicList.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Music\CommonMethod.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Music\A31FlieList.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\VideDoorLockSend.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\StackTraceLog.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\ObjectClass.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\CommonMethod.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\VideoDoorLockPage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\VideoDoorLockListPage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\OrderFunctionPage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\Face\FaceManagementPage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\DeliveryQrCodePage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\MemberManagement\MemberFaceManagementPage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\CombinedDimmingListPage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\GroupControl.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\AddCombineDimmingPage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Entity\ResponseEntity\FreeviewMemberInfo.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\GroupChooseRoomPage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\AddGroupControlPage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\VideDoorLockSend.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\StackTraceLog.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\ObjectClass.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\CommonMethod.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\VideoDoorLockPage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\VideoDoorLock\VideoDoorLockListPage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Light\GroupControlPage.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="$(MSBuildThisFileDirectory)Entity\Device\" />
@@ -553,5 +578,7 @@
     <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Light\LightScene\" />
     <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\FaceManagement\" />
     <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Acst\" />
+    <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\Face\" />
+    <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index c5ddbfa..4f1d9af 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
         /// <summary>
         /// 鐗堟湰鍙�
         /// </summary>
-        public static string VersionString = "1.6.4";
+        public static string VersionString = "1.8.0";
         ///// <summary>
         ///// 瀹㈡埛绔被鍨�
         ///// </summary>
@@ -35,7 +35,7 @@
         /// <summary>
         /// 
         /// </summary>
-        public static Entity.CityInfo cityInfo = new Entity.CityInfo();
+        public static CityInfo cityInfo = new CityInfo();
         /// <summary>
         /// 鍩庡競澶╂皵淇℃伅antion
         /// </summary>
@@ -136,11 +136,11 @@
                 {
                     _RoomNotSupportFunctionList = new List<string>();
                     _RoomNotSupportFunctionList.Add(SPK.EnergyStandard);
-                    _RoomNotSupportFunctionList.Add(SPK.MusicStandard);
-                    _RoomNotSupportFunctionList.Add(SPK.AvMusic);
+                    //_RoomNotSupportFunctionList.Add(SPK.MusicStandard);
+                    //_RoomNotSupportFunctionList.Add(SPK.AvMusic);
                     _RoomNotSupportFunctionList.Add(SPK.AirSwitch);
                     _RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
-                    _RoomNotSupportFunctionList.Add(SPK.OtherCommon);
+                    //_RoomNotSupportFunctionList.Add(SPK.OtherCommon);
                     _RoomNotSupportFunctionList.Add(SPK.SensorLight);
                     _RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
                     //_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
@@ -204,6 +204,52 @@
                 //    Application.HideSoftInput();
                 //});
             }
+
+            try
+            {
+                CommonClass.excptionAction = (obj) =>
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        Stan.HdlMessageLogic.Current.ShowAppProgramIsError(obj);
+                    });
+                };
+            }
+            catch (Exception ex)
+            {
+
+            }
+
+#if __ANDROID__
+            new System.Threading.Thread(async () =>
+            {
+                int i = 0;
+                while (i < 10) {
+                    try
+                    {
+                        var location_android = await HDL_ON_Android.LocationUtils.GetCurrentLocationAsync();
+                        if (location_android != null)
+                        {
+                            MainPage.cityInfo.lat = location_android.Latitude.ToString();
+                            MainPage.cityInfo.lon = location_android.Longitude.ToString();
+                            new HDL_ON.DAL.Server.HttpServerRequest().GetCityWeatherInfo(MainPage.cityInfo.lon.Replace(",", "."), MainPage.cityInfo.lat.ToString().Replace(",", "."));
+                            i = 100;
+                            Application.RunOnMainThread(() => {
+                                HomePage.LoadEvent_RefreshAir();
+                            });
+                        }
+                        else
+                        {
+                            i++;
+                        }
+                    } catch (Exception ex)
+                    {
+                        Log($"缁忕含搴﹁幏鍙栧紓甯�: {ex.Message}");
+                    }
+                }
+            })
+            { IsBackground = true }.Start();
+#endif
         }
 
         /// <summary>
@@ -211,7 +257,14 @@
         /// </summary>
         public static void GoLoginPage(UserInfo userInfo = null)
         {
-            BaseView.RemoveAll();
+            try
+            {
+                for (int i = 0; i < BaseView.ChildrenCount; i++)
+                {
+                    BaseView.GetChildren(i).RemoveFromParent();
+                }
+            }
+            catch { }
             BaseView.BackgroundColor = CSS_Color.BackgroundColor;
             var fisrtView = new UI.UI1Login.LoginPage();
             fisrtView.BackgroundColor = CSS_Color.MainBackgroundColor;
@@ -226,7 +279,14 @@
         /// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param>
         public static void GoUserPage(bool downloadData, bool isFirstOpen = false, Action pageShowEvent = null)
         {
-            BaseView.RemoveAll();
+            try
+            {
+                for (int i = 0; i < BaseView.ChildrenCount; i++)
+                {
+                    BaseView.GetChildren(i).RemoveFromParent();
+                }
+            }
+            catch { }
             #region 鍚庨��浜嬩欢
             BasePageView = new PageLayout();
             BasePageView.ScrollEnabled = false;
@@ -405,6 +465,7 @@
                     {
                         if (waitPage != null)
                         {
+                            waitPage.Hide();
                             waitPage.RemoveFromParent();
                             waitPage = null;
                         }
diff --git a/HDL_ON/UI/UI0-Public/DiySelectPopupDialog.cs b/HDL_ON/UI/UI0-Public/DiySelectPopupDialog.cs
index 980ea4d..db258bb 100644
--- a/HDL_ON/UI/UI0-Public/DiySelectPopupDialog.cs
+++ b/HDL_ON/UI/UI0-Public/DiySelectPopupDialog.cs
@@ -70,7 +70,7 @@
         /// <param name="mSecondList">浜岀骇鏁版嵁闆嗗悎</param>
         /// <param name="SelectAction">閫夋嫨鍥炶皟浜嬩欢</param>
         /// <param name="selectTagId"></param>
-        public void ShowView(List<RoomCellInfo> mFirstList, List<List<RoomCellInfo>> mSecondList, Action<string> SelectAction, string selectTagId = ALLSELECT)
+        public void ShowView(List<RoomCellInfo> mFirstList, List<List<RoomCellInfo>> mSecondList, Action<string> SelectAction, string selectTagId = ALLSELECT, int offsetY = 0)
         {
             if (mFirstList == null)
             {
@@ -109,7 +109,7 @@
                 }
 
                 //View鏄剧ず
-                ShowDoubleBaseView();
+                ShowDoubleBaseView(offsetY);
                 //鏁版嵁鍐呭濉厖
                 RefreshDoubleBaseView();
                 //閫変腑鏁堟灉
@@ -206,7 +206,7 @@
         /// <summary>
         /// 鏄剧ず浜岀骇view
         /// </summary>
-        void ShowDoubleBaseView()
+        void ShowDoubleBaseView(int offsetY = 0)
         {
             bodyView.BackgroundColor = CSS_Color.DialogTransparentColor1;
             this.AddChidren(bodyView);
@@ -218,7 +218,7 @@
             BackView = new FrameLayout()
             {
                 X = Application.GetRealWidth(10),
-                Y = Application.GetRealHeight(104),
+                Y = Application.GetRealHeight(104+ offsetY),
                 Width = Application.GetRealWidth(283),
                 Height = Application.GetRealWidth(242),
             };
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index 7c35a74..fd6cc65 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -225,6 +225,8 @@
             };
             EditParaterEvent(btnConfirm, errorId_IsNullOrEmpty, errorId_ContainsPar, baseList, etParater, callBackAction,
                 contentView, btnLine, btnCancel, editView, dialog, titleId);
+
+            etParater.Foucs = true;
         }
 
         /// <summary>
@@ -546,86 +548,105 @@
         /// <param name="title"></param>
         /// <param name="msg"></param>
         /// <param name="action"></param>
-        public void TipMsg(string title, string msg, Action action = null)
+        public void TipMsg(string title, string msg, Action action = null,bool again = true)
         {
-
-            Dialog dialog = new Dialog()
+            try
             {
-                BackgroundColor = CSS_Color.DialogTransparentColor1,
-            };
+                Dialog dialog = new Dialog()
+                {
+                    BackgroundColor = CSS_Color.DialogTransparentColor1,
+                };
 
-            FrameLayout contentView = new FrameLayout()
+                FrameLayout contentView = new FrameLayout()
+                {
+                    Gravity = Gravity.Center,
+                    Width = Application.GetRealWidth(270),
+                    Height = Application.GetRealHeight(140),
+                    BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
+                    BorderColor = 0x00000000,
+                    BorderWidth = 0,
+                    Radius = (uint)Application.GetMinRealAverage(10),
+                };
+                dialog.AddChidren(contentView);
+
+                Button btnTitle = new Button()
+                {
+                    Y = Application.GetRealHeight(16),
+                    Height = Application.GetRealHeight(30),
+                    TextColor = CSS_Color.MainColor,
+                    TextSize = CSS_FontSize.SubheadingFontSize,
+                    TextAlignment = TextAlignment.Center,
+                    IsBold = true,
+                    Text = title
+                };
+                contentView.AddChidren(btnTitle);
+
+                Button btnMsg = new Button()
+                {
+                    Gravity = Gravity.CenterHorizontal,
+                    Height = Application.GetRealHeight(35),
+                    Y = btnTitle.Bottom,
+                    Width = Application.GetRealHeight(200),
+                    TextAlignment = TextAlignment.Center,
+                    TextColor = CSS_Color.TextualColor,
+                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                    Text = msg,
+                    IsMoreLines = true,
+                };
+                contentView.AddChidren(btnMsg);
+
+                Button btnLine = new Button()
+                {
+                    Y = Application.GetRealHeight(96),
+                    Height = Application.GetRealHeight(1),
+                    BackgroundColor = CSS.CSS_Color.DividingLineColor,
+                };
+                contentView.AddChidren(btnLine);
+
+                Button btnConfirm = new Button()
+                {
+                    Y = btnLine.Bottom,
+                    Height = Application.GetRealHeight(43),
+                    TextAlignment = TextAlignment.Center,
+                    TextColor = CSS_Color.TextualColor,
+                    TextSize = CSS_FontSize.SubheadingFontSize,
+                    SelectedTextColor = CSS_Color.MainBackgroundColor,
+                    SelectedBackgroundColor = CSS_Color.MainColor,
+                    TextID = StringId.Confirm,
+                };
+                contentView.AddChidren(btnConfirm);
+
+                dialog.Show();
+
+                btnConfirm.MouseDownEventHandler += (sender, e) =>
+                {
+                    btnConfirm.IsSelected = true;
+                };
+                btnConfirm.MouseUpEventHandler += (sender, e) =>
+                {
+                    btnConfirm.IsSelected = false;
+                    action?.Invoke();
+                    dialog.Close();
+                };
+            }catch(Exception ex)
             {
-                Gravity = Gravity.Center,
-                Width = Application.GetRealWidth(270),
-                Height = Application.GetRealHeight(140),
-                BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
-                BorderColor = 0x00000000,
-                BorderWidth = 0,
-                Radius = (uint)Application.GetMinRealAverage(10),
-            };
-            dialog.AddChidren(contentView);
-
-            Button btnTitle = new Button()
+                MainPage.Log($"lc add fail:{ex.Message}");
+                if (again)
+                {
+                    new System.Threading.Thread(() =>
+                    {
+                        System.Threading.Thread.Sleep(500);
+                        Application.RunOnMainThread(() =>
+                        {
+                            TipMsg(title, msg, action, false);
+                        });
+                    }).Start() ;
+                }
+            }
+            finally
             {
-                Y = Application.GetRealHeight(16),
-                Height = Application.GetRealHeight(30),
-                TextColor = CSS_Color.MainColor,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextAlignment = TextAlignment.Center,
-                IsBold = true,
-                Text = title
-            };
-            contentView.AddChidren(btnTitle);
-
-            Button btnMsg = new Button()
-            {
-                Gravity = Gravity.CenterHorizontal,
-                Height = Application.GetRealHeight(35),
-                Y = btnTitle.Bottom,
-                Width = Application.GetRealHeight(200),
-                TextAlignment = TextAlignment.Center,
-                TextColor = CSS_Color.TextualColor,
-                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                Text = msg,
-                IsMoreLines = true,
-            };
-            contentView.AddChidren(btnMsg);
-
-            Button btnLine = new Button()
-            {
-                Y = Application.GetRealHeight(96),
-                Height = Application.GetRealHeight(1),
-                BackgroundColor = CSS.CSS_Color.DividingLineColor,
-            };
-            contentView.AddChidren(btnLine);
-
-            Button btnConfirm = new Button()
-            {
-                Y = btnLine.Bottom,
-                Height = Application.GetRealHeight(43),
-                TextAlignment = TextAlignment.Center,
-                TextColor = CSS_Color.TextualColor,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                SelectedTextColor = CSS_Color.MainBackgroundColor,
-                SelectedBackgroundColor = CSS_Color.MainColor,
-                TextID = StringId.Confirm,
-            };
-            contentView.AddChidren(btnConfirm);
-
-            dialog.Show();
-
-            btnConfirm.MouseDownEventHandler += (sender, e) =>
-            {
-                btnConfirm.IsSelected = true;
-            };
-            btnConfirm.MouseUpEventHandler += (sender, e) =>
-            {
-                btnConfirm.IsSelected = false;
-                action?.Invoke();
-                dialog.Close();
-            };
-
+                
+            }
         }
 
 
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 527e504..3c7a086 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -3,6 +3,7 @@
 using HDL_ON.DAL.Server;
 using HDL_ON.Entity;
 using Shared;
+using static HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod;
 
 namespace HDL_ON.UI
 {
@@ -12,7 +13,7 @@
         /// <summary>
         /// 鍔熻兘鎺у埗鐣岄潰璺宠浆浜嬩欢
         /// </summary>
-        public EventHandler<MouseEventArgs> LoadEvent_SkipFunctionControlPage(Function function, Button btnCollectionIcon, Button btnName, Button btnFromFloor
+        public EventHandler<MouseEventArgs> LoadEvent_SkipFunctionControlPage(Function function, Button btnCollectionIcon, Button btnName, Button btnFromFloor, Comerom comerom,Action action
             )
         {
             EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
@@ -21,6 +22,10 @@
                 //璺宠浆鍒板姛鑳戒俊鎭缃〉闈�
                 switch (function.spk)
                 {
+                    case SPK.GroupControl:
+                         var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
+                         dialog.ShowDialog();
+                        break;
                     case SPK.AirSwitch:
                         var airSwitchPage = new AirSwitchPage(function);
                         MainPage.BasePageView.AddChidren(airSwitchPage);
@@ -64,13 +69,13 @@
                         MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                         break;
                     case SPK.CurtainRoller:
-                        var rollingShutterView = new VenetianBlindsPage(function);
+                        var rollingShutterView = new RollingShutterPage(function);
                         MainPage.BasePageView.AddChidren(rollingShutterView);
                         rollingShutterView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
                         MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                         break;
                     case SPK.CurtainShades:
-                        var curtainShadesView = new RollingShutterPage(function);
+                        var curtainShadesView = new VenetianBlindsPage(function);
                         MainPage.BasePageView.AddChidren(curtainShadesView);
                         curtainShadesView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
                         MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -234,6 +239,18 @@
                         break;
                     case SPK.IpCam_Imou:
 #if __IOS__
+                        if (Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken == null){//鏈垵濮嬪寲鎽勫儚澶�
+                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().InitSDKWithAppKey("HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
+                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken = UserInfo.Current.LoginTokenString;
+                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshToken = UserInfo.Current.RefreshToken;
+                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
+                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshDeviceList();
+                        }
+                        //璺宠浆澶у崕鎽勫儚澶�
+                        Shared.Application.currentVC.NavigationController.NavigationBar.BarTintColor = UIKit.UIColor.LightGray;
+                        Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshDeviceList();
+                        Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().ToMonitorViewWithDeviceId(function.extDevId, function.name, Shared.Application.currentVC);
+                        //Shared.Application.currentVC.NavigationController.NavigationBar.Hidden = false;
 #else
                         FunctionList.List.GetIpCamImouList();
                         if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken))
@@ -259,6 +276,7 @@
                                         Application.RunOnMainThread(() =>{
                                             try
                                             {
+
                                                 Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
                                                 Com.Utils.HdlToLcUtils.Instance.Play(function.extDevId, function.name);
                                             }
@@ -298,6 +316,7 @@
                         {
                             try
                             {
+
                                 Com.Utils.HdlToLcUtils.Instance.Play(function.extDevId, function.name);
                             }
                             catch (Exception ex)
@@ -307,6 +326,14 @@
                         }
 #endif
                         break;
+                    case SPK.VideoDoorLock: {
+                            //钀ょ煶瑙嗛闂ㄩ攣
+                            var form = new VideoDoorLockPage(function, btnName, btnFromFloor,comerom,action);
+                            MainPage.BasePageView.AddChidren(form);
+                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                            form.Show();
+                        }
+                        break;
                 }
             };
             return eventHandler;
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 7951076..8bcda0b 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -26,6 +26,7 @@
         /// </summary>
         Button btnBack;
 
+        public Button btnTilte;
         /// <summary>
         /// 鏍囬鍚嶇О
         /// </summary>
@@ -79,7 +80,7 @@
         /// </summary>
         /// <param name="frame"></param>
         /// <param name="tilte"></param>
-        public void LoadTopView(uint color = CSS_Color.TopViewColor)
+        public void LoadTopView(uint color = CSS_Color.TopViewColor)//,Action<List<Function> action
         {
             contentView = new FrameLayout()
             {
@@ -98,7 +99,7 @@
             };
             contentView.AddChidren(btnBackIcon);
 
-            Button btnTilte = new Button()
+            btnTilte = new Button()
             {
                 Gravity = Gravity.CenterHorizontal,
                 Y = Application.GetRealHeight(30),
@@ -110,6 +111,7 @@
                 Text = title
             };
             contentView.AddChidren(btnTilte);
+           
 
 
             btnBack = new Button()
diff --git a/HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs b/HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs
index 924fa9d..26672ed 100644
--- a/HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs
+++ b/HDL_ON/UI/UI0-Stan/Controls/BottomControls/BottomTimeSelectControl.cs
@@ -95,7 +95,7 @@
             //鍒濆鍖栧簳灞傛帶浠�
             var frameWhiteBack = base.InitBaseControl();
             frameWhiteBack.Height = Application.GetRealHeight(contentView);
-            //frameWhiteBack.Y = frameWhiteBack.Parent.Height - Application.GetRealHeight(297 + 20);
+            //frameWhiteBack.Y = Application.GetRealHeight(667 - contentView + 60);
 
             //鍙栨秷
             base.btnCancel.ButtonClickEvent += (sender, e) =>
diff --git a/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs b/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs
index 11911e0..adbdd74 100644
--- a/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/Base/CommonFormBase.cs
@@ -115,8 +115,15 @@
             }
             catch (Exception ex)
             {
-                //鍑虹幇鏈煡閿欒
-                HdlMessageLogic.Current.ShowAppProgramIsError(ex);
+                if (ex.Message == "stop")
+                {
+                    //鑷畾涔変腑鏂叧闂〉闈紝鍙厓鍐欑殑澶鏉傦紝鍙兘鐢ㄨ繖绉嶆柟寮忓己琛屼腑鏂柟娉曡繍琛�  2023-06-01 09:22:46
+                }
+                else
+                {
+                    //鍑虹幇鏈煡閿欒
+                    HdlMessageLogic.Current.ShowAppProgramIsError(ex);
+                }
             }
         }
 
diff --git a/HDL_ON/UI/UI0-Stan/Form/HideOptionFileContentForm.cs b/HDL_ON/UI/UI0-Stan/Form/HideOptionFileContentForm.cs
index 24a238b..d15ddc9 100644
--- a/HDL_ON/UI/UI0-Stan/Form/HideOptionFileContentForm.cs
+++ b/HDL_ON/UI/UI0-Stan/Form/HideOptionFileContentForm.cs
@@ -76,6 +76,7 @@
             btnText.TextAlignment = TextAlignment.TopLeft;
             btnText.TextColor = UI.CSS.CSS_Color.MainColor;
             btnText.Text = textValue;
+            btnText.Enable = false;
 #if __Android__
             btnText.Foucs = false;
 #endif
diff --git a/HDL_ON/UI/UI0-Stan/Logic/HdlBluetoothAndroidLogic.cs b/HDL_ON/UI/UI0-Stan/Logic/HdlBluetoothAndroidLogic.cs
index b416038..16f00c6 100644
--- a/HDL_ON/UI/UI0-Stan/Logic/HdlBluetoothAndroidLogic.cs
+++ b/HDL_ON/UI/UI0-Stan/Logic/HdlBluetoothAndroidLogic.cs
@@ -379,6 +379,8 @@
             }
         }
 
+
+      
         /// <summary>
         /// 鎶凷DK鐨勶紝鎴戜篃涓嶇煡閬撹繖涓槸浠�涔�
         /// </summary>
diff --git a/HDL_ON/UI/UI0-Stan/Logic/HdlMessageLogic.cs b/HDL_ON/UI/UI0-Stan/Logic/HdlMessageLogic.cs
index 615bb1d..6a0f24c 100644
--- a/HDL_ON/UI/UI0-Stan/Logic/HdlMessageLogic.cs
+++ b/HDL_ON/UI/UI0-Stan/Logic/HdlMessageLogic.cs
@@ -82,16 +82,32 @@
         {
             this.ShowMassage(ShowMsgType.Error, "System Error!", () =>
             {
-                //string msg = ex.Message + "\r\n";
-                //msg += ex.StackTrace;
+                string msg = ex.Message + "\r\n";
+                msg += ex.StackTrace;
 
-                //var form = new HideOptionFileContentForm();
-                //form.AddForm(string.Empty);
-                //form.SetTextContent(msg);
+                var form = new HideOptionFileContentForm();
+                form.AddForm(string.Empty);
+                form.SetTextContent(msg);
+
+            }, "ok");
+        }
+
+        /// <summary>
+        /// 鏄剧ずApp绋嬪簭鍑虹幇浜嗚嚧鍛介敊璇�
+        /// </summary>
+        /// <param name="ex"></param>
+        public void ShowAppProgramIsError(string msg)
+        {
+            this.ShowMassage(ShowMsgType.Error, "System Error!", () =>
+            {
+                var form = new HideOptionFileContentForm();
+                form.AddForm(string.Empty);
+                form.SetTextContent(msg);
 
             }, "ok");
         }
 
+
         #endregion
     }
 }
diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
index b63cf28..abe6f65 100644
--- a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
+++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
@@ -112,7 +112,7 @@
         /// <summary>
         /// 楠岃瘉鐮佹枃鏈緭鍏ユ
         /// </summary>
-        EditText etVerificationCode;
+        TextView etVerificationCode;
         /// <summary>
         /// 鑾峰彇楠岃瘉鐮佹寜閽�
         /// </summary>
@@ -341,16 +341,16 @@
             //};
             //verificationCodeView.AddChidren(btnDividingLineVertical_VerificationCodeView1);
 
-            etVerificationCode = new EditText()
+            etVerificationCode = new TextView()
             {
                 X = Application.GetRealWidth(49),
                 Width = Application.GetRealWidth(61 + 84),
-                TextAlignment = TextAlignment.CenterLeft,
+                //TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.TextFontSize,
-                PlaceholderTextColor = CSS_Color.PromptingColor1,
-                PlaceholderText = Language.StringByID(StringId.PlsEntryVerificationCode),
-                IsNumberKeyboardType = true
+                //PlaceholderTextColor = CSS_Color.PromptingColor1,
+                //PlaceholderText = Language.StringByID(StringId.PlsEntryVerificationCode),
+                //IsNumberKeyboardType = true
             };
             verificationCodeView.AddChidren(etVerificationCode);
 
diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
index 79dced0..066db11 100644
--- a/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
@@ -145,14 +145,14 @@
             //    }
             //};
 
-            Action<View, string> textChangeEventHandler = (view, textStr) =>
-            {
-                LoadMothed_EnableResetButton();
-            };
-            //etAccount.TextChangeEventHandler += textChangeEventHandler;
-            etPassword.TextChangeEventHandler += textChangeEventHandler;
-            etRepeatPassword.TextChangeEventHandler += textChangeEventHandler;
-            etVerificationCode.TextChangeEventHandler += textChangeEventHandler;
+            //Action<View, string> textChangeEventHandler = (view, textStr) =>
+            //{
+            //    LoadMothed_EnableResetButton();
+            //};
+            ////etAccount.TextChangeEventHandler += textChangeEventHandler;
+            //etPassword.TextChangeEventHandler += textChangeEventHandler;
+            //etRepeatPassword.TextChangeEventHandler += textChangeEventHandler;
+            //etVerificationCode.TextChangeEventHandler += textChangeEventHandler;
         }
 
         /// <summary>
@@ -183,6 +183,7 @@
                             HDLCommon.Current.BottomLineShowType(btnAccountViewBottomLine, BottomLineType.Error);
                             new Tip()
                             {
+                                MaxWidth = Application.GetRealWidth(300),
                                 CloseTime = 1,
                                 Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
                                 Direction = AMPopTipDirection.None,
@@ -206,6 +207,7 @@
                             HDLCommon.Current.BottomLineShowType(btnAccountViewBottomLine, BottomLineType.Error);
                             new Tip()
                             {
+                                MaxWidth = Application.GetRealWidth(300),
                                 CloseTime = 1,
                                 Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress),
                                 Direction = AMPopTipDirection.None,
@@ -243,6 +245,7 @@
                         HDLCommon.Current.BottomLineShowType(btnPasswordViewBottomLine, BottomLineType.Error);
                         new Tip()
                         {
+                            MaxWidth = Application.GetRealWidth(300),
                             CloseTime = 1,
                             Direction = AMPopTipDirection.None,
                             Text = Language.StringByID(StringId.PasswordIsUnqualified)
@@ -283,23 +286,23 @@
             };
 
             //楠岃瘉鐮佹枃鏈鐒︾偣鍙樺寲浜嬩欢
-            etVerificationCode.FoucsChanged += (sender, e) =>
-            {
-                if (etVerificationCode.Foucs)
-                {
-                    HDLCommon.Current.BottomLineShowType(btnVerificationCodeViewBottomLine, BottomLineType.GotFocus);
-                }
-                else
-                {
-                    if (isHitBack) return;//鐐瑰嚮杩斿洖鍏抽棴椤甸潰涓嶆娴嬫彁绀�
+            //etVerificationCode.FoucsChanged += (sender, e) =>
+            //{
+            //    if (etVerificationCode.Foucs)
+            //    {
+            //        HDLCommon.Current.BottomLineShowType(btnVerificationCodeViewBottomLine, BottomLineType.GotFocus);
+            //    }
+            //    else
+            //    {
+            //        if (isHitBack) return;//鐐瑰嚮杩斿洖鍏抽棴椤甸潰涓嶆娴嬫彁绀�
 
-                    HDLCommon.Current.BottomLineShowType(btnVerificationCodeViewBottomLine, BottomLineType.Normal);
-                    if (etVerificationCode.Text.Length > 4)
-                    {
-                        LoadMothed_EnableResetButton();
-                    }
-                }
-            };
+            //        HDLCommon.Current.BottomLineShowType(btnVerificationCodeViewBottomLine, BottomLineType.Normal);
+            //        if (etVerificationCode.Text.Length > 4)
+            //        {
+            //            LoadMothed_EnableResetButton();
+            //        }
+            //    }
+            //};
         }
 
 
@@ -398,7 +401,7 @@
                                     {
                                         //鐭俊鍙戦�侀棿闅�60s
                                         (sender as Button).IsSelected = false;
-                                        etVerificationCode.Foucs = true;
+                                        //etVerificationCode.Foucs = true;
                                     });
                                     //2.1鑾峰彇楠岃瘉鐮佸�掕鏃�
                                     new Thread(() =>
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 5d79dec..c5bdf9f 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -22,6 +22,70 @@
                 Application.HideSoftInput();
             };
             pm = new HttpServerRequest();
+#if __ANDROID__
+            BaseActivity.HideKeyboardEvent = () => {
+                if (this.Y != 0)
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        try
+                        {
+                            this.Y = 0;
+                        }
+                        catch { }
+                    });
+                }
+            };
+            BaseActivity.ShowKeyboardEvent = () => {
+                try
+                {
+                    if (etPassword.Foucs)
+                    {
+                        new Thread(() =>
+                        {
+                            for (var i = 0; i < 10; i++)
+                            {
+                                Application.RunOnMainThread(() =>
+                                {
+                                    try
+                                    {
+                                        this.Y = 0 - Application.GetRealHeight(10 * i);
+                                    }
+                                    catch { }
+                                });
+                                Thread.Sleep(10);
+                            }
+                        })
+                        { IsBackground = true }.Start();
+                    }
+                }
+                catch { }
+            };
+            BaseActivity.SmsAction = (message) => {
+                Console.WriteLine($"鎺ユ敹鍒扮煭淇★細"+ message);
+
+                string pattern = @"銆怘DL銆�.*(\d{6}).*";
+
+                Regex regex = new Regex(pattern);
+
+                Match match = regex.Match(message);
+
+                if (match.Success)
+                {
+                    string code = match.Groups[1].Value;
+                    Console.WriteLine("楠岃瘉鐮佷负锛�" + code);
+                    if(loginType==0 && logintMode == 1)
+                    {
+                        etPassword.Text = code;
+                    }
+                    smsCode = code;
+                }
+                else
+                {
+                    Console.WriteLine("鏈壘鍒伴獙璇佺爜锛�");
+                }
+            };
+#endif
         }
 
         public override void RemoveFromParent()
@@ -33,13 +97,20 @@
                 waitPage = null;
             }
 
+#if __ANDROID__
+            BaseActivity.HideKeyboardEvent = () => {
+
+            };
+            BaseActivity.ShowKeyboardEvent = () => { };
+            BaseActivity.SmsAction = (sms) => { };
+#endif
             base.RemoveFromParent();
 
-            ////2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
+            //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
             //Application.HideSoftInput();
         }
 
-        #region 灞�閮ㄥ彉閲�
+#region 灞�閮ㄥ彉閲�
         /// <summary>
         /// 鐧诲綍绫诲瀷
         /// 0:鎵嬫満
@@ -54,9 +125,13 @@
         int logintMode = 0;
         string account = "";
         string password = "";
-        #endregion
+        /// <summary>
+        /// 鐭俊楠岃瘉鐮�
+        /// </summary>
+        string smsCode = "";
+#endregion
 
-        #region 鎺т欢鍒楄〃
+#region 鎺т欢鍒楄〃
         /// <summary>
         /// 绛夊緟鎻愮ず
         /// </summary>
@@ -149,7 +224,7 @@
         /// 鏈嶅姟鍣ㄨ姹傚璞�
         /// </summary>
         HttpServerRequest pm;
-        #endregion
+#endregion
 
         string verAccount = "";
 
@@ -190,6 +265,9 @@
                 UnSelectedImagePath = "Public/Logo-bg.png"
             };
             bodyView.AddChidren(btnIcon_bg);
+            btnIcon_bg.MouseDownEventHandler += (sender, e) => {
+                Application.HideSoftInput();
+            };
 
 #if DEBUG
             btnIcon_bg.MouseUpEventHandler += (sender, e) =>
@@ -208,7 +286,6 @@
                 //return;
                 if (b)
                 {
-                    //etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
                     //etAccount.Text = "1033326940@qq.com";
                     //etAccount.Text = "18022428438";//wjc
                     //etAccount.Text = "13602944661";//kx
@@ -218,10 +295,9 @@
                     //etAccount.Text = "tf@smarttech.com.ua";
                     //etAccount.Text = "455740454@qq.com";
                     //etAccount.Text = "18688565449";
-                    //etAccount.Text = "support7@hdlautomation.com";
                     //etAccount.Text = "18570064522";
                     //etAccount.Text = "18718417827";
-                    etAccount.Text = "18188019284";
+                    //etAccount.Text = "18188019284";
                     //etAccount.Text = "13143792049";
                     //etAccount.Text = "13288623489";//缃楁檽涓�
                     //etAccount.Text = "18244942707";
@@ -232,13 +308,18 @@
                     //etAccount.Text = "13418062953";
                     etAccount.Text = "13138683659";
                     //etAccount.Text = "15217626103";
+                    //etAccount.Text = "18100573477";
+                    //etAccount.Text = "18321091245";
+                    //etAccount.Text = "13751916353";
+                    etAccount.Text = "13549566666";
+                    etAccount.Text = "18316672920";
+                    etAccount.Text = "support7@hdlautomation.com";
+                    etAccount.Text = "13375012446";//娴嬭瘯鏈嶅姟鍣�
                 }
                 else
                 {
-                    //etAccount.Text = "15018447586";//闊充箰鏁伴噺鍒锋柊闂
                     //etAccount.Text = "464027401@qq.com";//
                     //etAccount.Text = "15217626103";//
-                    //etAccount.Text = "13682244600";//娉㈠摜
                     etAccount.Text = "13168123446";//鏄嗘槑閲戣寕椤圭洰锛屾柊椋庨棶棰�
                     //etAccount.Text = "2949126848@qq.com";//闄堢惓
                     etAccount.Text = "15014291819 ";
@@ -282,12 +363,19 @@
                 {
                     etPassword.Text = "wsad123321";
                 }
+                else if (etAccount.Text == "18100573477")
+                {
+                    etPassword.Text = "huang12345";
+                }else if(etAccount.Text == "13549566666")
+                {
+                    etPassword.Text = "12345678";
+                }
                 //etPassword.Text = "Hdl85521566";
                 btnLogin.IsSelected = true;
             };
 #endif
 
-            #region 鐧诲綍鏂瑰紡閫夋嫨
+#region 鐧诲綍鏂瑰紡閫夋嫨
             btnPhoneLogin = new Button()
             {
                 X = Application.GetRealWidth(28),
@@ -309,7 +397,7 @@
                 Height = Application.GetRealHeight(40),
                 TextID = StringId.LoginByEmail,
                 TextColor = CSS_Color.PromptingColor1,
-                TextAlignment = TextAlignment.Center,
+                TextAlignment = TextAlignment.CenterLeft,
                 TextSize = CSS_FontSize.TextFontSize,
             };
             bodyView.AddChidren(btnEmailLogin);
@@ -812,6 +900,7 @@
                         new FunctionAttributes() { key = "mode",value =new List<string>(){ "day", "night", "away", "normal", "timer" }, curValue="day",state = "day"   },
                         new FunctionAttributes() { key = "set_temp",value =new List<string>(){ "" }, curValue="26",state = "26" ,max = 35,min = 5  },
                         new FunctionAttributes() { key = "room_temp",value =new List<string>(){ "" }, curValue="26",state = "26"   },
+                        new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "掳F", "掳C" }, curValue = "掳F", state = "掳F" },
                     },
                 };
                 fh.SaveFunctionFile();
@@ -1082,7 +1171,7 @@
                 //        new AttrKeyConfig (){
                 //            key = "pm2.5",
                 //            type = "interval" ,
-                //            unit = "ug/m虏",
+                //            unit = "ug/m鲁",
                 //            configs = new List<AttrKeyInfo>(){
                 //               new AttrKeyInfo(){ start = "0",end = "75",color = "0xFFADE764", desc = "鑹ソ"},
                 //               new AttrKeyInfo(){ start = "76",end = "150",color = "0xFFFFD154",desc = "杞�/涓害姹℃煋"},
@@ -1240,8 +1329,8 @@
 #endif
 
 
-                #endregion
-                #region 鍦烘櫙
+#endregion
+#region 鍦烘櫙
                 var scene1 = new Scene()
                 {
                     sid = "scene1",
@@ -1535,6 +1624,7 @@
                         new FunctionAttributes() { key = "set_temp",step = "0.5", value = new List<string>() { "16", "30"}, curValue = "16", state = "16",max = 30,min = 16 },
                         new FunctionAttributes() { key = "room_temp", value = new List<string>() { }, curValue = "20", state = "20" },
                         new FunctionAttributes() { key = "swing", value = new List<string>() {"up_down", "left_right", "stop" }, curValue = "20", state = "20" },
+                        new FunctionAttributes() { key = "temperature_type", value = new List<string>() { "掳F", "掳C" }, curValue = "掳F", state = "掳F" },
                     }
                 };
                 ac2.SaveFunctionFile();
@@ -1560,7 +1650,7 @@
                 //    collect = false,
                 //};
                 //scene6.SaveSceneFile();
-                #endregion
+#endregion
 
 
                 var lightSwitch6 = new Function()
@@ -1623,11 +1713,11 @@
 
 #region 闅愮鏀跨瓥
             AddServiceAgreementControl(bodyView);
-            #endregion
+#endregion
 
         }
 
-        #region 鈻� 鏈嶅姟鍗忚___________________________
+#region 鈻� 鏈嶅姟鍗忚___________________________
         bool isAgreePrivacyPolicy = false;
         /// <summary>
         /// 娣诲姞鏈嶅姟鍗忚鎺т欢
@@ -1749,12 +1839,12 @@
                 OpenWebViewPage(true);
             };
 
-            #if __ANDROID__
+#if __ANDROID__
             //if(OnAppConfig.Instance.FirstRunApp || !OnAppConfig.Instance.isAgreePrivacyPolicy)
             //{
             //    HDL_ON_Android.HDLONUtils.StartSplashActivity();    
             //}
-            #endif
+#endif
         }
 
         /// <summary>
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 8766b65..13fc4ad 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -60,6 +60,7 @@
                     {
                         var tip = new Tip()
                         {
+                            MaxWidth = Application.GetRealWidth(300),
                             Text = Language.StringByID(StringId.PlsEntryPhoneNumber),
                             CloseTime = 1,
                             Direction = AMPopTipDirection.None
@@ -74,6 +75,7 @@
                     {
                         var tip = new Tip()
                         {
+                            MaxWidth = Application.GetRealWidth(300),
                             Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
                             CloseTime = 1,
                             Direction = AMPopTipDirection.None
@@ -84,6 +86,9 @@
                         btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
                         return;
                     }
+#if __IOS__
+                    etPassword.Foucs = true;
+#endif
                     //鍔犺浇Loading鏁堟灉
                     var waitPage = new Loading();
                     bodyView.AddChidren(waitPage);
@@ -225,6 +230,9 @@
                     }
                     //楠岃瘉鐮佷笉闇�瑕侀殣钘�
                     etPassword.SecureTextEntry = false;
+#if __IOS__
+                    etPassword.SetTextContentTypeToOneTimeCode();
+#endif
                 }
                 #endregion
             }
@@ -313,6 +321,7 @@
                 //}
                 //闅愯棌瀵嗙爜
                 etPassword.SecureTextEntry = true;
+                //etPassword.IsNumberKeyboardType = false;
             }
             //楠岃瘉鐮佺櫥褰�
             else if (logintMode == 1)
@@ -340,6 +349,9 @@
                 }
                 //楠岃瘉鐮佷笉闇�瑕侀殣钘�
                 etPassword.SecureTextEntry = false;
+                etPassword.Text = smsCode;
+                //etPassword.IsNumberKeyboardType = true;
+
             }
         }
 
@@ -390,6 +402,7 @@
                         {
                             var tip = new Tip()
                             {
+                                MaxWidth = Application.GetRealWidth(300),
                                 Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
                                 CloseTime = 1,
                                 Direction = AMPopTipDirection.None
@@ -413,6 +426,7 @@
                         {
                             var tip = new Tip()
                             {
+                                MaxWidth = Application.GetRealWidth(300),
                                 Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress),
                                 CloseTime = 1,
                                 Direction = AMPopTipDirection.None
@@ -431,9 +445,27 @@
                 {
                     btnPasswordViewBottomLine.BackgroundColor = CSS_Color.MainColor;
                     btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
+
+#if __IOS__
+      new Thread(() => {
+                            for(var i = 0; i < 10; i++)
+                            {
+                                Application.RunOnMainThread(() =>
+                                {
+                                    this.Y = 0-Application.GetRealHeight(10 * i);
+                                });
+                                Thread.Sleep(10);
+                            }
+                        }) { IsBackground = true }.Start();
+
+                    var sst = etPassword.MyTextContentType;
+                    Console.WriteLine(sst);
+                    etPassword.SetTextContentTypeToOneTimeCode();
+#endif
                 }
                 else
                 {
+                    this.Y = 0;
                     btnPasswordViewBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
                     btnPasswordViewBottomLine.Height = Application.GetRealHeight(1);
                 }
@@ -447,13 +479,9 @@
             //褰撶劍鐐瑰湪瀵嗙爜鏂囨湰妗嗘椂锛岀偣鍑婚敭鐩樺洖鎾ゆ寜閿紝瑙﹀彂鐨勪簨浠�
             etPassword.EditorEnterAction += (obj) =>
             {
+                LoginEvent();
                 Application.HideSoftInput();
             };
-            etPassword.MouseUpEventHandler = (sender, e) =>
-            {
-                etPassword.Foucs = true;
-            };
-
         }
 
         /// <summary>
@@ -482,48 +510,7 @@
         {
             btnLogin.MouseUpEventHandler += (sender, e) =>
             {
-                if (btnLogin.IsSelected)
-                {
-                    //鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
-                    if (CheckPrivacyPolicy() == false) return;
-
-                    account = etAccount.Text.Trim();
-                    password = etPassword.Text.Trim();
-
-                    if (loginType == 0)
-                    {
-                        if (!Utlis.CheckPhoneNumber(account, phoneZoneCode))
-                        {
-                            var tip = new Tip()
-                            {
-                                Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
-                                CloseTime = 1,
-                                Direction = AMPopTipDirection.None
-                            };
-                            tip.Show(bodyView);
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        if (!Utlis.CheckEmail(account))
-                        {
-                            var tip = new Tip()
-                            {
-                                Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress),
-                                CloseTime = 1,
-                                Direction = AMPopTipDirection.None
-                            };
-                            tip.Show(bodyView);
-                            return;
-                        }
-                    }
-
-                    //鍒涘缓鐧诲綍绾跨▼
-                    var loginThread = LoadThread_Login();
-                    waitPage = new Loading();
-                    new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
-                }
+                LoginEvent();
             };
             #region 褰撹处鍙峰瘑鐮侀兘杈撳叆鏃讹紝鎵嶈兘鐐瑰嚮鐧诲綍鎸夐挳
             etAccount.TextChangeEventHandler = (sender, e) =>
@@ -561,7 +548,58 @@
             };
             #endregion
         }
+        /// <summary>
+        /// 鐧诲綍浜嬩欢
+        /// </summary>
+        void LoginEvent()
+        {
+            if (btnLogin.IsSelected)
+            {
+                //鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
+                if (CheckPrivacyPolicy() == false)
+                {
+                    Application.HideSoftInput();
+                    return;
+                }
+                account = etAccount.Text.Trim();
+                password = etPassword.Text.Trim();
 
+                if (loginType == 0)
+                {
+                    if (!Utlis.CheckPhoneNumber(account, phoneZoneCode))
+                    {
+                        var tip = new Tip()
+                        {
+                            MaxWidth = Application.GetRealWidth(300),
+                            Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
+                            CloseTime = 1,
+                            Direction = AMPopTipDirection.None
+                        };
+                        tip.Show(bodyView);
+                        return;
+                    }
+                }
+                else
+                {
+                    if (!Utlis.CheckEmail(account))
+                    {
+                        var tip = new Tip()
+                        {
+                            Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress),
+                            CloseTime = 1,
+                            Direction = AMPopTipDirection.None
+                        };
+                        tip.Show(bodyView);
+                        return;
+                    }
+                }
+
+                //鍒涘缓鐧诲綍绾跨▼
+                var loginThread = LoadThread_Login();
+                waitPage = new Loading();
+                new PublicAssmebly().LoadPage_WaitPage(loginThread, bodyView, waitPage);
+            }
+        }
         /// <summary>
         /// 鍔犺浇鐧诲綍绾跨▼
         /// </summary>
diff --git a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
index 4e2b8ce..de7d890 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
@@ -197,6 +197,7 @@
                                 btnGetVerificationCode_Phone.IsSelected = false;
                                 new Tip()
                                 {
+                                    MaxWidth = Application.GetRealWidth(300),
                                     CloseTime = 1,
                                     Text = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber),
                                     Direction = AMPopTipDirection.None,
@@ -225,6 +226,7 @@
                                 btnGetVerificationCode_Mail.IsSelected = false;
                                 new Tip()
                                 {
+                                    MaxWidth = Application.GetRealWidth(300),
                                     CloseTime = 1,
                                     Text = Language.StringByID(StringId.PlsEntryCorrectEmailAddress),
                                     Direction = AMPopTipDirection.None,
@@ -268,6 +270,7 @@
                         HDLCommon.Current.BottomLineShowType(btnPasswordViewBottomLine, BottomLineType.Error);
                         new Tip()
                         {
+                            MaxWidth = Application.GetRealWidth(300),
                             CloseTime = 1,
                             Direction = AMPopTipDirection.None,
                             Text = Language.StringByID(StringId.PlsRegisterPassword)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 788f78b..4f2d2b4 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -289,7 +289,7 @@
                             deviceId = enviTemp.deviceId,
                             attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = humiAttr.state, curValue = humiAttr.curValue } },
                         };
-                        humiSensorList.Add(newTemp);
+                        humiSensorList.Add(newTemp);//020103CF594C3E00051F0001051F//	1650546588519424001
                     }
                     var tempAttr = enviTemp.attributes.Find((obj) => obj.key == "temperature");
                     if (tempAttr != null)
@@ -301,7 +301,7 @@
                             deviceId = enviTemp.deviceId,
                             attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = tempAttr.state, curValue = tempAttr.curValue } },
                         };
-                        tempSensorList.Add(newTemp);
+                        tempSensorList.Add(newTemp);//020103CF594C3E00051F0001051F
                     }
                 }
 
@@ -359,7 +359,10 @@
                     foreach (var temp in tempSensorList)
                     {
                         double tempValue = 0;
-                        double.TryParse(temp.GetAttrState("temperature"), out tempValue);
+                        if (temp.GetAttribute("temperature") != null)
+                            double.TryParse(temp.GetAttrState("temperature"), out tempValue);
+                        else
+                            double.TryParse(temp.GetAttrState("value"), out tempValue);
                         if (tempValue > 0)
                         {
                             tempTotalValues += tempValue;
@@ -413,7 +416,10 @@
                     foreach (var humi in humiSensorList)
                     {
                         double humiValue = 0;
-                        double.TryParse(humi.GetAttrState("humidity"), out humiValue);
+                        if (humi.GetAttribute("temperature") != null)
+                            double.TryParse(humi.GetAttrState("humidity"), out humiValue);
+                        else
+                            double.TryParse(humi.GetAttrState("value"), out humiValue);
                         if (humiValue > 0)
                         {
                             humiTotalValues += humiValue;
@@ -724,7 +730,9 @@
             try
             {
                 int index = 0;
-                var list = FunctionList.List.GetDeviceFunctionList();
+                var list = new List<Function>();
+                list.AddRange(FunctionList.List.GetDeviceFunctionList());
+                list.AddRange(FunctionList.List.groupControls);//鍔犲叆缇ゆ帶
                 foreach (var function in list)
                 {
                     //闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
@@ -1023,6 +1031,7 @@
                         btnState.Text = function.lastState;
                     }
                 }
+                
                 else
                 {
                     btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
@@ -1055,7 +1064,7 @@
                 if (//SPK.CurtainSpkList().Contains(function.spk))
                     function.spk == SPK.CurtainRoller || function.spk == SPK.CurtainShades ||
                     function.spk == SPK.CurtainDream ||
-                    function.spk == SPK.CurtainSwitch || function.spk == SPK.CurtainTrietex )
+                    function.spk == SPK.CurtainSwitch || function.spk == SPK.CurtainTrietex)
                 {
                     btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainIcon.png";
                     btnIcon.SelectedImagePath = "FunctionIcon/Curtain/CurtainOnIcon.png";
@@ -1140,7 +1149,7 @@
                             btnPower.IsSelected = true;
                             status = "on";
                         }
-                       function.SetAttrState("on_off", status);
+                        function.SetAttrState("on_off", status);
                         Dictionary<string, string> dic = new Dictionary<string, string>();
                         dic.Add("on_off", status);
                         Music.SendMethod.Current.SendControlCommand(function, dic);
@@ -1154,7 +1163,7 @@
                     Button btnUp;
                     btnUp = new Button()
                     {
-                        X = Application.GetRealWidth(84+3),
+                        X = Application.GetRealWidth(84 + 3),
                         Y = Application.GetRealWidth(89),
                         Width = Application.GetRealWidth(38),
                         Height = Application.GetRealWidth(38),
@@ -1179,7 +1188,7 @@
                     LoadEvent_ControlClothesHanger(function, btnUp, btnDown);
 
                 }
-                
+
                 else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
                 {
                     //btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}.png";
@@ -1202,7 +1211,16 @@
                     btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
                     btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
                 }
-
+                else if (function.spk == SPK.VideoDoorLock)
+                {
+                    btnIcon.UnSelectedImagePath = UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect);
+                    //btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
+                }
+                else if (function.spk == SPK.GroupControl)
+                {
+                    btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_blue.png";
+                    btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_white.png";
+                }
                 else
                 {
                     Button btnSwitch;
@@ -1216,7 +1234,6 @@
                         SelectedImagePath = "Public/SwitchOn.png",
                     };
                     view.AddChidren(btnSwitch);
-
                     btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
                     btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
                     LoadEvent_SwitchFunction(function, btnSwitch);
@@ -1238,7 +1255,9 @@
                 };
 
 
-                var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone);
+                var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect,()=> {
+                    this.LoadDeviceFunctionControlZone();//鍒犻櫎璁惧鍚庨噸鏂板埛鏂癠I
+                });
                 view.MouseUpEventHandler = skipControlPageEvent;
                 btnName.MouseUpEventHandler = skipControlPageEvent;
                 btnIcon.MouseUpEventHandler = skipControlPageEvent;
@@ -1452,11 +1471,14 @@
 
                 LoadEvent_ControlScene(btnCoverd, btnName, btnZone, btnShowDelay, scene);
 
-                btnSettingIcon.MouseUpEventHandler = (sender, e) => {
-                    Action backAction = () => {
+                btnSettingIcon.MouseUpEventHandler = (sender, e) =>
+                {
+                    Action backAction = () =>
+                    {
                         //LoadSceneFunctionControlZone();
                     };
-                    Action refreshAction = () => {
+                    Action refreshAction = () =>
+                    {
                         btnName.Text = scene.name;
                         btnZone.Text = scene.GetRoomListName();
                         //view.BackgroundImagePath = (scene as Scene).ImagePath;
@@ -1465,7 +1487,7 @@
                     };
                     var aep = new SceneEditPage(scene, backAction);
                     MainPage.BasePageView.AddChidren(aep);
-                    aep.LoadPage( refreshAction);
+                    aep.LoadPage(refreshAction);
                     MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                 };
                 //鍦烘櫙姝e湪鍊掕鏃舵墽琛屼腑
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 850ab99..5c82a1c 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -604,14 +604,14 @@
                         d.Add(FunctionAttributeKey.FadeTime, function.GetAttrState(FunctionAttributeKey.FadeTime));
                         Control.Ins.SendWriteCommand(function, d);
                     }
-                    else if (function.spk == SPK.PanelSocket)
-                    {
-                        if (function.attributes.Find((obj) => obj.key == "on_off_usb") != null)
-                        {
-                            d.Add("on_off_usb", function.trait_on_off.curValue.ToString());
-                        }
-                        Control.Ins.SendWriteCommand(function, d);
-                    }
+                    //else if (function.spk == SPK.PanelSocket)//鍘绘帀锛岀粺涓�澶勭悊鎬绘帶
+                    //{
+                    //    if (function.attributes.Find((obj) => obj.key == "on_off_usb") != null)
+                    //    {
+                    //        d.Add("on_off_usb", function.trait_on_off.curValue.ToString());
+                    //    }
+                    //    Control.Ins.SendWriteCommand(function, d);
+                    //}
                     else
                     {
                         d.Add("on_off", function.trait_on_off.curValue.ToString());
diff --git a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
index b2635af..30afa04 100644
--- a/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -832,6 +832,7 @@
             {
                 if (bodyView != null)
                 {
+
                     //Utlis.WriteLine("GetPushMessageAction M鏀跺埌鎺ㄩ��");
                     GetPushMessageList(showMesType);
                 }
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 04ca7f2..242e409 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -5,6 +5,7 @@
 using HDL_ON.Entity;
 using HDL_ON.UI;
 using HDL_ON.UI.CSS;
+using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Shared;
@@ -605,21 +606,35 @@
             };
         }
 
-
         /// <summary>
         /// 鍔犺浇鍔熻兘鍒楄〃鐣岄潰
         /// </summary>
-        void LoadFunctionPageView()
+        void LoadFunctionPageView ()
         {
-            #region
             functionsPageView = new VerticalScrolViewLayout()
             {
                 BackgroundColor = CSS_Color.BackgroundColor,
                 Height = Application.GetRealHeight(667 - 64 - 49 + 20),
             };
             contentPageView.AddChidren(functionsPageView);
+            this.RefreshFunctionView();
 
-            FrameLayout functionContentView;
+        }
+        FrameLayout functionContentView;
+        /// <summary>
+        /// 鏄剧ず鍔熻兘鍒楄〃鐣岄潰
+        /// </summary>
+        void RefreshFunctionView()
+        {
+            #region
+            //functionsPageView = new VerticalScrolViewLayout()
+            //{
+            //    BackgroundColor = CSS_Color.BackgroundColor,
+            //    Height = Application.GetRealHeight(667 - 64 - 49 + 20),
+            //};
+            //contentPageView.AddChidren(functionsPageView);
+
+            //FrameLayout functionContentView;
             functionContentView = new FrameLayout()
             {
                 Y = Application.GetRealHeight(16),
@@ -745,6 +760,14 @@
                         functionCount = FunctionList.List.GetAcstParentList().Count;
                         functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                         break;
+                    case ShowFunction.VideoDoorLock:
+                        functionCount = FunctionList.List.GetVideoDoorLockList().Count;
+#if DEBUG
+                        //functionCount = 1;
+#endif
+                        functionOnCount = 1;
+                        break;
+
 
 
                 }
@@ -798,7 +821,7 @@
                     TextAlignment = TextAlignment.CenterLeft,
                     IsMoreLines = true,
                 };
-                functionView.AddChidren(btnName);
+                functionView.AddChidren(btnName); 
 
                 if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
                     && item != ShowFunction.SecurityMonitoring && item != ShowFunction.FreshAir && item != ShowFunction.Music
@@ -1143,12 +1166,30 @@
                             MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                         };
                         break;
-
+                    case ShowFunction.VideoDoorLock:
+                        //钀ょ煶瑙嗛闂ㄩ攣
+                        btnName.TextID = StringId.yingshishipinmensuo;
+                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+                        {
+                            var list =CommonMethod.Current.GetVideoDoorLockList();
+                            var form = new VideoDoorLockListPage(()=> {
+                                functionContentView?.RemoveFromParent();
+                                this.RefreshFunctionView();
+                            });
+                            form.AddForm(list);
+                        };
+                        break;
 
                 }
-                //鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�
-                if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring && item != ShowFunction.DoorLock
-                    && ShowFunction.EnergyMonitoring != item && ShowFunction.VideoIntercom != item && ShowFunction.SecurityCenter != item
+                //鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈�--(钀ょ煶瑙嗛闂ㄩ攣)璺宠浆鑷繁鐨勭晫闈�
+                if (item != ShowFunction.VideoDoorLock
+                    && item != ShowFunction.Music
+                    && item != ShowFunction.Environmental
+                    && item != ShowFunction.SecurityMonitoring
+                    && item != ShowFunction.DoorLock
+                    && ShowFunction.EnergyMonitoring != item
+                    && ShowFunction.VideoIntercom != item &&
+                    ShowFunction.SecurityCenter != item
                     && ShowFunction.Acst != item)
                 {
                     btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
@@ -1444,6 +1485,8 @@
             #endregion
         }
 
+       
+
         void refreshInverterInfo(Button btnPowerTenerationToday, Button btnWorkingMode, Button btnCurrentPowerGeneration)
         {
             new System.Threading.Thread(() =>
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 08772f9..6c9a2e3 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -38,12 +38,18 @@
         /// 鏄惁鍦ㄨ皟鍏�
         /// </summary>
         bool onDimmerBar;
+        /// <summary>
+        /// 鍒犻櫎璁惧鍚庡洖璋冪粰鐣岄潰鍒锋柊
+        /// </summary>
+        Action action;
+
         #endregion
-        public FunctionControlZone(Function func)
+        public FunctionControlZone(Function func,Action action)
         {
             bodyDiv = this;
             bodyDiv.Tag = func.sid;
             function = func;
+            this.action = action;
         }
 
         public override void RemoveFromParent()
@@ -72,7 +78,10 @@
             }
 
             btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png";
-
+            if(function.spk == SPK.GroupControl)
+            {
+                btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/lightswitch.png";
+            }
             if (SPK.CurtainSpkList().Contains(function.spk))
             {//绐楀笜娌℃湁寮�鍏虫寜閽�
                 CurtainFragment();
@@ -186,6 +195,11 @@
             {
                 btnIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/DoorLock.png";
             }
+            else if (function.spk == SPK.VideoDoorLock)
+            {
+                btnIcon.UnSelectedImagePath =UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.function);
+            }
+            else if(function.spk == SPK.GroupControl) { }
             else if (function.spk == SPK.HvacCac)
             {
                 var btnHumidityIcon = new Button()
@@ -456,6 +470,19 @@
                 };
                 bodyDiv.AddChidren(btnOffline);
             }
+            //鎺掑簭
+            //btnIcon.MouseLongEventHandler = (sender, e) => {
+            //    OrderEvent();
+            //};
+            //btnName.MouseLongEventHandler = (sender, e) => {
+            //    OrderEvent();
+            //};
+            //btnFromFloor.MouseLongEventHandler = (sender, e) => {
+            //    OrderEvent();
+            //};
+            //bodyDiv.MouseLongEventHandler = (sender, e) => {
+            //    OrderEvent();
+            //};
         }
 
         /// <summary>
@@ -618,6 +645,11 @@
         }
 
         /// <summary>
+        /// 鎺掑簭浜嬩欢 
+        /// </summary>
+        public Action OrderEvent;
+
+        /// <summary>
         /// 鍔犺浇闊充箰鍔熻兘鎺у埗鍗$墖
         /// </summary>
         void MusicFragment()
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index f2a4587..a639e02 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -405,7 +405,18 @@
         /// </summary>
         void LoadEvent_DivSkipEvent()
         {
-            var eventHandler = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollectionIcon, btnName, btnFromFloor);
+            if (function.spk == SPK.GroupControl)
+            {
+                EventHandler<MouseEventArgs> handler = (sender, e) => {
+                    var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
+                    dialog.ShowDialog();
+                };
+                this.MouseUpEventHandler = handler;
+                btnName.MouseUpEventHandler = handler;
+                btnFromFloor.MouseUpEventHandler = handler;
+                return;
+            }
+            var eventHandler = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollectionIcon, btnName, btnFromFloor, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.room,this.action);
             this.MouseUpEventHandler = eventHandler;
             btnName.MouseUpEventHandler = eventHandler;
             btnFromFloor.MouseUpEventHandler = eventHandler;
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index 5ba2bed..219f44d 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -28,18 +28,21 @@
         #endregion
 
         List<Function> functionList;
+        int titleId;
 
         public FunctionPage()
         {
             bodyView = this;
             functionList = new List<Function>();
+
         }
 
-        public void LoadPage(int titleId)
+        public void LoadPage(int titleId_out)
         {
+            this.titleId = titleId_out;
 
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
-            if (titleId == StringId.Lights)
+            if (titleId == StringId.Lights && !DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
             {
                 Action action = () =>
                 {
@@ -141,17 +144,11 @@
 
             if (titleId == StringId.Lights)
             {
+                functionList.AddRange(FunctionList.List.groupControls);
                 functionList.AddRange(FunctionList.List.GetLightList());
-                var lightScene = FunctionList.List.scenes.FindAll((obj) => obj.sceneType == SceneType.LightScene);
 
-                foreach (var scene in lightScene)
-                {
-                    functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
 
-                    var sceneRow = new SceneControlZone(scene);
-                    functionListView.AddChidren(sceneRow);
-                    sceneRow.LoadView();
-                }
+
 
             }
             else if (titleId == StringId.AC)
@@ -197,28 +194,13 @@
             LoadDialog_ChangeFloor();
 
 
-            #region 鍔犺浇缁勫悎璋冨厜鍦烘櫙
-            if (titleId == StringId.Lights)
-            {
-                foreach (var lightScene in FunctionList.List.scenes)
-                {
-                    if (lightScene.sceneType == SceneType.LightScene)
-                        if (lightScene != null)
-                        {
-                            functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
-                            var sceneRow = new SceneControlZone(lightScene);
-                            functionListView.AddChidren(sceneRow);
-                            sceneRow.LoadView();
-                        }
-                }
-            }
-            #endregion
+        
 
         }
         /// <summary>
         /// 鏄剧ず鐨勮澶囩殑鎬绘暟
         /// </summary>
-        int showCount = 0;
+        int showCount = -1;
         /// <summary>
         /// 鍔犺浇鍔熻兘row
         /// </summary>
@@ -236,18 +218,34 @@
                     {
                         if (!isAppend)
                         {
-                            showCount = 0;
+                            showCount = -1;
                             functionListView.RemoveAll();
+                            #region 鍔犺浇缁勫悎璋冨厜鍦烘櫙
+                            if (titleId == StringId.Lights)
+                            {
+                                foreach (var lightScene in FunctionList.List.scenes)
+                                {
+                                    if (lightScene.sceneType == SceneType.LightScene)
+                                        if (lightScene != null)
+                                        {
+                                            var sceneRow = new SceneControlZone(lightScene);
+                                            functionListView.AddChidren(sceneRow);
+                                            sceneRow.LoadView();
+                                            functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
+                                        }
+                                }
+                            }
+                            #endregion
                         }
-                        int i = 0;
-                        foreach (var function in showList)
+                        for (var i = 0;i<50;i++)
+                        //foreach (var function in showList)
                         {
-                            i++;
-                            if (i > 50)
+                            showCount++;
+                            if (showCount >= showList.Count)
                             {
                                 break;
                             }
-                            showCount++;
+                            var function = showList[showCount];
 
                             if (function.spk == SPK.SensorDryContact || function.spk == SPK.SensorDryContact2)
                             {
@@ -255,7 +253,7 @@
                             }
                             if (function.spk == SPK.LightRGBW || function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
                             {
-                                var functionDiv = new FunctionControlZone(function)
+                                var functionDiv = new FunctionControlZone(function,null)
                                 {
                                     Gravity = Gravity.CenterHorizontal,
                                     Width = Application.GetRealWidth(343),
@@ -267,11 +265,12 @@
                                     Tag = function.spk + function.sid
                                 };
                                 functionDiv.LoadFunctionDiv();
+                                functionDiv.OrderEvent = OrderEvent;
                                 functionListView.AddChidren(functionDiv);
                             }
                             else if (function.spk == SPK.IpCam_Imou)
                             {
-                                var functionDiv = new FunctionControlZone(function)
+                                var functionDiv = new FunctionControlZone(function,null)
                                 {
                                     Gravity = Gravity.CenterHorizontal,
                                     Width = Application.GetRealWidth(343),
@@ -288,7 +287,7 @@
                             }
                             else
                             {
-                                var functionDiv = new FunctionControlZone(function)
+                                var functionDiv = new FunctionControlZone(function,null)
                                 {
                                     Gravity = Gravity.CenterHorizontal,
                                     Width = Application.GetRealWidth(343),
@@ -300,6 +299,7 @@
                                     Tag = function.spk + function.sid
                                 };
                                 functionDiv.LoadFunctionDiv();
+                                functionDiv.OrderEvent = OrderEvent;
                                 functionListView.AddChidren(functionDiv);
                             }
                             functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(10) });
@@ -312,12 +312,8 @@
                                 TextAlignment = TextAlignment.Center,
                                 TextSize = CSS_FontSize.SubheadingFontSize,
                                 TextColor = CSS_Color.FirstLevelTitleColor,
-                                Text = "鍔犺浇鏇村",
+                                TextID = StringId.LoadMore,
                             };
-                            if (Language.CurrentLanguage != "Chinese")
-                            {
-                                btnAppend.Text = "Load more";
-                            }
                             functionListView.AddChidren(btnAppend);
                             btnAppend.MouseUpEventHandler = (sender, e) =>
                             {
@@ -346,7 +342,21 @@
             })
             { IsBackground = true }.Start();
         }
-
+        /// <summary>
+        /// 鎺掑簭浜嬩欢
+        /// </summary>
+        void OrderEvent()
+        {
+            Action action = () =>
+            {
+                functionList = functionList.OrderBy(o => o.FunctionOrderNumber).ToList();
+                ShowFunctionRow(functionList);
+            };
+            var skipView = new OrderFunctionPage();
+            MainPage.BasePageView.AddChidren(skipView);
+            skipView.LoadPage(functionList, action);
+            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+        }
 
         ///// <summary>
         ///// 鍔犺浇鍔熻兘绫诲瀷鎺у埗鍗$墖
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index ab78fd4..f19a9d6 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘�
+using System;
 using HDL_ON.Entity;
 using HDL_ON.UI.CSS;
 using Shared;
@@ -53,6 +54,7 @@
             deleteAction = delAction;
             this.modifyImageAction = modifyImageAction;
         }
+
         /// <summary>
         /// 閲嶈浇鐣岄潰
         /// </summary>
@@ -65,31 +67,37 @@
             }
         }
 
+
         public void LoadPage()
         {
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
 
-            new TopViewDiv(bodyView,room.roomName).LoadTopView_RoomTop(ReloadRoomName, skipEditPageAction);
+            new TopViewDiv(bodyView, room.roomName).LoadTopView_RoomTop(ReloadRoomName, skipEditPageAction);
 
             functionListView = new VerticalScrolViewLayout()
             {
                 Y = Application.GetRealHeight(64),
-                Height = Application.GetRealHeight(603-12),
+                Height = Application.GetRealHeight(603 - 12),
             };
             bodyView.AddChidren(functionListView);
 
-            foreach (var function in room.GetRoomFunctions(false))
+            var list = room.GetRoomFunctions(false);
+
+            foreach (var function in list)
             {
-                if (MainPage.RoomNotSupportFunctionList.Contains( function.spk))
+                if (MainPage.RoomNotSupportFunctionList.Contains(function.spk))
                 {
                     continue;
                 }
+#if DEBUG
+                //throw new ArgumentNullException();
+#endif
 
                 functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
 
                 if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
                 {
-                    var functionDiv = new FunctionControlZone(function)
+                    var functionDiv = new FunctionControlZone(function, null)
                     {
                         Gravity = Gravity.CenterHorizontal,
                         Width = Application.GetRealWidth(343),
@@ -105,7 +113,10 @@
                 }
                 else
                 {
-                    var functionDiv = new FunctionControlZone(function)
+                    var functionDiv = new FunctionControlZone(function, () =>
+                    {
+                        this.ReLoadPage();
+                    })
                     {
                         Gravity = Gravity.CenterHorizontal,
                         Width = Application.GetRealWidth(343),
@@ -120,22 +131,32 @@
                     functionListView.AddChidren(functionDiv);
                 }
             }
-            foreach (var scene in room.GetRoomScenes(false))
+            try
             {
-                functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
-                var sceneRow = new FrameLayout()
+                foreach (var scene in room.GetRoomScenes(false))
                 {
-                    Gravity = Gravity.CenterHorizontal,
-                    Width = Application.GetRealWidth(343),
-                    Height = Application.GetRealHeight(116),
-                    Radius = (uint)Application.GetMinRealAverage(12),
-                    BorderColor = 0x00FFFFFF,
-                    BorderWidth = 1,
-                    BackgroundColor = CSS_Color.MainBackgroundColor,
-                    Tag = "Scene-" +  scene.sid
-                };
-                functionListView.AddChidren(sceneRow);
-                LoadSceneRow(sceneRow, scene);
+                    if (scene == null)
+                    {
+                        continue;
+                    }
+                    functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
+                    var sceneRow = new FrameLayout()
+                    {
+                        Gravity = Gravity.CenterHorizontal,
+                        Width = Application.GetRealWidth(343),
+                        Height = Application.GetRealHeight(116),
+                        Radius = (uint)Application.GetMinRealAverage(12),
+                        BorderColor = 0x00FFFFFF,
+                        BorderWidth = 1,
+                        BackgroundColor = CSS_Color.MainBackgroundColor,
+                        Tag = "Scene-" + scene.sid
+                    };
+                    functionListView.AddChidren(sceneRow);
+                    LoadSceneRow(sceneRow, scene);
+                }
+            }catch (Exception ex)
+            {
+                MainPage.Log($"RoomPage LoadPage Error:{ex.Message}");
             }
         }
 
@@ -147,7 +168,7 @@
         /// </summary>
         public void LoadSceneRow(FrameLayout bodyDiv, Scene scene)
         {
-          var  btnIcon = new Button()
+            var btnIcon = new Button()
             {
                 X = Application.GetRealWidth(10),
                 Y = Application.GetRealHeight(15),
@@ -214,15 +235,15 @@
                 btnName.X = Application.GetRealWidth(52 + 16);
             }
             //鍔犺浇鍦烘櫙鎺у埗浜嬩欢
-            LoadEvent_ControlScene(btnName,btnFromFloor,bodyDiv,scene );
+            LoadEvent_ControlScene(btnName, btnFromFloor, bodyDiv, scene);
 
-            LoadEvent_FunctionCollection(btnCollectionIcon,scene);
+            LoadEvent_FunctionCollection(btnCollectionIcon, scene);
         }
 
         /// <summary>
         /// 鍔犺浇鍔熻兘鏀惰棌鎸夐挳浜嬩欢
         /// </summary>
-        void LoadEvent_FunctionCollection(Button btnCollectionIcon,Scene scene)
+        void LoadEvent_FunctionCollection(Button btnCollectionIcon, Scene scene)
         {
             btnCollectionIcon.MouseUpEventHandler += (sender, e) =>
             {
@@ -233,9 +254,10 @@
         /// <summary>
         /// 鍔犺浇鍦烘櫙鎺у埗浜嬩欢
         /// </summary>
-        void LoadEvent_ControlScene(Button btnName,Button btnFromFloor,FrameLayout bodyDiv, Scene scene)
+        void LoadEvent_ControlScene(Button btnName, Button btnFromFloor, FrameLayout bodyDiv, Scene scene)
         {
-            EventHandler<MouseEventArgs> upEvent = (sender, e) => {
+            EventHandler<MouseEventArgs> upEvent = (sender, e) =>
+            {
                 DriverLayer.Control.Ins.ControlScene(scene);
                 string msg = scene.name + Language.StringByID(StringId.AlreadyOpened);
                 new PublicAssmebly().TipMsgAutoClose(msg, false);
@@ -245,5 +267,6 @@
             bodyDiv.MouseUpEventHandler = upEvent;
         }
 
+
     }
 }
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index 28be7fe..6841d02 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -226,17 +226,17 @@
             ///淇濆瓨鐐瑰嚮浜嬩欢
             saveView.btnClick.MouseUpEventHandler += (sender, e) =>
             {
-                if (Logic.currlogic.input.Count == 0 && Logic.currlogic.output.Count == 0)
-                {
-                    new LogicView.TipPopView().TipBox(StringId.tip, StringId.conditioncNullOrtargetNull);
-                    return;
-                }
+                //if (Logic.currlogic.input.Count == 0 && Logic.currlogic.output.Count == 0)
+                //{
+                //    new LogicView.TipPopView().TipBox(StringId.tip, StringId.conditioncNullOrtargetNull);
+                //    return;
+                //}
                 if (Logic.currlogic.input.Count == 0)
                 {
                     new LogicView.TipPopView().TipBox(StringId.tip, StringId.conditioncNull);
                     return;
                 }
-                if (Logic.currlogic.output.Count == 0)
+                if (Logic.currlogic.output.Count == 0&&!push.btnNextIcon.IsSelected)
                 {
                     new LogicView.TipPopView().TipBox(StringId.tip, StringId.targetNull);
                     return;
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ChooseIocate.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ChooseIocate.cs
index a37e8e9..d173496 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ChooseIocate.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ChooseIocate.cs
@@ -25,7 +25,7 @@
             {
                 RemoveFromParent();
             };
-            topView.topNameBtn.Text = "閫夋嫨瀹氫綅浣嶇疆";
+            topView.topNameBtn.TextID = StringId.Setting;// = "閫夋嫨瀹氫綅浣嶇疆";
 
             FrameLayout viewLayout = new FrameLayout
             {
@@ -43,7 +43,7 @@
             lonlatView.btnText.X = Application.GetRealWidth(16);
             lonlatView.btnLine.X = Application.GetRealWidth(16);
             lonlatView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
-            lonlatView.btnText.Text = "褰撳墠鐨勭粡绾害";
+            lonlatView.btnText.TextID = StringId.LatAndLon;
             lonlatView.btnState.Visible = true;
             lonlatView.btnState.IsMoreLines = true;
             lonlatView.btnState.Height = Application.GetRealHeight(25);
@@ -59,7 +59,7 @@
             locateView.btnText.X = Application.GetRealWidth(16);
             locateView.btnLine.X = Application.GetRealWidth(16);
             locateView.btnLine.Width = Application.GetRealWidth(375 - 16 - 16);
-            locateView.btnText.Text = "鍦ㄨ浣嶇疆鑼冨洿鏃�";
+            locateView.btnText.TextID = StringId.TriggeredRange;
             locateView.btnState.Visible = true;
             locateView.btnState.Text = this.queryItem(r.ToString());
             viewLayout.AddChidren(locateView.FLayoutView());
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 6094f4a..0cf91cc 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -2,7 +2,7 @@
 using Shared;
 using System.Collections.Generic;
 using HDL_ON.Entity;
-
+using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
 
 namespace HDL_ON.UI.UI2.Intelligence.Automation
 {
@@ -89,6 +89,7 @@
                 //绌鸿皟
                 case SPK.AcStandard:
                 case SPK.HvacAC:
+                case SPK.AcIr:
                 //鍦扮儹
                 case SPK.FloorHeatStandard:
                 case SPK.HvacFloorHeat:
@@ -342,7 +343,7 @@
                     }
                     break;
                 //鐜妫�娴嬩紶鎰熷櫒
-                case SPK.SensorEnvironment:
+                case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
                 case SPK.SensorEnvironment2:
                 case SPK.SensorEnvironment3:
                     {
@@ -618,7 +619,25 @@
                         }
                     }
                     break;
-                    
+                //钀ょ煶瑙嗛闂ㄩ攣
+                case SPK.VideoDoorLock:
+                    {
+                        LogicView.FunTypeView view1 = new LogicView.FunTypeView();
+                        view1.btnText.TextID=StringId.kaimenrenyuan;
+                        view1.btnText.Name = Language.StringByID(StringId.shipinmensuo);
+                        fLayout.AddChidren(view1.FLayoutView());
+                        view1.btnClick.MouseUpEventHandler += (sender, e) =>
+                        {
+                            this.identifier = "open_door";//寮�閿佷簨浠�
+                            this.VideoDoorLockAction(this, device, view1.btnState);
+                        };
+                        if (edit)
+                        {
+                            this.GetEditState(device, index, view1.btnState,null, null, null);
+                        }
+                    }
+                    break;
+
             }
             #region  淇濆瓨
             ///淇濆瓨View
@@ -668,6 +687,12 @@
                         //condition榛樿[]
                         inputDevice.condition = new List<Dictionary<string, string>>();
                     }
+                }
+                else if (device.spk == SPK.VideoDoorLock)
+                {
+                    ////钀ょ煶瑙嗛闂ㄩ攣
+                    inputDevice.condition_type = "9";
+                    inputDevice.identifier = this.identifier;
                 }
 
 
@@ -1035,40 +1060,131 @@
         /// <param name="frame">褰撳墠鐣岄潰</param>
         /// <param name="device">褰撳墠璁惧</param>
         /// <param name="btnState">鏃х姸鎬�</param>
-        public void FaceAction(FrameLayout frame, Entity.Function device,Button btnState) {
+        public void FaceAction(FrameLayout frame, Entity.Function device, Button btnState)
+        {
             selectedState = device.spk + "_";
             Loading loading = new Loading();
             frame.AddChidren(loading);
             loading.Start();
-            System.Threading.Tasks.Task.Run(() =>
+
+            CommonMethod.Current.SunThread(() =>
             {
                 try
                 {
-                   var faceIDList = Send.Current.GetListHomeFace(device.deviceId,true);
-                    List<string> faceNameList = new List<string>();
-                    for (int i = 0; i < faceIDList.Count; i++)
+                    var faceIdList = Send.Current.GetListHomeFace(device.deviceId, true);
+
+                    CommonMethod.Current.MainThread(() =>
                     {
-                        var face = faceIDList[i];
-                        faceNameList.Add(face.userName);
-                    }
+                        loading.Hide();
+                        string stateValue = btnState.Tag == null ? "" : btnState.Tag.ToString();
+                        PublicInterface publicInterface = new PublicInterface();
+                        publicInterface.MultiSelectShow(this, faceIdList, device.name, stateValue, (indexeList) =>
+                     {
+                         if (indexeList.Count > 0)
+                         {
+                             dicSateteList.Clear();
+                             string s = string.Empty;
+                             string tag = string.Empty;
+                             //鏁版嵁灏佽
+                             AddDictionary("open_type", "1", "integer");
+                             for (int i = 0; i < indexeList.Count; i++)
+                             {
+
+                                 if (i > faceIdList.Count)
+                                 {
+                                     continue;
+                                 }
+                                 var indexe = indexeList[i];
+                                 var face = faceIdList[indexe];
+                                 AddDictionary("user_id", face.userId, "string");
+                                 s += face.userName;
+                                 s += ",";
+                                 tag += face.userId;
+                                 tag += "_";
+                             }
+                             //鐣岄潰鏄剧ず閫変腑鍊�
+                             btnState.Text = s;
+                             btnState.Tag = tag;
+                         }
+
+                     });
+                    });
+                }
+                catch { }
+                finally
+                {
                     Application.RunOnMainThread(() =>
                     {
                         loading.Hide();
-                        PublicInterface publicInterface = new PublicInterface();
-                        publicInterface.FrameOrVv(this, faceNameList, new List<string> { btnState.Text }, device.name, (index) =>
-                        {
-                            var face = faceIDList[index];
-                            //鐣岄潰鏄剧ず閫変腑鍊�
-                            btnState.Text = face.userName;
-                            //鏁版嵁灏佽
-                            AddDictionary("open_type", "1", "integer");
-                            AddDictionary("user_id", face.userId, "string");
+                    });
+                }
 
-                        }, false);
+            });
+
+        }
+
+        /// <summary>
+        /// 钀ょ煶瑙嗛闂ㄩ攣涓撶敤
+        /// </summary>
+        /// <param name="frame">褰撳墠鐣岄潰</param>
+        /// <param name="device">褰撳墠璁惧</param>
+        /// <param name="btnState">鏃х姸鎬�</param>
+        public void VideoDoorLockAction(FrameLayout frame, Entity.Function device, Button btnState)
+        {
+            selectedState = device.spk + "_";
+            Loading loading = new Loading();
+            frame.AddChidren(loading);
+            loading.Start();
+            CommonMethod.Current.SunThread(() =>
+            {
+                try
+                {
+                    var faceIdList = Send.Current.GetVideoDoorLockUserListInfo(device);
+                    CommonMethod.Current.MainThread(() =>
+                    {
+
+                        loading.Hide();
+                        string stateValue = btnState.Text == null ? "" : btnState.Text.ToString();
+                        PublicInterface publicInterface = new PublicInterface();
+                        publicInterface.MultiSelectShow(this, faceIdList, device.name, stateValue, (indexeList) =>
+                        {
+                            if (indexeList.Count > 0)
+                            {
+                                dicSateteList.Clear();
+                                string s = string.Empty;
+                                string tag = string.Empty;
+                                for (int i = 0; i < indexeList.Count; i++)
+                                {
+                                    if (i > faceIdList.Count)
+                                    {
+                                        continue;
+                                    }
+                                    var indexe = indexeList[i];
+                                    var face = faceIdList[indexe];
+                                    //鏁版嵁灏佽<楂樿儨璇磋悿鐭抽偅杈规槸鎺ㄩ�佺敤鎴峰悕>
+                                    AddDictionary("open_user", face.userName, "string");
+                                    s += face.userName;
+                                    s += ",";
+                                    tag += face.userId;
+                                    tag += "_";
+                                }
+                                //鐣岄潰鏄剧ず閫変腑鍊�
+                                btnState.Text = s;
+                                btnState.Tag = tag;
+                            }
+
+                        });
 
                     });
                 }
                 catch { }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        loading.Hide();
+                    });
+                }
 
             });
 
@@ -1183,16 +1299,45 @@
                 var dic = dictionaryB[i];
                 string key = dic["key"];
                 string comparatorValue = dic["comparator"];
+                string value = dic["value"];
                 if (dictionaryA["key"] == key && dictionaryA["comparator"] == comparatorValue)
                 {
-                    //鍒ゆ柇鏄惁瀛樺湪
-                    valueInt = i;
-                    break;
+                    if (this.checkSpk())
+                    {
+                        //鏈変簺璁惧闇�瑕佸鍔犺繖涓垽鏂�
+                        if (dictionaryA["value"] == value)
+                        {
+                            //鍒ゆ柇鏄惁瀛樺湪
+                            valueInt = i;
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        //鍒ゆ柇鏄惁瀛樺湪
+                        valueInt = i;
+                        break;
+                    }
                 }
             }
             return valueInt;
         }
         /// <summary>
+        /// 妫�鏌ユ槸鍚︽敮鎸�
+        /// </summary>
+        /// <returns></returns>
+        private bool checkSpk()
+        {
+            if (this.function.spk == SPK.VideoDoorLock ||
+               this.function.spk == SPK.doorgate
+                )
+            {
+                return true;
+            }
+            return false;
+
+        }
+        /// <summary>
         /// 鍒ゆ柇dictionaryB鏄惁瀹屾暣鍖呭惈鍙︿竴涓猟ictionaryA
         /// </summary>
         /// <param name="dictionaryA"></param>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 4930ec3..7055171 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -162,6 +162,7 @@
                                 //绌鸿皟
                                 case SPK.AcStandard:
                                 case SPK.HvacAC:
+                                case SPK.AcIr:
                                 //鍦扮儹
                                 case SPK.HvacFloorHeat:
                                 case SPK.FloorHeatStandard:
@@ -311,7 +312,7 @@
                                         }
                                     }
                                     break;
-                                case SPK.SensorEnvironment:
+                                case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
                                 case SPK.SensorEnvironment2:
                                 case SPK.SensorEnvironment3:
                                     {
@@ -406,18 +407,53 @@
                                         }
                                     }
                                     break;
+                                case SPK.VideoDoorLock:
+                                    {
+                                        string s = string.Empty;
+                                        string tag = string.Empty;
+                                        for (int b = 0; b < dicList.Count; b++)
+                                        {
+                                            var dic = dicList[b];
+                                            //var userId = dic["value"].ToString();
+                                            //var FaceItem = this.GetVideoDoorLockUserItem(userId, device);
+                                            //s += FaceItem.userName;
+                                            //s += ",";
+                                            //tag += FaceItem.userId;
+                                            //tag += "_";
+                                            var userName = dic["value"].ToString();
+                                            s += userName;
+                                            s += ",";
+                                        }
+                                        inputView.btnState.Text = s;
+                                    }
+                                    break;
                                 case SPK.doorgate:
                                     {
+                                        string s = string.Empty;
                                         if (inputCondition.identifier == "door_call_cloud_event")
                                         {
-                                            inputView.btnState.Text = Language.StringByID(StringId.shipintonghuahujiao);
+                                            s = Language.StringByID(StringId.shipintonghuahujiao);
                                         }
                                         else
                                         {
-                                            string userId = this.GetKeyValue("user_id",dicList);
-                                            var FaceItem = this.GetFaceItem(userId, device.deviceId);
-                                            inputView.btnState.Text = FaceItem.userName;
+                                            for (int b = 0; b < dicList.Count; b++)
+                                            {
+                                                var dic = dicList[b];
+                                                var key = dic["key"].ToString();
+                                                if (key != "user_id")
+                                                {
+                                                    continue;
+                                                }
+                                                var userId = dic["value"].ToString();
+                                                var FaceItem = this.GetFaceItem(userId, device.deviceId);
+                                                s += FaceItem.userName;
+                                                s += ",";
+
+
+                                            }
+                                           
                                         }
+                                        inputView.btnState.Text = s;
                                     }
                                     break;
                                 case SPK.IpCam_Imou:
@@ -672,7 +708,7 @@
                             {
                                 //鐢╯id鎵惧埌璁惧锛�
                                 var device = LogicMethod.Current.GetDevice(inputCondition.sid);
-                                if (device.spk == SPK.SensorEnvironment
+                                if (device.spk == SPK.SensorEnvironment || device.spk == SPK.SensorEnvironmentHailin
                                 || device.spk == SPK.SensorEnvironment2
                                 || device.spk == SPK.SensorEnvironment3
                                 )
@@ -1081,6 +1117,7 @@
                                     break;
                                 case SPK.AcStandard:
                                 case SPK.HvacAC:
+                                case SPK.AcIr:
                                     {
                                         string on_off = GetKeyValue("on_off", dicList);
                                         string set_temp = GetKeyValue("set_temp", dicList);
@@ -1491,7 +1528,7 @@
                 //寮�鍏崇伅鍏�
                 case SPK.AirSwitch:
                 case SPK.LightSwitch:
-                    //鏈烘鎵�
+                //鏈烘鎵�
                 case SPK.MechanicalArm:
                     {
                         foreach (var dic in dicList)
@@ -1662,6 +1699,7 @@
                     break;
                 case SPK.AcStandard:
                 case SPK.HvacAC:
+                case SPK.AcIr:
                     {
                         foreach (var dic in dicList)
                         {
@@ -2128,6 +2166,27 @@
                         }
                     }
                     break;
+                case SPK.VideoDoorLock:
+                    {
+                        string s = string.Empty;
+                        string tag = string.Empty;
+                        for (int b = 0; b < dicList.Count; b++)
+                        {
+                            var dic = dicList[b];
+                            //var userId = dic["value"].ToString();
+                            //var FaceItem = this.GetVideoDoorLockUserItem(userId, device);
+                            //s += FaceItem.userName;
+                            //s += ",";
+                            //tag += FaceItem.userId;
+                            //tag += "_";
+                            var userName = dic["value"].ToString();
+                            s += userName;
+                            s += ",";
+                        }
+                        button1.Text = s;
+                        button1.Tag = tag;
+                    }
+                    break;
                 case SPK.MusicStandard:
                 case SPK.AvMusic:
                     {
@@ -2146,11 +2205,28 @@
                     break;
                 case SPK.doorgate:
                     {
-                        string value = this.GetKeyValue("user_id", dicList);
-                        button2.Text = this.GetFaceItem(value, device.deviceId).userName;
+                        string s = string.Empty;
+                        string tag = string.Empty;
+                        for (int b = 0; b < dicList.Count; b++)
+                        {
+                            var dic = dicList[b];
+                            var key = dic["key"].ToString();
+                            if (key != "user_id")
+                            {
+                                continue;
+                            }
+                            var userId = dic["value"].ToString();
+                            var FaceItem = this.GetFaceItem(userId, device.deviceId);
+                            s += FaceItem.userName;
+                            s += ",";
+                            tag += FaceItem.userId;
+                            tag += "_";
+                        }
+                        button2.Text = s;
+                        button2.Tag = tag;
                     }
                     break;
-              
+
             }
         }
         /// <summary>
@@ -2327,6 +2403,7 @@
                                     break;
                                 case SPK.AcStandard:
                                 case SPK.HvacAC:
+                                case SPK.AcIr:
                                 case SPK.FloorHeatStandard:
                                 case SPK.HvacFloorHeat:
                                     {
@@ -2616,7 +2693,7 @@
             }
         }
         /// <summary>
-        /// 鏌ユ壘鎸囧畾userId
+        /// 鏌ユ壘鎸囧畾鍙瀵硅userId
         /// </summary>
         /// <param name="userId"></param>
         /// <returns></returns> 
@@ -2633,6 +2710,24 @@
             }
             return face;
         }
+        /// <summary>
+        /// 鏌ユ壘鎸囧畾钀ょ煶瑙嗛闂ㄩ攣userId
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns> 
+        public Face GetVideoDoorLockUserItem(string userId, Function device)
+        {
+            if (Send.Current.VideoDoorLockUserListInfo.Count == 0)
+            {
+                Send.Current.GetVideoDoorLockUserListInfo(device);
+            }
+            var face = Send.Current.VideoDoorLockUserListInfo.Find((o) => { return o.userId == userId; });
+            if (face == null)
+            {
+                face = new Face();
+            }
+            return face;
+        }
 
     }
 }
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index d54f4de..9ed7f66 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -360,7 +360,8 @@
             {
                 return "LogicIcon/sensor.png";
             }
-            else if (SPK.DoorLock == device.spk)
+            else if (SPK.DoorLock == device.spk
+                || SPK.VideoDoorLock == device.spk)
             {
                 return "FunctionIcon/DoorLock/DoorLock.png";
             }
@@ -422,6 +423,7 @@
                     }
                     break;
                 case SPK.AcStandard:
+                case SPK.AcIr:
                 case SPK.HvacAC:
                     {
                         strPath = "LogicIcon/airconditionerlogic.png";
@@ -455,7 +457,7 @@
                 case SPK.SensorMmvPose:
                 case SPK.SenesorMegahealth:
                 case SPK.SenesorMegahealth2:
-                case SPK.SensorEnvironment:
+                case SPK.SensorEnvironment:case SPK.SensorEnvironmentHailin:
                 case SPK.SensorEnvironment2:
                 case SPK.SensorEnvironment3:
                 case SPK.SensorTemperature:
@@ -518,7 +520,7 @@
                 deviceStrTypeList.Add(Language.StringByID(StringId.Curtain));
             }
             ///绌鸿皟绫�
-            var ac = deviceList.Find((device) => device.spk == SPK.AcStandard || device.spk == SPK.HvacAC);
+            var ac = deviceList.Find((device) => device.spk == SPK.AcStandard || device.spk == SPK.HvacAC|| device.spk == SPK.AcIr);
             if (ac != null)
             {
                 deviceStrTypeList.Add(Language.StringByID(StringId.AC));
@@ -549,7 +551,7 @@
             || device.spk == SPK.SensorMmvPose
             || device.spk == SPK.SenesorMegahealth
             || device.spk == SPK.SenesorMegahealth2
-            || device.spk == SPK.SensorEnvironment
+            || device.spk == SPK.SensorEnvironment || device.spk == SPK.SensorEnvironmentHailin
              || device.spk == SPK.SensorEnvironment2
               || device.spk == SPK.SensorEnvironment3
                 || device.spk == SPK.SensorTemperature
@@ -576,7 +578,8 @@
                 deviceStrTypeList.Add(Language.StringByID(StringId.Electric));
             }
             ///闂ㄩ攣绫�
-            var doorlock = deviceList.Find((device) => device.spk == SPK.DoorLock);
+            var doorlock = deviceList.Find((device) => device.spk == SPK.DoorLock
+            || device.spk == SPK.VideoDoorLock);
             if (doorlock != null)
             {
                 deviceStrTypeList.Add(Language.StringByID(StringId.DoorLock));
@@ -645,6 +648,7 @@
                 functionTypeList.Add(SPK.AcStandard);
                 functionTypeList.Add(SPK.HvacAC);
                 functionTypeList.Add(SPK.HvacCac);
+                functionTypeList.Add(SPK.AcIr);
             }
             ///鍦版殩绫�
             else if (deviceType == Language.StringByID(StringId.FloorHeating))
@@ -671,7 +675,7 @@
                 functionTypeList.Add(SPK.SensorMmvPose);
                 functionTypeList.Add(SPK.SenesorMegahealth);
                 functionTypeList.Add(SPK.SenesorMegahealth2);
-                functionTypeList.Add(SPK.SensorEnvironment);
+                functionTypeList.Add(SPK.SensorEnvironment); functionTypeList.Add(SPK.SensorEnvironmentHailin);
                 functionTypeList.Add(SPK.SensorEnvironment2);
                 functionTypeList.Add(SPK.SensorEnvironment3);
                 functionTypeList.Add(SPK.SensorTemperature);
@@ -696,6 +700,7 @@
             else if (deviceType == Language.StringByID(StringId.DoorLock))
             {
                 functionTypeList.Add(SPK.DoorLock);
+                functionTypeList.Add(SPK.VideoDoorLock);
             }
             ///闊充箰绫�
             else if (deviceType == Language.StringByID(StringId.Music))
@@ -734,6 +739,7 @@
                 functionTypeList.Add(SPK.CurtainTrietex);
                 functionTypeList.Add(SPK.AcStandard);
                 functionTypeList.Add(SPK.HvacAC);
+                functionTypeList.Add(SPK.AcIr);
                 functionTypeList.Add(SPK.FloorHeatStandard);
                 functionTypeList.Add(SPK.HvacFloorHeat);
                 functionTypeList.Add(SPK.AirFreshStandard);
@@ -751,7 +757,7 @@
                 functionTypeList.Add(SPK.SensorMmvPose);
                 functionTypeList.Add(SPK.SenesorMegahealth);
                 functionTypeList.Add(SPK.SenesorMegahealth2);
-                functionTypeList.Add(SPK.SensorEnvironment);
+                functionTypeList.Add(SPK.SensorEnvironment); functionTypeList.Add(SPK.SensorEnvironmentHailin);
                 functionTypeList.Add(SPK.SensorEnvironment2);
                 functionTypeList.Add(SPK.SensorEnvironment3);
                 functionTypeList.Add(SPK.SensorTemperature);
@@ -773,6 +779,8 @@
                 functionTypeList.Add(SPK.MechanicalArm);
                 functionTypeList.Add(SPK.IpCam_Imou);
                 functionTypeList.Add(SPK.SensorPm10);
+                functionTypeList.Add(SPK.VideoDoorLock);
+                functionTypeList.Add(SPK.AcIr);
 
             }
 
@@ -799,7 +807,7 @@
                         deviceTypeList.Add(SPK.CurtainSwitch);
                         deviceTypeList.Add(SPK.CurtainRoller);
                         deviceTypeList.Add(SPK.CurtainTrietex);
-                        deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC);
+                        deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC);deviceTypeList.Add(SPK.AcIr);
                         deviceTypeList.Add(SPK.AirFreshStandard); deviceTypeList.Add(SPK.HvacAirFresh);
                         deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat);
                         deviceTypeList.Add(SPK.SensorSmoke);
@@ -814,7 +822,7 @@
                         deviceTypeList.Add(SPK.SensorMmvPose);
                         deviceTypeList.Add(SPK.SenesorMegahealth);
                         deviceTypeList.Add(SPK.SenesorMegahealth2);
-                        deviceTypeList.Add(SPK.SensorEnvironment);
+                        deviceTypeList.Add(SPK.SensorEnvironment); deviceTypeList.Add(SPK.SensorEnvironmentHailin);
                         deviceTypeList.Add(SPK.SensorEnvironment2);
                         deviceTypeList.Add(SPK.SensorEnvironment3);
                         deviceTypeList.Add(SPK.SensorTemperature);
@@ -832,6 +840,8 @@
                         deviceTypeList.Add(SPK.doorgate);
                         deviceTypeList.Add(SPK.IpCam_Imou);
                         deviceTypeList.Add(SPK.SensorPm10);
+                        deviceTypeList.Add(SPK.VideoDoorLock);
+                        deviceTypeList.Add(SPK.AcIr);
 
                     }
                     break;
@@ -845,7 +855,7 @@
                         deviceTypeList.Add(SPK.CurtainSwitch);
                         deviceTypeList.Add(SPK.CurtainRoller);
                         deviceTypeList.Add(SPK.CurtainTrietex);
-                        deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC);
+                        deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC); deviceTypeList.Add(SPK.AcIr);
                         deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat);
                         deviceTypeList.Add(SPK.AirFreshStandard); deviceTypeList.Add(SPK.HvacAirFresh);
                         deviceTypeList.Add(SPK.AirSwitch);
@@ -855,6 +865,7 @@
                         deviceTypeList.Add(SPK.MusicStandard);
                         deviceTypeList.Add(SPK.AvMusic);
                         deviceTypeList.Add(SPK.MechanicalArm);
+                        deviceTypeList.Add(SPK.AcIr);
                     }
                     break;
             }
@@ -1173,9 +1184,9 @@
                  //new Entity.Function { sid = "1234567890", name = "瓒呭0娉紶鎰熷櫒", spk = Entity.SPK.SensorUtrasonic },
                  // new Entity.Function { sid = "1234567891", name = "娓╁害浼犳劅鍣�", spk = Entity.SPK.SensorTemperature },
                  //  new Entity.Function { sid = "1234567892", name = "婀垮害浼犳劅鍣�", spk = Entity.SPK.SensorHumidity },
-                    new Entity.Function { sid = "12345678933456", name = "璋冨厜鐏�", spk = Entity.SPK.LightDimming },
-                      new Entity.Function { sid = "1234567895444", name = "闈㈡澘", spk = Entity.SPK.PanelSocket },
-                      new Entity.Function { sid = "12345678968888", name = "pm10", spk = Entity.SPK.SensorPm10 },
+                    //new Entity.Function { sid = "12345678933456", name = "闂ㄩ攣", spk = Entity.SPK.DoorLock },
+                    //  new Entity.Function { sid = "1234567895444", name = "瑙嗛闂ㄩ攣", spk = Entity.SPK.VideoDoorLock },
+                      new Entity.Function { sid = "12345678968888", name = "pm10", spk = Entity.SPK.LightDimming },
                       //  new Entity.Function { sid = "1234567897", name = "姣背娉紶鎰熷櫒1", spk = Entity.SPK.SenesorMegahealth2 },
                       // new Entity.Function { sid = "1234567899", name = "闂ㄧ浼犳劅鍣�", spk = Entity.SPK.SensorDoorWindow },
                       //  new Entity.Function { sid = "12345678991234", name = "HDL鏈烘鎵�", spk = Entity.SPK.MechanicalArm },
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunTypeView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunTypeView.cs
index 7ef9350..fef3b95 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunTypeView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/FunTypeView.cs
@@ -26,7 +26,7 @@
             Gravity = Gravity.CenterVertical,
             TextAlignment = TextAlignment.CenterLeft,
         };
-       
+
         /// <summary>
         /// 锛堟潯浠舵垨鑰呯洰鏍囷級璁惧鐘舵�佹枃鏈弿杩�
         /// </summary>
@@ -39,7 +39,7 @@
             Y = Application.GetRealHeight(17),
             X = Application.GetRealWidth(375 - 48 - 130),
             TextAlignment = TextAlignment.CenterRight,
-            Text="",
+            Text = "",
         };
         /// <summary>
         /// 鍥炬爣
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
index 57848d1..98e5cd6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -395,6 +395,12 @@
 
                         }
                         break;
+                    case 8:
+                        {
+                            iconInt = 5;
+
+                        }
+                        break;
                     case 10:
                         {
                             iconInt = 4;
@@ -511,6 +517,12 @@
                             strIcon = "LogicIcon/selectTheScene.png";
                         }
                         break;
+                    case 5:
+                        {
+
+                            strIcon = "LogicIcon/selectlocation.png";
+                        }
+                        break;
                     case 11:
                         {
                             //鍒嗗壊鏉′欢鍜岀洰鏍囩殑鍥炬爣
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index 0dc90c0..a073cc9 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -156,6 +156,83 @@
         }
 
         /// <summary>
+        /// 澶氶�夋嫨
+        /// </summary>
+        /// <param name="frameLayout">鐖舵帶浠�</param>
+        /// <param name="list">鏄剧ず鏁版嵁婧�</param>
+        /// <param name="titleText"></param>
+        /// <param name="stateTextList">涔嬪墠鐘舵�佹枃鏈�</param>
+        /// <param name="action">杩斿洖绱㈠紩鍊煎垪琛�</param>
+        /// <param name="textSize">鏄剧ず鏂囨湰瀛椾綋澶у皬</param>
+        public void MultiSelectShow(FrameLayout frameLayout, List<Face> list, string titleText, string stateTexts, Action<List<int>> action, int textSize = LogicView.TextSize.text14)
+        {
+            LogicView.DateView view = new LogicView.DateView();
+            view.btnTitle.Text = titleText;
+            view.FLayoutView(frameLayout, list.Count);
+            view.btnCancel.MouseUpEventHandler += (sender, e) =>
+            {
+                //绉婚櫎fLayout鐣岄潰
+                view.frameLayout.RemoveFromParent();
+            };
+            List<int> intList = new List<int>();
+            for (int i = 0; i < list.Count; i++)
+            {
+                var  face= list[i];
+                LogicView.CheckView checkView = new LogicView.CheckView();
+                checkView.frameLayout.Y = Application.GetRealHeight(56 + 50 * i);
+                checkView.btnText.TextSize = textSize;
+                view.frameLayout.AddChidren(checkView.FLayoutView());
+                checkView.btnText.Text = face.userName;
+                checkView.btnClick.Tag = i;//鏍囪
+
+                if (stateTexts.Contains(face.userId))
+                {
+                    //鏄剧ず涔嬪墠鐨勯�変腑鐘舵��
+                    checkView.btnCheckIcon.IsSelected = true;
+                    intList.Add(i);
+                }
+                //鐐瑰嚮浜嬩欢
+                checkView.btnClick.MouseUpEventHandler += (sender1, e1) =>
+                {
+
+                    int clickIndex =int.Parse(checkView.btnClick.Tag.ToString());
+                    checkView.btnClick.IsSelected = !checkView.btnClick.IsSelected;
+                    if (checkView.btnClick.IsSelected)
+                    {
+                        checkView.btnCheckIcon.IsSelected = true;
+                        if (!intList.Contains(clickIndex))
+                        {
+                            //娣诲姞閫変腑鏁版嵁
+                            intList.Add(clickIndex);
+                        }
+                    }
+                    else
+                    {
+                        checkView.btnCheckIcon.IsSelected = false;
+                        if (intList.Contains(clickIndex))
+                        {
+                            //绉婚櫎閫変腑鏁版嵁
+                            intList.Remove(clickIndex);
+                        }
+                    }
+
+                };
+
+            }
+            view.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
+            {
+                if (intList.Count == 0)
+                {
+                    return;
+                }
+                action(intList);
+                //绉婚櫎fLayout鐣岄潰
+                view.frameLayout.RemoveFromParent();
+            };
+
+        }
+
+        /// <summary>
         /// 鏈�-澶氶�夋嫨
         /// </summary>
         /// <param name="frameLayout">鐖舵帶浠�</param>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
index d6835e6..8ea607a 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -23,6 +23,7 @@
             }
         }
         public List<Face> faceList = new List<Face>();
+        public List<Face> VideoDoorLockUserListInfo = new List<Face>();
         /// <summary>
         /// 璋冪敤鑾峰彇浣忓畢瀛愯处鍙峰垪琛�
         /// </summary>
@@ -462,6 +463,62 @@
 
         }
 
+        /// <summary> 
+        /// 鑾峰彇浣忓畢宸插綍鍏ヤ汉鑴镐俊鎭�
+        /// </summary>
+        /// <param name="deviceId">鍙瀵硅璁惧id</param>
+        /// <returns></returns>
+        public List<Face> GetHomeFaceList(string deviceId, bool isTip) 
+        {
+            var jObject = new JObject();
+            jObject.Add("homeId", LogicMethod.Current.HomeId);
+            jObject.Add("deviceId", deviceId);
+            var responsePackNew = RequestServerhomeId(jObject, NewAPI.Api_Post_GetListHomeFace, "鑾峰彇浣忓畢宸插綍鍏ヤ汉鑴镐俊鎭�");
+            //濡傛灉鏄痶oken杩囨湡鍒欏埛鏂皌oken
+            if (responsePackNew.Code == StateCode.TOKEN_EXPIRED)
+            {
+                RefreshToken();
+                GetListHomeFace(deviceId, isTip);
+            }
+            if (Check(responsePackNew, isTip) == false)
+            {
+                return new List<Face>();
+            }
+            var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Face>>(responsePackNew.Data.ToString());
+            if (list == null)
+            {
+                list = new List<Face>();
+            }
+            faceList.Clear();
+            faceList.AddRange(list);
+            return list;
+
+        }
+
+        /// <summary> 
+        ///  鑾峰彇闂ㄩ攣鐢ㄦ埛鍒楄〃(钀ょ煶瑙嗛闂ㄩ攣)
+        /// </summary>
+        /// <param name="deviceId">璁惧</param>
+        /// <returns></returns>
+        public List<Face> GetVideoDoorLockUserListInfo(Function device)
+        {
+            var userList = FuntionControlView.VideoDoorLock.VideDoorLockSend.Current.GetVideoDoorLockUserListInfo(device);
+            List<Face> faceIdList = new List<Face>();
+            for (int i = 0; i < userList.Count; i++)
+            {
+                Face face = new Face();
+                var user = userList[i];
+                face.userId = user.extUserId;
+                face.userName = user.extUserName;
+                faceIdList.Add(face);
+            }
+            VideoDoorLockUserListInfo.Clear();
+            VideoDoorLockUserListInfo.AddRange(faceIdList);
+            return faceIdList;
+        }
+
+      
+
         /// <summary>
         ///璇锋眰鏈嶅姟鍣紙涓庝綇瀹呮湁鍏�:渚嬪锛沨omeId锛� 
         /// </summary>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 7aeb9f2..b1c6ab8 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -229,10 +229,10 @@
                         ///寮�鍏�
                         LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView();
                         curtainSwitchView.btnText.TextID = StringId.switchLogic;
-                        fLayout.AddChidren(curtainSwitchView.FLayoutView());
+                        //fLayout.AddChidren(curtainSwitchView.FLayoutView());//2023骞�04鏈�17鏃�16:27:10 浜у搧瑕佹眰鐨勫幓鎺�
                         ///鐧惧垎姣�
                         LogicView.FunTypeView crtainPercentumView = new LogicView.FunTypeView();
-                        crtainPercentumView.frameLayout.Y = curtainSwitchView.frameLayout.Bottom;
+                        //crtainPercentumView.frameLayout.Y = curtainSwitchView.frameLayout.Bottom;
                         crtainPercentumView.btnText.TextID = StringId.percentum;
                         fLayout.AddChidren(crtainPercentumView.FLayoutView());
                         crtainPercentumView.btnState.Text = "5%";//浜у搧缁忕悊鏅撹緣瑕佹眰鏀圭殑 2021-11-06
@@ -297,6 +297,7 @@
                     break;
                 case SPK.AcStandard:
                 case SPK.HvacAC:
+                case SPK.AcIr:
                     {
                         #region 鐣岄潰
                         ///寮�鍏�
@@ -599,25 +600,30 @@
                                 {
                                     //HDL_ON.DriverLayer.Control.Ins.GetMusicDirectory(device);
                                     //var palyListName = Music.SendMethod.mMethod.GetListName(device); 
-                                    var palyList= Music.SendMethod.Current.GetListMusic(device, "hdl_special");
-                                    List<string> musicNameList = new List<string>();
+                                    var palyList= Music.SendMethod.Current.GetSingleSongList(device, "hdl_special","");
+                                    List<string> songNameList = new List<string>(); 
                                     for (int i = 0; i < palyList.songs.Count; i++)
                                     {
-                                        var music = palyList.songs[i];
-                                        musicNameList.Add(music.name);
+                                        var song = palyList.songs[i]; 
+                                        songNameList.Add(song.name);
                                     }
                                     Application.RunOnMainThread(() =>
                                     {
                                         loading.Hide();
                                         PublicInterface publicInterface = new PublicInterface();
-                                        publicInterface.FrameOrVv(this, musicNameList, new List<string> { funTypeView.btnState.Text }, palyList.group, (index2) =>
+                                        publicInterface.FrameOrVv(this, songNameList, new List<string> { funTypeView.btnState.Text }, palyList.group, (index2) =>
                                         {
-                                            var musicSelecetd = palyList.songs[index2];
+                                            var songSelecetd = palyList.songs[index2]; 
                                             //鐣岄潰鏄剧ず閫変腑鍊�
-                                            funTypeView.btnState.Text = musicSelecetd.name;
+                                            funTypeView.btnState.Text = songSelecetd.name;
                                             //鏁版嵁灏佽
                                             AddDictionary("playlist_name", palyList.group);//鍒楄〃鍚�
-                                            AddDictionary("song_name", musicSelecetd.name);//姝屾洸鍚�
+                                            AddDictionary("song_name", songSelecetd.name);//姝屾洸鍚�
+                                            if (!string.IsNullOrEmpty(songSelecetd.url))
+                                            {
+                                                //瀛樺湪url灏变竴璧峰彂閫佽繃鍘�
+                                                AddDictionary("url", songSelecetd.url);
+                                            }
 
                                         },false);
 
@@ -694,6 +700,7 @@
                                 break;
                             }
                         case SPK.HvacAC:
+                        case SPK.AcIr:
                         case SPK.AcStandard:
                         case SPK.FloorHeatStandard:
                         case SPK.HvacFloorHeat:
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
index 84822aa..a7845f1 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
@@ -92,11 +92,12 @@
             //鏃ュ嚭/鏃ヨ惤/姝e崍鐐瑰嚮浜嬩欢
             timeSpecialView.btnClick.MouseUpEventHandler += (sen, e) =>
             {
-                if (string.IsNullOrEmpty( Entity.DB_ResidenceData.Instance.CurrentRegion.homeAddress))//.longitude == 0 && Entity.DB_ResidenceData.Instance.CurrentRegion.latitude == 0)
-                {
-                    new PublicAssmebly().TipMsg(StringId.tip, StringId.GatewayLocationInformationIsNotConfigured);
-                    return;
-                }
+                
+                //if (string.IsNullOrEmpty( Entity.DB_ResidenceData.Instance.CurrentRegion.homeAddress))//.longitude == 0 && Entity.DB_ResidenceData.Instance.CurrentRegion.latitude == 0)
+                //{
+                //    new PublicAssmebly().TipMsg(StringId.tip, StringId.GatewayLocationInformationIsNotConfigured);
+                //    return;
+                //}
                 SpeciaTime speciaTime = new SpeciaTime();
                 MainPage.BasePageView.AddChidren(speciaTime);
                 speciaTime.Show();
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 25a9a06..13115eb 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -86,38 +86,38 @@
             //鍒ゆ柇鏄惁闇�瑕侀殣钘忚嚜鍔ㄥ寲
             if (HideAutoPage)
             {
-                if (DB_ResidenceData.Instance.GatewayType == 1)//缃戝叧闇�瑕佸姞杞藉畨闃�--2021-11-28 19:56:53  鍒樻檽杈夊皢瀹夐槻鏀惧叆璇ョ晫闈�
-                {
-                    btnSceneTilte  = new Button()
-                    {
-                        Y = Application.GetRealHeight(30),
-                        Width = Application.GetRealWidth(170),
-                        Height = Application.GetRealHeight(25),
-                        TextAlignment = TextAlignment.CenterRight,
-                        TextSize = CSS_FontSize.HeadlineFontSize,
-                        TextColor = CSS_Color.PromptingColor1,
-                        SelectedTextColor = CSS_Color.MainColor,
-                        TextID = StringId.Scenes,
-                        IsSelected = true
-                    };
-                    topView.AddChidren(btnSceneTilte);
+                //if (DB_ResidenceData.Instance.GatewayType == 1)//缃戝叧闇�瑕佸姞杞藉畨闃�--2021-11-28 19:56:53  鍒樻檽杈夊皢瀹夐槻鏀惧叆璇ョ晫闈�
+                //{
+                //    btnSceneTilte  = new Button()
+                //    {
+                //        Y = Application.GetRealHeight(30),
+                //        Width = Application.GetRealWidth(170),
+                //        Height = Application.GetRealHeight(25),
+                //        TextAlignment = TextAlignment.CenterRight,
+                //        TextSize = CSS_FontSize.HeadlineFontSize,
+                //        TextColor = CSS_Color.PromptingColor1,
+                //        SelectedTextColor = CSS_Color.MainColor,
+                //        TextID = StringId.Scenes,
+                //        IsSelected = true
+                //    };
+                //    topView.AddChidren(btnSceneTilte);
 
-                    btnSecurityTitle = new Button()
-                    {
-                        X = Application.GetRealWidth(209),
-                        Y = Application.GetRealHeight(30),
-                        Width = Application.GetRealWidth(170),
-                        Height = Application.GetRealHeight(25),
-                        TextAlignment = TextAlignment.CenterLeft,
-                        TextSize = CSS_FontSize.TextFontSize,
-                        TextColor = CSS_Color.PromptingColor1,
-                        SelectedTextColor = CSS_Color.MainColor,
-                        TextID = StringId.anfang,
-                    };
-                    topView.AddChidren(btnSecurityTitle);
-                    btnAutomationTitle = new Button();
-                }
-                else
+                //    btnSecurityTitle = new Button()
+                //    {
+                //        X = Application.GetRealWidth(209),
+                //        Y = Application.GetRealHeight(30),
+                //        Width = Application.GetRealWidth(170),
+                //        Height = Application.GetRealHeight(25),
+                //        TextAlignment = TextAlignment.CenterLeft,
+                //        TextSize = CSS_FontSize.TextFontSize,
+                //        TextColor = CSS_Color.PromptingColor1,
+                //        SelectedTextColor = CSS_Color.MainColor,
+                //        TextID = StringId.anfang,
+                //    };
+                //    topView.AddChidren(btnSecurityTitle);
+                //    btnAutomationTitle = new Button();
+                //}
+                //else
                 {
 
                     btnSceneTilte = new Button()
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
index 6f695e2..cb55326 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
@@ -25,7 +25,13 @@
             sceneFunction = fc.localFunction.ConvertSceneFunction();
             foreach(var ll in sceneFunction.status)
             {
-                ll.value = fc.status.Find((obj) => obj.key == ll.key).value;
+                try
+                {
+                    var temp = fc.status.Find((obj) => obj.key == ll.key);
+                    if (temp != null)
+                        ll.value = temp.value;
+                }
+                catch { }
             }
             //sceneFunction = fc;
             refreshAction = action;
@@ -148,15 +154,6 @@
             btnConfrim.MouseUpEventHandler = (sender, e) =>
             {
                 var temp = scene.functions.Find((obj) => obj.sid == sceneFunction.sid);
-                //if (sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Brightness) != null)
-                //{
-                //    try
-                //    {
-                //        //涓�绔彛涓嶆敮鎸佸紑鍏冲�间笌浜害鍊间竴璧峰鐞嗭紝闇�瑕佸皢寮�鍏冲�肩Щ闄ゆ帀
-                //        sceneFunction.status.Remove(sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.OnOff));
-                //    }
-                //    catch { }
-                //}
                 
                 if (temp != null)
                 {
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
index 710917c..54d69c3 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
@@ -47,6 +47,7 @@
         public void LoadPage()
         {
             new TopViewDiv(bodyView, Language.StringByID(StringId.About)).LoadTopView();
+            this.BackgroundColor = CSS_Color.MainBackgroundColor;
 
             Button btnOnIcon = new Button()
             {
@@ -229,7 +230,7 @@
         /// </summary>
         void OpenUrl()
         {
-            if (!string.IsNullOrEmpty(newAppVersion))
+            if (!string.IsNullOrEmpty(newAppVersion)&& newAppVersion.Contains("http"))
             {
                 HDLUtils.OpenUrl(newAppVersionUrl);
             }
@@ -313,7 +314,7 @@
                 var newVersion = versionResult.version;
                 if (newVersion.CompareTo(MainPage.VersionString) > 0)
                 {
-                    newAppVersionUrl = versionResult.androidUrl;
+                    newAppVersionUrl = versionResult.packageUrl;
                     return newVersion;
                 }
                 return "";
@@ -360,7 +361,7 @@
         /// 妫�娴嬫柊鐗堟湰
         /// </summary>
         /// <returns>The https app version async.</returns>
-        private AppVersionRes CheckAppVersion()
+        private AppVersionResNew CheckAppVersion()
         {
             try
             {
@@ -372,7 +373,7 @@
                         return null;
                     }
 
-                    var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionRes>(result.Data.ToString());
+                    var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionResNew>(result.Data.ToString());
                     return responeData;
                 }
                 return null;
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 e4130c3..02435eb 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorEnvironment/AddSensorEnvironmentPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorEnvironment/AddSensorEnvironmentPage.cs
@@ -123,7 +123,7 @@
             {
                 editText.PlaceholderText = Language.StringByID(StringId.PlsEntryMacCode);
             }
-            if (integratedDevice.spk == SPK.SensorEnvironment)
+            if (integratedDevice.spk == SPK.SensorEnvironment || integratedDevice.spk == SPK.SensorEnvironmentHailin)
             {
                 Button btnScan = new Button()
                 {
@@ -160,7 +160,7 @@
                         try
                         {
                             var pm = new HttpServerRequest();
-                            var pack = pm.IndependentRegister3TyDevcie(integratedDevice.spk, snCode,integratedDevice.ProductShowName, pairString);// Language.StringByID(StringId.SensorEnvironment)
+                            var pack = pm.IndependentRegister3TyDevcie(integratedDevice.spk, snCode,integratedDevice.ProductShowName, integratedDevice.productBrand, pairString);// Language.StringByID(StringId.SensorEnvironment)
                             if (pack.Code == StateCode.SUCCESS)
                             {
                                 //var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrandDevice>>(pack.Data.ToString());
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 d4501dc..0965e3d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/SenesorMegahealth/AddSenesorMegahealthDirection1Page.cs
@@ -115,7 +115,7 @@
                         try
                         {
                             var pm = new HttpServerRequest();
-                            var pack = pm.IndependentRegister3TyDevcie(device.spk, snCode,Language.StringByID(StringId.SenesorMillimeterWave));
+                            var pack = pm.IndependentRegister3TyDevcie(device.spk, snCode,Language.StringByID(StringId.SenesorMillimeterWave),device.productBrand);
                             if (pack.Code == StateCode.SUCCESS)
                             {
                                 //var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<IntegratedBrandDevice>>(pack.Data.ToString());
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
index 802c094..14acce9 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
@@ -1,13 +1,47 @@
 锘縰sing System;
 using System.Collections.Generic;
+#if __ANDROID__
+using Android.Content;
+#endif
 using HDL_ON.DAL.Server;
 using HDL_ON.Entity;
 using HDL_ON.UI.CSS;
 using Shared;
+#if __IOS__
+using Shared.IOS.HDLCNVRSDK;
+#endif
 namespace HDL_ON.UI
 {
+
+
     public class AddDevciePage : FrameLayout
     {
+#if __ANDROID__
+    public class dddxx { }
+#else
+        //澶у崕鎽勫儚澶磗dk浠g悊锛圫hared.IOS.HDLCNVRSDK)
+        hdlLCNVRSDKDelegate hdlLCNVRDelegate;
+        public class hdlLCNVRSDKDelegate : HDLLCNVRSDKDelegate
+        {
+            Action act;
+            public hdlLCNVRSDKDelegate(Action action)
+            {
+                act = action;
+
+
+            }
+
+            public override void AddDeviceFailWithErrorCode(string errorCode)
+            {
+
+            }
+
+            public override void BackFromAddDeviceView()
+            {
+                act?.Invoke();
+            }
+        }
+#endif
         FrameLayout bodyView;
         IntegratedBrand brand;
         VerticalRefreshLayout contentView;
@@ -20,6 +54,7 @@
 
         public void LoadPage(VerticalRefreshLayout refreshView)
         {
+
             new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice)).LoadTopView();
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
 
@@ -46,7 +81,8 @@
         {
             var waitPage = new Loading();
             waitPage.Start();
-            new System.Threading.Thread(() => {
+            new System.Threading.Thread(() =>
+            {
                 try
                 {
                     var pm = new HttpServerRequest();
@@ -119,7 +155,7 @@
                     Width = Application.GetRealWidth(32),
                     Height = Application.GetRealWidth(32),
                     Radius = (uint)Application.GetRealWidth(4),
-                    UnSelectedImagePath =  $"FunctionIcon/Icon/{device.IconName}.png",
+                    UnSelectedImagePath = $"FunctionIcon/Icon/{device.IconName}.png",
                 };
                 row.AddChidren(btnIcon);
                 Button btnRight = new Button()
@@ -143,30 +179,215 @@
                 };
                 row.AddChidren(btnName);
 
-                btnName.MouseUpEventHandler = (sender, e) => {
+
+
+                btnName.MouseUpEventHandler = (sender, e) =>
+                {
                     switch (device.spk)
                     {
+                        case SPK.IpCam_Imou:
+
+#if __IOS__
+
+                            //鍒濆鍖栧ぇ鍗庢憚鍍忓ごsdk
+                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().InitSDKWithAppKey("HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
+                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken = UserInfo.Current.LoginTokenString;
+                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshToken = UserInfo.Current.RefreshToken;
+                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
+                            //璺宠浆娣诲姞鎽勫儚澶�(Shared.IOS.HDLCNVRSDK)
+                            hdlLCNVRDelegate = new hdlLCNVRSDKDelegate(() =>
+                            {//娣诲姞鎴愬姛杩斿洖浜嬩欢
+                                refreshView.BeginHeaderRefreshing();
+                                this.RemoveFromParent();
+                            });
+                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().Delegate = hdlLCNVRDelegate;
+                            Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().ToAddDeviceView();
+#else
+                                FunctionList.List.GetIpCamImouList();
+                                if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken))
+                                {
+
+                                    var waitPage = new Loading();
+                                    MainPage.BaseView.AddChidren(waitPage);
+                                    waitPage.Start("");
+                                    new System.Threading.Thread(() =>
+                                    {
+                                        try
+                                        {
+
+#if DEBUG
+                                            Com.Utils.HdlToLcUtils.Instance.ShowErrorInfo(true);
+#endif
+
+                                            var http = new HttpServerRequest();
+                                            var pack = http.GetLcSubAccountToken();
+                                            if (pack.Code == StateCode.SUCCESS)
+                                            {
+                                                if (pack.Data == null || string.IsNullOrEmpty(pack.Data.ToString()))
+                                                {
+                                                    Application.RunOnMainThread(() =>
+                                                    {
+                                                        new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.Get3tyIotInfoFailed));
+                                                        return;
+                                                    });
+                                                }
+                                                Com.Utils.HdlToLcUtils.Instance.InitData(Shared.Application.Activity, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
+                                                Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
+                                                Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
+                                                Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
+
+#if __ANDROID__
+                                                Application.RunOnMainThread(() =>
+                                                {
+                                                    try
+                                                    {
+                                                        var result = Com.Utils.HdlToLcUtils.Instance.CheckCameraPermissions();
+                                                        if (result)
+                                                        {
+                                                            var bindDeviceFeedback = new BindDeviceFeedback();
+                                                            bindDeviceFeedback.tipAction = (method, msg) => {
+                                                                HDLUtils.WriteLine(method + "::" + msg);
+                                                                if(method == "bindDevice")
+                                                                {
+                                                                    var bindResult = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(msg);
+                                                                    if (bindResult != null)
+                                                                    {
+                                                                        string tipTitle = Language.StringByID(StringId.Tip);
+                                                                        if (bindResult.Code == "147021") {
+                                                                            string tipMsg = Language.StringByID(StringId.UnableToBindThisDeviceTip);
+                                                                            new PublicAssmebly().TipMsg(tipTitle, tipMsg);
+                                                                        }
+                                                                        else
+                                                                        {
+                                                                            string tipMsg = $"{bindResult.message}({bindResult.Code})";
+                                                                            new PublicAssmebly().TipMsg(tipTitle, tipMsg);
+                                                                        }
+                                                                    }
+
+                                                                }
+                                                            };
+                                                            Hdl.Onpro.HdlData.Instance.InitData(bindDeviceFeedback, device.productBrand);
+
+                                                            var backTemp = new AddLcCam();
+                                                            backTemp.backAction = () =>
+                                                            {
+                                                                refreshView.BeginHeaderRefreshing();
+                                                                this.RemoveFromParent();
+                                                            };
+                                                            Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);
+                                                            
+                                                        }
+                                                        else
+                                                        {
+                                                            Com.Utils.HdlToLcUtils.Instance.RequestCameraPermissions();
+                                                        }
+                                                    }
+                                                    catch (Exception ex)
+                                                    {
+
+                                                    }
+                                                    finally
+                                                    {
+                                                    }
+                                                });
+#endif
+                                            }
+                                            else
+                                            {
+                                                Application.RunOnMainThread(() =>
+                                                {
+                                                    new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao) + $"({pack.Code})");
+                                                });
+                                            }
+                                        }
+                                        catch (Exception ex)
+                                        {
+                                            MainPage.Log("鍔犺浇涔愭鎽勫儚澶村紓甯�");
+                                        }
+                                        finally
+                                        {
+                                            Application.RunOnMainThread(() =>
+                                            {
+                                                if (waitPage != null)
+                                                {
+                                                    waitPage.RemoveFromParent();
+                                                    waitPage = null;
+                                                }
+                                            });
+                                        }
+                                    })
+                                    { IsBackground = true }.Start();
+                                }
+                                else
+                                {
+                                    var result = Com.Utils.HdlToLcUtils.Instance.CheckCameraPermissions();
+                                    if (result)
+                                    {
+                                        var bindDeviceFeedback = new BindDeviceFeedback();
+                                        bindDeviceFeedback.tipAction = (method, msg) => {
+                                            HDLUtils.WriteLine(method + "::" + msg);
+                                            if (method == "bindDevice")
+                                            {
+                                                var bindResult = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(msg);
+                                                if (bindResult != null)
+                                                {
+                                                    string tipTitle = Language.StringByID(StringId.Tip);
+                                                    if (bindResult.Code == "147021")
+                                                    {
+                                                        string tipMsg = Language.StringByID(StringId.UnableToBindThisDeviceTip);
+                                                        new PublicAssmebly().TipMsg(tipTitle, tipMsg);
+                                                    }
+                                                    else
+                                                    {
+                                                        string tipMsg = $"{bindResult.message}({bindResult.Code})";
+                                                        new PublicAssmebly().TipMsg(tipTitle, tipMsg);
+                                                    }
+                                                }
+                                            }
+                                        };
+                                        Hdl.Onpro.HdlData.Instance.InitData(bindDeviceFeedback, device.productBrand);
+
+
+                                    var backTemp = new AddLcCam();
+                                        backTemp.backAction = () =>
+                                        {
+                                            refreshView.BeginHeaderRefreshing();
+                                            this.RemoveFromParent();
+                                        };
+                                        Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);
+                                    }
+                                    else
+                                    {
+                                        Com.Utils.HdlToLcUtils.Instance.RequestCameraPermissions();
+                                    }
+                                }
+#endif
+                            break;
                         case SPK.IrModule:
                             var form = new AddMiniRemoteControlDirection1Page();
                             form.AddForm();
-                            form.AddDeviceEvent = (functionObj) => {
+                            form.AddDeviceEvent = (functionObj) =>
+                            {
                                 refreshView.BeginHeaderRefreshing();
-                            }; 
+                            };
                             break;
                         case SPK.SenesorMegahealth:
                         case SPK.SenesorMegahealth2:
                         case SPK.SensorMmvPose:
                             var form1 = new AddSenesorMegahealthDirection1Page();
                             form1.AddForm(device);
-                            form1.AddDeviceEvent = (functionObj) => {
+                            form1.AddDeviceEvent = (functionObj) =>
+                            {
                                 refreshView.BeginHeaderRefreshing();
                                 this.RemoveFromParent();
                             };
                             break;
                         case SPK.SensorEnvironment:
+                        case SPK.SensorEnvironmentHailin:
                             var form2 = new AddSensorEnvironmentPage();
                             form2.AddForm(device);
-                            form2.AddDeviceEvent = (functionObj) => {
+                            form2.AddDeviceEvent = (functionObj) =>
+                            {
                                 refreshView.BeginHeaderRefreshing();
                                 this.RemoveFromParent();
                             };
@@ -175,11 +396,20 @@
                         case SPK.SensorEnvironment3:
                             var form3 = new AddQingpingSensorEnvirTipPage();
                             form3.AddForm(device);
-                            form3.AddDeviceEvent = (functionObj) => {
+                            form3.AddDeviceEvent = (functionObj) =>
+                            {
                                 refreshView.BeginHeaderRefreshing();
                                 this.RemoveFromParent();
                             };
                             break;
+                        case SPK.Peephole:
+                        case SPK.VideoDoorLock:
+                        case SPK.Ev_Ipcam:
+                            {
+                                //璺宠浆鍒癮ndroid,ios閭h竟鍘�
+                                HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipAddDeviceActivity(device.spk);
+                            }
+                            break;
                     }
                 };
             }
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
index 7101fbe..11bd0d2 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
@@ -107,6 +107,10 @@
             bool isFrist = true;
             foreach (var brand in brandList)
             {
+                if(brand.productPlatform == "HaiLin")//瀛愭櫞闇�瑕侀殣钘忚繖涓叆鍙o紝鐢辫皟璇曡蒋浠朵笂浼犳暟鎹� 2023-03-09 17:20:33
+                {
+                    continue;
+                }
                 var row = new RowLayout()
                 {
                     Height = Application.GetRealHeight(87),
@@ -165,13 +169,17 @@
                 //涓嬭浇绗笁鏂瑰搧鐗宨con
                 ImageUtlis.Current.Load3tyBrandIconImages(brand.brandName, brand.brandIcon, btnIcon);
 
-                btnName.MouseUpEventHandler = (sender, e) => {
+                EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
                     
                     var page = new DeviceListPage(brand);
                     MainPage.BasePageView.AddChidren(page);
                     page.LoadPage();
                     MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                 };
+                btnName.MouseUpEventHandler = eventHandler;
+                btnIcon.MouseUpEventHandler = eventHandler;
+                btnRight.MouseUpEventHandler = eventHandler;
+                row.MouseUpEventHandler = eventHandler;
             }
 
         }
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
index 2496657..7bc7270 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs
@@ -3,13 +3,16 @@
 using HDL_ON.DAL.Server;
 using HDL_ON.Entity;
 using HDL_ON.UI.CSS;
+using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
 #if __Android__
 using Java.Interop;
+using Android.Content;
+using Hdl.Onpro;
 #endif
 using Shared;
 namespace HDL_ON.UI
 {
-    public class DeviceListPage  : FrameLayout
+    public class DeviceListPage : FrameLayout
     {
         FrameLayout bodyView;
         VerticalRefreshLayout contentView;
@@ -26,124 +29,10 @@
         {
             Action<string, string> action = (s, a) =>
             {
-                if (brand.productBrand == "IMOU")
-                {
-#if __ANDROID__
-
-                    FunctionList.List.GetIpCamImouList();
-
-
-                    if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken))
-                    {
-
-                        var waitPage = new Loading();
-                        MainPage.BaseView.AddChidren(waitPage);
-                        waitPage.Start("");
-                        new System.Threading.Thread(() =>
-                        {
-                            try
-                            {
-
-#if DEBUG
-                                Com.Utils.HdlToLcUtils.Instance.ShowErrorInfo(true);
-#endif
-
-                                var http = new HttpServerRequest();
-                                var pack = http.GetLcSubAccountToken();
-                                if (pack.Code == StateCode.SUCCESS)
-                                {
-                                    if (pack.Data == null || string.IsNullOrEmpty(pack.Data.ToString()))
-                                    {
-                                        Application.RunOnMainThread(() =>
-                                        {
-                                            new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.Get3tyIotInfoFailed));
-                                            return;
-                                        });
-                                    }
-                                    Com.Utils.HdlToLcUtils.Instance.InitData(Shared.Application.Activity, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
-                                    Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
-                                    Com.Utils.HdlToLcUtils.Instance.Token = UserInfo.Current.AccessToken;
-                                    Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
-#if __ANDROID__
-                                    Application.RunOnMainThread(() =>
-                                    {
-                                        try
-                                        {
-                                            
-                                            var result = Com.Utils.HdlToLcUtils.Instance.CheckCameraPermissions();
-                                            if (result)
-                                            {
-                                                var backTemp = new AddLcCam();
-                                                backTemp.backAction = () =>
-                                                {
-                                                    Load3tyBrandDeviceList();
-                                                };
-                                                Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);
-                                            }
-                                            else
-                                            {
-                                                Com.Utils.HdlToLcUtils.Instance.RequestCameraPermissions();
-                                            }
-                                        }
-                                        catch (Exception ex)
-                                        {
-
-                                        }
-                                    });
-#endif
-                                }
-                                else
-                                {
-                                    Application.RunOnMainThread(() =>
-                                    {
-                                        new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao) + $"({pack.Code})");
-                                    });
-                                }
-                            }
-                            catch (Exception ex)
-                            {
-                                MainPage.Log("鍔犺浇涔愭鎽勫儚澶村紓甯�");
-                            }
-                            finally
-                            {
-                                Application.RunOnMainThread(() =>
-                                {
-                                    if (waitPage != null)
-                                    {
-                                        waitPage.RemoveFromParent();
-                                        waitPage = null;
-                                    }
-                                });
-                            }
-                        })
-                        { IsBackground = true }.Start();
-                    }
-                    else
-                    {
-                        var result = Com.Utils.HdlToLcUtils.Instance.CheckCameraPermissions();
-                        if (result)
-                        {
-                            var backTemp = new AddLcCam();
-                            backTemp.backAction = () =>
-                            {
-                                Load3tyBrandDeviceList();
-                            };
-                            Com.Utils.HdlToLcUtils.Instance.AddCamera(backTemp);
-                        }
-                        else
-                        {
-                            Com.Utils.HdlToLcUtils.Instance.RequestCameraPermissions();
-                        }
-                    }
-#endif
-                }
-                else
-                {
-                    var page = new AddDevciePage(brand);
-                    MainPage.BasePageView.AddChidren(page);
-                    page.LoadPage(contentView);
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                }
+                var page = new AddDevciePage(brand);
+                MainPage.BasePageView.AddChidren(page);
+                page.LoadPage(contentView);
+                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
             };
             new TopViewDiv(bodyView, Language.StringByID(StringId.Devices)).LoadTopView_AddIcon("3ty", action);
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
@@ -171,7 +60,8 @@
         {
             var waitPage = new Loading();
             waitPage.Start();
-            new System.Threading.Thread(() => {
+            new System.Threading.Thread(() =>
+            {
                 try
                 {
                     var pm = new HttpServerRequest();
@@ -189,7 +79,7 @@
                             }
                             else
                             {
-                                var tipView = new EmptyTipView(Language.StringByID(StringId.NotAddedAnyDevices),160)
+                                var tipView = new EmptyTipView(Language.StringByID(StringId.NotAddedAnyDevices), 160)
                                 {
                                     Gravity = Gravity.CenterHorizontal,
                                 };
@@ -208,7 +98,8 @@
                 }
                 finally
                 {
-                    Application.RunOnMainThread(() => {
+                    Application.RunOnMainThread(() =>
+                    {
                         if (waitPage != null)
                         {
                             waitPage.RemoveFromParent();
@@ -225,6 +116,10 @@
             bool isFrist = true;
             foreach (var device in deviceList)
             {
+                //if (!this.CheckSupportDevice(device))
+                //{
+                //    continue;
+                //}
                 var row = new RowLayout()
                 {
                     Height = Application.GetRealHeight(50),
@@ -280,7 +175,8 @@
                 };
                 row.AddChidren(btnName);
 
-                btnName.MouseUpEventHandler = (sender, e) => {
+                btnName.MouseUpEventHandler = (sender, e) =>
+                {
                     switch (device.spk)
                     {
                         case SPK.IrModule:
@@ -300,6 +196,7 @@
                             };
                             break;
                         case SPK.SensorEnvironment:
+                        case SPK.SensorEnvironmentHailin:
                         case SPK.SensorEnvironment2:
                         case SPK.SensorEnvironment3:
                             var smPage1 = new SensorEnvironmentManagerPage();
@@ -308,6 +205,21 @@
                             {
                                 contentView.BeginHeaderRefreshing();
                             };
+                            break;
+                        case SPK.VideoDoorLock:
+                            {
+                                CommonMethod.Current.MainThread(() =>
+                                {
+                                    //钀ょ煶瑙嗛闂ㄩ攣
+                                    var form = new VideoDoorLockPage(device, btnName, new Button(), CommonMethod.Comerom.sanfan, () =>
+                                    {
+                                        row.RemoveFromParent();
+                                    });
+                                    MainPage.BasePageView.AddChidren(form);
+                                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                                    form.Show();
+                                });
+                            }
                             break;
                     }
                 };
@@ -379,7 +291,8 @@
                         Width = Application.GetRealWidth(150),
                     };
                     row.AddChidren(btnEdit);
-                    btnEdit.MouseUpEventHandler = (sender, e) =>{
+                    btnEdit.MouseUpEventHandler = (sender, e) =>
+                    {
                         Action<string> callBack = (str) =>
                         {
                             if (string.IsNullOrEmpty(str))
@@ -449,6 +362,23 @@
 
         }
 
+        /// <summary>
+        /// 妫�鏌ユ槸鍚︽敮鎸�
+        /// </summary>
+        /// <param name="function"></param>
+        /// <returns></returns>
+        bool CheckSupportDevice(Function function)
+        {
+
+            if (function == null) return false;
+            if (function.spk == SPK.VideoDoorLock)
+            {
+                return false;
+            }
+            return true;
+
+        }
+
     }
 
 
@@ -463,6 +393,23 @@
 
 
 #if __Android__
+
+    //[Android.Content.BroadcastReceiver(Enabled = true, Exported = false)]
+    //public class ImouReceiver : Android.Content.BroadcastReceiver
+    //{
+    //    public override void OnReceive(Context context, Intent intent)
+    //    {
+    //        if (intent != null)
+    //        {
+    //            string action = intent.Action;
+    //            if (action == "hdlUserDeviceBind")
+    //            {
+    //                string value = intent.GetStringExtra("data");
+    //            }
+    //        }
+    //    }
+    //}
+
     public class AddLcCam : Java.Lang.Object, Com.CallBack.IAddCamera
     {
 
@@ -523,6 +470,17 @@
         {
         }
     }
+
+    public class BindDeviceFeedback : Java.Lang.Object, Hdl.Onpro.IRegisterDeviceFeedback
+    {
+        public Action<string,string> tipAction;
+
+        public void Feedback(string method, string msg)
+        {
+            tipAction?.Invoke(method, msg);
+        }
+    }
+
 #else
     public class AddLcCam
     {
@@ -534,4 +492,8 @@
         }
     }
 #endif
+
+
+
+
 }
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_AuthorizedPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_AuthorizedPage.cs
index 809444b..b736d08 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_AuthorizedPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_AuthorizedPage.cs
@@ -79,14 +79,10 @@
                             TextColor = CSS_Color.FirstLevelTitleColor,
                             TextSize = CSS_FontSize.SubheadingFontSize,
                             Padding = new Padding(0, Application.GetRealWidth(16), 0, Application.GetRealWidth(16)),
-                            Text = "璐︽埛缁戝畾鎴愬姛锛屾偍鍙互缁х画瀹屾垚璁惧鍏宠仈鎿嶄綔",
+                            TextID = StringId.BindIotAccountTip,
                             IsMoreLines = true,
                         };
                         contentView.AddChidren(btnMsg);
-                        if(Language.CurrentLanguage != "Chinese")
-                        {
-                            btnMsg.Text = "Account binding is successful.You can continue to complete the device association operation";
-                        }
 
                         Button btnLine = new Button()
                         {
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs
index 0a77c44..7fe2ade 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs
@@ -59,13 +59,9 @@
                 TextSize = 21,
                 TextAlignment = TextAlignment.CenterLeft,
                 IsBold = true,
-                Text = "鍏充簬璐﹀彿缁戝畾鐨勫0鏄�"
+                TextID = StringId.AboutBindAcountTip,
             };
             contentView.AddChidren(btnTipTitle);
-            if (Language.CurrentLanguage != "Chinese")
-            {
-                btnTipTitle.Text = "Statement on account binding";
-            }
 
             var btnTipText = new Button()
             {
@@ -142,15 +138,10 @@
                 BackgroundColor= CSS_Color.MainColor,
                 TextColor = CSS_Color.MainBackgroundColor,
                 TextSize = CSS_FontSize.SubheadingFontSize,
-                Text = "鍚屾剰鎺堟潈",
+                TextID = StringId.Agree,
                 Radius = (uint)Application.GetRealHeight(22)
             };
             optionView.AddChidren(btnComfirm);
-            if (Language.CurrentLanguage != "Chinese")
-            {
-                btnComfirm.Text = "Consent authorization";
-            }
-
 
             if (!brand_Iot.hasAuthorization)
             {
@@ -177,11 +168,7 @@
             }
             else
             {
-                btnComfirm.Text = "瑙i櫎鎺堟潈";
-                if (Language.CurrentLanguage != "Chinese")
-                {
-                    btnComfirm.Text = "Cancel authorization";
-                }
+                btnComfirm.TextID = StringId.Cancel;
                 btnComfirm.MouseUpEventHandler = (sender, e) =>
                 {
                     Dialog dialog = new Dialog()
@@ -210,14 +197,10 @@
                         TextColor = CSS_Color.FirstLevelTitleColor,
                         TextSize = CSS_FontSize.SubheadingFontSize,
                         Padding = new Padding(0,Application.GetRealWidth(16),0,Application.GetRealWidth(16)),
-                        Text = "鎾ら攢鎺堟潈鍚庯紝璇ュ搧鐗屽叧鑱斿湪On Pro涓殑璁惧灏嗗叏閮ㄨ瑙g粦锛岀浉鍏充娇鐢ㄤ俊鎭悎璁惧鍊间篃灏嗗け鏁�",
+                        TextID = StringId.RevokeAuthorizationTip,
                         IsMoreLines = true,
                     };
                     contentView2.AddChidren(btnMsg);
-                    if (Language.CurrentLanguage != "Chinese")
-                    {
-                        btnMsg.Text = "After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid";
-                    }
 
                     Button btnLine = new Button()
                     {
@@ -236,12 +219,8 @@
                         TextSize = CSS_FontSize.SubheadingFontSize,
                         SelectedTextColor = CSS_Color.MainBackgroundColor,
                         SelectedBackgroundColor = CSS_Color.MainColor,
-                        Text = "纭畾鎾ゅ洖鎺堟潈",
+                        TextID = StringId.ConfirmRevocationOfAuthorization,
                     };
-                    if (Language.CurrentLanguage != "Chinese")
-                    {
-                        btnConfirm.Text = "Confirm to withdraw authorization";
-                    }
                     btnConfirm.SetCornerWithSameRadius(Application.GetMinRealAverage(10), HDLUtils.RectCornerBottomLeft);
                     btnConfirm.SetCornerWithSameRadius(Application.GetMinRealAverage(10), HDLUtils.RectCornerBottomRight);
                     contentView2.AddChidren(btnConfirm);
@@ -280,14 +259,7 @@
                                 }
                                 else
                                 {
-                                    if (Language.CurrentLanguage != "Chinese")
-                                    {
-                                        new Alert("", "Operation failed", "").Show();
-                                    }
-                                    else
-                                    {
-                                        new Alert("", "鎿嶄綔澶辫触", "").Show();
-                                    }
+                                    new Alert("", Language.StringByID(StringId.OperationFailed), "").Show();
                                 }
                             }
                             catch { }
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddCombineDimmingPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddCombineDimmingPage.cs
new file mode 100644
index 0000000..b5611fd
--- /dev/null
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddCombineDimmingPage.cs
@@ -0,0 +1,264 @@
+锘�//using System;
+//using Shared;
+//using HDL_ON.Entity;
+//using HDL_ON.UI.CSS;
+
+//namespace HDL_ON.UI
+//{
+//    public class AddCombineDimmingPage : FrameLayout
+//    {
+//        FrameLayout bodyView;
+
+
+//        GroupControl groupControl;
+
+//        public AddCombineDimmingPage()
+//        {
+//            bodyView = this;
+//            groupControl = new GroupControl();
+//        }
+
+//        public void LoadPage()
+//        {
+//            new TopViewDiv(bodyView, Language.StringByID(StringId.CombinedDimming)).LoadTopView();
+
+//            var contentView = new FrameLayout()
+//            {
+//                Y = Application.GetRealHeight(64),
+//                BackgroundColor = CSS_Color.MainBackgroundColor,
+//                Height = Application.GetRealHeight(550),
+//            };
+//            bodyView.AddChidren(contentView);
+
+//            #region 缁勫悕绉�
+//            FrameLayout groupNameView;
+//            groupNameView = new FrameLayout()
+//            {
+//                Height = Application.GetRealHeight(50),
+//                BackgroundColor = CSS_Color.MainBackgroundColor,
+//            };
+//            contentView.AddChidren(groupNameView);
+//            Button btnGroupNameTitle = new Button()
+//            {
+//                X = Application.GetRealWidth(16),
+//                Width = Application.GetRealWidth(78),
+//                TextID = StringId.GroupNmae,
+//                TextAlignment = TextAlignment.CenterLeft,
+//                TextSize = CSS_FontSize.SubheadingFontSize,
+//                TextColor = CSS_Color.FirstLevelTitleColor,
+//            };
+//            groupNameView.AddChidren(btnGroupNameTitle);
+
+//            var btnGroupName = new EditText()
+//            {
+//                X = Application.GetRealWidth(155),
+//                Width = Application.GetRealWidth(200),
+//                PlaceholderText =Language.StringByID( StringId.PlsEntry),
+//                TextSize = CSS_FontSize.TextFontSize,
+//                TextAlignment = TextAlignment.CenterRight,
+//                TextColor = CSS_Color.TextualColor,
+//            };
+//            groupNameView.AddChidren(btnGroupName);
+
+//            groupNameView.AddChidren(
+//                new Button()
+//                {
+//                    Gravity = Gravity.CenterHorizontal,
+//                    Y = Application.GetRealHeight(49),
+//                    Height = Application.GetRealHeight(1),
+//                    Width = Application.GetRealWidth(343),
+//                    BackgroundColor = CSS_Color.DividingLineColor,
+//                });
+//            #endregion
+//            #region 浣嶇疆绠$悊
+//            var locationMagtView = new FrameLayout()
+//            {
+//                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);
+
+//            var btnLocationValues = new Button()
+//            {
+//                X = Application.GetRealWidth(86),
+//                Width = Application.GetRealWidth(237),
+//                TextAlignment = TextAlignment.CenterRight,
+//                TextColor = CSS_Color.PromptingColor1,
+//                TextSize = CSS_FontSize.TextFontSize,
+//                Text = groupControl.GetRoomListName(),
+//            };
+//            locationMagtView.AddChidren(btnLocationValues);
+
+//            var 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);
+//            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+//            {
+//                //淇敼鍔熻兘鎵�灞炴埧闂翠箣鍚庣殑鍥炶皟浜嬩欢
+//                Action chooseRoomBackAction = () => {
+//                    try
+//                    {
+//                        btnLocationValues.Text = groupControl.GetRoomListName();
+//                    }
+//                    catch { }
+//                };
+//                var view = new GroupChooseRoomPage(groupControl, chooseRoomBackAction);
+//                MainPage.BasePageView.AddChidren(view);
+//                view.LoadPage();
+//                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+//            };
+//            if (btnLocationInfoRight != null)
+//            {
+//                btnLocationInfoRight.MouseUpEventHandler = eventHandler;
+//            }
+//            if (btnLocationValues != null)
+//            {
+//                btnLocationValues.MouseUpEventHandler = eventHandler;
+//            }
+
+//            locationMagtView.AddChidren(
+//                new Button()
+//                {
+//                    Gravity = Gravity.CenterHorizontal,
+//                    BackgroundColor = CSS_Color.DividingLineColor,
+//                    Width = Application.GetRealWidth(343),
+//                    Height = Application.GetRealHeight(1)
+//                });
+//            #endregion
+
+//            #region 璁惧閫夋嫨
+//            contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
+
+//            var chooseFunctionTitleView = new FrameLayout()
+//            {
+//                Height = Application.GetRealHeight(44),
+//                BackgroundColor = CSS_Color.MainBackgroundColor,
+//            };
+//            contentView.AddChidren(chooseFunctionTitleView);
+//            contentView.AddChidren(
+//            new Button()
+//            {
+//                Gravity = Gravity.CenterHorizontal,
+//                Y = Application.GetRealHeight(49),
+//                Height = Application.GetRealHeight(1),
+//                Width = Application.GetRealWidth(343),
+//                BackgroundColor = CSS_Color.DividingLineColor,
+//            });
+
+//            var btnChooseFunctionTitle = new Button()
+//            {
+//                X = Application.GetRealWidth(16),
+//                TextAlignment = TextAlignment.CenterLeft,
+//                TextColor = CSS_Color.MainColor,
+//                TextSize = CSS_FontSize.SubheadingFontSize,
+//                IsBold = true,
+//                TextID = StringId.SelectGroupControlFunction,
+//            };
+//            chooseFunctionTitleView.AddChidren(btnChooseFunctionTitle);
+
+//            var deviceListView = new VerticalScrolViewLayout()
+//            {
+//                Height = Application.GetRealHeight(387),
+//            };
+//            contentView.AddChidren(deviceListView);
+
+//            foreach(var function in FunctionList.List.GetLightList())
+//            {
+//                var functionRow = new FrameLayout()
+//                {
+//                    Height = Application.GetRealHeight(65),
+//                    BackgroundColor = CSS_Color.MainBackgroundColor,
+//                };
+//                deviceListView.AddChidren(functionRow);
+
+//                var btnFunctionName = new Button()
+//                {
+//                    X = Application.GetRealWidth(16),
+//                    Y = Application.GetRealHeight(10),
+//                    Width = Application.GetRealWidth(308),
+//                    Height = Application.GetRealHeight(24),
+//                    TextAlignment = TextAlignment.CenterLeft,
+//                    TextSize = CSS_FontSize.SubheadingFontSize,
+//                    TextColor = CSS_Color.FirstLevelTitleColor,
+//                    Text = function.name,
+//                };
+//                functionRow.AddChidren(btnFunctionName);
+
+//                var btnFunctionLocationInfo = new Button()
+//                {
+//                    X = Application.GetRealWidth(16),
+//                    Y = btnFunctionName.Bottom,
+//                    Width = Application.GetRealWidth(308),
+//                    Height = Application.GetRealHeight(21),
+//                    TextAlignment = TextAlignment.CenterLeft,
+//                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+//                    TextColor = CSS_Color.PromptingColor1,
+//                    Text = function.GetRoomListName(),
+//                };
+//                functionRow.AddChidren(btnFunctionLocationInfo);
+
+
+
+
+//            }
+
+
+//            #endregion
+
+//            #region 搴曢儴纭鎸夐挳
+
+
+
+//            var bottomView = new FrameLayout()
+//            {
+//                Y = Application.GetRealHeight(591),
+//                Height = Application.GetRealHeight(106),
+//                BackgroundColor = CSS_Color.MainBackgroundColor,
+//                Radius = (uint)Application.GetRealWidth(16),
+//            };
+//            bodyView.AddChidren(bottomView);
+
+//            var btnConfrim = new Button()
+//            {
+//                Gravity = Gravity.CenterHorizontal,
+//                Y = Application.GetRealHeight(12),
+//                Width = Application.GetRealWidth(220),
+//                Height = Application.GetRealWidth(44),
+//                TextAlignment = TextAlignment.Center,
+//                TextColor = CSS_Color.MainBackgroundColor,
+//                BackgroundColor = CSS_Color.MainColor,
+//                TextSize = CSS_FontSize.SubheadingFontSize,
+//                IsBold = true,
+//                Radius = (uint)Application.GetRealWidth(22),
+//                TextID = StringId.Complete
+//            };
+//            bottomView.AddChidren(btnConfrim);
+
+//            btnConfrim.MouseUpEventHandler = (sender, e) =>
+//            {
+                
+//            };
+
+//            #endregion
+
+
+//        }
+//    }
+//}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
new file mode 100644
index 0000000..76991c1
--- /dev/null
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
@@ -0,0 +1,711 @@
+锘�
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using HDL_ON.DAL.Server;
+using HDL_ON.DriverLayer;
+using HDL_ON.Entity;
+using HDL_ON.UI.CSS;
+using Shared;
+
+namespace HDL_ON.UI
+{
+    public class AddGroupControlPage : FrameLayout
+    {
+        #region 鎺т欢鍒楄〃
+        /// <summary>
+        /// 褰撳墠绐椾綋
+        /// </summary>
+        FrameLayout bodyView;
+        /// <summary>
+        /// 妤煎眰閫夋嫨涓嬫媺鍥炬爣
+        /// </summary>
+        Button btnFloorDownIcon;
+        /// <summary>
+        /// 妤煎眰鏄剧ず
+        /// </summary>
+        Button btnFloor;
+        /// <summary>
+        /// 鍏ㄩ�夋寜閽�
+        /// </summary>
+        Button btnChooseAll;
+        /// <summary>
+        /// 鍔熻兘鍒楄〃闆嗗悎鏄剧ず鍖哄煙
+        /// </summary>
+        VerticalScrolViewLayout functionListView;
+        /// <summary>
+        /// 瀹屾垚鎸夐挳
+        /// </summary>
+        Button btnConfrim;
+
+        #endregion
+        /// <summary>
+        /// 鍔熻兘鍒楄〃
+        /// </summary>
+        List<Function> groupControlLightList;
+        /// <summary>
+        /// 鏈湴鐨勭伅鍏夊垪琛�
+        /// </summary>
+        List<Function> lightList;
+        /// <summary>
+        /// 鍥炶皟鍒锋柊
+        /// </summary>
+        Action<GroupControl> backActon;
+        /// <summary>
+        /// 鏄惁鏂板缇ゆ帶
+        /// </summary>
+        bool isAdd = true;
+        /// <summary>
+        /// 缂栬緫鐨勭粍鎺ф暟鎹�
+        /// </summary>
+        string editDataString = "";
+
+        GroupControl groupControl;
+
+        GroupControlType groupControlType = new GroupControlType();
+
+        public AddGroupControlPage(GroupControl groupControl, Action<GroupControl> action)
+        {
+            bodyView = this;
+            if(groupControl == null)
+            {
+                this.groupControl = new GroupControl();
+            }
+            else
+            {
+                isAdd = false;
+                this.groupControl = groupControl;
+                editDataString = Newtonsoft.Json.JsonConvert.SerializeObject(this.groupControl);
+            }
+            groupControlLightList = new List<Function>();
+            backActon = action;
+            lightList = FunctionList.List.GetLightList();
+        }
+
+        public void LoadPage()
+        {
+            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
+            new TopViewDiv(bodyView, Language.StringByID(StringId.CombinedDimming)).LoadTopView();
+
+            var contentView = new FrameLayout()
+            {
+                Y = Application.GetRealHeight(64),
+                Height = Application.GetRealHeight(667-64),
+            };
+            bodyView.AddChidren(contentView);
+
+            #region 缁勫悕绉�
+            FrameLayout groupNameView;
+            groupNameView = new FrameLayout()
+            {
+                Height = Application.GetRealHeight(50),
+                BackgroundColor = CSS_Color.MainBackgroundColor,
+            };
+            contentView.AddChidren(groupNameView);
+            Button btnGroupNameTitle = new Button()
+            {
+                X = Application.GetRealWidth(16),
+                Width = Application.GetRealWidth(178),
+                TextID = StringId.GroupNmae,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                TextColor = CSS_Color.FirstLevelTitleColor,
+            };
+            groupNameView.AddChidren(btnGroupNameTitle);
+
+            var etGroupName = new EditText()
+            {
+                X = Application.GetRealWidth(155),
+                Width = Application.GetRealWidth(200),
+                PlaceholderText = Language.StringByID(StringId.PlsEntry),
+                TextSize = CSS_FontSize.TextFontSize,
+                TextAlignment = TextAlignment.CenterRight,
+                TextColor = CSS_Color.TextualColor,
+                PlaceholderTextColor = CSS_Color.PromptingColor1,
+            };
+            groupNameView.AddChidren(etGroupName);
+
+            groupNameView.AddChidren(
+                new Button()
+                {
+                    Gravity = Gravity.CenterHorizontal,
+                    Y = Application.GetRealHeight(49),
+                    Height = Application.GetRealHeight(1),
+                    Width = Application.GetRealWidth(343),
+                    BackgroundColor = CSS_Color.DividingLineColor,
+                });
+            #endregion
+            #region 浣嶇疆绠$悊
+            var locationMagtView = new FrameLayout()
+            {
+                Y = Application.GetRealHeight(50),
+                Height = Application.GetRealHeight(50),
+                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);
+
+            var btnLocationValues = new Button()
+            {
+                X = Application.GetRealWidth(86),
+                Width = Application.GetRealWidth(237),
+                TextAlignment = TextAlignment.CenterRight,
+                TextColor = CSS_Color.PromptingColor1,
+                TextSize = CSS_FontSize.TextFontSize,
+                Text = groupControl.GetRoomListName(),
+            };
+            locationMagtView.AddChidren(btnLocationValues);
+
+            var 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);
+            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+            {
+                Application.HideSoftInput();
+                //淇敼鍔熻兘鎵�灞炴埧闂翠箣鍚庣殑鍥炶皟浜嬩欢
+                Action chooseRoomBackAction = () => {
+                    try
+                    {
+                        groupControl.uids = groupControl.roomIds;
+                        btnLocationValues.Text = groupControl.GetRoomListName();
+                    }
+                    catch { }
+                };
+                var view = new GroupChooseRoomPage(groupControl, chooseRoomBackAction);
+                MainPage.BasePageView.AddChidren(view);
+                view.LoadPage();
+                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+            };
+            btnLocationInfoRight.MouseUpEventHandler = eventHandler;
+            btnLocationValues.MouseUpEventHandler = eventHandler;
+            
+
+            //locationMagtView.AddChidren(
+            //    new Button()
+            //    {
+            //        Y = Application.GetRealHeight(49),
+            //        Gravity = Gravity.CenterHorizontal,
+            //        BackgroundColor = CSS_Color.DividingLineColor,
+            //        Width = Application.GetRealWidth(343),
+            //        Height = Application.GetRealHeight(1)
+            //    });
+            #endregion
+
+            //contentView.AddChidren(new Button()
+            //{
+            //    Y = Application.GetRealHeight(164),
+            //    BackgroundColor = CSS_Color.BackgroundColor,
+            //});
+
+            /// <summary>
+            /// 鎴块棿鍐呭鏄剧ず鍖哄煙
+            /// </summary>
+            var roomFloorChangeView = new FrameLayout()
+            {
+                Y = Application.GetRealHeight(172),
+                Height = Application.GetRealHeight(52),
+                BackgroundColor = CSS_Color.BackgroundColor,
+            };
+            bodyView.AddChidren(roomFloorChangeView);
+            #region 鎴块棿椤堕儴鍒囨崲鏄剧ず鍖哄煙
+            btnFloorDownIcon = new Button()
+            {
+                Width = Application.GetMinRealAverage(16),
+                Height = Application.GetMinRealAverage(16),
+                X = Application.GetRealWidth(16),
+                Y = Application.GetRealHeight(18),
+                UnSelectedImagePath = "Public/DownIcon.png",
+            };
+            roomFloorChangeView.AddChidren(btnFloorDownIcon);
+
+            btnFloor = new Button()
+            {
+                X = btnFloorDownIcon.Right,
+                Width = Application.GetRealWidth(200),
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                TextAlignment = TextAlignment.CenterLeft,
+                Text = DB_ResidenceData.Instance.CurFloor.roomName,
+            };
+            roomFloorChangeView.AddChidren(btnFloor);
+
+            btnChooseAll = new Button()
+            {
+                X = Application.GetRealWidth(245),
+                Width = Application.GetRealWidth(109),
+                TextAlignment = TextAlignment.CenterRight,
+                TextSize = CSS_FontSize.TextFontSize,
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextID = StringId.SelectedAll,
+            };
+            if (groupControlLightList.Count == lightList.Count)
+            {
+                btnChooseAll.TextID = StringId.Cancel;
+            }
+            roomFloorChangeView.AddChidren(btnChooseAll);
+            btnChooseAll.MouseUpEventHandler = (sender, e) => {
+                if (groupControlLightList.Count == lightList.Count)
+                {
+                    groupControlLightList.Clear();
+                    btnChooseAll.TextID = StringId.SelectAll;
+                    btnConfrim.IsSelected = false;
+                }
+                else
+                {
+                    groupControlLightList.Clear();
+                    groupControlLightList.AddRange(lightList);
+                    btnChooseAll.TextID = StringId.Cancel;
+                    btnConfrim.IsSelected = true;
+                }
+
+                for (int i = 0; i < functionListView.ChildrenCount; i++)
+                {
+                    var view = functionListView.GetChildren(i);
+                    if (view.GetType() == typeof(LightRow))
+                    {
+                        if (view.Tag != null && view.Tag.ToString() == "row")
+                        {
+                            for (int j = 0; j < (view as FrameLayout).ChildrenCount; j++)
+                            {
+                                var btn = (view as FrameLayout).GetChildren(j);
+                                if (btn.GetType() == typeof(Button))
+                                {
+                                    if (btn.Tag != null && btn.Tag.ToString() == "ChooseIcon")
+                                    {
+                                        (btn as Button).IsSelected = groupControlLightList.Count == lightList.Count;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+            #endregion
+
+            functionListView = new VerticalScrolViewLayout()
+            {
+                Y = Application.GetRealHeight(220),
+                Height = Application.GetRealHeight(640 - 12 - 52 - 100 -100),
+            };
+            bodyView.AddChidren(functionListView);
+
+
+            functionListView.AddChidren(new Button()
+            {
+                Height = Application.GetRealHeight(10),
+            });
+
+            #region 搴曢儴view
+            var bottomView = new FrameLayout()
+            {
+                Y = Application.GetRealHeight(591),
+                Height = Application.GetRealHeight(100),
+                BackgroundColor = CSS_Color.MainBackgroundColor,
+                Radius = (uint)Application.GetRealWidth(12),
+            };
+            this.AddChidren(bottomView);
+
+            btnConfrim = new Button()
+            {
+                Y = Application.GetRealHeight(12),
+                Gravity = Gravity.CenterHorizontal,
+                Width = Application.GetRealWidth(220),
+                Height = Application.GetRealHeight(44),
+                Radius = (uint)Application.GetRealHeight(22),
+                TextAlignment = TextAlignment.Center,
+                TextColor = CSS_Color.MainBackgroundColor,
+                BackgroundColor = CSS_Color.BackgroundColor,
+                TextID = StringId.Confirm,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                SelectedTextColor = CSS_Color.MainBackgroundColor,
+                SelectedBackgroundColor = CSS_Color.MainColor,
+                IsSelected = !isAdd
+            };
+            bottomView.AddChidren(btnConfrim);
+            btnConfrim.MouseUpEventHandler = (sender, e) => {
+                if (btnConfrim.IsSelected)
+                {
+                    //淇濆瓨缇ゆ帶鏁版嵁
+                    var name = etGroupName.Text.Trim();
+                    if (string.IsNullOrEmpty(name))
+                    {
+                        new PublicAssmebly().TipMsg(StringId.Tip, StringId.PlsEntryGroupName);
+                        return;
+                    }
+                    if (groupControlLightList.Count < 2)
+                    {
+                        new PublicAssmebly().TipMsg(StringId.Tip, StringId.PlsSelectMoreData);
+                        return;
+                    }
+                    if (isAdd)
+                    {
+                        groupControl.name = name;
+                        groupControl.sids.Clear();
+                        foreach (var light in groupControlLightList)
+                        {
+                            try
+                            {
+                                var gc = new GroupControlFunction();
+                                gc.sid = light.sid;
+                                gc.spk = light.spk;
+                                groupControl.sids.Add(gc);
+                            }
+                            catch (Exception ex)
+                            {
+                                MainPage.Log($"鏂板缇ゆ帶杞崲鏁版嵁寮傚父:{ex.Message}");
+                            }
+                        }
+                        try
+                        {
+                            groupControl.type = groupControlType.type;
+                            groupControl.sid = groupControl.NewGroupControlSid();
+                            var pack = Common.ApiUtlis.Ins.HttpRequest.AddGroupControl(new List<GroupControl>() { groupControl });
+                            if (pack != null)
+                            {
+                                if (pack.Code == StateCode.SUCCESS)
+                                {
+                                    try
+                                    {
+                                        var addTemp = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GroupControl>>(pack.Data.ToString());
+                                        if (addTemp != null && addTemp.Count > 0)
+                                            groupControl.userDeviceGroupControlId = addTemp[0].userDeviceGroupControlId;
+                                        FunctionList.List.groupControls.Add(groupControl);
+                                    }
+                                    catch (Exception ex)
+                                    {
+                                        MainPage.Log($"娣诲姞缇ゆ帶鎴愬姛锛岃浆璇戣繑鍥炴暟鎹け璐�:{ex.Message}");
+                                    }
+                                    backActon?.Invoke(groupControl);
+                                    this.RemoveFromParent();
+                                }
+                                else
+                                {
+                                    IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            MainPage.Log($"鏂板缇ゆ帶寮傚父:{ex.Message}");
+                        }
+                    }
+                    else
+                    {
+                        try
+                        {
+                            var newEditDataString = Newtonsoft.Json.JsonConvert.SerializeObject(this.groupControl);
+                            //娌℃湁鏇存柊鏁版嵁鍒欑洿鎺ラ��鍑�
+                            if (newEditDataString == editDataString)
+                            {
+                                this.RemoveFromParent();
+                                return;
+                            }
+                            groupControl.sids.Clear();
+                            foreach (var light in groupControlLightList)
+                            {
+                                try
+                                {
+                                    var gc = new GroupControlFunction();
+                                    gc.sid = light.sid;
+                                    gc.spk = light.spk;
+                                    groupControl.sids.Add(gc);
+                                }
+                                catch (Exception ex)
+                                {
+                                    MainPage.Log($"鏂板缇ゆ帶杞崲鏁版嵁寮傚父:{ex.Message}");
+                                }
+                            }
+
+                            var pack = Common.ApiUtlis.Ins.HttpRequest.EditGroupControl(new List<GroupControl>() { groupControl });
+                            if (pack != null)
+                            {
+                                if (pack.Code == StateCode.SUCCESS)
+                                {
+                                    var temp = FunctionList.List.groupControls.Find((obj) => obj.userDeviceGroupControlId == groupControl.userDeviceGroupControlId);
+                                    if(temp!= null)
+                                    {
+                                        temp = groupControl;
+                                    }
+                                    backActon?.Invoke(temp);
+                                    this.RemoveFromParent();
+                                }
+                                else
+                                {
+                                    IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            MainPage.Log($"缂栬緫缇ゆ帶寮傚父:{ex.Message}");
+                        }
+
+                    }
+                }
+            };
+
+            #endregion
+
+
+            LoadDialog_ChangeFloor();
+
+
+            new Thread(() => {
+                if (isAdd)
+                {
+                    var pack = Common.ApiUtlis.Ins.HttpRequest.GetGroupControlTypes("light.switch");
+                    if (pack != null)
+                    {
+                        if (pack.Code == StateCode.SUCCESS)
+                        {
+                            try
+                            {
+
+                                var groupControlTypes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GroupControlType>>(pack.Data.ToString());
+                                if (groupControlTypes != null && groupControlTypes.Count > 0)
+                                {
+                                    groupControlType = groupControlTypes[0];
+                                    Application.RunOnMainThread(() => {
+                                        LoadLightRow(lightList);
+                                    });
+                                }
+                            }
+                            catch (Exception ex)
+                            {
+                                MainPage.Log($"璇诲彇缁勬帶绫诲瀷澶辫触:{ex.Message}");
+                            }
+                        }
+                        else
+                        {
+                            IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+                        }
+                    }
+                }
+                else
+                {
+                    var pack = Common.ApiUtlis.Ins.HttpRequest.GetGroupControInfo(groupControl.userDeviceGroupControlId);
+                    if (pack != null)
+                    {
+                        if (pack.Code == StateCode.SUCCESS)
+                        {
+                            try
+                            {
+
+                                var groupControlTemps = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GroupControl>>(pack.Data.ToString());
+                                if (groupControlTemps != null && groupControlTemps.Count > 0)
+                                {
+                                    groupControl = groupControlTemps[0];
+                                    Application.RunOnMainThread(() =>
+                                    {
+                                        if (groupControl.sids.Count == lightList.Count)
+                                        {
+                                            btnChooseAll.TextID = StringId.Cancel;
+                                        }
+                                        LoadLightRow(lightList);
+                                    });
+                                }
+                            }
+                            catch (Exception ex)
+                            {
+                                MainPage.Log($"璇诲彇缁勬帶淇℃伅澶辫触:{ex.Message}");
+                            }
+                        }
+                        else
+                        {
+                            IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+                        }
+                    }
+                }
+            }) { IsBackground = true }.Start();
+
+            if (!isAdd)
+            {
+                etGroupName.Text = groupControl.name;
+                btnLocationValues.Text = groupControl.GetRoomListName();
+            }
+        }
+
+        /// <summary>
+        /// 鏄剧ず鐨勮澶囩殑鎬绘暟
+        /// </summary>
+        int showCount = -1;
+
+        /// <summary>
+        /// 鍔犺浇鍔熻兘row
+        /// </summary>
+        /// <param name="lightList"></param>
+        void LoadLightRow(List<Function> functions, bool isAppend = false)
+        {
+            var waitPage = new Loading();
+            bodyView.AddChidren(waitPage);
+            waitPage.Start("");
+
+            new Thread(() =>
+            {
+                try
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (!isAppend)
+                        {
+                            showCount = -1;
+                            functionListView.RemoveAll();
+                        }
+                        for(var i =0;i<100;i++)
+                        //foreach (var function in functions)
+                        {
+                            showCount++;
+                            if (showCount >= functions.Count)
+                            {
+                                break;
+                            }
+                            var function = functions[showCount];
+
+                            var functionDiv = new LightRow(function)
+                            {
+                                Gravity = Gravity.CenterHorizontal,
+                                Height = Application.GetRealHeight(62),
+                                BorderColor = 0x00FFFFFF,
+                                BorderWidth = 1,
+                                BackgroundColor = CSS_Color.MainBackgroundColor,
+                                Tag = "row"
+                            };
+                            functionDiv.AddChidren(new Button()
+                            {
+                                Y = Application.GetRealHeight(61),
+                                Gravity = Gravity.CenterHorizontal,
+                                Width = Application.GetRealWidth(343),
+                                Height = Application.GetRealWidth(1),
+                                BackgroundColor = CSS_Color.DividingLineColor,
+                            });
+
+                            Action setAction = () =>
+                            {
+                                if (groupControlLightList.Count > 1)
+                                {
+                                    btnConfrim.IsSelected = true;
+                                }
+                                else
+                                {
+                                    btnConfrim.IsSelected = false;
+                                }
+                                if (groupControlLightList.Count != functions.Count)
+                                {
+                                    btnChooseAll.TextID = StringId.SelectedAll;
+                                }
+                                else
+                                {
+                                    if(btnChooseAll.TextID != StringId.Cancel)
+                                        btnChooseAll.TextID = StringId.Cancel;
+                                }
+                            };
+                            if (groupControl.sids.Find((obj) => obj.sid == function.sid) != null)
+                            {
+                                groupControlLightList.Add(function);
+                            }
+
+                            functionDiv.LoadDiv(groupControlLightList, setAction);
+                            functionListView.AddChidren(functionDiv);
+                        }
+
+                        if (functions.Count > showCount)
+                        {
+                            var btnAppend = new Button()
+                            {
+                                Height = Application.GetRealHeight(60),
+                                TextAlignment = TextAlignment.Center,
+                                TextSize = CSS_FontSize.SubheadingFontSize,
+                                TextColor = CSS_Color.FirstLevelTitleColor,
+                                TextID = StringId.LoadMore,
+                            };
+                            functionListView.AddChidren(btnAppend);
+                            btnAppend.MouseUpEventHandler = (sender, e) =>
+                            {
+                                btnAppend.RemoveFromParent();
+                                LoadLightRow(functions, true);
+                            };
+                        }
+                    });
+                }
+                catch (Exception ex)
+                {
+                    MainPage.Log("ShowFunctionRowError : " + ex.Message);
+                }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (waitPage != null)
+                        {
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
+                    });
+                }
+            })
+            { IsBackground = true }.Start();
+
+        }
+
+
+        /// <summary>
+        /// 浣忓畢鍒楄〃鐐瑰嚮浜嬩欢
+        /// </summary>
+        void LoadDialog_ChangeFloor()
+        {
+            string nowSelectId = null;
+            btnFloor.MouseUpEventHandler += (sender, e) =>
+            {
+                Application.HideSoftInput();
+                //鏄剧ず涓嬫媺鍒楄〃
+                var form = new FloorRoomSelectPopupView();
+                form.ShowDeviceFunctionView(btnFloor, this.lightList, (selectId, listFunc) =>
+                {
+                    groupControlLightList.Clear();
+                    groupControl.sids.Clear();
+                    btnChooseAll.TextID = StringId.SelectAll;
+                    btnConfrim.IsSelected = false;
+                    btnChooseAll.MouseUpEventHandler = (sender2, e2) => {
+                        if (groupControlLightList.Count == listFunc.Count)
+                        {
+                            groupControlLightList.Clear();
+                            btnChooseAll.TextID = StringId.SelectAll;
+                            btnConfrim.IsSelected = false;
+                        }
+                        else
+                        {
+                            groupControlLightList.Clear();
+                            groupControlLightList.AddRange(listFunc);
+                            btnChooseAll.TextID = StringId.Cancel;
+                            btnConfrim.IsSelected = true;
+                        }
+                        LoadLightRow(listFunc);
+                    };
+                    nowSelectId = selectId;
+                    //閲嶆柊鍔犺浇鐣岄潰
+                    LoadLightRow(listFunc);
+                }, nowSelectId,100);
+            };
+        }
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
new file mode 100644
index 0000000..6d960f5
--- /dev/null
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
@@ -0,0 +1,271 @@
+锘縰sing System;
+using System.Collections.Generic;
+using HDL_ON.Common;
+using HDL_ON.DAL.Server;
+using HDL_ON.Entity;
+using HDL_ON.UI.CSS;
+using Shared;
+
+namespace HDL_ON.UI
+{
+    public class CombinedDimmingListPage : FrameLayout
+    {
+        FrameLayout bodyView;
+        VerticalScrolViewLayout contentView;
+
+        public CombinedDimmingListPage()
+        {
+            bodyView = this;
+        }
+
+        public void LoadPage()
+        {
+
+            new TopViewDiv(bodyView, Language.StringByID(StringId.CombinedDimming)).LoadTopView_AddIcon("CombinedDimming",
+                (s,c)=>{
+                    try
+                    {
+                        var page = new AddGroupControlPage(null,
+                            (newGC)=> {
+                                ReadGroupControlList();
+                            });
+                        MainPage.BasePageView.AddChidren(page);
+                        page.LoadPage();
+                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                    }
+                    catch { }
+                });
+
+            contentView = new VerticalScrolViewLayout()
+            {
+                Y = Application.GetRealHeight(64),
+                Height = Application.GetRealHeight(667 - 64),
+                BackgroundColor = CSS_Color.MainBackgroundColor,
+            };
+            bodyView.AddChidren(contentView);
+
+            ReadGroupControlList();
+
+            #region 
+            contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
+
+            
+
+            #endregion
+
+        }
+        /// <summary>
+        /// 璇诲彇缁勬帶鏁版嵁
+        /// </summary>
+        private void ReadGroupControlList()
+        {
+
+            new System.Threading.Thread(() => {
+                var pack = ApiUtlis.Ins.HttpRequest.GetGroupControlList();
+                if (pack != null)
+                {
+                    if (pack.Code == StateCode.SUCCESS)
+                    {
+                        try
+                        {
+                            var groupControlList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GroupControl>>(pack.Data.ToString());
+                            Application.RunOnMainThread(() =>
+                            {
+                                LoadGroupControlView(groupControlList);
+                            });
+                        }
+                        catch (Exception ex)
+                        {
+                            MainPage.Log($"璇诲彇缁勬帶鍒楄〃澶辫触:{ex.Message}");
+                        }
+                    }
+                    else
+                    {
+                        IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+                    }
+                }
+            })
+            { IsBackground = true }.Start();
+
+        }
+
+
+        private void LoadGroupControlView(List<GroupControl> list)
+        {
+#if DEBUG
+            if (list.Count == 0)
+            {
+                list.Add(new GroupControl()
+                {
+                    name = "缁勫悎璋冨厜1",
+                    roomIds = new List<string> { Room.CurrentSpatial.RoomList[0].roomId },
+                    sid = "00000000000000001",
+                    type = "light",
+                });
+
+                list.Add(new GroupControl()
+                {
+                    name = "缁勫悎璋冨厜2",
+                    roomIds = new List<string> { Room.CurrentSpatial.RoomList[0].roomId },
+                    sid = "00000000000000002",
+                    type = "light",
+                });
+            }
+
+#endif
+
+            if (list.Count == 0)
+            {
+
+            }
+            else
+            {
+                contentView.RemoveAll();
+
+                foreach (var groupControl in list)
+                {
+                    var functionRow = new RowLayout()
+                    {
+                        Height = Application.GetRealHeight(65),
+                        BackgroundColor = CSS_Color.MainBackgroundColor,
+                        LineColor = 0x00000000
+                    };
+                    contentView.AddChidren(functionRow);
+
+                    var btnRight = new Button()
+                    {
+                        X = Application.GetRealWidth(339),
+                        Gravity = Gravity.CenterVertical,
+                        Width = Application.GetMinRealAverage(16),
+                        Height = Application.GetMinRealAverage(16),
+                        UnSelectedImagePath = "Public/Right.png",
+                    };
+                    functionRow.AddChidren(btnRight);
+
+                    var btnFunctionName = new Button()
+                    {
+                        X = Application.GetRealWidth(16),
+                        Y = Application.GetRealHeight(10),
+                        Width = Application.GetRealWidth(308),
+                        Height = Application.GetRealHeight(24),
+                        TextAlignment = TextAlignment.CenterLeft,
+                        TextSize = CSS_FontSize.SubheadingFontSize,
+                        TextColor = CSS_Color.FirstLevelTitleColor,
+                        Text = groupControl.name,
+                    };
+                    functionRow.AddChidren(btnFunctionName);
+
+                    var btnFunctionLocationInfo = new Button()
+                    {
+                        X = Application.GetRealWidth(16),
+                        Y = btnFunctionName.Bottom,
+                        Width = Application.GetRealWidth(308),
+                        Height = Application.GetRealHeight(21),
+                        TextAlignment = TextAlignment.CenterLeft,
+                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                        TextColor = CSS_Color.PromptingColor1,
+                        Text = groupControl.GetRoomListName(),
+                    };
+                    functionRow.AddChidren(btnFunctionLocationInfo);
+
+
+
+                    functionRow.AddChidren(
+                        new Button()
+                        {
+                            Gravity = Gravity.CenterHorizontal,
+                            Y = Application.GetRealHeight(64),
+                            Height = Application.GetRealHeight(1),
+                            Width = Application.GetRealWidth(343),
+                            BackgroundColor = CSS_Color.DividingLineColor,
+                        });
+
+                    EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
+                        var page = new AddGroupControlPage(groupControl,
+                           (newGC) => {
+                               try
+                               {
+                                   Application.RunOnMainThread(() =>
+                                   {
+                                       groupControl.roomIds = newGC.uids;
+                                       btnFunctionLocationInfo.Text = newGC.GetUidListName();
+                                   });
+                               }catch(Exception ex)
+                               {
+                                   MainPage.Log($"鍒锋柊缇ゆ帶鎴块棿淇℃伅寮傚父:{ex.Message}");
+                               }
+                           });
+                        MainPage.BasePageView.AddChidren(page);
+                        page.LoadPage();
+                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                    };
+                    functionRow.MouseUpEventHandler = eventHandler;
+                    btnRight.MouseUpEventHandler = eventHandler;
+                    btnFunctionName.MouseUpEventHandler = eventHandler;
+                    btnFunctionLocationInfo.MouseUpEventHandler = eventHandler;
+
+                    var btnDelGroupControl = new Button()
+                    {
+                        TextColor = CSS_Color.MainBackgroundColor,
+                        BackgroundColor = CSS_Color.WarningColor,
+                        TextID = StringId.Del,
+                        TextAlignment = TextAlignment.Center,
+                    };
+                    functionRow.AddRightView(btnDelGroupControl);
+                    btnDelGroupControl.MouseUpEventHandler = (sender1, e1) => {
+                        var waitPage = new Loading();
+                        this.AddChidren(waitPage);
+                        waitPage.Start("");
+                        new System.Threading.Thread(() =>
+                        {
+                            try
+                            {
+                                var pack = ApiUtlis.Ins.HttpRequest.DelGroupControl(groupControl.userDeviceGroupControlId);
+                                if (pack != null)
+                                {
+                                    Application.RunOnMainThread(() =>
+                                    {
+                                        try
+                                        {
+                                            if (pack.Code == StateCode.SUCCESS)
+                                            {
+                                                list.Remove(groupControl);
+                                                LoadGroupControlView(list);
+                                            }
+                                            else
+                                            {
+                                                IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+                                            }
+                                        }catch(Exception ex)
+                                        {
+                                            MainPage.Log($"鍒锋柊缁勬帶鏁版嵁寮傚父:{ex.Message}");
+                                        }
+                                    });
+                                }
+                            }catch(Exception ex)
+                            {
+                                MainPage.Log($"鍒犻櫎缁勬帶寮傚父:{ex.Message}");
+                            }
+                            finally
+                            {
+                                Application.RunOnMainThread(() => {
+                                    if (waitPage != null)
+                                    {
+                                        waitPage.Hide();
+                                        waitPage.RemoveFromParent();
+                                        waitPage = null;
+                                    }
+                                });
+                            }
+                        })
+                        { IsBackground = true }.Start();
+                    };
+
+                }
+
+            }
+        }
+
+
+    }
+}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs
new file mode 100644
index 0000000..c4ed617
--- /dev/null
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupChooseRoomPage.cs
@@ -0,0 +1,251 @@
+锘�
+using System;
+using HDL_ON.DAL.Server;
+using HDL_ON.Entity;
+using HDL_ON.UI.CSS;
+using Shared;
+
+namespace HDL_ON.UI
+{
+    /// <summary>
+    /// 鍔熻兘鍒嗛厤鎴块棿鐣岄潰
+    /// </summary>
+    public partial class GroupChooseRoomPage : FrameLayout
+    {
+        #region 鎺т欢鍒楄〃
+        FrameLayout bodyView;
+        /// <summary>
+        /// 鍐呭鍔犺浇鍖哄煙
+        /// </summary>
+        VerticalScrolViewLayout contentView;
+
+        Button btnAllRoomText;
+        Button btnChooseAll;
+
+        #endregion
+
+        #region 灞�閮ㄥ彉閲�
+
+        GroupControl function
+            ;
+        /// <summary>
+        /// 鍥炶皟浜嬩欢
+        /// </summary>
+        Action backAction;
+        #endregion
+
+        public GroupChooseRoomPage(GroupControl groupControl, Action action)
+        {
+            bodyView = this;
+            this.function = groupControl;
+            backAction = action;
+        }
+
+        public override void RemoveFromParent()
+        {
+            new System.Threading.Thread(() =>
+            {
+                Application.RunOnMainThread(() =>
+                {
+                    backAction?.Invoke();
+                });
+            })
+            { IsBackground = true }.Start();
+            base.RemoveFromParent();
+        }
+
+        /// <summary>
+        /// 鍔犺浇椤甸潰
+        /// </summary>
+        public void LoadPage()
+        {
+            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
+            new TopViewDiv(bodyView, Language.StringByID(StringId.CombinedDimming)).LoadTopView();
+
+            contentView = new VerticalScrolViewLayout()
+            {
+                Y = Application.GetRealHeight(64),
+                Height = Application.GetRealHeight(667 - 64),
+            };
+            bodyView.AddChidren(contentView);
+
+            var allRoomView = new FrameLayout()
+            {
+                Height = Application.GetRealHeight(50),
+                BackgroundColor = CSS_Color.MainBackgroundColor,
+            };
+            contentView.AddChidren(allRoomView);
+
+            btnChooseAll = new Button()
+            {
+                X = Application.GetRealWidth(331),
+                Gravity = Gravity.CenterVertical,
+                Width = Application.GetMinRealAverage(28),
+                Height = Application.GetMinRealAverage(28),
+                UnSelectedImagePath = "Public/ChooseIcon.png",
+                SelectedImagePath = "Public/ChooseOnIcon.png",
+                IsSelected = true
+            };
+            allRoomView.AddChidren(btnChooseAll);
+
+            btnAllRoomText = new Button()
+            {
+                X = Application.GetRealWidth(16),
+                TextID = StringId.All,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextAlignment = TextAlignment.CenterLeft,
+            };
+            allRoomView.AddChidren(btnAllRoomText);
+
+
+            foreach (var room in SpatialInfo.CurrentSpatial.RoomList)
+            {
+                var roomView = new FrameLayout()
+                {
+                    Height = Application.GetRealHeight(50),
+                    BackgroundColor = CSS_Color.MainBackgroundColor,
+                    Tag = "row"
+                };
+                contentView.AddChidren(roomView);
+
+                var btnLine = new Button()
+                {
+                    Gravity = Gravity.CenterHorizontal,
+                    Height = Application.GetMinReal(1),
+                    Width = Application.GetRealWidth(343),
+                    BackgroundColor = CSS_Color.DividingLineColor,
+                };
+                roomView.AddChidren(btnLine);
+
+                Button btnChoose = new Button()
+                {
+                    X = Application.GetRealWidth(331),
+                    Gravity = Gravity.CenterVertical,
+                    Width = Application.GetMinRealAverage(28),
+                    Height = Application.GetMinRealAverage(28),
+                    UnSelectedImagePath = "Public/ChooseIcon.png",
+                    SelectedImagePath = "Public/ChooseOnIcon.png",
+                    IsSelected = function.roomIds.Contains(room.roomId),
+                    Tag = "ChooseIcon"
+                };
+                roomView.AddChidren(btnChoose);
+
+                Button btnRoomText = new Button()
+                {
+                    X = Application.GetRealWidth(16),
+                    //Width = Application.GetRealWidth(280),
+                    TextSize = CSS_FontSize.SubheadingFontSize,
+                    TextColor = CSS_Color.FirstLevelTitleColor,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    Text = room.floorName + room.roomName,
+                };
+                roomView.AddChidren(btnRoomText);
+                btnRoomText.MouseUpEventHandler = (sender, e) => {
+                    btnChoose.IsSelected = !btnChoose.IsSelected;
+                    LoadEvent_RoomSelected(room, btnChoose.IsSelected);
+                };
+
+                if (!function.roomIds.Contains(room.roomId) && btnChooseAll.IsSelected)
+                {
+                    btnChooseAll.IsSelected = false;
+                }
+
+            }
+
+            LoadEventLoad();
+        }
+    }
+    /// <summary>
+    /// 鍔熻兘鍒嗛厤鎴块棿BLL
+    /// </summary>
+    public partial class GroupChooseRoomPage
+    {
+        /// <summary>
+        /// 鍔犺浇浜嬩欢鍒楄〃
+        /// </summary>
+        void LoadEventLoad()
+        {
+            LoadMethod_AllElection();
+        }
+
+        /// <summary>
+        /// 鍏ㄩ�夋寜閽簨浠�
+        /// </summary>
+        void LoadMethod_AllElection()
+        {
+            btnAllRoomText.MouseUpEventHandler = (sender, e) =>
+            {
+                try
+                {
+                    btnChooseAll.IsSelected = !btnChooseAll.IsSelected;
+
+                    for (int i = 0; i < contentView.ChildrenCount; i++)
+                    {
+                        var view = contentView.GetChildren(i);
+                        if (view.GetType() == typeof(FrameLayout))
+                        {
+                            if (view.Tag != null && view.Tag.ToString() == "row")
+                            {
+                                for (int j = 0; j < (view as FrameLayout).ChildrenCount; j++)
+                                {
+                                    var btn = (view as FrameLayout).GetChildren(j);
+                                    if (btn.GetType() == typeof(Button))
+                                    {
+                                        if (btn.Tag != null && btn.Tag.ToString() == "ChooseIcon")
+                                        {
+                                            (btn as Button).IsSelected = btnChooseAll.IsSelected;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    function.roomIds.Clear();
+                    if (btnChooseAll.IsSelected)
+                    {
+                        foreach (var room in Entity.SpatialInfo.CurrentSpatial.RoomList)
+                        {
+                            if (btnChooseAll.IsSelected)
+                            {
+                                function.roomIds.Add(room.roomId);
+                            }
+                        }
+                    }
+                }catch(Exception ex)
+                {
+                    MainPage.Log($"GroupChooseRoom 鍏ㄩ�夋寜閽簨浠� error : {ex.Message}");
+                    Application.RunOnMainThread(() => {
+                        this.RemoveFromParent();
+                    });
+                }
+            };
+        }
+
+        /// <summary>
+        /// 鎴块棿閫変腑浜嬩欢
+        /// </summary>
+        void LoadEvent_RoomSelected(Entity.Room room, bool isAdd)
+        {
+            if (isAdd)
+            {
+                function.roomIds.Add(room.roomId);
+            }
+            else
+            {
+                function.roomIds.Remove(room.roomId);
+            }
+
+
+            if (function.roomIds.Count == SpatialInfo.CurrentSpatial.RoomList.Count)
+            {
+                btnChooseAll.IsSelected = true;
+            }
+            else
+            {
+                btnChooseAll.IsSelected = false;
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs
new file mode 100644
index 0000000..30fbc37
--- /dev/null
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs
@@ -0,0 +1,201 @@
+锘縰sing System;
+using System.Collections.Generic;
+using HDL_ON.Common;
+using HDL_ON.DAL.Server;
+using HDL_ON.DriverLayer;
+using Shared;
+
+namespace HDL_ON.Entity
+{
+    public class GroupControl : Function
+    {
+        public GroupControl()
+        {
+            spk = "GroupControl";
+        }
+        /// <summary>
+        /// 缇ゆ帶ID
+        /// </summary>
+        public string userDeviceGroupControlId = string.Empty;
+        /// <summary>
+        /// 缇ゆ帶sid
+        /// </summary>
+        //public string sid = string.Empty;
+        /// <summary>
+        /// 鐢熸垚缇ゆ帶sid
+        /// </summary>
+        public string NewGroupControlSid()
+        {
+            string sceneId = "";
+            try
+            {
+                string sOidBeginsWith = "000101";//鍘傚晢 + 閫氳鏂瑰紡
+                DateTime dt = DateTime.Now;
+                DateTime startTime = TimeZoneInfo.ConvertTimeToUtc(new DateTime(2020, 1, 1));
+                long m = (long)((dt - startTime).TotalMilliseconds / 10);
+                string sTimeSpan = "00000000";
+
+                byte[] arry = new byte[4];
+                arry[0] = (byte)(m & 0xFF);
+                arry[1] = (byte)((m & 0xFF00) >> 8);
+                arry[2] = (byte)((m & 0xFF0000) >> 16);
+                arry[3] = (byte)((m >> 24) & 0xFF);
+                sTimeSpan = arry[0].ToString("X2") + arry[1].ToString("X2") + arry[2].ToString("X2") + arry[3].ToString("X2");
+
+
+                if (sTimeSpan.Length >= 8)
+                {
+                    sTimeSpan = sTimeSpan.Substring(0, 8);
+                }
+                else
+                {
+                    sTimeSpan = Guid.NewGuid().ToString().Substring(0, 8);
+                    //sTimeSpan = "00000000";
+                }
+
+                sceneId = sOidBeginsWith + sTimeSpan;
+
+                sceneId += "AA";
+                sceneId += "AA01";
+                int maxId = 1;
+
+                Random random = new Random(Guid.NewGuid().GetHashCode());
+                maxId = random.Next(10);
+
+                sceneId += (maxId + 1).ToString("X4");
+                sceneId += "0000";
+            }
+            catch
+            {
+                return sceneId;
+            }
+            return sceneId;
+        }
+        /// <summary>
+        /// 缇ゆ帶鍚嶇О
+        /// </summary>
+        //public string name = string.Empty;
+        /// <summary>
+        /// 缇ゆ帶绫诲瀷
+        /// </summary>
+        public string type = string.Empty;
+        /// <summary>
+        /// 鎴块棿uid
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public List<string> uids = new List<string>();
+        //public List<String> roomIds = new List<string>();
+        /// <summary>
+        /// 缇ゆ帶鍔熻兘sid閰嶇疆
+        /// </summary>
+        public List<GroupControlFunction> sids = new List<GroupControlFunction>();
+
+        /// <summary>
+        /// 鑾峰彇璁惧娣诲姞鍒版埧闂寸殑鎴块棿鍚嶇О
+        /// </summary>
+        /// <returns></returns>
+        public string GetUidListName()
+        {
+            string roomNameList = "";
+            foreach (var roomId in uids)
+            {
+                var findRoom = SpatialInfo.CurrentSpatial.RoomList.Find(obj => obj.roomId == roomId);
+                if (findRoom == null)
+                {
+                    continue;
+                }
+                if (roomNameList != "")
+                {
+                    roomNameList += ",";
+                }
+                roomNameList += findRoom.floorName + "-" + findRoom.roomName;
+            }
+            if (roomNameList == "")
+            {
+                roomNameList = Language.StringByID(StringId.WholeZone);
+            }
+            return roomNameList;
+        }
+
+        /// <summary>
+        /// 缇ゆ帶鎺у埗
+        /// </summary>
+        /// <param name="pairs"></param>
+        public void Control(Dictionary<string,string> pairs)
+        {
+            try
+            {
+               
+                if (DriverLayer.Control.Ins.GatewayOnline_Local)
+                {
+                    var functionControlDataObj = GetGatewayAlinkControlData(pairs);
+                    var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
+                    var sendBytes = DriverLayer.Control.Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlGroupControlTopic, functionControlDataJson);
+                    new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id, 3);
+                    MainPage.Log($"鏈湴閫氳 鍙戦�丠DL-Link鏁版嵁:{functionControlDataJson}");
+                }
+                else
+                {
+                    
+                    var controlValues = new Dictionary<string, object>();
+                    foreach (var p in pairs)
+                    {
+                        controlValues.Add("key", p.Key);
+                        controlValues.Add("value", p.Value);
+                    }
+                    var pack = ApiUtlis.Ins.HttpRequest.ControlGroupControl(userDeviceGroupControlId, controlValues);
+                    if (pack != null)
+                    {
+                        if (pack.Code == StateCode.SUCCESS)
+                        {
+                            //DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl.
+                        }
+                        else
+                        {
+                            MainPage.Log($"缇ゆ帶鎺у埗澶辫触,Code: {pack.Code}");
+                        }
+                    }
+                }
+            }
+            catch (Exception ex){
+                MainPage.Log($"缇ゆ帶鎺у埗澶辫触: {ex.Message}");
+            }
+        }
+    }
+
+    public class GroupControlFunction
+    {
+        /// <summary>
+        /// 鍔熻兘sid
+        /// </summary>
+        public string sid = string.Empty;
+        /// <summary>
+        /// 鍔熻兘spk
+        /// </summary>
+        public string spk = string.Empty;
+
+
+    }
+
+
+    public class GroupControlType
+    {
+        /// <summary>
+        /// 绫诲瀷
+        /// </summary>
+        public string type = string.Empty;
+        /// <summary>
+        /// 绫诲瀷鍚嶇О
+        /// </summary>
+        public string typeName = string.Empty;
+        /// <summary>
+        /// 缇ゆ帶鏀寔鐨剆pk
+        /// </summary>
+        public List<string> spks = new List<string>();
+        /// <summary>
+        /// 缇ゆ帶鏀寔鐨剆pk灞炴��
+        /// </summary>
+        public List<string> spkAttrs = new List<string>();
+    }
+}
+
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/Face/FaceManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/Face/FaceManagementPage.cs
new file mode 100644
index 0000000..bcd094e
--- /dev/null
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/Face/FaceManagementPage.cs
@@ -0,0 +1,10 @@
+锘縰sing System;
+namespace HDL_ON.UI
+{
+    public class FaceManagementPage
+    {
+        public FaceManagementPage()
+        {
+        }
+    }
+}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
index 80b04df..8704a24 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
@@ -1,4 +1,6 @@
 锘縰sing System;
+using System.Threading;
+using HDL_ON.DAL.Server;
 using HDL_ON.UI.CSS;
 using Shared;
 
@@ -14,6 +16,11 @@
         Button btnAddMember;
         Button btnScan;
         EditText etMemberAccount;
+        EditText etMemberName;
+        /// <summary>
+        /// 浜鸿劯鐓х墖鏁版嵁
+        /// </summary>
+        string base64string;
 
         Action backAction;
 
@@ -29,7 +36,7 @@
             bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
             new TopViewDiv(bodyView, Language.StringByID(StringId.AddMember)).LoadTopView();
 
-            var btnTitle = new Button()
+            var btnMemberName = new Button()
             {
                 Y = Application.GetRealHeight(70),
                 X = Application.GetRealWidth(16),
@@ -37,7 +44,44 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.TextFontSize,
                 TextAlignment = TextAlignment.CenterLeft,
-                TextID = StringId.NewMemberAccount,
+                TextID = StringId.MemberName,
+            };
+            bodyView.AddChidren(btnMemberName);
+
+            etMemberName = new EditText()
+            {
+                Y = btnMemberName.Bottom,
+                X = Application.GetRealWidth(16),
+                Width = Application.GetRealWidth(356),
+                Height = Application.GetRealHeight(40),
+                TextColor = CSS_Color.TextualColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                TextAlignment = TextAlignment.CenterLeft,
+                PlaceholderText = Language.StringByID(StringId.PleaseEnterContent),
+                PlaceholderTextColor = CSS_Color.PromptingColor2
+            };
+            bodyView.AddChidren(etMemberName);
+
+            var btnLine = new Button()
+            {
+                Y = etMemberName.Bottom,
+                Gravity = Gravity.CenterHorizontal,
+                Width = Application.GetRealWidth(343),
+                Height = Application.GetRealHeight(1),
+                BackgroundColor = CSS_Color.DividingLineColor,
+            };
+            bodyView.AddChidren(btnLine);
+
+
+            var btnTitle = new Button()
+            {
+                Y = btnLine.Bottom + Application.GetRealHeight(20),
+                X = Application.GetRealWidth(16),
+                Height = Application.GetRealHeight(32),
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextSize = CSS_FontSize.TextFontSize,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextID = StringId.MemberAccount,
             };
             bodyView.AddChidren(btnTitle);
 
@@ -55,7 +99,7 @@
             };
             bodyView.AddChidren(etMemberAccount);
 
-            var btnLine = new Button()
+            var btnLine1 = new Button()
             {
                 Y = etMemberAccount.Bottom,
                 Gravity = Gravity.CenterHorizontal,
@@ -63,12 +107,200 @@
                 Height = Application.GetRealHeight(1),
                 BackgroundColor = CSS_Color.DividingLineColor,
             };
-            bodyView.AddChidren(btnLine);
+            bodyView.AddChidren(btnLine1);
+
+            int btnAddmemberY = 30;
+            if (Entity.DB_ResidenceData.Instance.SupportFacePass)
+            {
+                btnAddmemberY = 203;
+                #region 浜鸿劯绠$悊
+                var btnMemberFaceTitle = new Button()
+                {
+                    Y = btnLine1.Bottom + Application.GetRealHeight(20),
+                    X = Application.GetRealWidth(16),
+                    Height = Application.GetRealHeight(32),
+                    TextColor = CSS_Color.FirstLevelTitleColor,
+                    TextSize = CSS_FontSize.TextFontSize,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextID = StringId.MemberFace,
+                };
+                bodyView.AddChidren(btnMemberFaceTitle);
+
+                var btnAddFace = new Button()
+                {
+                    Gravity = Gravity.CenterHorizontal,
+                    Y = btnMemberFaceTitle.Bottom,
+                    Width = Application.GetRealWidth(120),
+                    Height = Application.GetRealWidth(120),
+                    Radius = (uint)Application.GetRealWidth(22),
+                    BorderWidth = 0,
+                    UnSelectedImagePath = "PersonalCenter/FacePassage/FaceIcon.png",
+                    TextColor = CSS_Color.MainBackgroundColor,
+                    TextSize = CSS_FontSize.SubheadingFontSize,
+                    IsBold = true,
+                    TextAlignment = TextAlignment.Center,
+                };
+                bodyView.AddChidren(btnAddFace);
+
+
+                EventHandler<MouseEventArgs> eFaceHandler = (sender, e) =>
+                {
+                    Application.HideSoftInput();
+                    if (OnAppConfig.Instance.FaceManagementTip)
+                    {
+                        OnAppConfig.Instance.FaceManagementTip = true;
+                        OnAppConfig.Instance.SaveConfig();
+                        LoadPictureOptionView(btnAddFace);
+                        return;
+                    }
+
+                    Dialog dialog = new Dialog()
+                    {
+                        BackgroundColor = CSS_Color.DialogTransparentColor1,
+                    };
+
+                    FrameLayout contentView = new FrameLayout()
+                    {
+                        Gravity = Gravity.Center,
+                        Width = Application.GetRealWidth(270),
+                        Height = Application.GetRealHeight(192),
+                        BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
+                        BorderColor = 0x00000000,
+                        BorderWidth = 0,
+                        Radius = (uint)Application.GetMinRealAverage(10),
+                    };
+                    dialog.AddChidren(contentView);
+
+                    Button btnTitle2 = new Button()
+                    {
+                        Y = Application.GetRealHeight(16),
+                        Height = Application.GetRealHeight(30),
+                        TextColor = CSS_Color.MainColor,
+                        TextSize = CSS_FontSize.SubheadingFontSize,
+                        TextAlignment = TextAlignment.Center,
+                        IsBold = true,
+                        TextID = StringId.FaceProtocolPrompt,
+                    };
+                    contentView.AddChidren(btnTitle2);
+
+                    Button btnMsg = new Button()
+                    {
+                        Gravity = Gravity.CenterHorizontal,
+                        Height = Application.GetRealHeight(35),
+                        Y = btnTitle2.Bottom,
+                        Width = Application.GetRealHeight(200),
+                        TextAlignment = TextAlignment.CenterLeft,
+                        TextColor = CSS_Color.TextualColor,
+                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                        TextID = StringId.FaceProTipText1,
+                        IsMoreLines = true,
+                    };
+                    contentView.AddChidren(btnMsg);
+
+                    Button btnMsg1 = new Button()
+                    {
+                        Gravity = Gravity.CenterHorizontal,
+                        Height = Application.GetRealHeight(15),
+                        Y = btnMsg.Bottom,
+                        Width = Application.GetRealHeight(200),
+                        TextAlignment = TextAlignment.CenterLeft,
+                        TextColor = CSS_Color.MainColor,
+                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                        TextID = StringId.FaceProTipText2,
+                        IsMoreLines = true,
+                    };
+
+                    contentView.AddChidren(btnMsg1);
+
+                    Button btnMsg2 = new Button()
+                    {
+                        Gravity = Gravity.CenterHorizontal,
+                        Height = Application.GetRealHeight(35),
+                        Y = btnMsg1.Bottom,
+                        Width = Application.GetRealHeight(200),
+                        TextAlignment = TextAlignment.CenterLeft,
+                        TextColor = CSS_Color.TextualColor,
+                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                        TextID = StringId.FaceProTipText3,
+                        IsMoreLines = true,
+                    };
+                    contentView.AddChidren(btnMsg2);
+
+                    Button btnLine2 = new Button()
+                    {
+                        Y = Application.GetRealHeight(149),
+                        Height = Application.GetRealHeight(1),
+                        Width = Application.GetRealWidth(270 / 2),
+                        BackgroundColor = CSS.CSS_Color.DividingLineColor,
+                    };
+                    contentView.AddChidren(btnLine2);
+
+                    Button btnCancel = new Button()
+                    {
+                        Y = btnLine2.Bottom,
+                        Width = Application.GetRealWidth(135),
+                        Height = Application.GetRealHeight(43),
+                        TextAlignment = TextAlignment.Center,
+                        TextColor = CSS_Color.TextualColor,
+                        TextSize = CSS_FontSize.SubheadingFontSize,
+                        //SelectedTextColor = CSS_Color.MainBackgroundColor,
+                        //SelectedBackgroundColor = CSS_Color.MainColor,
+                        TextID = StringId.Disagree,
+                    };
+                    contentView.AddChidren(btnCancel);
+
+                    Button btnConfirm = new Button()
+                    {
+                        X = btnCancel.Right,
+                        Y = btnLine2.Y,
+                        Width = Application.GetRealWidth(135),
+                        Height = Application.GetRealHeight(45),
+                        TextAlignment = TextAlignment.Center,
+                        //TextColor = CSS_Color.TextualColor,
+                        TextSize = CSS_FontSize.SubheadingFontSize,
+                        TextColor = CSS_Color.MainBackgroundColor,
+                        BackgroundColor = CSS_Color.MainColor,
+                        TextID = StringId.Agree,
+                    };
+                    contentView.AddChidren(btnConfirm);
+                    //渚嬶細鍙充笅鍦嗚 澶у皬涓�50
+                    int mRectCornerID = HDLUtils.RectCornerBottomRight;
+                    btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
+                    dialog.Show();
+
+                    btnCancel.MouseUpEventHandler += (sender2, e2) =>
+                    {
+                        dialog.Close();
+                    };
+                    btnMsg1.MouseUpEventHandler += (sender2, e2) =>
+                    {
+                        string url = "https://developer.hdlcontrol.com/浜鸿劯淇℃伅閲囬泦鍗忚.html";
+                        if (Language.CurrentLanguage != "Chinese")
+                        {
+                            url = "https://developer.hdlcontrol.com/Face information collection protocol.html";
+                        }
+                        new WebViewDialog().LoadPage(Language.StringByID(StringId.GetFaceProtocol), url);
+
+                        dialog.Close();
+                    };
+                    btnConfirm.MouseUpEventHandler = (sender2, e2) =>
+                    {
+                        dialog.Close();
+                        OnAppConfig.Instance.FaceManagementTip = true;
+                        OnAppConfig.Instance.SaveConfig();
+                        LoadPictureOptionView(btnAddFace);
+                    };
+
+                };
+                btnAddFace.MouseUpEventHandler = eFaceHandler;
+                #endregion
+
+            }
 
             btnAddMember = new Button()
             {
                 Gravity = Gravity.CenterHorizontal,
-                Y = Application.GetRealHeight(244),
+                Y = btnLine1.Bottom + Application.GetRealHeight(btnAddmemberY),
                 Width = Application.GetRealWidth(220),
                 Height = Application.GetRealWidth(44),
                 Radius = (uint)Application.GetRealWidth(22),
@@ -79,18 +311,18 @@
                 TextSize = CSS_FontSize.SubheadingFontSize,
                 IsBold = true,
                 TextAlignment = TextAlignment.Center,
-                TextID = StringId.ConfirmInvitation,
+                TextID = StringId.Confirm,
             };
             bodyView.AddChidren(btnAddMember);
 
+
             btnScan = new Button()
             {
-                Y = btnAddMember.Bottom,
-                Height = Application.GetRealHeight(44),
-                TextAlignment = TextAlignment.Center,
-                TextColor = CSS_Color.MainColor,
-                TextSize = CSS_FontSize.TextFontSize,
-                TextID = StringId.ScanQRCoden,
+                Y = btnTitle.Bottom,
+                Width = Application.GetRealWidth(40),
+                Height = Application.GetRealWidth(40),
+                X = Application.GetRealWidth(310),
+                UnSelectedImagePath = "Public/Scan.png"
             };
             bodyView.AddChidren(btnScan);
 
@@ -137,5 +369,152 @@
             }) { IsBackground = true }.Start();
 
         }
+
+        const int imageHeight = 400;
+
+        /// <summary>
+        /// 鍔犺浇鍥炬爣閫夋嫨閫夐」
+        /// </summary>
+        void LoadPictureOptionView(Button btnAddFace)
+        {
+            var pView = new FrameLayout()
+            {
+                BackgroundColor = CSS_Color.DialogTransparentColor1,
+            };
+            bodyView.AddChidren(pView);
+
+            var pictureOptionView = new FrameLayout()
+            {
+                Y = Application.GetRealHeight(445 + 50),
+                Height = Application.GetRealHeight(250),
+                AnimateSpeed = 0.3f,
+                Animate = Animate.DownToUp,
+            };
+            pView.AddChidren(pictureOptionView);
+
+            var 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);
+
+            var 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 });
+
+            var 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 });
+
+            var btnCancel = new Button()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                Y = Application.GetRealHeight(8) + optionView.Bottom,
+                Width = Application.GetRealWidth(343),
+                Height = Application.GetRealHeight(50),
+                BackgroundColor = CSS_Color.MainBackgroundColor,
+                Radius = (uint)Application.GetRealWidth(12),
+                TextID = StringId.Cancel,
+                TextColor = CSS_Color.WarningColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+            };
+            pictureOptionView.AddChidren(btnCancel);
+
+
+
+            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) =>
+                {
+                    if (imagePath != null)
+                    {
+                        var imageBytes = getFaceImageBytes(imagePath);
+                        btnAddFace.ImageBytes = imageBytes;
+                        base64string = Convert.ToBase64String(imageBytes);
+                    }
+
+                }, imageName, 6, 6, imageHeight);
+
+                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) =>
+                {
+                    if (imagePath != null)
+                    {
+                        var imageBytes = getFaceImageBytes(imagePath);
+                        btnAddFace.ImageBytes = imageBytes;
+                        base64string = Convert.ToBase64String(imageBytes);
+                    }
+                }, imageName, 6, 6, imageHeight);
+
+                pictureOptionView.Parent.RemoveFromParent();
+            };
+
+        }
+
+        /// <summary>
+        /// 鑾峰彇鏈湴閫夊彇鐨勪汉鑴告暟鎹�
+        /// </summary>
+        /// <param name="selectImagePath"></param>
+        /// <returns></returns>
+        byte[] getFaceImageBytes(string selectImagePath)
+        {
+            var imageBytes = Shared.IO.FileUtils.ReadFile(selectImagePath);
+            System.IO.File.Delete(selectImagePath);
+            return imageBytes;
+        }
+
     }
 }
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPageBLL.cs
index 3ed1e67..066bd64 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPageBLL.cs
@@ -22,12 +22,14 @@
         {
             btnAddMember.MouseUpEventHandler = (sender, e) => {
                 var memberAccount = etMemberAccount.Text.Trim();
-                if(string.IsNullOrEmpty(memberAccount))
+                var name = etMemberName.Text.Trim();
+                if(string.IsNullOrEmpty(name))
                 {
-                    TipDivMsg(Language.StringByID(StringId.PlsEntryAccount));
+                    TipDivMsg(Language.StringByID(StringId.PlsEntrySubAccountRemark));
                     return;
                 }
-                BindMember(memberAccount);
+
+                BindMember(memberAccount, name, base64string);
             };
         }
 
@@ -35,7 +37,7 @@
         /// 缁戝畾璐﹀彿
         /// </summary>
         /// <param name="memberAccount"></param>
-        void BindMember(string memberAccount)
+        void BindMember(string memberAccount,string nickName,string faceUrl)
         {
             var waitPage = new Loading();
             bodyView.AddChidren(waitPage);
@@ -45,7 +47,7 @@
             {
                 try
                 {
-                    var result = new HttpServerRequest().BindResidenceMemberAccount(memberAccount, memberAccount);
+                    var result = new HttpServerRequest().BindResidenceMemberAccount(memberAccount, nickName,faceUrl);
                     if (result.Code == StateCode.SUCCESS)
                     {
                         Application.RunOnMainThread(() =>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs
new file mode 100644
index 0000000..db9bf9a
--- /dev/null
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFaceManagementPage.cs
@@ -0,0 +1,617 @@
+锘縰sing System;
+using System.Threading;
+using HDL_ON.DAL.Server;
+using HDL_ON.Entity;
+using HDL_ON.UI.CSS;
+using Shared;
+
+namespace HDL_ON.UI
+{
+    /// <summary>
+    /// 澧炲姞瀛愯处鍙风晫闈�
+    /// </summary>
+    public partial class MemberFaceManagementPage : FrameLayout
+    {
+        FrameLayout bodyView;
+
+        /// <summary>
+        /// 浜鸿劯鐓х墖鏁版嵁
+        /// </summary>
+        string base64string;
+        ResidenceMemberInfo memberInfo;
+        public MemberFaceManagementPage(ResidenceMemberInfo memberInfo)
+        {
+            bodyView = this;
+            this.memberInfo = memberInfo;
+        }
+
+
+        public void LoadPage()
+        {
+            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
+            new TopViewDiv(bodyView, memberInfo.nickName).LoadTopView();
+
+            #region 浜鸿劯绠$悊
+            var btnMemberFaceTitle = new Button()
+            {
+                Y = Application.GetRealHeight(80),
+                X = Application.GetRealWidth(16),
+                Height = Application.GetRealHeight(32),
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextSize = CSS_FontSize.TextFontSize,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextID = StringId.MemberFace,
+            };
+            bodyView.AddChidren(btnMemberFaceTitle);
+
+            var btnAddFace = new Button()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                Y = btnMemberFaceTitle.Bottom,
+                Width = Application.GetRealWidth(230),
+                Height = Application.GetRealWidth(230),
+                Radius = (uint)Application.GetRealWidth(22),
+                BorderWidth = 0,
+                UnSelectedImagePath = "PersonalCenter/FacePassage/FaceIcon.png",
+                TextColor = CSS_Color.MainBackgroundColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                IsBold = true,
+                TextAlignment = TextAlignment.Center,
+            };
+            bodyView.AddChidren(btnAddFace);
+
+
+            EventHandler<MouseEventArgs> eFaceHandler = (sender, e) =>
+            {
+                if (OnAppConfig.Instance.FaceManagementTip)
+                {
+                    OnAppConfig.Instance.FaceManagementTip = true;
+                    OnAppConfig.Instance.SaveConfig();
+                    LoadPictureOptionView(btnAddFace);
+                    return;
+                }
+
+                Dialog dialog = new Dialog()
+                {
+                    BackgroundColor = CSS_Color.DialogTransparentColor1,
+                };
+
+                FrameLayout contentView = new FrameLayout()
+                {
+                    Gravity = Gravity.Center,
+                    Width = Application.GetRealWidth(270),
+                    Height = Application.GetRealHeight(192),
+                    BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
+                    BorderColor = 0x00000000,
+                    BorderWidth = 0,
+                    Radius = (uint)Application.GetMinRealAverage(10),
+                };
+                dialog.AddChidren(contentView);
+
+                Button btnTitle = new Button()
+                {
+                    Y = Application.GetRealHeight(16),
+                    Height = Application.GetRealHeight(30),
+                    TextColor = CSS_Color.MainColor,
+                    TextSize = CSS_FontSize.SubheadingFontSize,
+                    TextAlignment = TextAlignment.Center,
+                    IsBold = true,
+                    TextID = StringId.FaceProtocolPrompt,
+                };
+                contentView.AddChidren(btnTitle);
+
+                Button btnMsg = new Button()
+                {
+                    Gravity = Gravity.CenterHorizontal,
+                    Height = Application.GetRealHeight(35),
+                    Y = btnTitle.Bottom,
+                    Width = Application.GetRealHeight(200),
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextColor = CSS_Color.TextualColor,
+                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                    TextID = StringId.FaceProTipText1,
+                    IsMoreLines = true,
+                };
+                contentView.AddChidren(btnMsg);
+
+                Button btnMsg1 = new Button()
+                {
+                    Gravity = Gravity.CenterHorizontal,
+                    Height = Application.GetRealHeight(15),
+                    Y = btnMsg.Bottom,
+                    Width = Application.GetRealHeight(200),
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextColor = CSS_Color.MainColor,
+                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                    TextID = StringId.FaceProTipText2,
+                    IsMoreLines = true,
+                };
+
+                contentView.AddChidren(btnMsg1);
+
+                Button btnMsg2 = new Button()
+                {
+                    Gravity = Gravity.CenterHorizontal,
+                    Height = Application.GetRealHeight(35),
+                    Y = btnMsg1.Bottom,
+                    Width = Application.GetRealHeight(200),
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextColor = CSS_Color.TextualColor,
+                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                    TextID = StringId.FaceProTipText3,
+                    IsMoreLines = true,
+                };
+                contentView.AddChidren(btnMsg2);
+
+                Button btnLine = new Button()
+                {
+                    Y = Application.GetRealHeight(149),
+                    Height = Application.GetRealHeight(1),
+                    Width = Application.GetRealWidth(270 / 2),
+                    BackgroundColor = CSS.CSS_Color.DividingLineColor,
+                };
+                contentView.AddChidren(btnLine);
+
+                Button btnCancel = new Button()
+                {
+                    Y = btnLine.Bottom,
+                    Width = Application.GetRealWidth(135),
+                    Height = Application.GetRealHeight(43),
+                    TextAlignment = TextAlignment.Center,
+                    TextColor = CSS_Color.TextualColor,
+                    TextSize = CSS_FontSize.SubheadingFontSize,
+                        //SelectedTextColor = CSS_Color.MainBackgroundColor,
+                        //SelectedBackgroundColor = CSS_Color.MainColor,
+                        TextID = StringId.Disagree,
+                };
+                contentView.AddChidren(btnCancel);
+
+                Button btnConfirm = new Button()
+                {
+                    X = btnCancel.Right,
+                    Y = btnLine.Y,
+                    Width = Application.GetRealWidth(135),
+                    Height = Application.GetRealHeight(45),
+                    TextAlignment = TextAlignment.Center,
+                        //TextColor = CSS_Color.TextualColor,
+                        TextSize = CSS_FontSize.SubheadingFontSize,
+                    TextColor = CSS_Color.MainBackgroundColor,
+                    BackgroundColor = CSS_Color.MainColor,
+                    TextID = StringId.Agree,
+                };
+                contentView.AddChidren(btnConfirm);
+                    //渚嬶細鍙充笅鍦嗚 澶у皬涓�50
+                    int mRectCornerID = HDLUtils.RectCornerBottomRight;
+                btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
+                dialog.Show();
+
+                btnCancel.MouseUpEventHandler += (sender2, e2) =>
+                {
+                    dialog.Close();
+                };
+                btnMsg1.MouseUpEventHandler += (sender2, e2) =>
+                {
+                    string url = "https://developer.hdlcontrol.com/浜鸿劯淇℃伅閲囬泦鍗忚.html";
+                    if (Language.CurrentLanguage != "Chinese")
+                    {
+                        url = "https://developer.hdlcontrol.com/Face information collection protocol.html";
+                    }
+                    new WebViewDialog().LoadPage("浜鸿劯淇℃伅閲囬泦鍗忚", url);
+
+                    dialog.Close();
+                };
+                btnConfirm.MouseUpEventHandler = (sender2, e2) =>
+                {
+                    dialog.Close();
+                    OnAppConfig.Instance.FaceManagementTip = true;
+                    OnAppConfig.Instance.SaveConfig();
+                    LoadPictureOptionView(btnAddFace);
+                };
+
+            };
+            btnAddFace.MouseUpEventHandler = eFaceHandler;
+            #endregion
+
+            var btnDeleteFaceDate = new Button()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                Y = btnAddFace.Bottom + Application.GetRealHeight(30),
+                Width = Application.GetRealWidth(220),
+                Height = Application.GetRealWidth(44),
+                Radius = (uint)Application.GetRealWidth(22),
+                BorderWidth = 0,
+                BorderColor = 0x00000000,
+                BackgroundColor = 0xFFFF7272,
+                TextColor = CSS_Color.MainBackgroundColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                IsBold = true,
+                TextAlignment = TextAlignment.Center,
+                TextID = StringId.DeleteMemberFace,
+            };
+            bodyView.AddChidren(btnDeleteFaceDate);
+
+            btnDeleteFaceDate.MouseUpEventHandler = (sender, e) => {
+                var waitPage = new Loading();
+                waitPage.Start("");
+                new Thread(() =>
+                {
+                    try
+                    {
+                        var pack = new HttpServerRequest().DeleteMemberFace(memberInfo.id);
+                        if (pack != null)
+                        {
+                            if(pack.Code == StateCode.SUCCESS)
+                            {
+                                Application.RunOnMainThread(() =>
+                                {
+                                    memberInfo.userFaceUrl = "";
+                                    btnAddFace.ImageBytes = null;
+                                    btnAddFace.UnSelectedImagePath = "PersonalCenter/FacePassage/FaceIcon.png";
+                                    btnDeleteFaceDate.Enable = btnDeleteFaceDate.Visible = false;
+                                });
+                            }
+                        }
+                        else
+                        {
+                            Application.RunOnMainThread(() =>
+                            {
+                                TipDivMsg(Language.StringByID(StringId.delFail));
+                            });
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                    }
+                    finally
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            if (waitPage != null)
+                            {
+                                waitPage.RemoveFromParent();
+                                waitPage = null;
+                            }
+                        });
+                    }
+                })
+                { IsBackground = true }.Start();
+
+            };
+
+            if (!string.IsNullOrEmpty(memberInfo.userFaceUrl))
+            {
+                var waitPage = new Loading();
+                waitPage.Start("");
+                new Thread(() =>
+                {
+                    try
+                    {
+                        var bytes = downloadImageBytes(memberInfo.userFaceUrl);
+                        if (bytes != null)
+                        {
+                            Application.RunOnMainThread(() =>
+                            {
+                                btnAddFace.ImageBytes = bytes;
+                            });
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                    }
+                    finally
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            if (waitPage != null)
+                            {
+                                waitPage.RemoveFromParent();
+                                waitPage = null;
+                            }
+                        });
+                    }
+                })
+                { IsBackground = true }.Start();
+            }
+            else
+            {
+                btnDeleteFaceDate.Enable = btnDeleteFaceDate.Visible = false;
+            }
+        }
+
+        void TipDivMsg(string msg)
+        {
+            var tipBodyView = new FrameLayout();
+            bodyView.AddChidren(tipBodyView);
+
+            var msgView = new FrameLayout()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                Y = Application.GetRealHeight(167),
+                Width = Application.GetRealWidth(210),
+                Height = Application.GetRealHeight(62),
+                Radius = (uint)Application.GetRealWidth(8),
+                BorderWidth = 0,
+                BorderColor = 0x00000000,
+                BackgroundColor = 0xFF333333,
+            };
+            tipBodyView.AddChidren(msgView);
+
+            var btnMsg = new Button()
+            {
+                Gravity = Gravity.Center,
+                Width = Application.GetRealWidth(186),
+                Height = Application.GetRealHeight(42),
+                TextColor = CSS_Color.MainBackgroundColor,
+                TextSize = CSS_FontSize.TextFontSize,
+                TextAlignment = TextAlignment.Center,
+                Text = msg,
+                IsMoreLines = true,
+            };
+            msgView.AddChidren(btnMsg);
+
+            new System.Threading.Thread(() => {
+                System.Threading.Thread.Sleep(1200);
+                Application.RunOnMainThread(() => {
+                    tipBodyView.RemoveAll();
+                    tipBodyView.RemoveFromParent();
+                });
+            })
+            { IsBackground = true }.Start();
+
+        }
+
+        const int imageHeight = 400;
+
+        /// <summary>
+        /// 鍔犺浇鍥炬爣閫夋嫨閫夐」
+        /// </summary>
+        void LoadPictureOptionView(Button btnAddFace)
+        {
+            var pView = new FrameLayout()
+            {
+                BackgroundColor = CSS_Color.DialogTransparentColor1,
+            };
+            bodyView.AddChidren(pView);
+
+            var pictureOptionView = new FrameLayout()
+            {
+                Y = Application.GetRealHeight(445 + 50),
+                Height = Application.GetRealHeight(250),
+                AnimateSpeed = 0.3f,
+                Animate = Animate.DownToUp,
+            };
+            pView.AddChidren(pictureOptionView);
+
+            var 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);
+
+            var 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 });
+
+            var 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 });
+
+            var btnCancel = new Button()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                Y = Application.GetRealHeight(8) + optionView.Bottom,
+                Width = Application.GetRealWidth(343),
+                Height = Application.GetRealHeight(50),
+                BackgroundColor = CSS_Color.MainBackgroundColor,
+                Radius = (uint)Application.GetRealWidth(12),
+                TextID = StringId.Cancel,
+                TextColor = CSS_Color.WarningColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+            };
+            pictureOptionView.AddChidren(btnCancel);
+
+
+
+            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, 6, 6, imageHeight);
+
+                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, 6, 6, imageHeight);
+
+                pictureOptionView.Parent.RemoveFromParent();
+            };
+
+        }
+
+        /// <summary>
+        /// 涓嬭浇浜戠浜鸿劯鍥剧墖
+        /// </summary>
+        /// <param name="imageUrl"></param>
+        /// <returns></returns>
+        byte[] downloadImageBytes(string imageUrl)
+        {
+            var imageBytes = ImageUtlis.Current.GetImageDownloadUrl(imageUrl);
+
+            return imageBytes;
+        }
+
+
+        /// <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, 1, imageName);
+                            }, imageName, 6, 6, imageHeight);
+                        }
+                        else
+                        {
+                            CropImage.SelectPicture((imagePath) =>
+                            {
+                                CropImageCallBack(imagePath, 2, imageName);
+                            }, imageName, 6, 6, imageHeight);
+                        }
+                    }
+                };
+
+                //if (isSuccess)
+                //{
+                //}
+
+                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().UpdataMemberFace(memberInfo.id, base64string);
+                        if (pack != null)
+                        {
+                            var data = Newtonsoft.Json.JsonConvert.DeserializeObject<System.Collections.Generic.Dictionary<string,string>>(pack.Data.ToString());
+                            if(data!= null)
+                            {
+                                data.TryGetValue("userFace",out memberInfo.userFaceUrl);
+                            }
+                            Utlis.WriteLine("涓婁紶缁撴灉锛�" + pack.message);
+                            if(pack.Code == StateCode.SUCCESS)
+                            {
+                                Application.RunOnMainThread(() =>
+                                {
+                                    this.RemoveFromParent();
+                                });
+                            }
+                            uploadResultAction?.Invoke(pack.Code == StateCode.SUCCESS);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                    }
+                    finally
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            if (waitPage != null)
+                            {
+                                waitPage.RemoveFromParent();
+                                waitPage = null;
+                            }
+                        });
+                    }
+                })
+                { IsBackground = true }.Start();
+            }
+            catch (Exception ex)
+            {
+                MainPage.Log(ex.Message);
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
index 0eec00f..4cad50b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
@@ -3,6 +3,8 @@
 using HDL_ON.Entity;
 using HDL_ON.UI.CSS;
 using System.Collections.Generic;
+using System.Threading;
+using HDL_ON.DAL.Server;
 
 namespace HDL_ON.UI
 {
@@ -27,6 +29,9 @@
 
         public void LoadPage()
         {
+#if DEBUG
+            //Entity.DB_ResidenceData.Instance.SupportFacePass = true;
+#endif
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
             //鍒涘缓璇诲彇鎴愬憳璐﹀彿绾跨▼
             var thread = LoadThread_GetResidenceMemberAccount();
@@ -77,7 +82,6 @@
                 {
                     Gravity = Gravity.CenterHorizontal,
                     Width = Application.GetRealWidth(343),
-                    //Height = Application.GetRealWidth(230),
                     Height = Application.GetRealWidth(180),
                     BackgroundColor = CSS_Color.MainBackgroundColor,
                     Radius = (uint)Application.GetRealWidth(12),
@@ -86,6 +90,10 @@
                     ScrollEnabled = false,
                     VerticalScrollBarEnabled = false,//闅愯棌婊氬姩鏉�
                 };
+                if (Entity.DB_ResidenceData.Instance.SupportFacePass)
+                {
+                    sView.Height = Application.GetRealWidth(180 + 50);
+                }
                 contentView.AddChidren(sView);
                 #region 澶村儚淇℃伅
                 var view1 = new FrameLayout()
@@ -115,7 +123,7 @@
                     TextID = StringId.Member
                 };
                 userTypeView.AddChidren(btnUserTypeName);
-                if(Language.CurrentLanguage == "English")
+                if (Language.CurrentLanguage == "English")
                 {
                     userTypeView.X = Application.GetRealWidth(260);
                 }
@@ -145,7 +153,11 @@
                     Text = HDLCommon.Current.GetUserName(memberInfo.memberName)
                 };
                 view1.AddChidren(btnMemberName);
+                if (memberInfo.isVirtualAccount)
+                {
+                    btnMemberName.Text = memberInfo.nickName;
 
+                }
                 var btnMemberEmail = new Button()
                 {
                     X = Application.GetRealWidth(88),
@@ -166,6 +178,13 @@
                     Width = Application.GetRealWidth(311),
                     BackgroundColor = CSS_Color.DividingLineColor,
                 });
+
+                if(string.IsNullOrEmpty(memberInfo.Account))
+                {
+                    LoadView_BindAccount(memberInfo, btnMemberEmail, btnMemberName, memberHeadImageView);
+                }
+
+
                 #endregion
 
                 #region 鏄电О淇℃伅
@@ -213,7 +232,7 @@
                     Width = Application.GetRealWidth(311),
                     BackgroundColor = CSS_Color.DividingLineColor,
                 });
-                LoadView_EidtNickname(btnNickname, btnNicknameRight, memberInfo);
+                LoadView_EidtNickname(btnNickname, btnNicknameRight, memberInfo, memberInfo.isVirtualAccount ? btnMemberName : null);
                 #endregion
 
                 #region 浣跨敤鏉冮檺
@@ -244,17 +263,12 @@
                 };
                 view3.AddChidren(btnPermissionRight);
 
-                //sView.AddChidren(new Button()
-                //{
-                //    Gravity = Gravity.CenterHorizontal,
-                //    Height = Application.GetRealWidth(1),
-                //    Width = Application.GetRealWidth(311),
-                //    BackgroundColor = CSS_Color.DividingLineColor,
-                //});
+
 
                 EventHandler<MouseEventArgs> eHandler = (sender, e) =>
                 {
-                    action = () => {
+                    action = () =>
+                    {
                         residenceMemberInfos.Remove(memberInfo);
                         LoadMemberRow();
                     };
@@ -263,45 +277,66 @@
                     mmp.LoadPage();
                     MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                 };
-                sView.MouseUpEventHandler = eHandler;
+                view3.MouseUpEventHandler = eHandler;
                 btnPermissionTitle.MouseUpEventHandler = eHandler;
                 btnPermissionRight.MouseUpEventHandler = eHandler;
 
                 #endregion
 
-                //#region 鍒涘缓鍦烘櫙 2020-12-23 闅愯棌鍒涘缓鍦烘櫙鎸夐挳
-                //var view4 = new FrameLayout()
-                //{
-                //    Height = Application.GetRealWidth(50),
-                //};
-                //sView.AddChidren(view4);
 
-                //var btnCreateSceneTitle = new Button()
-                //{
-                //    X = Application.GetRealWidth(16),
-                //    Width = Application.GetRealWidth(200),
-                //    TextAlignment = TextAlignment.CenterLeft,
-                //    TextColor = CSS_Color.FirstLevelTitleColor,
-                //    TextSize = CSS_FontSize.TextFontSize,
-                //    TextID = StringId.CreateScene,
-                //};
-                //view4.AddChidren(btnCreateSceneTitle);
+                #region 浜鸿劯绠$悊
+                if (Entity.DB_ResidenceData.Instance.SupportFacePass)
+                {
+                    sView.AddChidren(new Button()
+                    {
+                        Gravity = Gravity.CenterHorizontal,
+                        Height = Application.GetRealWidth(1),
+                        Width = Application.GetRealWidth(311),
+                        BackgroundColor = CSS_Color.DividingLineColor,
+                    });
 
-                //var btnCreateSceneRight = new Button()
-                //{
-                //    X = Application.GetRealWidth(287),
-                //    Y = Application.GetRealHeight(4),
-                //    Width = Application.GetMinRealAverage(38),
-                //    Height = Application.GetMinRealAverage(38),
-                //    UnSelectedImagePath = "Public/Switch_2.png",
-                //    SelectedImagePath = "Public/SwitchOn_2.png",
-                //    IsSelected = memberInfo.isAllowCreateScene
-                //};
-                //view4.AddChidren(btnCreateSceneRight);
+                    var view4 = new FrameLayout()
+                    {
+                        Height = Application.GetRealWidth(49),
+                    };
+                    sView.AddChidren(view4);
 
-                //LoadView_ChangeCreateSceneState(btnCreateSceneRight, btnCreateSceneTitle, memberInfo);
-                //#endregion 
+                    var btnFaceManagementTitle = new Button()
+                    {
+                        X = Application.GetRealWidth(16),
+                        Width = Application.GetRealWidth(330),
+                        TextAlignment = TextAlignment.CenterLeft,
+                        TextColor = CSS_Color.FirstLevelTitleColor,
+                        TextSize = CSS_FontSize.TextFontSize,
+                        TextID = StringId.FaceManagemant,
+                    };
+                    view4.AddChidren(btnFaceManagementTitle);
+
+                    var btnFaceManagementRight = new Button()
+                    {
+                        X = Application.GetRealWidth(311),
+                        Gravity = Gravity.CenterVertical,
+                        Width = Application.GetMinRealAverage(16),
+                        Height = Application.GetMinRealAverage(16),
+                        UnSelectedImagePath = "Public/Right.png",
+                    };
+                    view4.AddChidren(btnFaceManagementRight);
+
+
+                    EventHandler<MouseEventArgs> eFaceHandler = (sender, e) =>
+                    {
+                        var page = new MemberFaceManagementPage(memberInfo);
+                        MainPage.BasePageView.AddChidren(page);
+                        page.LoadPage();
+                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                    };
+                    view4.MouseUpEventHandler = eFaceHandler;
+                    btnFaceManagementRight.MouseUpEventHandler = eFaceHandler;
+                    btnFaceManagementTitle.MouseUpEventHandler = eFaceHandler;
+                }
+                #endregion
+
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
index e659d9c..60cdde3 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
@@ -161,7 +161,7 @@
         /// <summary>
         /// 淇敼鏄电О绐楀彛
         /// </summary>
-        void LoadView_EidtNickname(Button btn1, Button btn2, ResidenceMemberInfo mInfo)
+        void LoadView_EidtNickname(Button btn1, Button btn2, ResidenceMemberInfo mInfo,Button btnMemberName)
         {
             EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
             {
@@ -185,12 +185,16 @@
                     {
                         try
                         {
-                            var responsePack = new HttpServerRequest().EditSubAccountNickName(str, mInfo.childAccountId);
+                            var responsePack = new HttpServerRequest().EditSubAccountNickName(str, mInfo.id);
                             if (responsePack.Code.ToUpper() == StateCode.SUCCESS)
                             {
                                 Application.RunOnMainThread(() =>
                                 {
                                     btn1.Text = str;
+                                    if (btnMemberName != null)
+                                    {
+                                        btnMemberName.Text = str;
+                                    }
                                 });
                                 mInfo.nickName = str;
                             }
@@ -223,6 +227,75 @@
             btn2.MouseUpEventHandler = eventHandler;
         }
 
+        void LoadView_BindAccount(ResidenceMemberInfo mInfo,Button btnShowText,Button btnClick,ImageView ivClick)
+        {
+            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+            {
+                if (!string.IsNullOrEmpty(btnShowText.Text))
+                {
+                    return;
+                }
+
+                Action<string> callBack = (str) =>
+                {
+                    if (string.IsNullOrEmpty(str))
+                    {
+                        new Tip()
+                        {
+                            CloseTime = 1,
+                            Text = Language.StringByID(StringId.PleaseEnterContent),
+                            Direction = AMPopTipDirection.None,
+                        }.Show(bodyView);
+                        return;
+                    }
+
+                    var waitPage = new Loading();
+                    bodyView.AddChidren(waitPage);
+                    waitPage.Start(Language.StringByID(StringId.PleaseWait));
+                    new Thread(() =>
+                    {
+                        try
+                        {
+                            var responsePack = new HttpServerRequest().SubChildBindAccount(mInfo.id, str);
+                            if (responsePack.Code.ToUpper() == StateCode.SUCCESS)
+                            {
+                                Application.RunOnMainThread(() =>
+                                {
+                                    btnShowText.Text = str;
+                                });
+                                //mInfo.Account = str;
+
+                            }
+                            else
+                            {
+                                IMessageCommon.Current.ShowErrorInfoAlter(responsePack.Code);
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            MainPage.Log($"update user name error : {ex.Message}");
+                        }
+                        finally
+                        {
+                            Application.RunOnMainThread(() =>
+                            {
+                                if (waitPage != null)
+                                {
+                                    waitPage.RemoveFromParent();
+                                    waitPage = null;
+                                }
+                            });
+                        }
+                    })
+                    { IsBackground = true }.Start();
+                };
+                new PublicAssmebly().LoadDialog_EditParater(StringId.BindSubAccount, "", callBack, StringId.NicknameCannotBeEmpty, 0, new List<string>());
+            };
+            btnShowText.MouseUpEventHandler = eventHandler;
+            btnClick.MouseUpEventHandler = eventHandler;
+            ivClick.MouseUpEventHandler = eventHandler;
+        }
+
         /// <summary>
         /// 淇敼鍒涘缓鍦烘櫙鏉冮檺
         /// </summary>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
index e7454e3..dcf64c7 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
@@ -63,34 +63,51 @@
             };
             headPortraitView.AddChidren(btnMemberName);
             string username = HDLCommon.Current.GetUserName(memberInfo.memberName);
-            btnMemberName.Text = memberInfo.nickName + "(" + username + ")";
+            btnMemberName.Text = memberInfo.nickName;
 
-            #region RoomList
-            roomListView = new VerticalScrolViewLayout()
+            if (!memberInfo.isVirtualAccount)
             {
-                Y = Application.GetRealHeight(138),
-                Height = Application.GetRealHeight(471),
-                //BackgroundColor = CSS_Color.MainBackgroundColor,
-            };
-            bodyView.AddChidren(roomListView);
-            #endregion
-
+                btnMemberName.Text = memberInfo.nickName + "(" + username + ")";
+                #region RoomList
+                roomListView = new VerticalScrolViewLayout()
+                {
+                    Y = Application.GetRealHeight(138),
+                    Height = Application.GetRealHeight(471),
+                    //BackgroundColor = CSS_Color.MainBackgroundColor,
+                };
+                bodyView.AddChidren(roomListView);
+                #endregion
+            }
             btnDelMember = new Button()
             {
                 Y = Application.GetRealHeight(617),
-                //Height = MainPage.Increase ? Application.GetRealHeight(70) : Application.GetRealHeight(50),
-                Height = Application.GetRealHeight(50),
-                TextAlignment = TextAlignment.Center,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextColor = CSS_Color.WarningColor,
+                //Height = Application.GetRealHeight(50),
+                //TextAlignment = TextAlignment.Center,
+                //TextSize = CSS_FontSize.SubheadingFontSize,
+                //TextColor = CSS_Color.WarningColor,
                 TextID = StringId.RemoveTheMember,
-                BackgroundColor = CSS_Color.MainBackgroundColor,
+                //BackgroundColor = CSS_Color.MainBackgroundColor,
+
+                Gravity = Gravity.CenterHorizontal,
+                Width = Application.GetRealWidth(220),
+                Height = Application.GetRealWidth(44),
+                Radius = (uint)Application.GetRealWidth(22),
+                BorderWidth = 0,
+                BorderColor = 0x00000000,
+                BackgroundColor = 0xFFFF7272,
+                TextColor = CSS_Color.MainBackgroundColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                IsBold = true,
+                TextAlignment = TextAlignment.Center,
+
             };
             bodyView.AddChidren(btnDelMember);
 
             LoadEventList();
-
-            GetShareDataByAccount();
+            if (!memberInfo.isVirtualAccount)
+            {
+                GetShareDataByAccount();
+            }
         }
 
         /// <summary>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 3c86be0..b70cf7f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -2,6 +2,7 @@
 using HDL_ON.UI.CSS;
 using HDL_ON.Entity;
 using HDL_ON.DriverLayer;
+using System;
 
 namespace HDL_ON.UI
 {
@@ -163,6 +164,7 @@
             bodyView = this;
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
         }
+
         public void LoadView()
         {
             #region 涓汉淇℃伅
@@ -290,22 +292,26 @@
         {
             contentView.RemoveAll();
 
+            var residenceFunctionCount = 0;
+
             #region 浣忓畢淇℃伅鍖哄煙
-            //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare && DB_ResidenceData.Instance.GatewayType == 1)
-            //{
-            //    residenceInfoView = new FrameLayout()
-            //    {
-            //        Gravity = Gravity.CenterHorizontal,
-            //        Width = Application.GetRealWidth(343),
-            //        Height = Application.GetRealHeight(213),
-            //        BackgroundColor = CSS_Color.MainBackgroundColor,
-            //        Radius = (uint)Application.GetRealHeight(12),
-            //        BorderColor = 0x00FFFFFF,
-            //        BorderWidth = 0,
-            //    };
-            //    contentView.AddChidren(residenceInfoView);
-            //}
-            //else
+            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare
+                && DB_ResidenceData.Instance.GatewayType == 1
+                && DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
+            {
+                residenceInfoView = new FrameLayout()
+                {
+                    Gravity = Gravity.CenterHorizontal,
+                    Width = Application.GetRealWidth(343),
+                    Height = Application.GetRealHeight(213),
+                    BackgroundColor = CSS_Color.MainBackgroundColor,
+                    Radius = (uint)Application.GetRealHeight(12),
+                    BorderColor = 0x00FFFFFF,
+                    BorderWidth = 0,
+                };
+                contentView.AddChidren(residenceInfoView);
+            }
+            else
             {
                 residenceInfoView = new FrameLayout()
                 {
@@ -388,6 +394,7 @@
 
             if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
             {
+                residenceFunctionCount++;
                 #region ---浣忓畢绠$悊鍖哄煙
                 residenceManageView = new FrameLayout()
                 {
@@ -420,6 +427,7 @@
                 residenceManageView.AddChidren(btnResidenceManageText);
                 #endregion
 
+                residenceFunctionCount++;
                 #region ---鎴愬憳鍖哄煙
                 residenceMemberView = new FrameLayout()
                 {
@@ -547,6 +555,7 @@
 
                 if (DB_ResidenceData.Instance.GatewayType == 1)
                 {
+                    residenceFunctionCount++;
                     #region ---娣诲姞鍔熻兘鍖哄煙
                     residenceAddFunctionView = new FrameLayout()
                     {
@@ -577,6 +586,53 @@
                     };
                     residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
                     #endregion
+
+                    if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
+                    {
+                        residenceFunctionCount++;
+                        #region ---缁勫悎璋冨厜
+                        var faceManagementView = new FrameLayout()
+                        {
+                            X = Application.GetRealWidth(28 - 24),
+                            Y = residenceManageView.Bottom,
+                            Width = Application.GetRealWidth(64 + 48),
+                            Height = Application.GetRealWidth(64),
+                        };
+                        residenceInfoView.AddChidren(faceManagementView);
+
+                        var btnFaceManagementIcon = new Button
+                        {
+                            Gravity = Gravity.CenterHorizontal,
+                            Y = Application.GetRealHeight(5),
+                            Width = Application.GetMinRealAverage(30),
+                            Height = Application.GetMinRealAverage(30),
+                            UnSelectedImagePath = "PersonalCenter/CombinedDimmingIcon.png",
+                        };
+                        faceManagementView.AddChidren(btnFaceManagementIcon);
+                        var btnFaceManagementText = new Button()
+                        {
+                            Y = btnResidenceManageIcon.Bottom,
+                            Height = Application.GetRealHeight(29),
+                            TextID = StringId.CombinedDimming,
+                            TextAlignment = TextAlignment.Center,
+                            TextColor = CSS_Color.FirstLevelTitleColor,
+                            TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                            IsMoreLines = true,
+                        };
+                        faceManagementView.AddChidren(btnFaceManagementText);
+
+                        EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+                        {
+                            var page = new CombinedDimmingListPage();
+                            MainPage.BasePageView.AddChidren(page);
+                            page.LoadPage();
+                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                        };
+                        faceManagementView.MouseUpEventHandler = eventHandler;
+                        btnFaceManagementText.MouseUpEventHandler = eventHandler;
+                        btnFaceManagementIcon.MouseUpEventHandler = eventHandler;
+                        #endregion
+                    }
                 }
             }
             else
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index f485677..be1fc7d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -226,6 +226,7 @@
                             dialog.Close();
                             LoadEvent_ChangeCurHome(home);
                             LoadContentView();
+                            HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.ChangeCurrHome(home);
                         };
                     }
                     dialog.Show();
@@ -303,15 +304,12 @@
                         Width = Application.GetRealWidth(374 / 2),
                         Height = Application.GetRealHeight(50) - 1,
                         BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
-                        Text = "涓婁竴椤�",
+                        TextID = StringId.PreviousPage,
                         TextAlignment = TextAlignment.Center,
                         TextColor = CSS.CSS_Color.TextualColor,
                         TextSize = CSS.CSS_FontSize.TextFontSize,
                     };
-                    if(Language.CurrentLanguage != "Chinese")
-                    {
-                        btnPre.Text = "Previous";
-                    }
+                    
                     bottomOptionView.AddChidren(btnPre);
                     btnPre.MouseUpEventHandler = (sender33, e33) => {
                         if (pageIndex < 1)
@@ -329,15 +327,11 @@
                         Width = Application.GetRealWidth(374 / 2),
                         Height = Application.GetRealHeight(50) - 1,
                         BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
-                        Text = "涓嬩竴椤�",
+                        TextID = StringId.NextPage,
                         TextAlignment = TextAlignment.Center,
                         TextColor = CSS.CSS_Color.TextualColor,
                         TextSize = CSS.CSS_FontSize.TextFontSize,
                     };
-                    if(Language.CurrentLanguage != "Chinese")
-                    {
-                        btnNext.Text = "Next";
-                    }
 
                     bottomOptionView.AddChidren(btnNext);
                     btnNext.MouseUpEventHandler = (sender33, e33) => {
@@ -415,6 +409,7 @@
                     dialog.Close();
                     LoadEvent_ChangeCurHome(home);
                     LoadContentView();
+                    HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.ChangeCurrHome(home);
                 };
             }
 
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index 9cbb1e1..eb2e32c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -744,7 +744,7 @@
                     //鍒锋柊鎺ュ彛璇锋眰鎵�闇�瑕佺殑鍙傛暟
                     Foundation.NSDictionary info = new Foundation.NSDictionary("regionUrl", HttpUtil.GlobalRequestHttpsHost, "token", UserInfo.Current.LoginTokenString, "appkey", "HDL-HOME-APP-TEST", "secret", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "refreshToken", UserInfo.Current.RefreshToken);
                     Shared.IOS.HDLFVSDK.Video.RefreshInfo(info);
-                    //璺宠浆璁垮绠$悊鐣岄潰
+                    ////璺宠浆璁垮绠$悊鐣岄潰
                     Shared.IOS.HDLFVSDK.Video.ShowVisitorManager();
 #else
                     var page = new VisitorQRCodePage();
@@ -828,6 +828,7 @@
                 MainPage.BasePageView.AddChidren(myServerInfoPage);
                 myServerInfoPage.LoadPage();
                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
             };
             myServerInfoCellView.GoAction = selectAction;
             myServerInfoCellView.BtnTilte.Text = Language.StringByID(StringId.ServerInformation);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
index ce10df7..26b7215 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
@@ -4,6 +4,11 @@
 using HDL_ON.Entity;
 using Shared;
 
+#if __IOS__
+using UIKit;
+using Foundation;
+#endif
+
 namespace HDL_ON.UI
 {
     public partial class PersonalDataPage
@@ -439,7 +444,6 @@
                 MainPage.BasePageView.AddChidren(aep);
                 aep.LoadPage();
                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-
             };
             _QRcodeView.MouseUpEventHandler = eventHandler;
             btnQRcode.MouseUpEventHandler = eventHandler;
@@ -447,7 +451,7 @@
             btnQRcodeRight.MouseUpEventHandler = eventHandler;
         }
 
-        #region 淇敼缁戝畾閭
+#region 淇敼缁戝畾閭
         /// <summary>
         /// 淇敼缁戝畾閭
         /// </summary>
@@ -459,6 +463,7 @@
                 {
 
                     btnUserEmailInfo.Text = GetBindAccountText(email);
+
                 };
 
                 if (CheckIfUnbound(btnUserEmailInfo.Text))
@@ -493,6 +498,7 @@
                 Action<string> action = (phone) =>
                 {
                     btnUserPhoneInfo.Text = GetBindAccountText(phone);
+
                 };
 
                 if (CheckIfUnbound(btnUserPhoneInfo.Text))
@@ -511,15 +517,14 @@
                     MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                 }
 
-
             };
             btnUserPhoneInfo.MouseUpEventHandler = eventHandler;
             btnUserPhoneRight.MouseUpEventHandler = eventHandler;
             userPhoneInfoView.MouseUpEventHandler = eventHandler;
         }
-        #endregion
+#endregion
 
-        #region 瑙i攣璁剧疆鍖哄煙
+#region 瑙i攣璁剧疆鍖哄煙
         //void LoadEvent_SkipInterpretationSettings()
         //{
         //    EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
@@ -535,7 +540,7 @@
         //    btnInterpretationSettingsTip.MouseUpEventHandler = eventHandler;
         //}
 
-        #endregion
+#endregion
 
         /// <summary>
         /// 璺宠浆淇敼瀵嗙爜鐣岄潰
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
index 7084db6..a37633b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirSend.cs
@@ -291,10 +291,10 @@
         /// <returns></returns>
         public static ResponsePackNew RequestServerhomeId(object o, string api_Url, int mTimeout = 20)
         {
-            MainPage.Log("绾㈠瀹濊姹傛暟鎹�:"+api_Url+"\r\n"+o.ToString());
+            MainPage.Log("绾㈠瀹�->鍙戦�佹暟鎹�:"+api_Url+"\r\n"+o.ToString());
             var requestJson = HttpUtil.GetSignRequestJson(o);
             var responsePackNew=  HttpUtil.RequestHttpsPostFroHome(api_Url, requestJson, mTimeout);
-            MainPage.Log("鍥炲绾㈠瀹濊姹傛暟鎹�:" + "\r\n"+ Newtonsoft.Json.JsonConvert.SerializeObject(responsePackNew));
+            MainPage.Log("绾㈠瀹�->鍥炲鏁版嵁:" + "\r\n"+ Newtonsoft.Json.JsonConvert.SerializeObject(responsePackNew));
             return responsePackNew;
 
         }
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/DeliveryQrCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/DeliveryQrCodePage.cs
new file mode 100644
index 0000000..e77c9d6
--- /dev/null
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/DeliveryQrCodePage.cs
@@ -0,0 +1,106 @@
+锘縰sing System;
+using System.Collections.Generic;
+using HDL_ON.UI.CSS;
+using Shared;
+
+namespace HDL_ON.UI
+{
+    /// <summary>
+    /// 鎴戠殑浜岀淮鐮侀〉闈�
+    /// </summary>
+    public class DeliveryQrCodePage : FrameLayout
+    {
+        FrameLayout bodyView;
+
+        public DeliveryQrCodePage()
+        {
+            bodyView = this;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void LoadPage()
+        {
+            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
+            new TopViewDiv(bodyView, Language.StringByID(StringId.ResidentialDelivery)).LoadTopView();
+
+            int backViewHeight = Application.GetRealHeight(132) + Application.GetRealWidth(266);
+            FrameLayout backView = new FrameLayout()
+            {
+                Y = Application.GetRealHeight(144),
+                Gravity = Gravity.CenterHorizontal,
+                Height = Application.GetRealWidth(288),
+                Width = Application.GetRealWidth(288),
+                BackgroundColor = CSS_Color.MainBackgroundColor,
+                Radius = (uint)Application.GetRealWidth(8),
+            };
+            bodyView.AddChidren(backView);
+
+          
+
+            var btnHomeName = new Button()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                Y = backView.Bottom + Application.GetRealWidth(12),
+                Width = Application.GetRealWidth(300),
+                Height = Application.GetRealHeight(60),
+                TextAlignment = TextAlignment.Center,
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                Text = Entity.DB_ResidenceData.Instance.CurrentRegion.homeName,
+                IsBold = true,
+                IsMoreLines = true,
+
+            };
+            bodyView.AddChidren(btnHomeName);
+
+            var waitPage = new Loading();
+            bodyView.AddChidren(waitPage);
+            waitPage.Start("");
+            new System.Threading.Thread(() => {
+                try
+                {
+                    var pack = Common.ApiUtlis.Ins.HttpRequest.GetHouseDeliveryUrl();
+                    if (pack != null)
+                    {
+                        if (pack.Code == DAL.Server.StateCode.SUCCESS)
+                        {
+                            var deliveryUrl = pack.Data.ToString();
+                            Application.RunOnMainThread(() => {
+                                //浜岀淮鐮�
+                                int codeWidth = Application.GetRealWidth(266);
+                                ImageView codeImage = new ImageView()
+                                {
+                                    Gravity = Gravity.Center,
+                                    Height = codeWidth,
+                                    Width = codeWidth,
+                                    ImageBytes = Scan.BytesFromText(deliveryUrl, codeWidth, codeWidth),
+                                };
+                                backView.AddChidren(codeImage);
+                            });
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    MainPage.Log($"鑾峰彇浣忓畢浜や粯閾炬帴寮傚父:{ex.Message}");
+                }
+                finally
+                {
+                    if(waitPage!= null)
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            waitPage.RemoveFromParent();
+                        });
+                    }
+                }
+            })
+            { IsBackground = true }.Start();
+
+      
+        }
+        
+    }
+}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
index 849be74..dc72414 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
@@ -1,4 +1,5 @@
 锘縰sing System;
+using HDL_ON.DAL.Server;
 using HDL_ON.Entity;
 using HDL_ON.UI.CSS;
 using Shared;
@@ -202,9 +203,9 @@
             };
             residenceAddressRow.AddChidren(btnResidenceAddress);
             #endregion
-            #region 妤煎眰绠$悊
             contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
 
+            #region 妤煎眰绠$悊
             floorManagementRow = new FrameLayout()
             {
                 Height = Application.GetRealHeight(50),
@@ -274,183 +275,386 @@
             };
             roomManagementRow.AddChidren(btnRoomManagementSkinIcon);
             #endregion
-
-            #region 绠$悊鍛樻潈闄愯縼绉�
-            contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
-            administratorPermissionMigrationRow = new FrameLayout()
+            //宸茬粡浜や粯
+            if (DB_ResidenceData.Instance.CurrentRegion.deliverStatus == "Delivered" || DB_ResidenceData.Instance.CurrentRegion.deliverStatus == "SECONDARY_DEBUGGIN")
             {
-                Height = Application.GetRealHeight(65),
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-            };
-            if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false)
-            {
-                //鏄富璐﹀彿鏈汉鎵嶈兘鏄剧ず杩欎釜鑿滃崟
-                contentView.AddChidren(administratorPermissionMigrationRow);
-            }
 
-            btnAdministratorPermissionMigrationTitle = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(10),
-                Width = Application.GetRealWidth(308),
-                Height = Application.GetRealHeight(24),
-                TextID = StringId.AdministratorPermissionMigration,
-                TextAlignment = TextAlignment.CenterLeft,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-            };
-            administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationTitle);
-
-            btnAdministratorPermissionMigrationExplan = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = btnAdministratorPermissionMigrationTitle.Bottom,
-                Width = Application.GetRealWidth(308),
-                Height = Application.GetRealHeight(21),
-                TextID = StringId.AdministratorPermissionMigrationExPlan,
-                TextAlignment = TextAlignment.CenterLeft,
-                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                TextColor = CSS_Color.PromptingColor1,
-            };
-            administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationExplan);
-
-
-            btnAdministratorPermissionMigrationSkinIcon = new Button()
-            {
-                X = Application.GetRealWidth(343),
-                Gravity = Gravity.CenterVertical,
-                Width = Application.GetMinRealAverage(16),
-                Height = Application.GetMinRealAverage(16),
-                UnSelectedImagePath = "Public/RightIcon.png",
-            };
-            administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationSkinIcon);
-
-            administratorPermissionMigrationRow.AddChidren(
-                new Button()
+                if (DB_ResidenceData.Instance.CurrentRegion.deliverStatus != "SECONDARY_DEBUGGIN")
                 {
-                    Gravity = Gravity.CenterHorizontal,
-                    Y = Application.GetRealHeight(64),
-                    Height = Application.GetRealHeight(1),
-                    Width = Application.GetRealWidth(343),
-                    BackgroundColor = CSS_Color.DividingLineColor,
-                });
-            #endregion
+                    #region 绠$悊鍛樻潈闄愯縼绉�
+                    contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
+                    administratorPermissionMigrationRow = new FrameLayout()
+                    {
+                        Height = Application.GetRealHeight(65),
+                        BackgroundColor = CSS_Color.MainBackgroundColor,
+                    };
+                    if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false)
+                    {
+                        //鏄富璐﹀彿鏈汉鎵嶈兘鏄剧ず杩欎釜鑿滃崟
+                        contentView.AddChidren(administratorPermissionMigrationRow);
+                    }
 
-            #region 杩囨埛
-            transferRow = new FrameLayout()
-            {
-                Y = administratorPermissionMigrationRow.Bottom,
-                Height = Application.GetRealHeight(65),
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-            };
-            //鏈夌綉鍏虫墠鑳借繃鎴�
-            if (DB_ResidenceData.Instance.HomeGateway != null && string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.gatewayId) == false
-                && DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false)
-            {
-                contentView.AddChidren(transferRow);
-            }
+                    btnAdministratorPermissionMigrationTitle = new Button()
+                    {
+                        X = Application.GetRealWidth(16),
+                        Y = Application.GetRealHeight(10),
+                        Width = Application.GetRealWidth(308),
+                        Height = Application.GetRealHeight(24),
+                        TextID = StringId.AdministratorPermissionMigration,
+                        TextAlignment = TextAlignment.CenterLeft,
+                        TextSize = CSS_FontSize.SubheadingFontSize,
+                        TextColor = CSS_Color.FirstLevelTitleColor,
+                    };
+                    administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationTitle);
 
-            btnTransferTitle = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(10),
-                Width = Application.GetRealWidth(308),
-                Height = Application.GetRealHeight(24),
-                TextID = StringId.Transfer,
-                TextAlignment = TextAlignment.CenterLeft,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-            };
-            transferRow.AddChidren(btnTransferTitle);
-
-            btnTrasferExplan = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = btnTransferTitle.Bottom,
-                Width = Application.GetRealWidth(308),
-                Height = Application.GetRealHeight(21),
-                TextID = StringId.TransferExPlan,
-                TextAlignment = TextAlignment.CenterLeft,
-                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                TextColor = CSS_Color.PromptingColor1,
-            };
-            transferRow.AddChidren(btnTrasferExplan);
-
-            btnTrasferSkinIcon = new Button()
-            {
-                X = Application.GetRealWidth(343),
-                Gravity = Gravity.CenterVertical,
-                Width = Application.GetMinRealAverage(16),
-                Height = Application.GetMinRealAverage(16),
-                UnSelectedImagePath = "Public/RightIcon.png",
-            };
-            transferRow.AddChidren(btnTrasferSkinIcon);
-            #endregion
-
-            #region 璋冭瘯鏉冮檺
-
-            contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
-            FrameLayout commissioningAuthorityRow;
-            commissioningAuthorityRow = new FrameLayout()
-            {
-                Height = Application.GetRealHeight(65),
-                BackgroundColor = CSS_Color.MainBackgroundColor,
-            };
-            contentView.AddChidren(commissioningAuthorityRow);
+                    btnAdministratorPermissionMigrationExplan = new Button()
+                    {
+                        X = Application.GetRealWidth(16),
+                        Y = btnAdministratorPermissionMigrationTitle.Bottom,
+                        Width = Application.GetRealWidth(308),
+                        Height = Application.GetRealHeight(21),
+                        TextID = StringId.AdministratorPermissionMigrationExPlan,
+                        TextAlignment = TextAlignment.CenterLeft,
+                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                        TextColor = CSS_Color.PromptingColor1,
+                    };
+                    administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationExplan);
 
 
-            var btnCommissioningAuthorityTitle = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(10),
-                Width = Application.GetRealWidth(308),
-                Height = Application.GetRealHeight(24),
-                TextID = StringId.CommissioningAuthority,
-                TextAlignment = TextAlignment.CenterLeft,
-                TextSize = CSS_FontSize.SubheadingFontSize,
-                TextColor = CSS_Color.FirstLevelTitleColor,
-            };
-            commissioningAuthorityRow.AddChidren(btnCommissioningAuthorityTitle);
+                    btnAdministratorPermissionMigrationSkinIcon = new Button()
+                    {
+                        X = Application.GetRealWidth(343),
+                        Gravity = Gravity.CenterVertical,
+                        Width = Application.GetMinRealAverage(16),
+                        Height = Application.GetMinRealAverage(16),
+                        UnSelectedImagePath = "Public/RightIcon.png",
+                    };
+                    administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationSkinIcon);
 
-            var btnCommissioningAuthorityExplan = new Button()
-            {
-                X = Application.GetRealWidth(16),
-                Y = btnCommissioningAuthorityTitle.Bottom,
-                Width = Application.GetRealWidth(308),
-                Height = Application.GetRealHeight(21),
-                TextID = StringId.CommissioningAuthorityExPlan,
-                TextAlignment = TextAlignment.CenterLeft,
-                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                TextColor = CSS_Color.PromptingColor1,
-            };
-            commissioningAuthorityRow.AddChidren(btnCommissioningAuthorityExplan);
+                    administratorPermissionMigrationRow.AddChidren(
+                        new Button()
+                        {
+                            Gravity = Gravity.CenterHorizontal,
+                            Y = Application.GetRealHeight(64),
+                            Height = Application.GetRealHeight(1),
+                            Width = Application.GetRealWidth(343),
+                            BackgroundColor = CSS_Color.DividingLineColor,
+                        });
+                    #endregion
 
-            btnCommissioningAuthoritySwitchIcon = new Button()
-            {
-                X = Application.GetRealWidth(314),
-                Gravity = Gravity.CenterVertical,
-                Width = Application.GetMinRealAverage(48),
-                Height = Application.GetMinRealAverage(36),
-                UnSelectedImagePath = "Public/Switch.png",
-                SelectedImagePath = "Public/SwitchOn.png",
-                IsSelected = DB_ResidenceData.Instance.CurrentRegion.debugPerm
-            };
-            commissioningAuthorityRow.AddChidren(btnCommissioningAuthoritySwitchIcon);
+                    #region 杩囨埛
+                    transferRow = new FrameLayout()
+                    {
+                        Y = administratorPermissionMigrationRow.Bottom,
+                        Height = Application.GetRealHeight(65),
+                        BackgroundColor = CSS_Color.MainBackgroundColor,
+                    };
+                    //鏈夌綉鍏虫墠鑳借繃鎴�
+                    if (DB_ResidenceData.Instance.HomeGateway != null && string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.gatewayId) == false
+                        && DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false)
+                    {
+                        contentView.AddChidren(transferRow);
+                    }
 
-            btnCommissioningAuthoritySwitchIcon.MouseUpEventHandler = (sender, e) =>
-            {
-                DB_ResidenceData.Instance.CurrentRegion.debugPerm = !DB_ResidenceData.Instance.CurrentRegion.debugPerm;
-                btnCommissioningAuthoritySwitchIcon.IsSelected = DB_ResidenceData.Instance.CurrentRegion.debugPerm;
-                new System.Threading.Thread(() =>
+                    btnTransferTitle = new Button()
+                    {
+                        X = Application.GetRealWidth(16),
+                        Y = Application.GetRealHeight(10),
+                        Width = Application.GetRealWidth(308),
+                        Height = Application.GetRealHeight(24),
+                        TextID = StringId.Transfer,
+                        TextAlignment = TextAlignment.CenterLeft,
+                        TextSize = CSS_FontSize.SubheadingFontSize,
+                        TextColor = CSS_Color.FirstLevelTitleColor,
+                    };
+                    transferRow.AddChidren(btnTransferTitle);
+
+                    btnTrasferExplan = new Button()
+                    {
+                        X = Application.GetRealWidth(16),
+                        Y = btnTransferTitle.Bottom,
+                        Width = Application.GetRealWidth(308),
+                        Height = Application.GetRealHeight(21),
+                        TextID = StringId.TransferExPlan,
+                        TextAlignment = TextAlignment.CenterLeft,
+                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                        TextColor = CSS_Color.PromptingColor1,
+                    };
+                    transferRow.AddChidren(btnTrasferExplan);
+
+                    btnTrasferSkinIcon = new Button()
+                    {
+                        X = Application.GetRealWidth(343),
+                        Gravity = Gravity.CenterVertical,
+                        Width = Application.GetMinRealAverage(16),
+                        Height = Application.GetMinRealAverage(16),
+                        UnSelectedImagePath = "Public/RightIcon.png",
+                    };
+                    transferRow.AddChidren(btnTrasferSkinIcon);
+                    #endregion
+
+                    LoadEvent_SkipAdminMigrationConfirmPage();
+                    LoadEvent_SkipTransferConfirmPage();
+
+
+
+                    var btnRollBack = new Button()
+                    {
+                        Y = Application.GetRealHeight(623),
+                        Height = Application.GetRealHeight(50),
+                        TextAlignment = TextAlignment.Center,
+                        TextSize = CSS_FontSize.SubheadingFontSize,
+                        TextColor = CSS_Color.AuxiliaryColor2,
+                        TextID = StringId.RollBack,
+                        BackgroundColor = CSS_Color.MainBackgroundColor,
+                    };
+                    bodyView.AddChidren(btnRollBack);
+
+                    if (MainPage.Increase)
+                    {
+                        btnRollBack.Y = Application.GetRealHeight(613);
+                        btnRollBack.Height = Application.GetRealHeight(50);
+                        bodyView.AddChidren(new Button() { Y = Application.GetRealHeight(663), Height = Application.GetRealHeight(20), BackgroundColor = CSS_Color.MainBackgroundColor });
+                    }
+                    btnRollBack.MouseUpEventHandler += (sender, e) =>
+                    {
+                        Action okAction = () =>
+                        {
+                            var waitPage = new Loading();
+                            this.AddChidren(waitPage);
+                            waitPage.Start("");
+                            new System.Threading.Thread(() => {
+                                try
+                                {
+                                    var pack = Common.ApiUtlis.Ins.HttpRequest.RollBack();
+                                    Application.RunOnMainThread(() =>
+                                    {
+                                        if (pack != null)
+                                        {
+                                            if (pack.Code == StateCode.SUCCESS)
+                                            {
+                                                new PublicAssmebly().TipMsg(StringId.Tip, StringId.SuccessfullyUnboundTheResidence, () =>
+                                                {
+                                                    Common.ApiUtlis.Ins.HttpRequest.GetHomePager();
+                                                });
+                                            }
+                                            else
+                                            {
+                                                IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+                                            }
+                                        }
+                                    });
+                                }
+                                catch (Exception ex)
+                                {
+                                    MainPage.Log($"浣忓畢鍥炴粴寮傚父锛歿ex.Message}");
+                                }
+                                finally
+                                {
+                                    Application.RunOnMainThread(() =>
+                                    {
+                                        try
+                                        {
+                                            waitPage.Hide();
+                                            waitPage.RemoveFromParent();
+                                            waitPage = null;
+                                        }
+                                        catch { }
+                                    });
+                                }
+                            })
+                            { IsBackground = true }.Start();
+                        };
+                        new ConfirmDialog().ShowDialog(StringId.Tip, StringId.RollBackTipMsg, okAction);
+                    };
+
+
+                }
+                #region 璋冭瘯鏉冮檺
+
+                contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
+                FrameLayout commissioningAuthorityRow;
+                commissioningAuthorityRow = new FrameLayout()
                 {
-                    new DAL.Server.HttpServerRequest().ChangeResidenceDebugPerm(DB_ResidenceData.Instance.CurrentRegion.debugPerm);
-                })
-                { IsBackground = true }.Start();
-            };
-
-            #endregion
+                    Height = Application.GetRealHeight(65),
+                    BackgroundColor = CSS_Color.MainBackgroundColor,
+                };
+                contentView.AddChidren(commissioningAuthorityRow);
 
 
+                var btnCommissioningAuthorityTitle = new Button()
+                {
+                    X = Application.GetRealWidth(16),
+                    Y = Application.GetRealHeight(10),
+                    Width = Application.GetRealWidth(308),
+                    Height = Application.GetRealHeight(24),
+                    TextID = StringId.CommissioningAuthority,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextSize = CSS_FontSize.SubheadingFontSize,
+                    TextColor = CSS_Color.FirstLevelTitleColor,
+                };
+                commissioningAuthorityRow.AddChidren(btnCommissioningAuthorityTitle);
+
+                var btnCommissioningAuthorityExplan = new Button()
+                {
+                    X = Application.GetRealWidth(16),
+                    Y = btnCommissioningAuthorityTitle.Bottom,
+                    Width = Application.GetRealWidth(308),
+                    Height = Application.GetRealHeight(21),
+                    TextID = StringId.CommissioningAuthorityExPlan,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                    TextColor = CSS_Color.PromptingColor1,
+                };
+                commissioningAuthorityRow.AddChidren(btnCommissioningAuthorityExplan);
+
+                btnCommissioningAuthoritySwitchIcon = new Button()
+                {
+                    X = Application.GetRealWidth(314),
+                    Gravity = Gravity.CenterVertical,
+                    Width = Application.GetMinRealAverage(48),
+                    Height = Application.GetMinRealAverage(36),
+                    UnSelectedImagePath = "Public/Switch.png",
+                    SelectedImagePath = "Public/SwitchOn.png",
+                    IsSelected = DB_ResidenceData.Instance.CurrentRegion.debugPerm
+                };
+                commissioningAuthorityRow.AddChidren(btnCommissioningAuthoritySwitchIcon);
+
+                btnCommissioningAuthoritySwitchIcon.MouseUpEventHandler = (sender, e) =>
+                {
+                    DB_ResidenceData.Instance.CurrentRegion.debugPerm = !DB_ResidenceData.Instance.CurrentRegion.debugPerm;
+                    btnCommissioningAuthoritySwitchIcon.IsSelected = DB_ResidenceData.Instance.CurrentRegion.debugPerm;
+                    var waitPage = new Loading();
+                    bodyView.AddChidren(waitPage);
+                    waitPage.Start("");
+                    new System.Threading.Thread(() =>
+                    {
+                        try
+                        {
+                            var pack = new DAL.Server.HttpServerRequest().ChangeResidenceDebugPerm(DB_ResidenceData.Instance.CurrentRegion.debugPerm);
+                            if (pack != null)
+                            {
+                                if (pack.Code == DAL.Server.StateCode.SUCCESS)
+                                {
+                                    DB_ResidenceData.Instance.CurrentRegion.debugStatus = DB_ResidenceData.Instance.CurrentRegion.debugPerm ? "SECONDARY_DEBUGGIN" : "Delivered";
+                                    Application.RunOnMainThread(() =>
+                                    {
+                                        bodyView.RemoveAll();
+                                        LoadPage();
+                                    });
+                                }
+                            }
+                        }catch(Exception ex)
+                        {
+                            Application.RunOnMainThread(() => {
+                                waitPage.Hide();
+                            });
+                        }
+                    })
+                    { IsBackground = true }.Start();
+                };
+
+                #endregion
+
+            }
+            //璋冭瘯瀹屾垚  鎵嶈兘鍔犺浇浜岀淮鐮�
+            else if (DB_ResidenceData.Instance.CurrentRegion.deliverStatus == "WAIT_DELIVERED")
+            {
+                #region 浜や粯浜岀淮鐮�
+                contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
+                var deliveryQRcodeRow = new FrameLayout()
+                {
+                    Height = Application.GetRealHeight(50),
+                    BackgroundColor = CSS_Color.MainBackgroundColor,
+                };
+                contentView.AddChidren(deliveryQRcodeRow);
+
+                var btnDeliveryQRcodeTitle = new Button()
+                {
+                    X = Application.GetRealWidth(16),
+                    Width = Application.GetRealWidth(308),
+                    TextID = StringId.ResidentialDelivery,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextSize = CSS_FontSize.SubheadingFontSize,
+                    TextColor = CSS_Color.FirstLevelTitleColor,
+                };
+                deliveryQRcodeRow.AddChidren(btnDeliveryQRcodeTitle);
+
+
+                var btnDeliveryQRcodeRightIcon = new Button()
+                {
+                    X = Application.GetRealWidth(343),
+                    Gravity = Gravity.CenterVertical,
+                    Width = Application.GetMinRealAverage(16),
+                    Height = Application.GetMinRealAverage(16),
+                    UnSelectedImagePath = "Public/RightIcon.png",
+                };
+                deliveryQRcodeRow.AddChidren(btnDeliveryQRcodeRightIcon);
+
+
+                EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+                {
+                    var skipPage = new DeliveryQrCodePage();
+                    MainPage.BasePageView.AddChidren(skipPage);
+                    skipPage.LoadPage();
+                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                };
+                deliveryQRcodeRow.MouseUpEventHandler = eventHandler;
+                btnDeliveryQRcodeTitle.MouseUpEventHandler = eventHandler;
+                btnDeliveryQRcodeRightIcon.MouseUpEventHandler = eventHandler;
+                #endregion
+            }
+            else
+            {
+                #region 鎴垮眿鐘舵�佹彁绀�
+                contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
+                var houseStatusTipRow = new FrameLayout()
+                {
+                    Height = Application.GetRealHeight(50),
+                    BackgroundColor = CSS_Color.MainBackgroundColor,
+                };
+                contentView.AddChidren(houseStatusTipRow);
+
+                var btnHouseStatusTipTitle = new Button()
+                {
+                    X = Application.GetRealWidth(16),
+                    Width = Application.GetRealWidth(308),
+                    TextID = StringId.HouseStatus,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextSize = CSS_FontSize.SubheadingFontSize,
+                    TextColor = CSS_Color.FirstLevelTitleColor,
+                };
+                houseStatusTipRow.AddChidren(btnHouseStatusTipTitle);
+
+                switch (DB_ResidenceData.Instance.CurrentRegion.deliverStatus)
+                {
+                    case "To_Be_Debugged"://寰呰皟璇�
+                        btnHouseStatusTipTitle.Text += " : "+ Language.StringByID(StringId.To_Be_Debugged);
+                        break;
+                    case "Debugging"://璋冭瘯涓�
+                        btnHouseStatusTipTitle.Text += " : " + Language.StringByID(StringId.Debugging);
+                        break;
+                    case "INITIAL_TATE"://鍒濆鎬�
+                        btnHouseStatusTipTitle.Text += " : " + Language.StringByID(StringId.INITIAL_TATE);
+                        break;
+                    case "ACCEPTANCE"://楠屾敹
+                        btnHouseStatusTipTitle.Text += " : " + Language.StringByID(StringId.ACCEPTANCE);
+
+                        break;
+                    case "To_Be_Accepted"://寰呴獙鏀�
+                        btnHouseStatusTipTitle.Text += " : " + Language.StringByID(StringId.To_Be_Accepted);
+                        break;
+                    default:
+                        btnHouseStatusTipTitle.Text += " : " + Language.StringByID(StringId.INITIAL_TATE);
+                        break;
+                }
+
+
+
+                #endregion
+
+
+            }
             LoadEventList();
         }
     }
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs
index f62265b..43aec8b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs
@@ -14,8 +14,6 @@
             LoadEvent_SkipRoomsPage();
             LoadEvent_EditResidencName();
             LoadEvent_EditResidencAddress();
-            LoadEvent_SkipAdminMigrationConfirmPage();
-            LoadEvent_SkipTransferConfirmPage();
         }
 
         /// <summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index c55d69b..1b55639 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -104,7 +104,7 @@
             var temp = (int)Convert.ToDouble(setTempTemp);
             if (temp <= 0)
             {
-                //榛樿鍊兼敼鎴�16,2022骞�06鏈�10鏃�10:03:19 鎴愮敨瑕佹眰鐨�
+                //榛樿鍊兼敼鎴�16
                 temp = 16;
                 device.SetAttrState(FunctionAttributeKey.SetTemp, temp.ToString());
             }
@@ -156,7 +156,7 @@
                     TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
                     IsBold = true,
                     TextAlignment = TextAlignment.CenterLeft,
-                    Text = "掳C",
+                    Text = acFunction.GetTempUnitString(device),
                 };
                 FrameWhiteCentet1.AddChidren(btnTempUint);
 
@@ -166,7 +166,7 @@
                     Y = btnTemp.Bottom,
                     Width = Application.GetRealWidth(120),
                     Height = Application.GetRealHeight(30),
-                    Text = Language.StringByID(StringId.Indoor) + " 20掳C",
+                    Text = Language.StringByID(StringId.Indoor) + " 20" + acFunction.GetTempUnitString(device),
                     TextColor = CSS_Color.PromptingColor1,
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                     TextAlignment = TextAlignment.TopCenter,
@@ -1035,7 +1035,9 @@
                 {
                     //device = FunctionList.List.Functions.Find((obj) => obj.sid == device.sid);
 
-                    btnIndoorTemp.Text = Language.StringByID(StringId.Indoor) + " " + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", "."))) + "掳C";
+                    btnIndoorTemp.Text = Language.StringByID(StringId.Indoor) + " "
+                    + Convert.ToInt32(Convert.ToDouble(device.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", ".")))
+                     + acFunction.GetTempUnitString(device);
                     btnMode.SelectedImagePath = acFunction.GetModeIconPath(device.GetAttrState(FunctionAttributeKey.Mode));
                     btnSwing.SelectedImagePath = acFunction.GetSwingIconPath(device.GetAttrState(FunctionAttributeKey.Swing));
                     btnWindSpeed.SelectedImagePath = acFunction.GetFanIconPath(device.GetAttrState(FunctionAttributeKey.FanSpeed));
diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/MechanicalArmPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/MechanicalArmPage.cs
index 93f3500..ff748b3 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/MechanicalArmPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/MechanicalArmPage.cs
@@ -138,6 +138,13 @@
             {
                 tipMsg = "纭畾鍏抽棴?";
             }
+            if (Language.CurrentLanguage != "Chinese")
+            {
+
+                tipMsg = "Are you sure to close?";
+                if (this.btnSwitch.IsSelected)
+                    tipMsg = "Are you sure to open it?";
+            }
             Action action = () => {
 
                 this.btnPictrue.CanClick = false;
@@ -155,7 +162,7 @@
                     });
                 });
             };
-            new PublicAssmebly().TipOptionMsg(StringId.EmptyString, tipMsg, action);
+            new PublicAssmebly().TipOptionMsg(StringId.Tip, tipMsg, action);
 
         }
 
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
index a7e40b8..4094b80 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -204,6 +204,10 @@
                 Text = "掳C",
             };
             controlView.AddChidren(btnTempUint);
+            if (function.GetAttribute(FunctionAttributeKey.TempType) != null)
+            {
+                btnTempUint.Text = function.GetAttrState(FunctionAttributeKey.TempType);
+            }
 
             btnIndoorTemp = new Button()
             {
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs
index f566630..97c577b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs
@@ -597,7 +597,7 @@
             var btnTitleText2 = new Button()
             {
                 X = btnCollection.Right,
-                Text = "鎴戠殑瀹跺涵",
+                TextID = StringId.MyHome,
                 TextSize = 16,
                 TextColor = 0xFF242424,
                 TextAlignment = TextAlignment.CenterLeft,
@@ -605,10 +605,6 @@
                 Height = Application.GetRealHeight(54),
             };
             subTitleView.AddChidren(btnTitleText2);
-            if(Language.CurrentLanguage != "Chinese")
-            {
-                btnTitleText2.Text = "My Home";
-            }
 
             int subFunctionCount = 0;
 
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
index 77c25b5..d0d0372 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
@@ -57,7 +57,7 @@
         public void LoadPage()
         {
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
-            new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(backAction);
+            new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView();
 
             contentView = new VerticalScrolViewLayout()
             {
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
index a431833..8dd444b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs
@@ -159,7 +159,7 @@
                 { 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>();
+                var d = new System.Collections.Generic.Dictionary<string, string>();
                 d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
                 DriverLayer.Control.Ins.SendWriteCommand(function, d);
                 //CurtainAnimation(100);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
index 6b7887f..bdc5072 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockPage.cs
@@ -6,6 +6,7 @@
 using HDL_ON.UI.CSS;
 using HDL_ON.Entity;
 using HDL_ON.DriverLayer;
+using HDL_ON.DAL.Server;
 
 namespace HDL_ON.UI
 {
@@ -73,6 +74,8 @@
         /// </summary>
         private Dictionary<string, string> dicText = new Dictionary<string, string>();
 
+
+
         #endregion
 
         #region 鈻� 鍒濆鍖朹____________________________
@@ -117,6 +120,47 @@
             this.RefreshFormStatu();
             //璇诲彇璁惧鐘舵��
             Control.Ins.SendReadCommand(device);
+
+            // 鑾峰彇涓存椂瀵嗙爜
+            GetTempPwd();
+        }
+
+        /// <summary>
+        /// 鑾峰彇涓存椂瀵嗙爜
+        /// </summary>
+        private void GetTempPwd()
+        {
+            new System.Threading.Thread(() =>
+            {
+                try
+                {
+                    var pack = Common.ApiUtlis.Ins.HttpRequest.GetDoorTempPassword(device.deviceId);
+                    if (pack != null)
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            if (pack.Code == StateCode.SUCCESS)
+                            {
+                                var tempPasswrodObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<DoorTempPassword>>(pack.Data.ToString());
+                                if (tempPasswrodObj.Count > 0)
+                                {
+                                    doorLockData.TempPassword = tempPasswrodObj[0].pwd;
+                                    doorLockData.StartTimeTick = tempPasswrodObj[0].beginTime;
+                                    doorLockData.EndTimeTick = tempPasswrodObj[0].endTime;
+                                    doorLockData.PwdId = tempPasswrodObj[0].pwdId;
+                                    this.InitTempPasswordControl();
+                                }
+                            }
+                        });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    MainPage.Log($"鑾峰彇涓存椂瀵嗙爜寮傚父:{ex.Message}");
+                }
+            })
+            { IsBackground = true }.Start();
+
         }
 
         /// <summary>
@@ -185,37 +229,43 @@
             frameTempPsw.Visible = false;
             FrameWhiteCentet1.AddChidren(frameTempPsw);
 
-            ////澹伴煶
-            //this.btnVoice = new IconViewControl(24);
-            //btnVoice.UnSelectedImagePath = "FunctionIcon/DoorLock/Voice.png";
-            //btnVoice.X = Application.GetRealWidth(23);
-            //btnVoice.Y = Application.GetRealHeight(410);
-            //FrameWhiteCentet1.AddChidren(btnVoice);
+            
+            //澹伴煶
+            this.btnVoice = new IconViewControl(24);
+            btnVoice.UnSelectedImagePath = "FunctionIcon/DoorLock/Voice.png";
+            btnVoice.X = Application.GetRealWidth(23);
+            btnVoice.Y = Application.GetRealHeight(410);
+            FrameWhiteCentet1.AddChidren(btnVoice);
 
-            ////澹伴煶鐨勬粦鍔ㄦ潯
-            //this.seekBarVoiceControl = new SeekBarImageControl(215);
-            //seekBarVoiceControl.Gravity = Gravity.CenterHorizontal;
-            //FrameWhiteCentet1.AddChidren(seekBarVoiceControl);
-            //seekBarVoiceControl.Y = btnVoice.Y - (seekBarVoiceControl.Height - btnVoice.Height) / 2;
-            ////缁戝畾PageLayout鎺т欢
-            //seekBarVoiceControl.BindPageLayout();
+            //澹伴煶鐨勬粦鍔ㄦ潯
+            this.seekBarVoiceControl = new SeekBarImageControl(215);
+            seekBarVoiceControl.Gravity = Gravity.CenterHorizontal;
+            FrameWhiteCentet1.AddChidren(seekBarVoiceControl);
+            seekBarVoiceControl.Y = btnVoice.Y - (seekBarVoiceControl.Height - btnVoice.Height) / 2;
+            //缁戝畾PageLayout鎺т欢
+            seekBarVoiceControl.BindPageLayout();
 
-            ////澹伴煶鐧惧垎姣�
-            //this.btnVoicePersent = new NormalViewControl(Application.GetRealWidth(50), btnVoice.Height, false);
-            //btnVoicePersent.X = seekBarVoiceControl.Right + Application.GetRealWidth(8) - seekBarVoiceControl.SeekBarPadding;
-            //btnVoicePersent.Y = btnVoice.Y;
-            //btnVoicePersent.TextColor = CSS_Color.PromptingColor1;
-            //btnVoicePersent.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;
-            //btnVoicePersent.Text = "100%";
-            //FrameWhiteCentet1.AddChidren(btnVoicePersent);
+            //澹伴煶鐧惧垎姣�
+            this.btnVoicePersent = new NormalViewControl(Application.GetRealWidth(50), btnVoice.Height, false);
+            btnVoicePersent.X = seekBarVoiceControl.Right + Application.GetRealWidth(8) - seekBarVoiceControl.SeekBarPadding;
+            btnVoicePersent.Y = btnVoice.Y;
+            btnVoicePersent.TextColor = CSS_Color.PromptingColor1;
+            btnVoicePersent.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;
+            btnVoicePersent.Text = "100%";
+            FrameWhiteCentet1.AddChidren(btnVoicePersent);
 
-            //seekBarVoiceControl.ProgressChangedEvent += (div, value) =>
-            //{
-            //    btnVoicePersent.Text = value + "%";
-            //    if (div == 1)
-            //    {
-            //    }
-            //};
+            seekBarVoiceControl.ProgressChangedEvent += (div, value) =>
+            {
+                btnVoicePersent.Text = value + "%";
+                //if (div == 1)
+                //{
+                //}
+            };
+            seekBarVoiceControl.OnStopTrackingTouchEvent = (sender, e) => {
+                var dic = new Dictionary<string, string>();
+                dic.Add("door_volume", e.ToString());
+                Control.Ins.SendWriteCommand(this.device, dic);
+            };
 
             //鍒濆鍖栧紑閿佽彍鍗�(涓�閿紑閿�,涓存椂瀵嗙爜寮�閿�)
             this.InitUnLockMenuControl();
@@ -229,7 +279,7 @@
         private void InitUnLockMenuControl()
         {
             //濡傛灉鏄垚鍛�,鍒欏彧鏈変竴閿紑閿�
-            if (true)// DB_ResidenceData.Instance.CurrentRegion.isOtherShare == true)
+            if ( DB_ResidenceData.Instance.CurrentRegion.isOtherShare == true)
             {
                 //涓�閿紑閿�
                 var btnOneKey = new NormalViewControl(100, 25, true);
@@ -556,32 +606,34 @@
                 this.frameTempPsw.AddChidren(btnDelete);
                 btnDelete.ButtonClickEvent += (sender, e) =>
                 {
-                    //娓呴櫎褰撳墠涓存椂瀵嗙爜锛�
-                    HdlMessageLogic.Current.ShowMassage(ShowMsgType.Confirm, Language.StringByID(StringId.ClearTempPsswordMsg), () =>
+                    if (Convert.ToInt64(this.doorLockData.EndTimeTick) < DateTime.Now.Ticks)
                     {
-                        //娓呯┖涓存椂瀵嗙爜
-                        this.doorLockData.TempPassword = string.Empty;
-                        this.doorLockData.StatrtTime = string.Empty;
-                        this.doorLockData.EndTime = string.Empty;
-                        //閲嶆柊鍒濆鍖栦复鏃跺瘑鐮佹帶浠�
-                        this.InitTempPasswordControl();
-                    });
+                        DelTempPwd();
+                    }
+                    else
+                    {
+                        //娓呴櫎褰撳墠涓存椂瀵嗙爜锛�
+                        HdlMessageLogic.Current.ShowMassage(ShowMsgType.Confirm, Language.StringByID(StringId.ClearTempPsswordMsg), () =>
+                        {
+                            DelTempPwd();
+                        });
+                    }
                 };
 
-                //澶嶅埗涓存椂瀵嗙爜鍥炬爣
-                var btnCopy = new IconViewControl(28);
-                btnCopy.UnSelectedImagePath = "FunctionIcon/DoorLock/Shard.png";
-                btnCopy.X = this.frameTempPsw.Width - btnCopy.IconSize - btnDelete.X;
-                btnCopy.Y = btnDelete.Y;
-                this.frameTempPsw.AddChidren(btnCopy);
-                btnCopy.ButtonClickEvent += (sender, e) =>
-                {
-                    //涓存椂瀵嗙爜宸茬粡澶嶅埗
-                    HdlCommonLogic.Current.SetTextToShearPlate(this.doorLockData.TempPassword, Language.StringByID(StringId.TempPsswordHasBeenCopy));
-                };
+                ////澶嶅埗涓存椂瀵嗙爜鍥炬爣
+                //var btnCopy = new IconViewControl(28);
+                //btnCopy.UnSelectedImagePath = "FunctionIcon/DoorLock/Shard.png";
+                //btnCopy.X = this.frameTempPsw.Width - btnCopy.IconSize - btnDelete.X;
+                //btnCopy.Y = btnDelete.Y;
+                //this.frameTempPsw.AddChidren(btnCopy);
+                //btnCopy.ButtonClickEvent += (sender, e) =>
+                //{
+                //    //涓存椂瀵嗙爜宸茬粡澶嶅埗
+                //    HdlCommonLogic.Current.SetTextToShearPlate(this.doorLockData.TempPassword, Language.StringByID(StringId.TempPsswordHasBeenCopy));
+                //};
 
                 //鐢熸晥鏃堕棿
-                var frameEffective = this.CreatEffectiveTimeControl(this.frameTempPsw, Language.StringByID(StringId.EffectiveTime), this.doorLockData.StatrtTime);
+                var frameEffective = this.CreatEffectiveTimeControl(this.frameTempPsw, Language.StringByID(StringId.EffectiveTime), this.doorLockData.StartTime);
                 frameEffective.X = Application.GetRealWidth(24);
                 frameEffective.Y = Application.GetRealHeight(180);
 
@@ -600,6 +652,61 @@
                 btnLine.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;
                 this.frameTempPsw.AddChidren(btnLine);
             }
+        }
+        /// <summary>
+        /// 鍒犻櫎涓存椂瀵嗙爜
+        /// </summary>
+        private void DelTempPwd()
+        {
+            var waitPage = new Loading();
+            this.AddChidren(waitPage);
+            waitPage.Start("");
+            new System.Threading.Thread(() =>
+            {
+                try
+                {
+                    var pack = Common.ApiUtlis.Ins.HttpRequest.DelDoorTempPassword(device.deviceId, doorLockData.PwdId);
+                    if (pack != null)
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            if (pack.Code == StateCode.SUCCESS)
+                            {
+                                //娓呯┖涓存椂瀵嗙爜
+                                this.doorLockData.TempPassword = string.Empty;
+                                this.doorLockData.StartTimeTick = string.Empty;
+                                this.doorLockData.EndTimeTick = string.Empty;
+                                this.doorLockData.PwdId = string.Empty;
+                                //閲嶆柊鍒濆鍖栦复鏃跺瘑鐮佹帶浠�
+                                this.InitTempPasswordControl();
+                            }
+                            else
+                            {
+                                IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+                            }
+                        });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    MainPage.Log($"鍒犻櫎闂ㄩ攣涓存椂瀵嗙爜寮傚父: {ex.Message}");
+                }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        try
+                        {
+                            waitPage.Hide();
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
+                        catch { }
+                    });
+                }
+            })
+            { IsBackground = true }.Start();
+
         }
 
         /// <summary>
@@ -657,12 +764,13 @@
 
             //鐢熸晥鏃堕棿
             var effectiveTime = Language.StringByID(StringId.EffectiveTime);
-            contr.AddRowMenu(effectiveTime, startTime.ToString("yyyy.MM.dd HH:mm"), (btnView, btnValue) =>
+            contr.AddRowMenu(effectiveTime + ": " + startTime.ToString("yyyy.MM.dd HH:mm"),"", (btnView, btnValue) =>
             {
                 //鍏虫帀鐣岄潰,鐒跺悗閲嶆柊璋冭捣鏉�
                 contr.Close();
 
                 var form = new DoorLockSelectTimePage();
+                form.TimeCheck = true;
                 form.AddForm(startTime);
                 form.SelectFinshEvent += (selectTime) =>
                 {
@@ -673,12 +781,13 @@
 
             //澶辨晥鏃堕棿
             var failTime = Language.StringByID(StringId.FailureTime);
-            contr.AddRowMenu(failTime, endTime.ToString("yyyy.MM.dd HH:mm"), (btnView, btnValue) =>
+            contr.AddRowMenu(failTime+": "+ endTime.ToString("yyyy.MM.dd HH:mm"),"", (btnView, btnValue) =>
             {
                 //鍏虫帀鐣岄潰,鐒跺悗閲嶆柊璋冭捣鏉�
                 contr.Close();
 
                 var form = new DoorLockSelectTimePage();
+                form.TimeCheck = true;
                 form.AddForm(endTime);
                 form.SelectFinshEvent += (selectTime) =>
                 {
@@ -698,12 +807,26 @@
                     //鍏虫帀鐣岄潰
                     contr.Close();
 
-                    //鐢熸垚涓存椂瀵嗙爜
-                    this.doorLockData.TempPassword = "987654";
-                    this.doorLockData.StatrtTime = startTime.ToString("yyyy.MM.dd HH:mm");
-                    this.doorLockData.EndTime = endTime.ToString("yyyy.MM.dd HH:mm");
-                    //閲嶆柊鍒濆鍖栦复鏃跺瘑鐮佹帶浠�
-                    this.InitTempPasswordControl();
+                    new System.Threading.Thread(() =>
+                    {
+                        var pack = Common.ApiUtlis.Ins.HttpRequest.CreateDoorTempPassword(device.deviceId,
+                            Utlis.DateTimeToUnix(startTime).ToString(), Utlis.DateTimeToUnix(endTime).ToString());
+                        if (pack != null)
+                        {
+                            if (pack.Code == StateCode.SUCCESS)
+                            {
+                                // 鑾峰彇涓存椂瀵嗙爜
+                                GetTempPwd();
+                            }
+                            else
+                            {
+                                Application.RunOnMainThread(() => {
+                                    IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+                                });
+                            }
+                        }
+                    })
+                    { IsBackground = true }.Start();
                 }
             };
 
@@ -725,6 +848,12 @@
             {
                 //鐢熸晥鏃堕棿蹇呴』澶т簬澶辨晥鏃堕棿
                 HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(StringId.EffectiveTimeMustBeOverFailureTime));
+                return false;
+            }
+            if ((endTime - startTime).TotalHours>=24)
+            {
+                //涓存椂瀵嗙爜鏈夋晥鏈熶笉鑳藉ぇ浜�24灏忔椂
+                HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(StringId.TempPwdValidityTip));
                 return false;
             }
             return true;
@@ -758,34 +887,43 @@
         /// </summary>
         private void RefreshFormStatu()
         {
-            //濡傛灉涓嶅湪绾�
-            if (this.doorLockData.IsOnline == false)
+            try
             {
-                //寮�閿佸浘鐗�
-                this.picLockControl.UnSelectedImagePath = "FunctionIcon/DoorLock/LockPictrue2.png";
-                //杩炴帴鐘舵��
-                this.btnOnlineIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/UnConnect.png";
-                this.btnOnlineView.Text = this.dicText["鏈繛鎺�"];
-                this.btnOnlineView.TextColor = CSS_Color.AuxiliaryColor2;
-                //甯稿紑妯″紡鍥炬爣
-                if (this.btnNormallyOpenIcon != null)
+                //濡傛灉涓嶅湪绾�
+                if (this.doorLockData.IsOnline == false)
                 {
-                    this.btnNormallyOpenIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/NormallyOpenIcon2.png";
+                    //寮�閿佸浘鐗�
+                    this.picLockControl.UnSelectedImagePath = "FunctionIcon/DoorLock/LockPictrue2.png";
+                    //杩炴帴鐘舵��
+                    this.btnOnlineIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/UnConnect.png";
+                    this.btnOnlineView.Text = this.dicText["鏈繛鎺�"];
+                    this.btnOnlineView.TextColor = CSS_Color.AuxiliaryColor2;
+                    //甯稿紑妯″紡鍥炬爣
+                    if (this.btnNormallyOpenIcon != null)
+                    {
+                        this.btnNormallyOpenIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/NormallyOpenIcon2.png";
+                    }
                 }
+                else
+                {
+                    //寮�閿佸浘鐗�
+                    this.picLockControl.UnSelectedImagePath = this.doorLockData.Open == true ? "FunctionIcon/DoorLock/UnLockPictrue3.png" : "FunctionIcon/DoorLock/LockPictrue1.png";
+                    //杩炴帴鐘舵��
+                    this.btnOnlineIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/Connect.png";
+                    this.btnOnlineView.Text = this.dicText["宸茶繛鎺�"];
+                    this.btnOnlineView.TextColor = CSS_Color.PromptingColor1;
+                    //甯稿紑妯″紡鍥炬爣
+                    if (this.btnNormallyOpenIcon != null)
+                    {
+                        this.btnNormallyOpenIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/NormallyOpenIcon1.png";
+                    }
+                }
+                this.seekBarVoiceControl.Progress = this.doorLockData.Voice;
+                this.btnVoicePersent.Text = this.doorLockData.Voice.ToString();
             }
-            else
+            catch (Exception ex)
             {
-                //寮�閿佸浘鐗�
-                this.picLockControl.UnSelectedImagePath = this.doorLockData.Open == true ? "FunctionIcon/DoorLock/UnLockPictrue3.png" : "FunctionIcon/DoorLock/LockPictrue1.png";
-                //杩炴帴鐘舵��
-                this.btnOnlineIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/Connect.png";
-                this.btnOnlineView.Text = this.dicText["宸茶繛鎺�"];
-                this.btnOnlineView.TextColor = CSS_Color.PromptingColor1;
-                //甯稿紑妯″紡鍥炬爣
-                if (this.btnNormallyOpenIcon != null)
-                {
-                    this.btnNormallyOpenIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/NormallyOpenIcon1.png";
-                }
+                MainPage.Log($"鐣岄潰鏇存柊寮傚父锛岄棬閿�:{ex.Message}");
             }
         }
 
@@ -1001,7 +1139,7 @@
                     }
                 }
                 //闊抽噺
-                else if (data.key == "volume")
+                else if (data.key == "door_volume") 
                 {
                     var value = data.state;
                     if (value != string.Empty)
@@ -1065,13 +1203,62 @@
             /// <summary>
             /// 涓存椂瀵嗙爜鐢熸晥鏃堕棿(2020.03.17 13:27)
             /// </summary>
-            public string StatrtTime = string.Empty;
+            public string StartTime {
+                get
+                {
+                    try
+                    {
+                        if(string.IsNullOrEmpty(StartTimeTick))
+                        {
+                            return string.Empty;
+                        }
+                        return Utlis.UnixToDateTime(Convert.ToInt64(StartTimeTick)).ToString("yyyy.MM.dd HH:mm");
+                    }catch(Exception ex)
+                    {
+                        MainPage.Log($"涓存椂瀵嗙爜鐢熸晥鏃堕棿杞崲寮傚父: {ex.Message}");
+                        return string.Empty;
+                    }
+                }
+            }
+            public string StartTimeTick = string.Empty;
             /// <summary>
             /// 涓存椂瀵嗙爜澶辨晥鏃堕棿(2020.03.17 13:27)
             /// </summary>
-            public string EndTime = string.Empty;
+            public string EndTime {
+                get
+                {
+                    try
+                    {
+                        if (string.IsNullOrEmpty(EndTimeTick))
+                        {
+                            return string.Empty;
+                        }
+                        return Utlis.UnixToDateTime(Convert.ToInt64(EndTimeTick)).ToString("yyyy.MM.dd HH:mm");
+                    }
+                    catch (Exception ex)
+                    {
+                        MainPage.Log($"涓存椂瀵嗙爜鐢熸晥鏃堕棿杞崲寮傚父: {ex.Message}");
+                        return string.Empty;
+                    }
+                }
+            }
+            public string EndTimeTick = string.Empty;
+            /// <summary>
+            /// 涓存椂瀵嗙爜id
+            /// </summary>
+            public string PwdId = string.Empty;
         }
 
+        /// <summary>
+        /// 闂ㄩ攣涓存椂瀵嗙爜
+        /// </summary>
+        private class DoorTempPassword
+        {
+            public string pwdId = string.Empty;
+            public string pwd = string.Empty;
+            public string beginTime = string.Empty;
+            public string endTime = string.Empty;
+        }
         #endregion
     }
 }
diff --git a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockSelectTimePage.cs b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockSelectTimePage.cs
index 349efc6..2219b13 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockSelectTimePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockSelectTimePage.cs
@@ -22,6 +22,12 @@
         /// 閫夋嫨鐨勬椂闂�
         /// </summary>
         private DateTime selectDateTime;
+        /// <summary>
+        /// 鏃堕棿鏍¢獙
+        /// 鏄惁闇�瑕佹牎楠屾椂闂村ぇ浜庡綋鍓嶆椂闂�
+        /// </summary>
+        public bool TimeCheck = false;
+
 
         #endregion
 
@@ -51,18 +57,44 @@
             this.ClearBodyFrame();
 
             //閫夋嫨鏃ユ湡
-            var rowDate = new RowLayoutControl();
+            var rowDate = new FrameLayout() {
+                Height = Application.GetRealHeight(50),
+            };
             rowDate.BackgroundColor = CSS_Color.MainBackgroundColor;
             bodyFrameLayout.AddChidren(rowDate);
-            rowDate.frameTable.AddLeftCaption(Language.StringByID(StringId.SelectDate), 300);
-            rowDate.frameTable.AddRightArrow();
-            rowDate.frameTable.AddBottomLine();
-            var btnDay = rowDate.frameTable.AddMostRightView(this.selectDateTime.ToString("yyyy.MM.dd"), 300);
-            rowDate.frameTable.ButtonClickEvent += (sender, e) =>
+            var btnDateLeft = new Button()
+            {
+                TextID = StringId.SelectDate,
+                TextAlignment = TextAlignment.CenterLeft,
+                Width = Application.GetRealWidth(300),
+                X = Application.GetRealWidth(16),
+                TextColor = CSS_Color.FirstLevelTitleColor,
+            };
+            rowDate.AddChidren(btnDateLeft);
+            var btnDateRight = new Button()
+            {
+                X = Application.GetRealWidth(339),
+                Gravity = Gravity.CenterVertical,
+                Width = Application.GetMinRealAverage(16),
+                Height = Application.GetMinRealAverage(16),
+                UnSelectedImagePath = "Public/Right.png",
+            };
+            rowDate.AddChidren(btnDateRight);
+            rowDate.AddChidren(new Button() { X = Application.GetRealWidth(16),Y = Application.GetRealHeight(49), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
+
+            var btnDay = new Button()
+            {
+                Width = Application.GetRealWidth(327),
+                TextAlignment = TextAlignment.CenterRight,
+                Text = selectDateTime.ToString("yyyy.MM.dd"),
+                TextColor = CSS_Color.FirstLevelTitleColor,
+            };
+            rowDate.AddChidren(btnDay);
+            EventHandler<MouseEventArgs> dateEvent = (sender, e) =>
             {
                 //鏄剧ず鏃ユ湡閫夋嫨鐨勫簳閮ㄥ脊绐�
                 var contr = new BottomDateSelectControl();
-                contr.InitControl(this.selectDateTime.Year, this.selectDateTime.Month, this.selectDateTime.Day, 1, 1);
+                contr.InitControl(this.selectDateTime.Year, this.selectDateTime.Month, this.selectDateTime.Day, 0, 1);
                 contr.FinishEvent += (div, year, month, day) =>
                 {
                     //瑕嗙洊鏃堕棿
@@ -73,21 +105,50 @@
                     }
                 };
             };
+            btnDateLeft.MouseUpEventHandler = dateEvent;
+            btnDateRight.MouseUpEventHandler = dateEvent;
+            btnDay.MouseUpEventHandler = dateEvent;
 
             //閫夋嫨鏃堕棿
-            var rowTime = new RowLayoutControl();
-            rowTime.Y = rowDate.Bottom;
-            rowTime.BackgroundColor = CSS_Color.MainBackgroundColor;
+            var rowTime = new FrameLayout() {
+                Y = rowDate.Bottom,
+                Height = Application.GetRealHeight(50),
+                BackgroundColor = CSS_Color.MainBackgroundColor,
+            };
             bodyFrameLayout.AddChidren(rowTime);
-            rowTime.frameTable.AddLeftCaption(Language.StringByID(StringId.SelectTime), 300);
-            rowTime.frameTable.AddRightArrow();
-            var btnTime = rowTime.frameTable.AddMostRightView(this.selectDateTime.ToString("HH:mm"), 300);
-            rowTime.frameTable.ButtonClickEvent += (sender, e) =>
+            rowTime.AddChidren(new Button() { X = Application.GetRealWidth(16),Y = Application.GetRealHeight(49), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
+            var btnTimeLeft = new Button()
+            {
+                TextID = StringId.SelectTime,
+                TextAlignment = TextAlignment.CenterLeft,
+                Width = Application.GetRealWidth(300),
+                X = Application.GetRealWidth(16),
+                TextColor = CSS_Color.FirstLevelTitleColor,
+            };
+            rowTime.AddChidren(btnTimeLeft);
+            var btnTimeRight = new Button()
+            {
+                X = Application.GetRealWidth(339),
+                Gravity = Gravity.CenterVertical,
+                Width = Application.GetMinRealAverage(16),
+                Height = Application.GetMinRealAverage(16),
+                UnSelectedImagePath = "Public/Right.png",
+            };
+            rowTime.AddChidren(btnTimeRight);
+            var btnTime = new Button()
+            {
+                Width = Application.GetRealWidth(327),
+                TextAlignment = TextAlignment.CenterRight,
+                Text = selectDateTime.ToString("HH:mm"),
+                TextColor = CSS_Color.FirstLevelTitleColor,
+            };
+            rowTime.AddChidren(btnTime);
+            EventHandler<MouseEventArgs> timeEvent = (sender, e) =>
             {
                 //鏄剧ず鏃ユ湡閫夋嫨鐨勫簳閮ㄥ脊绐�
                 var contr = new BottomTimeSelectControl();
-                contr.RowCount = 5;
-                contr.InitControl(this.selectDateTime.Hour, this.selectDateTime.Minute, -1);
+                contr.RowCount = 4;
+                contr.InitControl(this.selectDateTime.Hour, this.selectDateTime.Minute,250);
                 contr.FinishEvent += (div, hour, minute) =>
                 {
                     //瑕嗙洊鏃堕棿
@@ -98,6 +159,9 @@
                     }
                 };
             };
+            btnTimeLeft.MouseUpEventHandler = timeEvent;
+            btnTimeRight.MouseUpEventHandler = timeEvent;
+            btnTime.MouseUpEventHandler = timeEvent;
         }
 
         #endregion
@@ -109,6 +173,14 @@
         /// </summary>
         public override void CloseFormBefore()
         {
+            if (TimeCheck)
+            {
+                if (DateTime.Now > this.selectDateTime.AddMinutes(1))
+                {
+                    new PublicAssmebly().TipMsg(StringId.Tip, StringId.TempPwdSettingTip);
+                    throw new Exception("stop");
+                }
+            }
             base.CloseFormBefore();
             //璋冪敤鍥炶皟浜嬩欢
             this.SelectFinshEvent?.Invoke(this.selectDateTime);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs
index cf7936f..2b41c7d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs
@@ -892,7 +892,7 @@
             switch (sensorSPK)
             {
                 case SPK.SensorPm25:
-                    btnTitle.Text = "PM2.5(ug/m虏)";
+                    btnTitle.Text = "PM2.5(ug/m鲁)";
                     break;
                 case SPK.SensorTemperature:
                     btnTitle.Text = Language.StringByID(StringId.Temp) + "(掳C)";
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
index a49c750..58cfe45 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
@@ -495,6 +495,7 @@
             List<uint> levelColorList = new List<uint>();
             List<int> levelTextList = new List<int>();
             List<string> levelText = new List<string>();
+            List<string> intervalList = new List<string>();
             var configs = sensor.GetAttrKeyConfigs(sensor.SpkClassification);
 
 
@@ -514,7 +515,9 @@
             {
                 levelColorList = sensorTemp.GetLevelColorList(sensor.spk);
                 levelTextList = sensorTemp.GetLevelTextList(sensor.spk);
-                foreach(var iii in levelTextList)
+                intervalList = sensorTemp.GetIntervalValue(sensor.spk);
+
+                foreach (var iii in levelTextList)
                 {
                     levelText.Add(Language.StringByID(iii));
                 }
@@ -554,7 +557,7 @@
             switch (sensor.spk)
             {
                 case SPK.SensorPm25:
-                    btnTitle.Text = "PM2.5(ug/m虏)";
+                    btnTitle.Text = "PM2.5(ug/m鲁)";//虏
                     break;
                 case SPK.SensorTemperature:
                     btnTitle.Text = Language.StringByID(StringId.Temp) + "(掳C)";
@@ -611,55 +614,65 @@
                 IsBold = true,
                 TextID = StringId.ColorValue,
             });
-            for (int index = 0; index < levelText.Count; index++)
+            try
             {
-                infoView.AddChidren(new Button()
+                for (int index = 0; index < levelText.Count; index++)
                 {
-                    Gravity = Gravity.CenterHorizontal,
-                    Width = Application.GetRealWidth(303),
-                    Height = Application.GetRealWidth(1),
-                    BackgroundColor = CSS_Color.DividingLineColor,
-                });
+                    //if(sensorTemp.GetIntervalValue(sensor.spk).Count >= index)
+                    //{
+                    //    return;
+                    //}
+                    infoView.AddChidren(new Button()
+                    {
+                        Gravity = Gravity.CenterHorizontal,
+                        Width = Application.GetRealWidth(303),
+                        Height = Application.GetRealWidth(1),
+                        BackgroundColor = CSS_Color.DividingLineColor,
+                    });
 
-                FrameLayout subInfoView = new FrameLayout()
-                {
-                    Height = Application.GetRealHeight(44),
-                };
-                infoView.AddChidren(subInfoView);
+                    FrameLayout subInfoView = new FrameLayout()
+                    {
+                        Height = Application.GetRealHeight(44),
+                    };
+                    infoView.AddChidren(subInfoView);
 
-                subInfoView.AddChidren(new Button()
-                {
-                    X = Application.GetRealWidth(20),
-                    Width = Application.GetRealWidth(100),
-                    TextAlignment = TextAlignment.CenterLeft,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.TextFontSize,
-                    IsBold = true,
-                    Text = sensorTemp.GetIntervalValue(sensor.spk)[index]
-                });
+                    subInfoView.AddChidren(new Button()
+                    {
+                        X = Application.GetRealWidth(20),
+                        Width = Application.GetRealWidth(100),
+                        TextAlignment = TextAlignment.CenterLeft,
+                        TextColor = CSS_Color.FirstLevelTitleColor,
+                        TextSize = CSS_FontSize.TextFontSize,
+                        IsBold = true,
+                        Text = sensorTemp.GetIntervalValue(sensor.spk)[index]
+                    });
 
-                subInfoView.AddChidren(new Button()
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    Width = Application.GetRealWidth(100),
-                    TextAlignment = TextAlignment.Center,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.TextFontSize,
-                    IsBold = true,
-                    Text = levelText[index]
-                });
+                    subInfoView.AddChidren(new Button()
+                    {
+                        Gravity = Gravity.CenterHorizontal,
+                        Width = Application.GetRealWidth(100),
+                        TextAlignment = TextAlignment.Center,
+                        TextColor = CSS_Color.FirstLevelTitleColor,
+                        TextSize = CSS_FontSize.TextFontSize,
+                        IsBold = true,
+                        Text = levelText[index]
+                    });
 
-                subInfoView.AddChidren(new Button()
-                {
-                    X = Application.GetRealWidth(285),
-                    Gravity = Gravity.CenterVertical,
-                    Width = Application.GetRealWidth(38),
-                    Height = Application.GetRealHeight(18),
-                    Radius = (uint)Application.GetRealWidth(4),
-                    BackgroundColor = levelColorList[index]
-                });
+                    subInfoView.AddChidren(new Button()
+                    {
+                        X = Application.GetRealWidth(285),
+                        Gravity = Gravity.CenterVertical,
+                        Width = Application.GetRealWidth(38),
+                        Height = Application.GetRealHeight(18),
+                        Radius = (uint)Application.GetRealWidth(4),
+                        BackgroundColor = levelColorList[index]
+                    });
+                }
             }
-
+            catch (Exception ex)
+            {
+                MainPage.Log($"鐜绛夌骇淇℃伅琛ㄥ姞杞藉紓甯�:{ex.Message}");
+            }
 
 
 
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
index 7a4bc60..8828d13 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
@@ -152,7 +152,7 @@
 //                Text = "10掳C",
 //            };
 //            topWeatherView.AddChidren(btnTempUpperLimitText);
-            
+
 //            var btnTempLowerLimit = new Button()
 //            {
 //                X = btnTempUpperLimitText.Right,
@@ -295,7 +295,7 @@
 //                UnSelectedImagePath = "Public/DownIcon.png",
 //            };
 //            contentView.AddChidren(btnFoorDownIcon);
-            
+
 //            btnRoom = new Button()
 //            {
 //                X = btnFoorDownIcon.Right,
@@ -514,7 +514,7 @@
 //            switch (sensor.spk)
 //            {
 //                case SPK.SensorPm25:
-//                    btnTitle.Text = "PM2.5(ug/m虏)";
+//                    btnTitle.Text = "PM2.5(ug/m鲁)";
 //                    break;
 //                case SPK.SensorTemperature:
 //                    btnTitle.Text = Language.StringByID(StringId.Temp) + "(掳C)";
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
index 7bed343..a10b239 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
@@ -69,7 +69,7 @@
             {
                 Y = Application.GetRealHeight(64),
                 Height = Application.GetRealHeight(600),
-                ScrollEnabled = false
+                ScrollEnabled = sensorList.Count > 6
             };
             bodyView.AddChidren(contentView);
 
@@ -657,165 +657,178 @@
             bool initTitleButton = true;
 
             int index = 1;
-            foreach (var tempSensor in sensorList)
+            try
             {
-                if(index > 6)
+                new System.Threading.Thread(() =>
                 {
-                    break;
-                }
-                if (tempSensor.sid == function.sid)
-                {
-                    continue;
-                }
-                if (tempSensor.spk != function.spk)
-                {
-                    continue;
-                }
-                contentView.ScrollEnabled = true;
-
-                if (initTitleButton)
-                {
-                    Button btnOthreTitle = new Button()
+                    foreach (var tempSensor in sensorList)
                     {
-                        X = Application.GetRealWidth(16),
-                        Width = Application.GetRealWidth(200),
-                        Height = Application.GetRealWidth(38),
-                        TextAlignment = TextAlignment.CenterLeft,
-                        TextColor = CSS_Color.FirstLevelTitleColor,
-                        TextSize = CSS_FontSize.SubheadingFontSize,
-                        TextID = StringId.OtherArea,
-                    };
-                    contentView.AddChidren(btnOthreTitle);
-                    initTitleButton = false;
-                }
+                        if (index >= 6)
+                        {
+                            break;
+                        }
+                        if (tempSensor.sid == function.sid)
+                        {
+                            continue;
+                        }
+                        if (tempSensor.spk != function.spk)
+                        {
+                            continue;
+                        }
 
-                #region 鍏跺畠浼犳劅鍣ㄤ俊鎭爮
-                FrameLayout otherInfoView = new FrameLayout()
-                {
-                    Gravity = Gravity.CenterHorizontal,
-                    Width = Application.GetRealWidth(343),
-                    Height = Application.GetRealWidth(100),
-                    BackgroundColor = CSS_Color.MainBackgroundColor,
-                    Radius = (uint)Application.GetRealWidth(12),
-                    BorderColor = 0x00000000,
-                    BorderWidth = 0,
-                };
-                contentView.AddChidren(otherInfoView);
-
-                Button btnTipColor1 = new Button()
-                {
-                    X = Application.GetRealWidth(8),
-                    Y = Application.GetRealWidth(16),
-                    Width = Application.GetRealWidth(12),
-                    Height = Application.GetRealWidth(12),
-                    BackgroundColor = tipColorList[index++],
-                    Radius = (uint)Application.GetRealWidth(2),
-                    BorderWidth = 0,
-                    BorderColor = 0x00000000,
-                };
-                otherInfoView.AddChidren(btnTipColor1);
-
-                Button btnSensorName = new Button()
-                {
-                    X = Application.GetRealWidth(28),
-                    Y = Application.GetRealWidth(10),
-                    Width = Application.GetRealWidth(250),
-                    Height = Application.GetRealWidth(24),
-                    TextAlignment = TextAlignment.CenterLeft,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    TextSize = CSS_FontSize.TextFontSize,
-                    Text = function.name,
-                    IsBold = true,
-                };
-                otherInfoView.AddChidren(btnSensorName);
-
-                Button btnFromFoorAndRoom1 = new Button()
-                {
-                    X = Application.GetRealWidth(16),
-                    Y = btnSeltSensorName.Bottom,
-                    Width = Application.GetRealWidth(270),
-                    Height = Application.GetRealHeight(21),
-                    TextColor = CSS_Color.PromptingColor1,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                    Text = tempSensor.GetRoomListName()
-                };
-                otherInfoView.AddChidren(btnFromFoorAndRoom1);
-
-                var btnSetting1 = new Button()
-                {
-                    X = Application.GetRealWidth(291),
-                    Y = Application.GetRealWidth(6),
-                    Width = Application.GetMinRealAverage(32),
-                    Height = Application.GetMinRealAverage(32),
-                    UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
-                };
-                otherInfoView.AddChidren(btnSetting1);
-
-                btnSetting1.MouseUpEventHandler = (sender, e) =>
-                {
-                    Action backAction = () =>
-                    {
-                        MainPage.Log("45678i");
                         Application.RunOnMainThread(() =>
                         {
-                            btnSeltSensorName.Text = tempSensor.name;
+                            if (initTitleButton)
+                            {
+                                Button btnOthreTitle = new Button()
+                                {
+                                    X = Application.GetRealWidth(16),
+                                    Width = Application.GetRealWidth(200),
+                                    Height = Application.GetRealWidth(38),
+                                    TextAlignment = TextAlignment.CenterLeft,
+                                    TextColor = CSS_Color.FirstLevelTitleColor,
+                                    TextSize = CSS_FontSize.SubheadingFontSize,
+                                    TextID = StringId.OtherArea,
+                                };
+                                contentView.AddChidren(btnOthreTitle);
+                                initTitleButton = false;
+                            }
+
+                            #region 鍏跺畠浼犳劅鍣ㄤ俊鎭爮
+                            FrameLayout otherInfoView = new FrameLayout()
+                            {
+                                Gravity = Gravity.CenterHorizontal,
+                                Width = Application.GetRealWidth(343),
+                                Height = Application.GetRealWidth(100),
+                                BackgroundColor = CSS_Color.MainBackgroundColor,
+                                Radius = (uint)Application.GetRealWidth(12),
+                                BorderColor = 0x00000000,
+                                BorderWidth = 0,
+                            };
+                            contentView.AddChidren(otherInfoView);
+
+                            Button btnTipColor1 = new Button()
+                            {
+                                X = Application.GetRealWidth(8),
+                                Y = Application.GetRealWidth(16),
+                                Width = Application.GetRealWidth(12),
+                                Height = Application.GetRealWidth(12),
+                                BackgroundColor = tipColorList[index++],
+                                Radius = (uint)Application.GetRealWidth(2),
+                                BorderWidth = 0,
+                                BorderColor = 0x00000000,
+                            };
+                            otherInfoView.AddChidren(btnTipColor1);
+
+                            Button btnSensorName = new Button()
+                            {
+                                X = Application.GetRealWidth(28),
+                                Y = Application.GetRealWidth(10),
+                                Width = Application.GetRealWidth(250),
+                                Height = Application.GetRealWidth(24),
+                                TextAlignment = TextAlignment.CenterLeft,
+                                TextColor = CSS_Color.FirstLevelTitleColor,
+                                TextSize = CSS_FontSize.TextFontSize,
+                                Text = function.name,
+                                IsBold = true,
+                            };
+                            otherInfoView.AddChidren(btnSensorName);
+
+                            Button btnFromFoorAndRoom1 = new Button()
+                            {
+                                X = Application.GetRealWidth(16),
+                                Y = btnSeltSensorName.Bottom,
+                                Width = Application.GetRealWidth(270),
+                                Height = Application.GetRealHeight(21),
+                                TextColor = CSS_Color.PromptingColor1,
+                                TextAlignment = TextAlignment.CenterLeft,
+                                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                                Text = tempSensor.GetRoomListName()
+                            };
+                            otherInfoView.AddChidren(btnFromFoorAndRoom1);
+
+                            var btnSetting1 = new Button()
+                            {
+                                X = Application.GetRealWidth(291),
+                                Y = Application.GetRealWidth(6),
+                                Width = Application.GetMinRealAverage(32),
+                                Height = Application.GetMinRealAverage(32),
+                                UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
+                            };
+                            otherInfoView.AddChidren(btnSetting1);
+
+                            btnSetting1.MouseUpEventHandler = (sender, e) =>
+                            {
+                                Action backAction = () =>
+                                {
+                                    MainPage.Log("45678i");
+                                    Application.RunOnMainThread(() =>
+                                    {
+                                        btnSeltSensorName.Text = tempSensor.name;
+                                    });
+                                };
+                                var infoView = new FunctionBaseInfoSetPage(tempSensor, backAction);
+                                MainPage.BasePageView.AddChidren(infoView);
+                                infoView.LoadPage();
+                                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                            };
+
+                            Button btnSensorValue = new Button()
+                            {
+                                X = Application.GetRealWidth(16),
+                                Y = Application.GetRealWidth(47),
+                                Width = Application.GetRealWidth(200),
+                                Height = Application.GetRealWidth(43),
+                                TextAlignment = TextAlignment.CenterLeft,
+                                TextColor = CSS_Color.FirstLevelTitleColor,
+                                IsBold = true,
+                                TextSize = CSS_FontSize.HeadlineFontSize,
+                            };
+                            otherInfoView.AddChidren(btnSensorValue);
+
+                            var btnShowData1 = new Button()
+                            {
+                                X = Application.GetRealWidth(291),
+                                Y = Application.GetRealWidth(62),
+                                Width = Application.GetMinRealAverage(32),
+                                Height = Application.GetMinRealAverage(32),
+                                UnSelectedImagePath = "FunctionIcon/EnvironmentalScience/DiagramIcon.png",
+                                SelectedImagePath = "FunctionIcon/EnvironmentalScience/DiagramIconOn.png",
+                            };
+                            otherInfoView.AddChidren(btnShowData1);
+                            btnShowData1.MouseUpEventHandler = (sender, e) =>
+                            {
+                                btnShowData1.IsSelected = !btnShowData1.IsSelected;
+                                if (btnShowData1.IsSelected)
+                                {
+                                    if (!showFunctions.Contains(tempSensor))
+                                    {
+                                        showFunctions.Add(tempSensor);
+                                    }
+                                }
+                                else
+                                {
+                                    if (showFunctions.Contains(tempSensor))
+                                    {
+                                        showFunctions.Remove(tempSensor);
+                                    }
+                                }
+                                LoadMothed_GetSensorHistoryData();
+                            };
+                            #endregion
+
+                            contentView.AddChidren(new Button()
+                            {
+                                Height = Application.GetRealHeight(12),
+                            });
                         });
-                    };
-                    var infoView = new FunctionBaseInfoSetPage(tempSensor, backAction);
-                    MainPage.BasePageView.AddChidren(infoView);
-                    infoView.LoadPage();
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                };
-
-                Button btnSensorValue = new Button()
-                {
-                    X = Application.GetRealWidth(16),
-                    Y = Application.GetRealWidth(47),
-                    Width = Application.GetRealWidth(200),
-                    Height = Application.GetRealWidth(43),
-                    TextAlignment = TextAlignment.CenterLeft,
-                    TextColor = CSS_Color.FirstLevelTitleColor,
-                    IsBold = true,
-                    TextSize = CSS_FontSize.HeadlineFontSize,
-                };
-                otherInfoView.AddChidren(btnSensorValue);
-
-                var btnShowData1 = new Button()
-                {
-                    X = Application.GetRealWidth(291),
-                    Y = Application.GetRealWidth(62),
-                    Width = Application.GetMinRealAverage(32),
-                    Height = Application.GetMinRealAverage(32),
-                    UnSelectedImagePath = "FunctionIcon/EnvironmentalScience/DiagramIcon.png",
-                    SelectedImagePath = "FunctionIcon/EnvironmentalScience/DiagramIconOn.png",
-                };
-                otherInfoView.AddChidren(btnShowData1);
-                btnShowData1.MouseUpEventHandler = (sender, e) => {
-                    btnShowData1.IsSelected = !btnShowData1.IsSelected;
-                    if (btnShowData1.IsSelected)
-                    {
-                        if (!showFunctions.Contains(tempSensor))
-                        {
-                            showFunctions.Add(tempSensor);
-                        }
+                        System.Threading.Thread.Sleep(50);
                     }
-                    else
-                    {
-                        if (showFunctions.Contains(tempSensor))
-                        {
-                            showFunctions.Remove(tempSensor);
-                        }
-                    }
-                    LoadMothed_GetSensorHistoryData();
-                };
-                #endregion
-
-                contentView.AddChidren(new Button()
-                {
-                    Height = Application.GetRealHeight(12),
-                });
-
+                }).Start();
+            }
+            catch(Exception ex)
+            {
+                MainPage.Log($"鍔犺浇浼犳劅鍣ㄥ紓甯竫x:{ex.Message}");
             }
             #endregion
             new TopViewDiv(bodyView, Language.StringByID(sensorTemp.GetFunctionTypeNameId(function.spk))).LoadTopView();
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
index 6835fc1..a7a9b3e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
@@ -19,6 +19,10 @@
                     {
                         return;
                     }
+                    if (updateTemp.sid != bodyView.function.sid)
+                    {
+                        return;
+                    }
                     var outinTemp = Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.SetTemp).Replace(",", ".")));
                     bodyView.btnTemp.Text = outinTemp.ToString();
                     //bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.RoomTemp).Replace(",", "."))) + "掳C";
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
index d58fb4b..90902b3 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
@@ -29,6 +29,18 @@
         /// 浣嶇疆淇℃伅璺宠浆缂栬緫鎸夐挳
         /// </summary>
         Button btnLocationInfoRight;
+        /// <summary>
+        /// 鍒犻櫎璁惧
+        /// </summary>
+        Button delTextBtn;
+        /// <summary>
+        /// 涓嬩竴绾у浘鏍�
+        /// </summary>
+        Button delRightBtn;
+        /// <summary>
+        /// 鍒犻櫎璁惧琛孎rameLayout
+        /// </summary>
+        FrameLayout delView;
 
         #endregion
 
@@ -38,6 +50,11 @@
         /// 鍚庨��鏃讹紝鍒锋柊涔嬪墠鐣岄潰鐨勬樉绀轰俊鎭�
         /// </summary>
         Action actionRefresh;
+
+        /// <summary>
+        /// 瑙g粦璁惧鍥炶皟
+        /// </summary>
+        public Action actionDel;
         #endregion
 
         public FunctionBaseInfoSetPage(Function func, Action action)
@@ -66,7 +83,7 @@
         public void LoadPage(bool locationSetting = true)
         {
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
-            new TopViewDiv(bodyView, Language.StringByID(StringId.Setting)).LoadTopView(actionRefresh);
+            new TopViewDiv(bodyView, Language.StringByID(StringId.Setting)).LoadTopView();
 
             var contentView = new VerticalScrolViewLayout()
             {
@@ -180,13 +197,13 @@
                 #endregion
             }
             #region 鍏变韩
+
             //var sharedView = new FrameLayout()
             //{
             //    Height = Application.GetRealHeight(55),
             //    BackgroundColor = CSS_Color.MainBackgroundColor,
             //};
             //contentView.AddChidren(sharedView);
-
             //var btnSharedText = new Button()
             //{
             //    X = Application.GetRealWidth(16),
@@ -219,6 +236,129 @@
             //    });
             #endregion
 
+            #region 鍒犻櫎璁惧琛�  搴忓垪鍙� 鍨嬪彿
+
+            //鍒犻櫎璁惧琛�
+            delView = new FrameLayout() 
+            {
+                Height = Application.GetRealHeight(55),
+                BackgroundColor = CSS_Color.MainBackgroundColor,
+            };
+            if (this.function.spk == SPK.VideoDoorLock)
+            {
+                contentView.AddChidren(delView);
+            }
+            var lineBtn = new Button()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                BackgroundColor = CSS_Color.DividingLineColor,
+                Width = Application.GetRealWidth(343),
+                Height = Application.GetRealHeight(1)
+            };
+            delView.AddChidren(lineBtn);
+             delTextBtn = new Button() 
+            {
+                X = Application.GetRealWidth(16),
+                Width = Application.GetRealWidth(160),
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                TextID = StringId.DeleteDevice,
+            };
+            delView.AddChidren(delTextBtn);
+
+            delRightBtn= new Button()
+            {
+                X = Application.GetRealWidth(339),
+                Gravity = Gravity.CenterVertical,
+                Width = Application.GetMinRealAverage(16),
+                Height = Application.GetMinRealAverage(16),
+                UnSelectedImagePath = "Public/RightIcon.png",
+            };
+            delView.AddChidren(delRightBtn);
+
+            //搴忓垪鍙�
+            var serialView = new FrameLayout()
+            {
+                Height = Application.GetRealHeight(55),
+                BackgroundColor = CSS_Color.MainBackgroundColor,
+            };
+            if (this.function.spk == SPK.VideoDoorLock)
+            {
+                contentView.AddChidren(serialView);
+            }
+            var serialLineBtn = new Button()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                BackgroundColor = CSS_Color.DividingLineColor,
+                Width = Application.GetRealWidth(343),
+                Height = Application.GetRealHeight(1)
+            };
+            serialView.AddChidren(serialLineBtn);
+           var serialTextBtn = new Button()
+            {
+                X = Application.GetRealWidth(16),
+                Width = Application.GetRealWidth(160),
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+               TextID = StringId.xuliehao,
+           };
+            serialView.AddChidren(serialTextBtn);
+            var serialValuesBtn = new Button()
+            {
+                X = Application.GetRealWidth(86),
+                Width = Application.GetRealWidth(237),
+                TextAlignment = TextAlignment.CenterRight,
+                TextColor = CSS_Color.PromptingColor1,
+                TextSize = CSS_FontSize.TextFontSize,
+                Text = this.function.sid,
+            };
+            serialView.AddChidren(serialValuesBtn);
+
+
+
+            //鍨嬪彿
+            var modelView = new FrameLayout()
+            {
+                Height = Application.GetRealHeight(55),
+                BackgroundColor = CSS_Color.MainBackgroundColor,
+            };
+            if (this.function.spk == SPK.VideoDoorLock)
+            {
+                contentView.AddChidren(modelView);
+            }
+            var modelLineBtn = new Button()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                BackgroundColor = CSS_Color.DividingLineColor,
+                Width = Application.GetRealWidth(343),
+                Height = Application.GetRealHeight(1)
+            };
+            modelView.AddChidren(modelLineBtn);
+            var modelTextBtn = new Button()
+            {
+                X = Application.GetRealWidth(16),
+                Width = Application.GetRealWidth(160),
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+               TextID=StringId.xinghao,
+            };
+            modelView.AddChidren(modelTextBtn);
+            var modelValuesBtn = new Button()
+            {
+                X = Application.GetRealWidth(86),
+                Width = Application.GetRealWidth(237),
+                TextAlignment = TextAlignment.CenterRight,
+                TextColor = CSS_Color.PromptingColor1,
+                TextSize = CSS_FontSize.TextFontSize,
+                Text = this.function.omodel,
+            };
+            modelView.AddChidren(modelValuesBtn);
+
+
+            #endregion
 #if stage2
             #region 娣诲姞鍒版闈�
             var addToDesktopView = new FrameLayout()
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
index 006e71d..ff4c689 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
@@ -12,6 +12,8 @@
         {
             LoadEvent_ChangeFunctionName ();
             SkipChooseRoomPage();
+            DelDeviceEvent();
+
         }
 
         /// <summary>
@@ -77,5 +79,45 @@
             }
                 
         }
+        /// <summary>
+        /// 瑙g粦璁惧鐨勪簨浠�
+        /// </summary>
+        void DelDeviceEvent()
+        {
+
+            EventHandler<MouseEventArgs> ClickEvent = (sener, e) =>
+            {
+                new HDL_ON.UI.Music.View.TipView().TipBox(-1, StringId.AreYouSureToDeleteThisDevice, () =>
+                {
+                    UI2.FuntionControlView.VideoDoorLock.VideDoorLockSend.Current.DelDevice(this.function, (isBool) =>
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            if (!isBool)
+                            {
+                                new Tip()
+                                {
+                                    CloseTime = 1,
+                                    Text = Language.StringByID(StringId.delFail),
+                                    Direction = AMPopTipDirection.None,
+                                }.Show(bodyView);
+                                return;
+                            }
+                            //鍒犻櫎鏈湴鏂囦欢                                  
+                            UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DeleteFunction(this.function);
+                            this.RemoveFromParent();
+                            this.actionDel?.Invoke();
+                        });
+
+                    });
+
+                });
+            };
+            this.delView.MouseUpEventHandler += ClickEvent;
+            this.delTextBtn.MouseUpEventHandler += ClickEvent;
+            this.delRightBtn.MouseUpEventHandler += ClickEvent;
+        }
+
+
     }
 }
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
index 97304ad..bdfc709 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
@@ -248,14 +248,18 @@
                     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(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
-                    if (btnSwitch.IsSelected)
-                    {
-                        d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
-                    }
-                    else
-                    {
-                        function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness));
-                    }
+                    if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
+                    {
+                        d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
+                    }
+                    //if (btnSwitch.IsSelected)
+                    //{
+                    //    d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
+                    //}
+                    //else
+                    //{
+                    //    function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness));
+                    //}
                     Control.Ins.SendWriteCommand(function, d);
                 })
                 { IsBackground = true }.Start();
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index 7f395fe..1fd9624 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -179,18 +179,22 @@
                     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(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
-                    if (btnSwitch.IsSelected)
+                    if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
                     {
-                        if (function.lastBrightness == 0)
-                        {
-                            function.lastBrightness = 100;
-                        }
-                        d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
+                        d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
                     }
-                    else
-                    {
-                        function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness));
-                    }
+                    //if (btnSwitch.IsSelected)
+                    //{
+                    //    if(function.lastBrightness == 0)
+                    //    {
+                    //        function.lastBrightness = 100;
+                    //    }
+                    //    d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
+                    //}
+                    //else
+                    //{
+                    //    function.lastBrightness = Convert.ToInt32( function.GetAttrState(FunctionAttributeKey.Brightness));
+                    //}
                     Control.Ins.SendWriteCommand(function, d);
                 })
                 { IsBackground = true }.Start();
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage.cs
new file mode 100644
index 0000000..43c592a
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage.cs
@@ -0,0 +1,572 @@
+锘�
+using System;
+using System.Collections.Generic;
+using HDL_ON.Entity;
+using HDL_ON.UI.CSS;
+using Shared;
+
+namespace HDL_ON.UI
+{
+    /// <summary>
+    /// 鐏厜鍦烘櫙缂栬緫寮圭獥
+    /// </summary>
+    public class GroupControlPage : Dialog
+    {
+        GroupControl group;
+        public GroupControlPage(GroupControl groupControl)
+        {
+            group = groupControl;
+            if(group == null)
+            {
+                group = new GroupControl();
+            }
+        }
+
+
+        public void ShowDialog()
+        {
+            var hadDimming = false;
+            var hadCCT = false;
+            var hadRGB = false;
+
+            foreach (var temp in group.sids)
+            {
+                if (temp.spk == SPK.LightRGB)
+                {
+                    hadRGB = true;
+                }
+                else if (temp.spk == SPK.LightCCT)
+                {
+                    hadCCT = true;
+                }else if (temp.spk == SPK.LightDimming)
+                {
+                    hadDimming = true;
+                }
+
+                if(hadDimming && hadCCT && hadRGB)
+                {
+                    break;
+                }
+            }
+
+
+            var bodyView = new FrameLayout();
+            this.AddChidren(bodyView);
+            //bodyView.MouseUpEventHandler = (sender, e) =>
+            //{
+            //    this.Close();
+            //};
+
+            var contentView = new FrameLayout()
+            {
+                BackgroundColor = CSS_Color.MainBackgroundColor,
+                Width = Application.GetRealWidth(343),
+                Radius = (uint)Application.GetRealWidth(12),
+            };
+            bodyView.AddChidren(contentView);
+
+            #region 鏍囬鍖�
+            var titleView = new FrameLayout()
+            {
+                Width = Application.GetRealWidth(343),
+                Height = Application.GetRealHeight(52),
+            };
+            contentView.AddChidren(titleView);
+
+            var btnTitle = new Button()
+            {
+                Height = Application.GetRealHeight(52),
+                Gravity = Gravity.Center,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                TextColor = CSS_Color.MainColor,
+                TextID = StringId.CombinedDimming,
+                TextAlignment = TextAlignment.Center,
+            };
+            if (btnTitle.GetTextWidth() > Application.GetRealWidth(197))//247
+            {
+                btnTitle.Width = Application.GetRealWidth(197);
+                btnTitle.IsMoreLines = true;
+            }
+            else
+            {
+                btnTitle.Width = btnTitle.GetTextWidth() + Application.GetRealWidth(10);
+                btnTitle.IsMoreLines = false;
+            }
+            titleView.AddChidren(btnTitle);
+
+            var btnEditIcon = new Button()
+            {
+                Width = Application.GetRealWidth(24),
+                Height = Application.GetRealWidth(24),
+                X = Application.GetRealWidth(12) + btnTitle.Right,
+                Gravity = Gravity.CenterVertical,
+                UnSelectedImagePath = "Public/Edit.png",
+            };
+           
+            btnTitle.Text = group.name;
+            btnTitle.Width = btnTitle.GetTextWidth() + Application.GetRealWidth(10);
+            btnTitle.Gravity = Gravity.Center;
+
+            titleView.AddChidren(new Button() { Height = 1, BackgroundColor = CSS_Color.DividingLineColor, Y = Application.GetRealHeight(51) });
+
+            #endregion
+
+            //灞炴�ц缃尯鍩�
+            var attrView = new VerticalScrolViewLayout()
+            {
+                Y = Application.GetRealHeight(52),
+                Width = Application.GetRealWidth(343),
+                ScrollEnabled = false,
+            };
+            //灞炴�ц缃尯鍩熼珮搴�
+            int attrViewHight = Application.GetRealHeight(18 + 22);
+
+
+                attrViewHight += Application.GetRealHeight(50);
+                if (hadRGB)
+                {
+                    attrViewHight += Application.GetRealHeight(248);
+                    hadDimming = true;
+                }
+                if (hadCCT)
+                {
+                    attrViewHight += Application.GetRealHeight(75 + 11);
+                    hadDimming = true;
+                }
+                if (hadDimming)
+                {
+                    attrViewHight += Application.GetRealHeight(54 + 11);
+                }
+                attrView.Height = attrViewHight;
+                contentView.AddChidren(attrView);
+                attrView.AddChidren(new Button() { Height = Application.GetRealHeight(18) });
+
+
+                if (hadDimming)
+                {
+                    LoadDimmingAttrView(attrView);
+                }
+                if (hadCCT)
+                {
+                    LoadCctAttrView(attrView);
+                }
+                if (hadRGB)
+                {
+                    LoadRgbAttrView(attrView);
+                }
+
+                var view = new FrameLayout()
+                {
+                    Width = Application.GetRealWidth(343),
+                    Height = Application.GetRealHeight(50),
+                };
+                attrView.AddChidren(view);
+
+
+                var btnClose = new Button()
+                {
+                    X = Application.GetRealWidth(50),
+                    Gravity = Gravity.CenterVertical,
+                    Width = Application.GetRealWidth(98),
+                    Height = Application.GetRealHeight(40),
+                    TextColor = CSS_Color.TextualColor,
+                    SelectedBackgroundColor = CSS_Color.MainColor,
+                    SelectedTextColor = CSS_Color.MainBackgroundColor,
+                    BackgroundColor = CSS_Color.DividingLineColor,
+                    TextID = StringId.OFF,
+                    TextSize = CSS_FontSize.TextFontSize,
+                    Radius = (uint)Application.GetRealWidth(5),
+                };
+                view.AddChidren(btnClose);
+
+                var btnOpen = new Button()
+                {
+                    X = Application.GetRealWidth(100 + 98),
+                    Gravity = Gravity.CenterVertical,
+                    Width = Application.GetRealWidth(98),
+                    Height = Application.GetRealHeight(40),
+                    TextColor = CSS_Color.TextualColor,
+                    SelectedBackgroundColor = CSS_Color.MainColor,
+                    SelectedTextColor = CSS_Color.MainBackgroundColor,
+                    BackgroundColor = CSS_Color.DividingLineColor,
+                    TextID = StringId.On,
+                    TextSize = CSS_FontSize.TextFontSize,
+                    Radius = (uint)Application.GetRealWidth(5),
+                };
+                view.AddChidren(btnOpen);
+
+                btnClose.MouseUpEventHandler = (sender, e) =>
+                {
+                    btnClose.IsSelected = true;
+                    btnOpen.IsSelected = false;
+                    var d = new Dictionary<string, string>();
+                    d.Add(FunctionAttributeKey.OnOff, "off");
+                    group.Control(d);
+                };
+                btnOpen.MouseUpEventHandler = (sender, e) =>
+                {
+                    btnClose.IsSelected = false;
+                    btnOpen.IsSelected = true;
+
+                    var d = new Dictionary<string, string>();
+                    d.Add(FunctionAttributeKey.OnOff, "on");
+                    group.Control(d);
+                };
+
+
+
+            contentView.Height = Application.GetRealHeight(52 + 44) + attrViewHight;
+            contentView.Gravity = Gravity.Center;
+
+
+            var bottomView = new FrameLayout()
+            {
+                Y = Application.GetRealHeight(52) + attrViewHight,
+                Height = Application.GetRealHeight(46),
+            };
+            contentView.AddChidren(bottomView);
+            bottomView.AddChidren(new Button() { Height = 1, BackgroundColor = CSS_Color.DividingLineColor });
+
+            var btnCloseDialog = new Button()
+            {
+                TextAlignment = TextAlignment.Center,
+                TextColor = CSS_Color.TextualColor,
+                TextID = StringId.Close,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+            };
+            bottomView.AddChidren(btnCloseDialog);
+            btnCloseDialog.MouseUpEventHandler = (sender, e) => {
+                this.Close();
+            };
+
+
+            this.Show();
+
+        }
+
+        /// <summary>
+        /// 鍔犺浇璋冨厜灞炴�ц缃帶浠�
+        /// </summary>
+        /// <param name="attrView"></param>
+        void LoadDimmingAttrView(VerticalScrolViewLayout attrView)
+        {
+            var dimmingView = new FrameLayout()
+            {
+                Height = Application.GetRealHeight(54 + 11)
+            };
+            attrView.AddChidren(dimmingView);
+
+            #region 浜害璋冭妭
+            var btnBrightnessText = new Button()
+            {
+                X = Application.GetRealWidth(35),
+                Y = Application.GetRealHeight(1),
+                Width = Application.GetRealWidth(224),
+                Height = Application.GetRealHeight(25),
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                TextID = StringId.Brightness,
+            };
+            btnBrightnessText.Text = Language.StringByID(StringId.Brightness) + " " + group.GetAttrState(FunctionAttributeKey.Brightness) + "%";
+            dimmingView.AddChidren(btnBrightnessText);
+
+
+            var btnMinValuesText = new Button()
+            {
+                X = Application.GetRealWidth(35),
+                Y = btnBrightnessText.Bottom,
+                Width = Application.GetRealWidth(40),
+                Height = Application.GetRealHeight(21),
+                Text = "0%",
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = CSS_Color.PromptingColor1,
+                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+            };
+            dimmingView.AddChidren(btnMinValuesText);
+
+            var dimmerBar = new DiyImageSeekBar()
+            {
+                X = Application.GetRealWidth(45 + 10),
+                Y = Application.GetRealHeight(11),
+                Width = Application.GetRealWidth(220),
+                Height = Application.GetRealHeight(54),
+                SeekBarViewHeight = Application.GetRealHeight(8),
+                ThumbImagePath = "Public/ThumbImage.png",
+                ThumbImageHeight = Application.GetRealHeight(54),
+                ProgressTextColor = CSS_Color.FirstLevelTitleColor,
+                ProgressTextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                ProgressBarColor = CSS_Color.AuxiliaryColor1,
+                MaxValue = 100,
+                SeekBarPadding = Application.GetRealWidth(20),
+                IsProgressTextShow = false,
+                ProgressChangeDelayTime = 0,
+            };
+            dimmingView.AddChidren(dimmerBar);
+            dimmerBar.OnProgressChangedEvent = (sender, e) =>
+            {
+                btnBrightnessText.Text = Language.StringByID(StringId.Brightness) + " " + e + "%";
+            };
+            dimmerBar.OnStopTrackingTouchEvent = (sender, e) =>
+            {
+                btnBrightnessText.Text = Language.StringByID(StringId.Brightness) + " " + e + "%";
+
+                var d = new Dictionary<string, string>();
+                d.Add(FunctionAttributeKey.Brightness, e.ToString());
+                group.Control(d);
+            };
+
+
+            var btnMaxValuesText = new Button()
+            {
+                X = dimmerBar.Right,
+                Y = btnBrightnessText.Bottom,
+                Width = Application.GetRealWidth(55),
+                Height = Application.GetRealHeight(21),
+                Text = "100%",
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = CSS_Color.PromptingColor1,
+                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+            };
+            dimmingView.AddChidren(btnMaxValuesText);
+            #endregion
+
+        }
+
+        /// <summary>
+        /// 鍔犺浇cct灞炴�ц缃帶浠�
+        /// </summary>
+        /// <param name="attrView"></param>
+        void LoadCctAttrView(VerticalScrolViewLayout attrView)
+        {
+            #region 鑹叉俯
+            var cctView = new FrameLayout()
+            {
+                Height = Application.GetRealHeight(75 + 11)
+            };
+            attrView.AddChidren(cctView);
+
+
+            //鑹叉俯
+            var btnTempClolor = new Button();
+            btnTempClolor.X = Application.GetRealWidth(35);
+            btnTempClolor.Y = Application.GetRealHeight(1);
+            btnTempClolor.Width = Application.GetRealWidth(224);
+            btnTempClolor.Height = Application.GetRealHeight(42);
+            btnTempClolor.TextAlignment = TextAlignment.CenterLeft;
+            btnTempClolor.TextColor = CSS_Color.FirstLevelTitleColor;
+            btnTempClolor.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;
+            btnTempClolor.TextID = StringId.ColorTemperature;
+            cctView.AddChidren(btnTempClolor);
+
+            //2700K
+            var btnTempClolorMin = new Button()
+            {
+                X = Application.GetRealWidth(35),
+                Y = btnTempClolor.Bottom,
+                Width = Application.GetRealWidth(40),
+                Height = Application.GetRealHeight(21),
+            };
+            btnTempClolorMin.Width = Application.GetRealWidth(54);
+            btnTempClolorMin.Height = Application.GetRealHeight(21);
+            btnTempClolorMin.Text = "2700K";
+            btnTempClolorMin.TextAlignment = TextAlignment.CenterLeft;
+            btnTempClolorMin.TextColor = CSS_Color.PromptingColor1;
+            btnTempClolorMin.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;
+            cctView.AddChidren(btnTempClolorMin);
+
+            //婊戝姩鏉$殑鑳屾櫙鍥剧墖
+            var btnColorTemplatrueBack = new Button()
+            {
+                X = Application.GetRealWidth(55 + 22 + 15),
+                Y = Application.GetRealHeight(11),
+                Width = Application.GetRealWidth(180),
+                Height = Application.GetRealHeight(54),
+            };
+            btnColorTemplatrueBack.UnSelectedImagePath = "FunctionIcon/Light/ColorTemperatureBar.png";
+            btnColorTemplatrueBack.Height = Application.GetRealHeight(8);
+            btnColorTemplatrueBack.Gravity = Gravity.CenterHorizontal;
+            cctView.AddChidren(btnColorTemplatrueBack);
+            //婊戝姩鏉℃帶浠�
+            var barColorTemplatrue = new CCTSeekBarControl()
+            {
+                X = Application.GetRealWidth(55 + 22),
+                Y = Application.GetRealHeight(11),
+                Width = Application.GetRealWidth(220),
+                Height = Application.GetRealHeight(54),
+            };
+            barColorTemplatrue.MinValue = 27;
+            barColorTemplatrue.MaxValue = 65;
+            barColorTemplatrue.ProgressBarColor = 0x00000000;//鍏ㄩ儴閫忔槑
+            barColorTemplatrue.ProgressBarUnEnableColor = 0x00000000;
+            barColorTemplatrue.SeekBarBackgroundColor = 0x00000000;
+            cctView.AddChidren(barColorTemplatrue);
+            barColorTemplatrue.Y = btnTempClolorMin.Y - (barColorTemplatrue.Height - btnTempClolorMin.Height) / 2;
+            //璁剧疆鍒濆鍊�
+            btnTempClolor.Text = Language.StringByID(StringId.ColorTemperature) + " " + (barColorTemplatrue.Progress * 100 + "K");
+            barColorTemplatrue.OnProgressChangedEvent = (sender, e) =>
+            {
+                btnTempClolor.Text = Language.StringByID(StringId.ColorTemperature) + " " + (barColorTemplatrue.Progress * 100 + "K");
+            };
+            barColorTemplatrue.OnStopTrackingTouchEvent = (sender, e) =>
+            {
+                var d = new Dictionary<string, string>();
+                d.Add(FunctionAttributeKey.CCT, (barColorTemplatrue.Progress * 100).ToString());
+                group.Control(d);
+            };
+            //鍙樻洿鑳屾櫙鍥剧殑Y杞村潗鏍�
+            btnColorTemplatrueBack.Y = barColorTemplatrue.Y + (barColorTemplatrue.Height - btnColorTemplatrueBack.Height) / 2;
+
+            //6500K
+            var btnTempClolorMax = new Button();
+            btnTempClolorMax.Y = btnTempClolorMin.Y;
+            btnTempClolorMax.X = barColorTemplatrue.Right - Application.GetRealWidth(30);
+            btnTempClolorMax.Width = Application.GetRealWidth(54);
+            btnTempClolorMax.Height = Application.GetRealHeight(21);
+            btnTempClolorMax.Text = "6500K";
+            btnTempClolorMax.TextAlignment = TextAlignment.CenterRight;
+            btnTempClolorMax.TextColor = CSS_Color.PromptingColor1;
+            btnTempClolorMax.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;
+            cctView.AddChidren(btnTempClolorMax);
+
+            #endregion
+
+
+        }
+
+        /// <summary>
+        /// 鍔犺浇rgb灞炴�ц缃帶浠�
+        /// </summary>
+        /// <param name="attrView"></param>
+        void LoadRgbAttrView(VerticalScrolViewLayout attrView)
+        {
+
+            #region RGB
+            var rgbView = new FrameLayout()
+            {
+                Height = Application.GetRealHeight(248)
+            };
+            attrView.AddChidren(rgbView);
+
+
+            var btnCurColor = new Button()
+            {
+                X = Application.GetRealWidth(24),
+                Y = Application.GetRealHeight(10),
+                Width = Application.GetMinRealAverage(24),
+                Height = Application.GetMinRealAverage(24),
+                Radius = (uint)Application.GetMinRealAverage(8),
+                BorderColor = CSS_Color.PromptingColor2,
+                BorderWidth = 1,
+                //BackgroundColor = (uint)(0xFF000000 + tempLight.GetRGBcolor(commandDic[FunctionAttributeKey.RGB]))
+            };
+            rgbView.AddChidren(btnCurColor);
+
+            //鑹茬洏鐨勬甯冩帶浠�(闄愬埗閭d釜鐧借壊婊戝姩鐞冧娇鐢�)
+            var framePickerBack = new FrameLayout();
+            framePickerBack.Gravity = Gravity.CenterHorizontal;
+            framePickerBack.Y = Application.GetRealHeight(20);
+            framePickerBack.Width = Application.GetMinRealAverage(198);
+            framePickerBack.Height = Application.GetMinRealAverage(198);
+            rgbView.AddChidren(framePickerBack);
+
+            var colorPicker = new ColorPicker()
+            {
+                ColorImagePath = "FunctionIcon/Light/ColorWheel.png",
+            };
+            framePickerBack.AddChidren(colorPicker);
+
+
+
+
+
+
+            //鐧界偣鎺т欢
+            var btnWhiteRound = new Button();
+            btnWhiteRound.Width = Application.GetRealWidth(24);
+            btnWhiteRound.Height = Application.GetRealWidth(24);
+            btnWhiteRound.UnSelectedImagePath = "FunctionIcon/Light/ColorWheelTip.png";
+            btnWhiteRound.Visible = false;
+            framePickerBack.AddChidren(btnWhiteRound);
+
+
+            //褰撳墠鐐瑰嚮鐨勩�愮偣銆戞槸鍚︽纭�
+            bool pointIsRight = false;
+            //鍦嗙殑鍗婂緞(鑰冭檻杈圭晫,闇�瑕佽缃畠鐨勫崐寰勬瘮杈冨皬涓�鐐�)
+            int circleR = colorPicker.Width / 2 - Application.GetRealWidth(12);
+            string rgbString = "255,255,255";
+            var rgbTemp = new Light();
+            colorPicker.MouseUpEventHandler = (sender2, e2) =>
+            {
+                var d = new Dictionary<string, string>();
+                d.Add(FunctionAttributeKey.RGB, rgbString);
+                group.Control(d);
+            };
+            colorPicker.ColorChaged += (sender2, e2) =>
+            {
+                rgbString = (e2[0] + "," + e2[1] + "," + e2[2]).ToString();
+                btnCurColor.BackgroundColor = (uint)(0xFF000000 + rgbTemp.GetRGBcolor(rgbString));
+                var d = new Dictionary<string, string>();
+                d.Add(FunctionAttributeKey.RGB, rgbString);
+                group.Control(d);
+            };
+            colorPicker.MouseDownEventHandler += (sender, e) =>
+            {
+                pointIsRight = this.CheckPoint(circleR, colorPicker.Width / 2, colorPicker.Height / 2, (int)e.X, (int)e.Y);
+                if (pointIsRight == false)
+                {
+                    //鐐圭殑鍖哄煙涓嶆槸鍦嗙洏鍐�
+                    return;
+                }
+                //鏄剧ず鐧界偣
+                btnWhiteRound.X = (int)e.X - btnWhiteRound.Width / 2;
+                btnWhiteRound.Y = (int)e.Y - btnWhiteRound.Height / 2;
+                if (btnWhiteRound.Visible == false)
+                {
+                    btnWhiteRound.Visible = true;
+                }
+            };
+
+            colorPicker.MouseMoveEventHandler += (sender, e) =>
+            {
+                //褰撻紶鏍囩偣涓嬩簨浠跺鐞�
+                colorPicker.MouseDownEventHandler(sender, e);
+            };
+
+
+            #endregion
+
+        }
+
+
+        /// <summary>
+        /// 妫�娴嬬偣鍑荤偣
+        /// </summary>
+        /// <param name="circleR">鍦嗙殑鍗婂緞</param>
+        /// <param name="circleX">鍦嗗績X杞�</param>
+        /// <param name="circleY">鍦嗗績Y杞�</param>
+        /// <param name="pointX">鐐瑰嚮鐐圭殑X杞�</param>
+        /// <param name="pointY">鐐瑰嚮鐐圭殑Y杞�</param>
+        /// <returns></returns>
+        private bool CheckPoint(int circleR, int circleX, int circleY, int pointX, int pointY)
+        {
+            int dwidth = circleX - pointX;
+            if (dwidth < 0) { dwidth *= -1; }
+
+            int dHeight = circleY - pointY;
+            if (dHeight < 0) { dHeight *= -1; }
+
+            //鏍规嵁涓夎鍑芥暟,姹備笁瑙掑舰鐨勬枩杈归暱
+            int dlength = dwidth * dwidth + dHeight * dHeight;
+            //鍗婂緞闀垮害(涓嶅紑鏂�,鎵�浠ユ槸鎸夊钩鏂圭畻)
+            circleR *= circleR;
+            if (dlength < circleR)
+            {
+                //濡傛灉缁勬垚鐨勪笁瑙掑舰骞舵病鏈夐暱杩囧崐寰�,鍒欎唬琛ㄨ繕鍦ㄥ渾鍐�(涓嶅厑璁哥偣杈圭晫)
+                return true;
+            }
+            return false;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs
index c58d221..a0aef90 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs
@@ -194,7 +194,7 @@
         /// <summary>
         /// 鏄剧ず鐨勮澶囩殑鎬绘暟
         /// </summary>
-        int showCount = 0;
+        int showCount = -1;
 
         /// <summary>
         /// 鍔犺浇鍔熻兘row
@@ -214,18 +214,19 @@
                     {
                         if (!isAppend)
                         {
-                            showCount = 0;
+                            showCount = -1;
                             functionListView.RemoveAll();
                         }
-                        int i = 0;
-                        foreach (var function in functions)
+                        for(var i =0;i<100;i++)
+                        //foreach (var function in functions)
                         {
-                            i++;
-                            if (i > 100)
+                            showCount++;
+                            if (showCount >= functions.Count)
                             {
                                 break;
                             }
-                            showCount++;
+                            var function = functions[showCount];
+
                             var functionDiv = new LightRow(function)
                             {
                                 Gravity = Gravity.CenterHorizontal,
@@ -264,12 +265,8 @@
                                 TextAlignment = TextAlignment.Center,
                                 TextSize = CSS_FontSize.SubheadingFontSize,
                                 TextColor = CSS_Color.FirstLevelTitleColor,
-                                Text = "鍔犺浇鏇村",
+                                TextID = StringId.LoadMore,
                             };
-                            if (Language.CurrentLanguage != "Chinese")
-                            {
-                                btnAppend.Text = "Load more";
-                            }
                             functionListView.AddChidren(btnAppend);
                             btnAppend.MouseUpEventHandler = (sender, e) =>
                             {
@@ -419,11 +416,17 @@
                 Height = Application.GetRealWidth(32),
                 UnSelectedImagePath = "FunctionIcon/Light/LightScene/CheckIcon.png",
                 SelectedImagePath = "FunctionIcon/Light/LightScene/CheckOnIcon.png",
-                IsSelected = functions.Find((obj) => obj.deviceId == function.deviceId) != null
+                IsSelected = functions.Find((obj) => obj.deviceId == function.deviceId) != null,
+                Tag = "ChooseIcon"
             };
+            if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
+            {
+                btnSelect.X = Application.GetRealWidth(323);
+            }
             bodyDiv.AddChidren(btnSelect);
             
             btnSelect.MouseUpEventHandler = (sender, e) => {
+                Application.HideSoftInput();
                 btnSelect.IsSelected = !btnSelect.IsSelected;
                 if(btnSelect.IsSelected)
                 {
@@ -435,17 +438,17 @@
                 }
                 else
                 {
-                    var removeTemp = functions.Find((obj) => obj.deviceId == function.deviceId);
+                    var removeTemp = functions.Find((obj) => obj.sid == function.sid);
                     if (removeTemp != null)
                     {
                         functions.Remove(removeTemp);
                     }
                 }
                 ///鍒锋柊鐣岄潰
-                if (functions.Count == 0 || functions.Count == 1)
-                {
+                //if (functions.Count == 0 || functions.Count == 1)
+                //{
                     action();
-                }
+                //}
             };
 
         }
@@ -521,7 +524,7 @@
             {
                 if (!commandDic.ContainsKey(FunctionAttributeKey.Brightness))
                 {
-                    commandDic.Add(FunctionAttributeKey.Brightness, lightCCT[0].GetAttrState(FunctionAttributeKey.Brightness));
+                    commandDic.Add(FunctionAttributeKey.Brightness, lightDimming[0].GetAttrState(FunctionAttributeKey.Brightness));
                 }
             }
 
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 8dbdfa5..697f09c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -185,6 +185,7 @@
                             lightTemp.SetRGBcolor(lastColor, function);
                             System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                             d.Add(FunctionAttributeKey.RGB, lightTemp.GetRGBcolorString(function));
+                            d.Add(FunctionAttributeKey.Brightness, dimmerBar.Progress.ToString());
                             Control.Ins.SendWriteCommand(function, d,false,0);
                             break;
                         }
@@ -305,6 +306,10 @@
                     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(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
+                    if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
+                    {
+                        d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
+                    }
                     if (btnSwitch.IsSelected)
                     {
                         if(function.lastBrightness == 0)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs
index 6446c69..e12b753 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPageBLL.cs
@@ -307,6 +307,10 @@
                     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(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
+                    if (function.GetAttribute(FunctionAttributeKey.FadeTime) != null)
+                    {
+                        d.Add(FunctionAttributeKey.FadeTime, barFadeTime.Progress.ToString());
+                    }
                     if (btnSwitch.IsSelected)
                     {
                         if (function.lastBrightness == 0)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31FlieList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31FlieList.cs
new file mode 100644
index 0000000..f46332d
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31FlieList.cs
@@ -0,0 +1,169 @@
+锘縰sing System;
+using System.Collections.Generic;
+using HDL_ON.UI.UI2.FuntionControlView.Music;
+using Shared;
+namespace HDL_ON.UI.Music
+{
+    public class A31FlieList : FrameLayout
+    {
+
+        public A31FlieList(string source,string title)
+        {
+            Tag = "Music";
+            this.source = source;
+            this.title = title;
+        }
+        /// <summary>
+        /// 闊充箰婧�
+        /// </summary>
+        private string source = string.Empty;
+        /// <summary>
+        /// 鏍囬
+        /// </summary>
+        private string title = string.Empty;
+
+        VerticalRefreshLayout middViewLayout;
+        public void Show()
+        {
+            #region   鐣岄潰甯冨眬------
+
+            this.BackgroundColor = MusicColor.ViewColor;
+            var topView = new TopView();
+            this.AddChidren(topView.TopFLayoutView());
+            topView.topNameBtn.Text=this.title;
+            topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
+            {
+                this.RemoveFromParent();
+            };
+            middViewLayout = new VerticalRefreshLayout
+            {
+                BackgroundColor = MusicColor.WhiteColor,
+                Y = topView.fLayout.Bottom,
+                Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
+            };
+            this.AddChidren(middViewLayout);
+            #endregion
+
+            middViewLayout.BeginHeaderRefreshingAction += () =>
+            {
+                System.Threading.Tasks.Task.Run(() =>
+                {
+                    try
+                    {
+                        var Group = SendMethod.Current.GetSingleSourceListNameList(A31MusicModel.Current.functionMusic, this.source);
+                        CommonMethod.Current.AddSourceGroupListMemory(Group);//淇濆瓨缂撳瓨
+                    }
+                    catch { }
+                    finally
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            var listNameList = CommonMethod.Current.GetListNameListMemory(this.source);
+                            this.FileListView(listNameList);
+                            middViewLayout.EndHeaderRefreshing();
+                        });
+                    }
+                });
+
+            };
+
+        }
+        /// <summary>
+        /// 鍔犺浇鍒楄〃
+        /// </summary>
+        /// <param name="listNames">鍒楄〃鍚嶅垪琛�</param>
+        public void FileListView(List<ListName> listNames)
+        {
+            middViewLayout.RemoveAll();
+            for (int i = 0; i < listNames.Count; i++)
+            {
+                var listName= listNames[i];
+                 RowLayout addFlieRow = new RowLayout
+                {
+                    Height = Application.GetRealHeight(104),
+                    LineColor = MusicColor.WhiteColor,
+                    SubViewWidth = Application.GetRealWidth(90),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
+                };
+                middViewLayout.AddChidren(addFlieRow);
+                //鏂囦欢鍥炬爣
+                Button fileIconBtn = new Button
+                {
+                    X = Application.GetRealWidth(16),
+                    Y = Application.GetRealHeight(8),
+                    Width = Application.GetRealWidth(88),
+                    Height = Application.GetRealWidth(88),
+                    UnSelectedImagePath = "MusicIcon/fileList.png",
+                };
+                addFlieRow.AddChidren(fileIconBtn);
+
+                //鏂囦欢鍚嶆帶浠�
+                Button fileNameBtn = new Button
+                {
+                    X = fileIconBtn.Right + Application.GetRealWidth(16),
+                    Y = Application.GetRealHeight(42),
+                    Width = Application.GetRealWidth(217),
+                    Height = Application.GetRealHeight(20),
+                    TextColor = MusicColor.TextColor,
+                    TextSize = TextSize.Text14,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    Text = listName.group,
+                };
+                addFlieRow.AddChidren(fileNameBtn);
+
+                Button clickBtn = new Button
+                {
+                    X = fileIconBtn.Right + Application.GetRealWidth(16),
+                    Width = Application.GetRealWidth(375 - 138),
+                    Height = Application.GetRealHeight(104),
+                    Tag=listName.group
+                };
+                addFlieRow.AddChidren(clickBtn);
+                clickBtn.MouseUpEventHandler += (sender, e) =>
+                {
+                    string groupName = clickBtn.Tag.ToString();
+                    Loading loading = new Loading();
+                    this.AddChidren(loading);
+                    loading.Start();
+                    //鍚戠紦瀛樻嬁鍒楄〃
+                    var songListMemory = CommonMethod.Current.GetSongListMemory(groupName,this.source);  
+                    System.Threading.Tasks.Task.Run(() =>
+                    {
+                        try
+                        {
+                            //缂撳瓨娌℃湁鍒楄〃鎵嶅幓璇诲彇
+                            if (songListMemory.songs.Count == 0)
+                            {
+                                //璇诲彇姝屾洸鍒楄〃
+                                var songList = SendMethod.Current.GetSingleSongList(A31MusicModel.Current.functionMusic, groupName, this.source);
+                                CommonMethod.Current.AddSongListMemory(songList,this.source);//淇濆瓨缂撳瓨
+                                songListMemory.songs.AddRange(songList.songs);//鏇存柊鍒楄〃
+                            }
+                        }
+                        catch
+                        {
+                        }
+                        finally
+                        {
+                            Application.RunOnMainThread(() =>
+                            {
+                                loading.Hide();
+                                A31SongPlay a31Song = new A31SongPlay();
+                                MainPage.BasePageView.AddChidren(a31Song);
+                                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                                a31Song.Show(songListMemory);
+                            });
+                        }
+                    });
+
+                };
+
+
+
+            }
+        }
+
+       
+
+        
+    }
+}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicFileList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicFileList.cs
deleted file mode 100644
index 075ace3..0000000
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicFileList.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using Shared;
-namespace HDL_ON.UI.Music
-{
-    public class A31MusicFileList : FrameLayout
-    {
-        public A31MusicFileList()
-        {
-            Tag = "Music";
-        }
-        VerticalRefreshLayout middViewLayout;
-        public void Show()
-        {
-            #region   鐣岄潰甯冨眬------
-
-            this.BackgroundColor = MusicColor.ViewColor;
-            var topView = new TopView();
-            this.AddChidren(topView.TopFLayoutView());
-            topView.topNameBtn.TextID = StringId.localMusic;
-            topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
-            {
-                this.RemoveFromParent();
-            };
-            middViewLayout = new VerticalRefreshLayout
-            {
-                BackgroundColor = MusicColor.WhiteColor,
-                Y = topView.fLayout.Bottom,
-                Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
-            };
-            this.AddChidren(middViewLayout);
-            #endregion
-
-            middViewLayout.BeginHeaderRefreshingAction += () =>
-            {
-                System.Threading.Tasks.Task.Run(() =>
-                {
-                    try
-                    {
-                        SendMethod.Current.GetPalyList(A31MusicModel.Current.functionMusic);
-                    }
-                    catch { }
-                    finally
-                    {
-                        Application.RunOnMainThread(() =>
-                        {
-                            this.FileView();
-                            middViewLayout.EndHeaderRefreshing();
-                        });
-                    }
-                });
-
-            };
-
-        }
-        /// <summary>
-        /// 鍔犺浇鏂囦欢澶筕iew鐨勬柟娉�
-        /// </summary>
-        public void FileView()
-        {
-            middViewLayout.RemoveAll();
-            for (int i = 0; i < A31MusicModel.Current.palyLists.Count; i++)
-            {
-                var list = A31MusicModel.Current.palyLists[i];
-                RowLayout addFlieRow = new RowLayout
-                {
-                    Height = Application.GetRealHeight(104),
-                    LineColor = MusicColor.WhiteColor,
-                    SubViewWidth = Application.GetRealWidth(90),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
-                };
-                middViewLayout.AddChidren(addFlieRow);
-                //鏂囦欢鍥炬爣
-                Button fileIconBtn = new Button
-                {
-                    X = Application.GetRealWidth(16),
-                    Y = Application.GetRealHeight(8),
-                    Width = Application.GetRealWidth(88),
-                    Height = Application.GetRealWidth(88),
-                    UnSelectedImagePath = "MusicIcon/fileList.png",
-                };
-                addFlieRow.AddChidren(fileIconBtn);
-
-                //鏂囦欢鍚嶆帶浠�
-                Button fileNameBtn = new Button
-                {
-                    X = fileIconBtn.Right + Application.GetRealWidth(16),
-                    Y = Application.GetRealHeight(42),
-                    Width = Application.GetRealWidth(217),
-                    Height = Application.GetRealHeight(20),
-                    TextColor = MusicColor.TextColor,
-                    TextSize = TextSize.Text14,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    Text = list.group,
-                };
-                addFlieRow.AddChidren(fileNameBtn);
-
-                Button clickBtn = new Button
-                {
-                    X = fileIconBtn.Right + Application.GetRealWidth(16),
-                    Width = Application.GetRealWidth(375 - 138),
-                    Height = Application.GetRealHeight(104),
-                };
-                addFlieRow.AddChidren(clickBtn);
-                clickBtn.MouseUpEventHandler += (sender, e) =>
-                {
-                    A31SongPlay a31Song = new A31SongPlay();
-                    MainPage.BasePageView.AddChidren(a31Song);
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                    a31Song.Show(list.songs, list.group);
-                };
-
-            }
-        }
-    }
-}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
index 1207c0b..fdf19dd 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs
@@ -69,30 +69,31 @@
         /// </summary>
         public string UniqueDeviceName = string.Empty;
 
-       
 
         public MusicInfo CurrentMusic = new MusicInfo();
 
-        /// <summary>
-        ///褰撳墠鎾斁鐨勫垪琛ㄤ俊鎭�
-        /// </summary>
-        public List<Songs> CurrentPlayMusicInfoList = new List<Songs>();
 
         /// <summary>
         /// 鏄惁鍏佽鏄剧ず
         /// </summary>
         public bool IsCanShow = true;
-
+       
         /// <summary>
-        /// 鍒楄〃
+        /// 褰撳墠鎾斁姝屾洸鍒楄〃
         /// </summary>
-        public List<PalyList> palyLists = new List<PalyList>();
-
+        public List<SongList> CurrentPlayMusicInfoList = new List<SongList>();
         /// <summary>
         ///  鍠滅埍闊充箰鍒楄〃
         /// </summary>
-        public List<Songs> LoveMusicInfoList = new List<Songs>();
-
+        public List<SongInfo> LoveMusicInfoList = new List<SongInfo>();
+        /// <summary>
+        /// 鎵�鏈夈�愰煶涔愬垪琛ㄣ��
+        /// </summary>
+        public List<SongList> AllMusicLists = new List<SongList>();
+        /// <summary>
+        /// 鎵�鏈夈�愰煶涔愭簮銆戠殑鍒楄〃
+        /// </summary>
+        public List<GroupList> AllSourceGroupList = new List<GroupList>(); 
         /// <summary>
         ///鍒涘缓闊充箰鏂囦欢鍒楄〃
         /// </summary>
@@ -109,12 +110,12 @@
         /// 鎸囧畾鍒楄〃鍚嶈幏鍙栭煶涔愬垪琛�
         /// </summary>
         /// <returns></returns>
-        public List<Songs> GetSongList(string listName)
+        public List<SongInfo> GetSongList(string listName)
         {
-            var list = palyLists.Find((o) => o.group == listName);
+            var list = CurrentPlayMusicInfoList.Find((o) => o.group == listName);
             if (list == null)
             {
-                return new List<Songs>();
+                return new List<SongInfo>();
             }
             return list.songs;
         }
@@ -165,7 +166,7 @@
         /// <summary>
         ///  鍒楄〃姝屾洸淇℃伅
         /// </summary>
-        public List<Songs> MusicInfoList = new List<Songs>();
+        public List<SongInfo> MusicInfoList = new List<SongInfo>();
     }
     [System.Serializable]
     public class TidalMusicInfo : MusicInfo
@@ -199,35 +200,43 @@
     /// <summary>
     /// 鏀寔澶氫釜闊充箰
     /// </summary>
-    public class PalyListInfo
-    {
+    public class PalyerSongListInfo
+    { 
         /// <summary>
         /// 闊充箰sid
         /// </summary>
         public string sid = string.Empty;
         /// <summary>
-        ///  瑙i噴澶氫釜闊充箰
+        /// 闊充箰婧�
         /// </summary>
-        public List<PalyList> playlist = new List<PalyList>();
+        public string source = string.Empty;
+        /// <summary>
+        ///  鍒楄〃淇℃伅
+        /// </summary>
+        public List<SongList> playlist = new List<SongList>(); 
     }
 
     [System.Serializable]
     /// <summary>
     /// 鍒楄〃淇℃伅
     /// </summary>
-    public class PalyList
+    public class SongList
     {
         /// <summary>
         /// 鍒楄〃鍚�
         /// </summary>
         public string group = string.Empty;
         /// <summary>
+        /// 鑷繁瀹氫箟鐨�(鐢ㄨ瘑鍒槸閭d釜闊充箰婧愮殑鍒楄〃)
+        /// </summary>
+        public string source = string.Empty;
+        /// <summary>
         ///  鍒楄〃姝屾洸淇℃伅
         /// </summary>
-        public List<Songs> songs = new List<Songs>();
+        public List<SongInfo> songs = new List<SongInfo>();
     }
     [System.Serializable]
-    public class Songs : MusicInfo
+    public class SongInfo : MusicInfo 
     {
         /// <summary>
         /// 姝屾洸鍚嶇О
@@ -241,6 +250,10 @@
         /// 鏃堕暱
         /// </summary>
         public string time = string.Empty;
+        /// <summary>
+        /// 姝屾洸鍦板潃
+        /// </summary>
+        public string url = string.Empty;
         /// <summary>
         /// 绫诲瀷<鑷繁鐢�>
         /// </summary>
@@ -263,6 +276,10 @@
         /// </summary>
         public string sid = string.Empty;
         /// <summary>
+        /// 闊充箰婧�
+        /// </summary>
+        public string source = string.Empty;
+        /// <summary>
         /// 鍒楄〃鍚嶉泦鍚�
         /// </summary>
         public List<ListName> groupList = new List<ListName>();
@@ -281,4 +298,6 @@
 
     }
 
+   
+
 }
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
index 0ecebe6..9bc18b9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
@@ -1,17 +1,18 @@
 锘縰sing System;
 using System.Collections.Generic;
 using System.Security;
+using HDL_ON.UI.UI2.FuntionControlView.Music;
 using Shared;
 namespace HDL_ON.UI.Music
 {
-    public class A31MusicSourcePage:FrameLayout
+    public class A31MusicSourcePage : FrameLayout
     {
         public A31MusicSourcePage()
         {
             Tag = "Music";
         }
 
-       
+
         public void Show()
         {
             #region   鐣岄潰甯冨眬------
@@ -33,7 +34,7 @@
             #region 鍩虹淇℃伅锛� 鎾斁鍣� 钃濈墮 鍖哄煙锛�
             FrameLayout fL1 = new FrameLayout
             {
-                Height = Application.GetRealHeight(202-50),
+                Height = Application.GetRealHeight(202 - 50),
                 Width = Application.GetRealWidth(375),
             };
             middViewLayout.AddChidren(fL1);
@@ -105,7 +106,7 @@
                 Height = Application.GetRealHeight(352),
                 Width = Application.GetRealWidth(375),
             };
-            //middViewLayout.AddChidren(fL3);
+            middViewLayout.AddChidren(fL3);
 
             View.MusicSourceView selectedSourceView = new View.MusicSourceView();
             selectedSourceView.fLayout.Height = Application.GetRealHeight(44);
@@ -114,7 +115,7 @@
             selectedSourceView.textBtn.TextSize = TextSize.Text16;
             selectedSourceView.inputTextBtn.Visible = false;
             selectedSourceView.nextLevelBtn.Visible = false;
-            //selectedSourceView.FrameLayoutView(fL3, false);
+            selectedSourceView.FrameLayoutView(fL3, false);
 
             View.MusicSourceView musicSourceView = new View.MusicSourceView();
             musicSourceView.fLayout.Y = selectedSourceView.fLayout.Bottom;
@@ -122,10 +123,16 @@
             musicSourceView.textBtn.TextID = StringId.localMusic;
             //musicSourceView.FrameLayoutView(fL3);
 
-       
+            View.MusicSourceView usbSourceView = new View.MusicSourceView();
+            //usbSourceView.fLayout.Y = selectedSourceView.fLayout.Bottom;
+            usbSourceView.iconBtn.UnSelectedImagePath = "MusicIcon/usb.png";
+            usbSourceView.textBtn.TextID = StringId.usb;
+            usbSourceView.FrameLayoutView(fL3);
+
+
 
             View.MusicSourceView bluetoothSourceView = new View.MusicSourceView();
-            bluetoothSourceView.fLayout.Y = musicSourceView.fLayout.Bottom;
+            bluetoothSourceView.fLayout.Y = usbSourceView.fLayout.Bottom;
             bluetoothSourceView.iconBtn.UnSelectedImagePath = "MusicIcon/bluetooth.png";
             bluetoothSourceView.textBtn.TextID = StringId.bluetooth;
             //bluetoothSourceView.FrameLayoutView(fL3);
@@ -142,24 +149,62 @@
             #endregion
 
             #region  鎵�鏈夌偣鍑讳簨浠�
-            ///浜嬩欢
+            ///鏈湴闊充箰浜嬩欢
             musicSourceView.clickBtn.MouseUpEventHandler += (sender, e) =>
             {
-                A31MusicFileList a31MusicFileList = new A31MusicFileList();
-                MainPage.BasePageView.AddChidren(a31MusicFileList);
-                a31MusicFileList.Show();
+                //A31UsbMusicList a31UsbMusicList = new A31UsbMusicList(); 
+                //MainPage.BasePageView.AddChidren(a31UsbMusicList);
+                //a31UsbMusicList.Show();
+                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                //Loading loading = new Loading();
+                //a31UsbMusicList.AddChidren(loading);
+                //loading.Start();
+                //System.Threading.Tasks.Task.Run(() =>
+                //{
+                //    try
+                //    {
+                //        if (A31MusicModel.Current.UsbMusicLists.Count == 0)
+                //        {
+                //            SendMethod.Current.GetCurrentPalyList(A31MusicModel.Current.functionMusic);
+
+                //        }
+                //    }
+                //    catch
+                //    {
+                //    }
+                //    finally
+                //    {
+                //        Application.RunOnMainThread(() =>
+                //        {
+                //            loading.Hide();
+                //            //a31UsbMusicList.FileView();
+                //        });
+                //    }
+                //});
+            };
+
+            ///usb浜嬩欢
+            usbSourceView.clickBtn.MouseUpEventHandler += (sender, e) =>
+            {
+
+                A31FlieList a31FlieList = new A31FlieList(KeyProperty.sdcard, usbSourceView.textBtn.Text);
+                MainPage.BasePageView.AddChidren(a31FlieList);
+                a31FlieList.Show();
                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                 Loading loading = new Loading();
-                a31MusicFileList.AddChidren(loading);
+                a31FlieList.AddChidren(loading);
                 loading.Start();
+                var listNameList = CommonMethod.Current.GetListNameListMemory(KeyProperty.sdcard);
                 System.Threading.Tasks.Task.Run(() =>
                 {
                     try
                     {
-                        if (A31MusicModel.Current.palyLists.Count == 0)
+
+                        if (listNameList.Count == 0)
                         {
-                           SendMethod.Current.GetPalyList(A31MusicModel.Current.functionMusic);
-                           
+                            var Group = SendMethod.Current.GetSingleSourceListNameList(A31MusicModel.Current.functionMusic, KeyProperty.sdcard);
+                            CommonMethod.Current.AddSourceGroupListMemory(Group);//淇濆瓨缂撳瓨
+                            listNameList.AddRange(Group.groupList);//鏇存柊鍒楄〃鍊�
                         }
                     }
                     catch
@@ -170,10 +215,11 @@
                         Application.RunOnMainThread(() =>
                         {
                             loading.Hide();
-                            a31MusicFileList.FileView();
+                            a31FlieList.FileListView(listNameList);
                         });
                     }
                 });
+
             };
 
 
@@ -189,7 +235,7 @@
                     {
                         try
                         {
-                            SendMethod.Current.EditDeviceName(A31MusicModel.Current.functionMusic.deviceId,playerName);
+                            SendMethod.Current.EditDeviceName(A31MusicModel.Current.functionMusic.deviceId, playerName);
                         }
                         catch { }
 
@@ -198,7 +244,7 @@
                 });
 
             };
-           
+
             ///鍖哄煙淇敼鐨勪簨浠�
             areaText.clickBtn.MouseUpEventHandler += (sender, e) =>
             {
@@ -235,15 +281,13 @@
                 //a31MyList.Show();
                 //a31MyList.UpdateSelectedFile();
                 //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                
+
                 System.Threading.Tasks.Task.Run(() =>
                 {
                     try
                     {
 
-                        //HDL_ON.DriverLayer.Control.Ins.GetMusicDirectory(device);
-                        var palyListName = Music.SendMethod.Current.GetListName(A31MusicModel.Current.functionMusic);
-                        var palyList = Music.SendMethod.Current.GetListMusic(A31MusicModel.Current.functionMusic, "hdl_special");
+                        var palyList = Music.SendMethod.Current.GetSingleSongList(A31MusicModel.Current.functionMusic, "hdl_special", "");
                         List<string> musicNameList = new List<string>();
                         for (int i = 0; i < palyList.songs.Count; i++)
                         {
@@ -255,8 +299,8 @@
                             UI2.Intelligence.Automation.PublicInterface publicInterface = new UI2.Intelligence.Automation.PublicInterface();
                             publicInterface.FrameOrVv(this, musicNameList, new List<string> { "123" }, palyList.group, (index) =>
                             {
-                               
-                                
+
+
                             }, false);
 
                         });
@@ -265,9 +309,9 @@
 
                 });
             };
-          
-     
-          
+
+
+
 
             ///钃濈墮浜嬩欢
             bluetoothSourceView.clickBtn.MouseUpEventHandler += (sender, e) =>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index a74585d..168d4b0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -43,7 +43,7 @@
         {
 
             ///1绉掑畾鏃舵洿鏂扮姸鎬�
-            timerUpdateStatus();
+            TimerUpdateStatus();
             #region   ---鐣岄潰甯冨眬---
             this.BackgroundColor = MusicColor.ViewColor;
             topView = new TopView();
@@ -161,7 +161,7 @@
                         return name == musicInfo.name;
                     }))
                     {
-                        A31MusicModel.Current.LoveMusicInfoList.Add(new Songs { name = name, time = songTime });
+                        A31MusicModel.Current.LoveMusicInfoList.Add(new SongInfo { name = name, time = songTime });
                     }
                 }
                 else
@@ -182,17 +182,31 @@
                 UI2.FuntionControlView.Music.View.MyListView myListView = new UI2.FuntionControlView.Music.View.MyListView();
                 myListView.frameLayout(this, A31MusicModel.Current);
                 myListView.dialogFra.AddChidren(loading);//dialogFra鍒锋柊鍥炬爣鐖舵帶浠�
+                loading.Start();
                 ///涓嬫媺鍒锋柊
                 myListView.verticalScrolViewLayout.BeginHeaderRefreshingAction += () =>
                 {
-                    System.Threading.Tasks.Task.Run(() =>
+                    myListView.verticalScrolViewLayout.EndHeaderRefreshing(); //缁撴潫鍒锋柊
+                    loading.Start();
+                    System.Threading.Tasks.Task.Run((() =>
                     {
                         try
                         {
-                            A31MusicModel.Current.palyLists.Clear();
-                            if (A31MusicModel.Current.palyLists.Count == 0)
+                            A31MusicModel.Current.CurrentPlayMusicInfoList.Clear();
+                            if (A31MusicModel.Current.CurrentPlayMusicInfoList.Count == 0)
                             {
-                                SendMethod.Current.GetPalyList(A31MusicModel.Current.functionMusic);
+                                SendMethod.Current.GetCurrentPalyList(A31MusicModel.Current.functionMusic, () =>
+                                {
+
+                                    Application.RunOnMainThread(() =>
+                                    {
+                                        myListView.verticalScrolViewLayout.RemoveAll();
+                                        var listName = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playlist_name);
+                                        var source = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.source);
+                                        var musicList = A31MusicModel.Current.GetSongList(listName);
+                                        A31SongPlay.SongListView(myListView.verticalScrolViewLayout, musicList, listName, source, myListView.popFra);
+                                    });
+                                });
 
                             }
                         }
@@ -203,15 +217,17 @@
                         {
                             Application.RunOnMainThread(() =>
                             {
-                                myListView.verticalScrolViewLayout.EndHeaderRefreshing();
-                                myListView.verticalScrolViewLayout.RemoveAll();
-                                var listName = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playlist_name);
-                                var musicList = A31MusicModel.Current.GetSongList(listName);
-                                A31SongPlay.SongListView(myListView.verticalScrolViewLayout, musicList, listName, myListView.popFra);
+                                loading.Hide();
+                                //myListView.verticalScrolViewLayout.EndHeaderRefreshing();
+                                //myListView.verticalScrolViewLayout.RemoveAll();
+                                //var listName = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playlist_name);
+                                //var source = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.source);
+                                //var musicList = A31MusicModel.Current.GetSongList(listName);
+
+                                //A31SongPlay.SongListView(myListView.verticalScrolViewLayout, musicList, listName, source, myListView.popFra);
                             });
                         }
-                    });
-                    //缁撴潫鍒锋柊
+                    }));
 
                 };
                 ///绉婚櫎鐣岄潰
@@ -220,14 +236,14 @@
                      myListView.popFra.RemoveFromParent();
                  };
                 myListView.backIextBtn.MouseUpEventHandler += removeFromParentView;
-                myListView.popFra.MouseUpEventHandler += removeFromParentView;
+                //myListView.popFra.MouseUpEventHandler += removeFromParentView;
                 #endregion
                 //var listName = A31MusicModel.Current.functionMusic.GetAttribute("playlist_name").ToString();
                 //var musicList = A31MusicModel.Current.GetSongList(listName);
                 //new A31SongPlay { }.SongListView(myListView.verticalScrolViewLayout, musicList, listName);
 
-                PlayListView(myListView.popFra, myListView.verticalScrolViewLayout);
-                UpdateSelectedMusic(myListView.popFra, myListView.verticalScrolViewLayout);
+                this.PlayListView(myListView.popFra, myListView.verticalScrolViewLayout, loading);
+                this.UpdateSelectedMusic(myListView.popFra, myListView.verticalScrolViewLayout);
 
             };
             ///闊抽噺鍥炬爣鐐瑰嚮浜嬩欢
@@ -329,7 +345,7 @@
         /// <summary>
         /// 瀹氭椂鏇存柊鐘舵��
         /// </summary>       
-        void timerUpdateStatus()
+        void TimerUpdateStatus()
         {
             timerThread = new System.Threading.Thread((obj) =>
             {
@@ -597,24 +613,34 @@
         /// 鍔犺浇鎾斁闊充箰鍒楄〃View
         /// </summary>
         /// <param name="verticalScrolViewLayout"></param>
-        void PlayListView(FrameLayout frameLayout, VerticalRefreshLayout verticalScrolViewLayout)
+        private void PlayListView(FrameLayout frameLayout, VerticalRefreshLayout verticalScrolViewLayout, Loading loading)
         {
             verticalScrolViewLayout.RemoveAll();
-            //鑾峰彇鎾斁鍣ㄥ悕绉�
             var listName = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playlist_name);
+            var source = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.source);
             //鑾峰彇缂撳瓨姝屾洸鍒楄〃
             var musicList = A31MusicModel.Current.GetSongList(listName);
+            loading.Start();
             if (musicList.Count == 0)
             {
-                System.Threading.Tasks.Task.Run(() =>
+                System.Threading.Tasks.Task.Run((() =>
                 {
                     try
                     {
-                        A31MusicModel.Current.palyLists.Clear();
-                        if (A31MusicModel.Current.palyLists.Count == 0)
+                        A31MusicModel.Current.CurrentPlayMusicInfoList.Clear();
+                        if (A31MusicModel.Current.CurrentPlayMusicInfoList.Count == 0)
                         {
                             //鑾峰彇姝屾洸鍒楄〃
-                            SendMethod.Current.GetPalyList(A31MusicModel.Current.functionMusic);
+                            SendMethod.Current.GetCurrentPalyList(A31MusicModel.Current.functionMusic, () =>
+                            {
+
+                                Application.RunOnMainThread(() =>
+                                {
+                                    musicList = A31MusicModel.Current.GetSongList(listName);
+                                    A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, source, frameLayout);
+
+                                });
+                            });
 
                         }
                     }
@@ -625,21 +651,26 @@
                     {
                         Application.RunOnMainThread(() =>
                         {
-                            musicList = A31MusicModel.Current.GetSongList(listName);
-                            A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, frameLayout);
+                            loading.Hide();
+                            //musicList = A31MusicModel.Current.GetSongList(listName);
+                            //A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, source, frameLayout);
                         });
                     }
-                });
+                }));
             }
             else
             {
-                A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, frameLayout);
+                Application.RunOnMainThread(() =>
+                {
+                    loading.Hide();
+                    A31SongPlay.SongListView(verticalScrolViewLayout, musicList, listName, source, frameLayout);
+                });
             }
         }
         /// <summary>
         /// 瀹氭椂鏇存柊褰撳墠鎾斁闊充箰
         /// </summary>
-        void UpdateSelectedMusic(FrameLayout frameLayout, VerticalRefreshLayout middViewLayout)
+        private void UpdateSelectedMusic(FrameLayout frameLayout, VerticalRefreshLayout middViewLayout)
         {
             UpdateThread.updateCurrMusicThread(frameLayout, middViewLayout, A31MusicModel.Current);
         }
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31SongPlay.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31SongPlay.cs
index f036a0b..139f635 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31SongPlay.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31SongPlay.cs
@@ -2,6 +2,7 @@
 using Shared;
 using HDL_ON.UI.Music;
 using System.Collections.Generic;
+using HDL_ON.UI.UI2.FuntionControlView.Music;
 
 namespace HDL_ON.UI.Music
 {
@@ -13,13 +14,14 @@
             Tag = "Music";
         }
 
-        public void Show(List<Songs> musicList,string listName)
+
+        public void Show(SongList songLists)
         {
 
             this.BackgroundColor = MusicColor.ViewColor;
             var topView = new TopView();
             this.AddChidren(topView.TopFLayoutView());
-            topView.topNameBtn.TextID = StringId.localMusic;
+            topView.topNameBtn.Text=songLists.group;
             topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
             {
                 this.RemoveFromParent();
@@ -33,10 +35,33 @@
             this.AddChidren(vv);
             vv.BeginHeaderRefreshingAction += () =>
             {
-                vv.EndHeaderRefreshing();
+                System.Threading.Tasks.Task.Run(() =>
+                {
+                    try
+                    {
+                        //鑾峰彇姝屾洸鍒楄〃
+                        var songList = SendMethod.Current.GetSingleSongList(A31MusicModel.Current.functionMusic, songLists.group, songLists.source);
+                        CommonMethod.Current.AddSongListMemory(songList, songLists.source);//淇濆瓨缂撳瓨
+                    }
+                    catch
+                    {
+                    }
+                    finally
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            vv.EndHeaderRefreshing();
+                            //浠庣紦瀛樻嬁鍒楄〃
+                            var songListMemory = CommonMethod.Current.GetSongListMemory(songLists.group, songLists.source); 
+                            ///鍔犺浇闊充箰鍒楄〃
+                            SongListView(vv, songListMemory.songs, songListMemory.group, songLists.source);
+                            
+                        });
+                    }
+                });
             };
             ///鍔犺浇闊充箰鍒楄〃
-            SongListView(vv, musicList, listName);
+            SongListView(vv, songLists.songs, songLists.group,songLists.source);
 
 
         }
@@ -46,8 +71,12 @@
         /// <param name="vv">鐖舵帶浠�</param>
         /// <param name="musicList">闊充箰鍒楄〃</param>
         /// <param name="listName">鍒楄〃鍚�</param>
-        public static void SongListView(VerticalRefreshLayout vv,List<Songs> musicList,string listName, FrameLayout frame = null) {
-
+        /// <param name="source">闊充箰婧�</param>
+        public static void SongListView(VerticalRefreshLayout vv, List<SongInfo> musicList, string listName,string source, FrameLayout frame = null)
+        {
+            if (vv!=null) {
+                vv.RemoveAll();
+            }
             for (int i = 0; i < musicList.Count; i++)
             {
                 var songs = musicList[i];
@@ -66,7 +95,7 @@
                         System.Threading.Thread.Sleep(50);
                         Application.RunOnMainThread(() =>
                         {
-                            //绉婚櫎鐣岄潰
+                            //淇敼缂撳瓨灞炴�х姸鎬佸��
                             A31MusicModel.Current.functionMusic.SetAttrState("song_name", songView.songBtn.Text);
                             A31MusicModel.Current.functionMusic.SetAttrState("playlist_name", listName);
                             //绉婚櫎鐣岄潰
@@ -78,6 +107,14 @@
                             Dictionary<string, string> dic = new Dictionary<string, string>();
                             dic.Add("song_name", songView.songBtn.Text);
                             dic.Add("playlist_name", listName);
+                            if (!string.IsNullOrEmpty(songs.url))
+                            {
+                                dic.Add("url", songs.url);
+                            }
+                            if (!string.IsNullOrEmpty(source))
+                            {
+                                dic.Add("source", source);
+                            }
                             SendMethod.Current.SendControlCommand(A31MusicModel.Current.functionMusic, dic);
                         });
                     });
@@ -144,6 +181,6 @@
             });
             updateSelectedMusicThread.Start();
         }
-      
+
     }
 }
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31UsbMusicList.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31UsbMusicList.cs
new file mode 100644
index 0000000..6c36515
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31UsbMusicList.cs
@@ -0,0 +1,43 @@
+锘縰sing System;
+using HDL_ON.UI.Music;
+using Shared;
+
+namespace HDL_ON.UI.UI2.FuntionControlView.Music
+{
+    public class A31UsbMusicList:FrameLayout
+    {
+        public A31UsbMusicList()
+        {
+            Tag = "Music";
+        }
+        VerticalRefreshLayout middViewLayout;
+        /// <summary>
+        /// 鍏堝姞杞界晫闈㈠嚭鏉�
+        /// </summary>
+        public void Show( )
+        {
+            #region   鐣岄潰甯冨眬------
+
+            this.BackgroundColor = MusicColor.ViewColor;
+            var topView = new TopView();
+            this.AddChidren(topView.TopFLayoutView());
+            topView.topNameBtn.Text ="USB";
+            topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
+            {
+                this.RemoveFromParent();
+            };
+            middViewLayout = new VerticalRefreshLayout
+            {
+                BackgroundColor = MusicColor.WhiteColor,
+                Y = topView.fLayout.Bottom,
+                Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
+            };
+            this.AddChidren(middViewLayout);
+            middViewLayout.BeginHeaderRefreshingAction += () =>
+            {
+                middViewLayout.EndHeaderRefreshing();
+            };
+            #endregion
+        }
+    }
+}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/CommonMethod.cs
new file mode 100644
index 0000000..7116dff
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/CommonMethod.cs
@@ -0,0 +1,137 @@
+锘縰sing System;
+using System.Collections.Generic;
+using HDL_ON.UI.Music;
+
+namespace HDL_ON.UI.UI2.FuntionControlView.Music
+{
+    public class CommonMethod
+    {
+        public CommonMethod()
+        {
+        }
+
+        private static CommonMethod commonMethod = null;
+
+        public static CommonMethod Current
+        {
+            get
+            {
+                if (commonMethod == null)
+                {
+                    commonMethod = new CommonMethod();
+                }
+                return commonMethod;
+            }
+
+        }
+        /// <summary>
+        /// 鑾峰彇銆愰煶涔愬垪琛ㄣ��
+        /// </summary>
+        /// <param name="listName">鍒楄〃鍚�</param>
+        /// <param name="source">闊充箰婧�</param>
+        /// <returns></returns>
+        public SongList GetSongListMemory(string listName, string source) 
+        {
+            for (int i = 0; i < A31MusicModel.Current.AllMusicLists.Count; i++)
+            {
+                var songList = A31MusicModel.Current.AllMusicLists[i];
+                if (songList.source == source && songList.group == listName)
+                {
+                    return songList;
+                }
+
+            }
+            return new SongList() {group=listName,source=source};
+        }
+
+        /// <summary>
+        /// 娣诲姞銆愰煶涔愬垪琛ㄣ��(瀛樺湪绉婚櫎鍐嶆坊鍔�)
+        /// </summary>
+        /// <param name="newSongList">闊充箰鍒楄〃</param>
+        ///  <param name="source">闊充箰婧�</param>
+        public void AddSongListMemory(SongList newSongList, string source) 
+        {
+            
+            newSongList.source = source;//鏇存柊闊充箰婧�
+            int existsInt = -1;
+            for (int i = 0; i < A31MusicModel.Current.AllMusicLists.Count; i++)
+            {
+                var songList = A31MusicModel.Current.AllMusicLists[i];
+                if (songList.source == newSongList.source && songList.group == newSongList.group)
+                {
+                    existsInt = i;
+                    break;
+                }
+
+
+            }
+            if (existsInt > -1)
+            {
+                //瀛樺湪绉婚櫎鍐嶆坊鍔�
+                A31MusicModel.Current.AllMusicLists.RemoveAt(existsInt);
+                A31MusicModel.Current.AllMusicLists.Insert(existsInt, newSongList);
+
+            }
+            else
+            {
+                //娣诲姞
+                A31MusicModel.Current.AllMusicLists.Add(newSongList);
+
+            }
+
+        }
+     
+        /// <summary>
+        /// 鑾峰彇銆愰煶涔愭簮銆戝垪琛ㄥ悕鍒楄〃
+        /// </summary>
+        /// <param name="source">闊充箰婧�</param>
+        /// <returns></returns>
+        public List<ListName> GetListNameListMemory(string source) 
+        {
+
+            for (int i = 0; i < A31MusicModel.Current.AllSourceGroupList.Count; i++)
+            {
+                var group = A31MusicModel.Current.AllSourceGroupList[i];
+                if (group.source == source)
+                {
+                    return group.groupList;
+                }
+
+            }
+            return new List<ListName>();
+        }
+        /// <summary>
+        /// 娣诲姞銆愰煶涔愭簮銆�(瀛樺湪绉婚櫎鍐嶆坊鍔�)
+        /// </summary>
+        /// <param name="groupLists"></param>
+        public void AddSourceGroupListMemory(GroupList groupLists)
+        {
+            int existsInt = -1;
+            for (int i = 0; i < A31MusicModel.Current.AllSourceGroupList.Count; i++)
+            {
+                var group = A31MusicModel.Current.AllSourceGroupList[i];
+                if (group.sid == groupLists.sid && group.source == groupLists.source)
+                {
+                    existsInt = i;
+                    break;
+                }
+
+
+            }
+            if (existsInt > -1)
+            {
+                //瀛樺湪绉婚櫎鍐嶆坊鍔�
+                A31MusicModel.Current.AllSourceGroupList.RemoveAt(existsInt);
+                A31MusicModel.Current.AllSourceGroupList.Insert(existsInt, groupLists);
+
+            }
+            else
+            {
+                //娣诲姞
+                A31MusicModel.Current.AllSourceGroupList.Add(groupLists);
+
+            }
+
+        }
+    }
+}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicProperty.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicProperty.cs
index 22bd45a..7462603 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicProperty.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicProperty.cs
@@ -57,6 +57,27 @@
         /// 褰撳墠姝屾洸鎾斁鏃堕棿<0-9999(s)>
         /// </summary>
         public const string playing_time = "playing_time";
+        /// <summary>
+        /// 銆怳SB銆戦煶涔愭簮
+        /// </summary>
+        public const string sdcard = "sdcard";
+        /// <summary>
+        /// 銆愰煶棰戣緭鍏ャ�戦煶涔愭簮
+        /// </summary>
+        public const string audio_in = "audio_in";
+        /// <summary>
+        /// 銆恌tp銆戦煶涔愭簮
+        /// </summary>
+        public const string ftp = "ftp";
+        /// <summary>
+        /// 銆愭敹闊虫満銆戦煶涔愭簮
+        /// </summary>
+        public const string radio = "radio";
+        /// <summary>
+        /// 銆愯摑鐗欍�戦煶涔愭簮
+        /// </summary>
+        public const string bluetooth = "bluetooth";
+
 
 
         #endregion
@@ -138,4 +159,15 @@
 
 
     }
+
+    public enum Source
+    {
+
+        sdcard,//usb
+        audio_in,//闊抽杈撳叆
+        ftp,
+        radio,//鏀堕煶鏈�
+        bluetooth//钃濈墮
+
+    }
 }
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
index fc0f09e..7aed7ce 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs
@@ -86,7 +86,7 @@
                 d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
                 d.Add("deviceIds", functionIds);
                 var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_RefreshDeviceStatus, "鍒锋柊璁惧鐘舵��");
-                if (responsePackNew.Code != "0" || responsePackNew.Data == null || responsePackNew.Data.ToString() == "")
+                if (!this.DataChecking(responsePackNew))
                 {
                     return;
                 }
@@ -110,11 +110,12 @@
         }
 
         /// <summary>
-        /// 鑾峰彇闊充箰鍒楄〃
+        /// 鑾峰彇褰撳墠鎾斁闊充箰鍒楄〃
         /// </summary>
-        /// <param name="music"></param>
+        /// <param name="music">闊充箰鎾斁鍣�</param>
+        /// <param name="action">鍥炶皟</param>
         /// <returns></returns>
-        public void GetPalyList(Function music)
+        public void GetCurrentPalyList(Function music, Action action)
         {
             try
             {
@@ -122,43 +123,57 @@
                 d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
                 d.Add("deviceIds", new List<string> { music.deviceId });
                 var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_PlayerList, "鑾峰彇闊充箰鍒楄〃");
-                if (responsePackNew.Code != "0" || responsePackNew.Data == null || responsePackNew.Data.ToString() == "")
+                if (!this.DataChecking(responsePackNew))
                 {
                     return;
                 }
                 //鏁版嵁杩斿簭鍒楀寲涓篎unction瀵硅薄
                 var str = Newtonsoft.Json.JsonConvert.SerializeObject(responsePackNew.Data);
-                var palyLists = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PalyListInfo>>(str);
+                var palyLists = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PalyerSongListInfo>>(str);
                 if (palyLists == null)
                 {
-                    palyLists =new List<PalyListInfo>();
+                    palyLists = new List<PalyerSongListInfo>();
                 }
                 if (palyLists.Count > 0)
                 {
                     ///榛樿鎷跨涓�涓垪琛�
-                    A31MusicModel.Current.palyLists = palyLists[0].playlist;
+                    A31MusicModel.Current.CurrentPlayMusicInfoList = palyLists[0].playlist;
                 }
             }
             catch
             {
             }
+            finally
+            {
+                Application.RunOnMainThread(() =>
+                {
+                    action();
+                });
+            }
 
         }
         /// <summary>
-        /// 鑾峰彇鍒楄〃鍚嶅垪琛�
+        /// 鑾峰彇銆愬涓煶涔愭簮銆戝垪琛ㄥ悕鍒楄〃
         /// </summary>
         /// <param name="music"></param>
+        /// <param name="source">闊充箰婧愪负null,鏀寔澶氫釜婧愯幏鍙�</param>
         /// <returns></returns>
-        public List<GroupList> GetListName(Function music)
+        public List<GroupList> GetMultipleSourceListName(Function music, string source)
         {
             try
             {
                 Dictionary<string, object> d = new Dictionary<string, object>();
                 d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
                 d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
-                d.Add("deviceIds", new List<string> { music.deviceId });
+                Dictionary<string, object> deviceIds = new Dictionary<string, object>();
+                deviceIds.Add("deviceId", music.deviceId);
+                if (!string.IsNullOrEmpty(source))
+                {
+                    deviceIds.Add("source", source);
+                }
+                d.Add("deviceInfos", new List<Dictionary<string, object>> { deviceIds });
                 var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_GroupList, "鑾峰彇鍒楄〃鍚嶅垪琛�");
-                if (responsePackNew.Code != "0" || responsePackNew.Data == null || responsePackNew.Data.ToString() == "")
+                if (!this.DataChecking(responsePackNew))
                 {
                     return new List<GroupList>();
                 }
@@ -176,13 +191,35 @@
                 return new List<GroupList>();
             }
         }
+
         /// <summary>
-        /// 鑾峰彇鍒楄〃闊充箰
+        /// 鑾峰彇銆愬崟涓煶涔愭簮銆戝垪琛ㄥ悕鍒楄〃(榛樿鍙栧畾鍒楄〃涓竴涓�)
+        /// </summary>
+        /// <param name="music"></param>
+        /// <param name="source">闊充箰婧�</param>
+        /// <returns></returns>
+        public GroupList GetSingleSourceListNameList(Function music, string source)
+        {
+            List<GroupList> groupList = this.GetMultipleSourceListName(music, source);
+            if (groupList.Count == 0)
+            {
+                return new GroupList();
+            }
+            ////榛樿鍙栧畾鍒楄〃涓竴涓�
+            return groupList.Count > 0 ? groupList[0] : new GroupList();
+        }
+
+      
+
+
+        /// <summary>
+        /// 閫氳繃鍒楄〃鍚嶈幏鍙栥�愬涓瓕鏇插垪琛ㄣ��
         /// </summary>
         /// <param name="music"></param>
         /// <param name="listName">鍒楄〃鍚�</param>
+        /// <param name="source">闊充箰婧�</param>
         /// <returns></returns>
-        public PalyList GetListMusic(Function music, string listName)
+        public List<PalyerSongListInfo> GetMultipleSongListM(Function music, string listName, string source)
         {
             try
             {
@@ -193,34 +230,66 @@
                 d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
                 d2.Add("group", listName);
                 d1.Add("sid", music.sid);
+                if (!string.IsNullOrEmpty(source))
+                {
+                    d1.Add("source", source);
+                }
                 d1.Add("groupList", new List<Dictionary<string, object>> { d2 });
                 d.Add("sidGroups", new List<Dictionary<string, object>> { d1 });
 
-                var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_GroupPlayerList, "鑾峰彇鍒楄〃闊充箰");
-                if (responsePackNew.Code != "0" || responsePackNew.Data == null || responsePackNew.Data.ToString() == "")
+                var responsePackNew = RequestServerhomeId(d, NewAPI.Api_Post_GroupPlayerList, "閫氳繃鍒楄〃鍚嶈幏鍙栨瓕鏇插垪琛�");
+                if (!this.DataChecking(responsePackNew))
                 {
-                    return new PalyList();
+                    return new List<PalyerSongListInfo>();
                 }
                 //鏁版嵁杩斿簭鍒楀寲涓篎unction瀵硅薄
                 var str = Newtonsoft.Json.JsonConvert.SerializeObject(responsePackNew.Data);
-                var palyLists = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PalyListInfo>>(str);
+                var palyLists = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PalyerSongListInfo>>(str);
                 if (palyLists == null)
                 {
-                    palyLists = new List<PalyListInfo>();
+                    return new List<PalyerSongListInfo>();
                 }
 
-                if (palyLists.Count == 0)
-                {
-                    return new PalyList();
-                }
-                //榛樿绗竴涓垪琛ㄩ噷闈㈢涓�涓煶涔愬垪琛�
-                return palyLists[0].playlist.Count > 0 ? palyLists[0].playlist[0] : new PalyList();
+                return palyLists;
 
             }
             catch
             {
-                return new PalyList();
+                return new List<PalyerSongListInfo>();
             }
+        }
+        /// <summary>
+        /// 閫氳繃鍒楄〃鍚嶈幏鍙栥�愬崟涓瓕鏇插垪琛ㄣ��(榛樿鍙栧畾鍒楄〃涓竴涓瓕鏇插垪琛�)
+        /// </summary>
+        /// <param name="music"></param>
+        /// <param name="listName">鍒楄〃鍚�</param>
+        /// <param name="source">闊充箰婧�</param>
+        /// <returns></returns>
+        public SongList GetSingleSongList(Function music, string listName, string source)
+        {
+            List<PalyerSongListInfo> listInfos = this.GetMultipleSongListM(music, listName, source);
+            if (listInfos.Count == 0)
+            {
+                return new SongList();
+            }
+            ////榛樿绗竴涓垪琛ㄩ噷闈㈢涓�涓煶涔愬垪琛�
+            SongList songList = listInfos[0].playlist.Count > 0 ? listInfos[0].playlist[0] : new SongList();
+            return songList;
+
+        }
+        /// <summary>
+        /// 妫�楠屾暟鎹洖澶嶆垚鍔熸垨鑰呭け璐�
+        /// </summary>
+        /// <param name="responsePackNew">鍥炲鏁版嵁瀵硅薄</param>
+        /// <returns></returns>
+        private bool DataChecking(ResponsePackNew responsePackNew)
+        {
+            if (responsePackNew.Data == null||responsePackNew.Code != "0"  || responsePackNew.Data.ToString() == "")
+            {
+                
+                return false;
+            }
+            return true;
         }
 
         /// <summary>
@@ -232,7 +301,7 @@
         /// <returns></returns>
         public ResponsePackNew RequestServerhomeId(object o, string api_Url, string tag, int mTimeout = 5)
         {
-            JObject jobject = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(o)); 
+            JObject jobject = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(o));
             return UI2.Intelligence.Automation.Send.Current.RequestServerhomeId(jobject, api_Url, tag, mTimeout);
         }
     }
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
index 0da47b3..9af645d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs
@@ -9,7 +9,7 @@
         ///寮圭獥鏂囦欢澶瑰垪琛ㄧ晫闈�
         /// </summary>
         /// <param name="musicInfo"></param>
-        public void FieListView(Songs musicInfo)
+        public void FieListView(SongInfo musicInfo)
         {
             #region
             //涓绘帶浠�
@@ -114,7 +114,7 @@
             FileView(dialog, verticalScrolViewLayout, musicInfo);
 
         }
-        void FileView(Dialog dialog, VerticalScrolViewLayout verticalScrolViewLayout, Songs musicInfo)
+        void FileView(Dialog dialog, VerticalScrolViewLayout verticalScrolViewLayout, SongInfo musicInfo)
         {
             verticalScrolViewLayout.RemoveAll();
             for (int i = 0; i < A31MusicModel.Current.FileLists.Count; i++)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
index 5335d37..e79f5b4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
@@ -184,7 +184,7 @@
             Y = Application.GetRealHeight(355),
             Width = Application.GetRealWidth(28),
             Height = Application.GetRealWidth(28),
-            UnSelectedImagePath = "MusicIcon/playList.png",
+            UnSelectedImagePath = "MusicIcon/currentPlayList.png",
         };
         /// <summary>
         /// 闊抽噺鍥炬爣
@@ -214,7 +214,6 @@
             SeekBarViewHeight = Application.GetRealWidth(8),//杩涘害鏉$殑楂樺害
             ProgressChangeDelayTime = 300,//0.3绉掑彂閫佷竴娆�
             SeekBarPadding = Application.GetRealWidth(20),
-
         };
 
         /// <summary>
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs
index e2d5c9d..f0eeb8a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs
@@ -1,93 +1,94 @@
 锘縰sing System;
 namespace HDL_ON.UI.Music
 {
-    public static class TextSize
+    public class TextSize
     {
-        public static int TopLine = 1;
-        public static int MiddleLine =1;
-        public static int DownLine = 1;
+        public const int TopLine = 1;
+        public const int MiddleLine = 1;
+        public const int DownLine = 1;
 
 
 
-        public static int Text24 = 24;
-        public static int Text20 = 20;
-        public static int Text18 = 18;
-        public static int Text16 = 16;
-        public static int Text14 = 14;
-        public static int Text12 = 12;
-        public static int Text10 = 10;
+        public const int Text24 = 24;
+        public const int Text20 = 20;
+        public const int Text18 = 18;
+        public const int Text16 = 16;
+        public const int Text14 = 14;
+        public const int Text12 = 12;
+        public const int Text10 = 10;
 
     }
-    public static class MusicColor
+    public class MusicColor
     {
         /// <summary>
         /// 椤堕儴鑳屾櫙棰滆壊
         /// </summary>
-        public static uint TopViewColor = 0xFFF7F7F7;
+        public const uint TopViewColor = 0xFFF7F7F7;
         /// <summary>
         /// 鐣岄潰鑳屾櫙棰滆壊
         /// </summary>
-        public static uint ViewColor = 0xFFF2F3F7;
+        public const uint ViewColor = 0xFFF2F3F7;
         /// <summary>
         /// 鐧借壊鑳屾櫙棰滆壊
         /// </summary>
-        public static uint WhiteColor = 0xFFFFFFFF;
+        public const uint WhiteColor = 0xFFFFFFFF;
         /// <summary>
         /// 绾㈣壊鑳屾櫙棰滆壊
         /// </summary>
-        public static uint RedColor = 0xFFFF4747;
-        
-        /// <summary>
-        /// 绾挎潯棰滆壊
-        /// </summary>
-        public static uint LineColor =0xFFECEDEE;
-        /// <summary>
-        /// 寮圭獥鑳屾櫙棰滆壊
-        /// </summary>
-        public static uint PopupBackgroundColor = 0x90000000;
+        public const uint RedColor = 0xFFFF4747;
 
         /// <summary>
         /// 绾挎潯棰滆壊
         /// </summary>
-        public static uint MusicEditColor = 0xFFFC9C04;
+        public const uint LineColor = 0xFFECEDEE;
         /// <summary>
         /// 寮圭獥鑳屾櫙棰滆壊
         /// </summary>
-        public static uint MusicDelColor = 0xFFFF7474;
+        public const uint PopupBackgroundColor = 0x90000000;
 
-        public static uint Text18Color = 0xFF1B2D4D;
-        public static uint MusicTxet14SelectedColor = 0xFF4484F4;
-        public static uint MusicTxet14Color = 0xFF1B2D4D;
-        public static uint MusicTxet12SelectedColor = 0xFF4484F4;
-       
-        public static uint MusicNoTxetColor = 0xFFC0C7D4;
-        public static uint TextColor = 0xFF1B2D4D;
-        public static uint SelectedColor = 0xFF4484F4;
+        /// <summary>
+        /// 绾挎潯棰滆壊
+        /// </summary>
+        public const uint MusicEditColor = 0xFFFC9C04;
+        /// <summary>
+        /// 寮圭獥鑳屾櫙棰滆壊
+        /// </summary>
+        public const uint MusicDelColor = 0xFFFF7474;
 
-        public static uint TextTimeColor = 0xFF798394;
+        public const uint Text18Color = 0xFF1B2D4D;
+        public const uint MusicTxet14SelectedColor = 0xFF4484F4;
+        public const uint MusicTxet14Color = 0xFF1B2D4D;
+        public const uint MusicTxet12SelectedColor = 0xFF4484F4;
 
-        public static uint TextCancelColor = 0xFF798394; 
+        public const uint MusicNoTxetColor = 0xFFC0C7D4;
+        public const uint TextColor = 0xFF1B2D4D;
+        public const uint SelectedColor = 0xFF4484F4;
+
+        public const uint TextTimeColor = 0xFF798394;
+
+        public const uint TextCancelColor = 0xFF798394;
 
     }
 
-    public static class H_W {
+    public class H_W
+    {
         /// <summary>
         /// app楂樺害
         /// </summary>
-        public static int H = 667;
+        public const int H = 667;
         /// <summary>
         /// app瀹藉害
         /// </summary>
-        public static int W = 375;
+        public const int W = 375;
         /// <summary>
         /// 椤堕儴楂樺害
         /// </summary>
-        public static int T_Height = 64;
+        public const int T_Height = 64;
 
         /// <summary>
         /// 绾块珮搴�
         /// </summary>
-        public static int Line = 1;
+        public const int Line = 1;
     }
 
 
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs
index 26b9e2f..13649cf 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs
@@ -94,7 +94,7 @@
         /// 甯冨眬姝屾洸淇℃伅鐨刅iew
         /// </summary>
         /// <returns></returns>
-        public void SongFrameLayout(VerticalRefreshLayout refreshLayout, Songs songs)
+        public void SongFrameLayout(VerticalRefreshLayout refreshLayout, SongInfo songs)
         {
             musicViewFl.AddChidren(playIconBtn);
             musicViewFl.AddChidren(songBtn);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs b/HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs
new file mode 100644
index 0000000..a20397c
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs
@@ -0,0 +1,334 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using HDL_ON.DAL.Server;
+using HDL_ON.DriverLayer;
+using HDL_ON.Entity;
+using HDL_ON.UI.CSS;
+using Shared;
+
+namespace HDL_ON.UI
+{
+    public class OrderFunctionPage : FrameLayout
+    {
+        #region 鎺т欢鍒楄〃
+        /// <summary>
+        /// 褰撳墠绐椾綋
+        /// </summary>
+        static FrameLayout bodyView;
+        /// <summary>
+        /// 鍔熻兘鍒楄〃闆嗗悎鏄剧ず鍖哄煙
+        /// </summary>
+        static VerticalScrolViewLayout functionListView;
+        /// <summary>
+        /// 瀹屾垚鎸夐挳
+        /// </summary>
+        Button btnConfrim;
+
+        #endregion
+        /// <summary>
+        /// 鍥炶皟鍒锋柊
+        /// </summary>
+        Action<Scene> backActon;
+
+        List<Function> orderList = new List<Function>();
+        List<int> orderNumber = new List<int>();
+
+        public OrderFunctionPage()
+        {
+            bodyView = this;
+        }
+
+        public void LoadPage(List<Function> functions,Action action)
+        {
+            List<int> orderNumberAlreay = new List<int>();
+            for (int i=0;i< functions.Count; i++)
+            {
+                if (functions[i].FunctionOrderNumber != 9999)
+                {
+                    orderNumberAlreay.Add(functions[i].FunctionOrderNumber);
+                }
+            }
+            for (int i = 1; i < functions.Count + 1; i++)
+            {
+                if (!orderNumberAlreay.Contains(i))
+                {
+                    orderNumber.Add(i);
+                }
+            }
+
+            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
+            new TopViewDiv(bodyView, Language.StringByID(StringId.Sort)).LoadTopView();
+
+            functionListView = new VerticalScrolViewLayout()
+            {
+                Y = Application.GetRealHeight(84),
+                Height = Application.GetRealHeight(640 - 100),
+            };
+            bodyView.AddChidren(functionListView);
+
+            LoadRow(functions);
+
+            #region 搴曢儴view
+            var bottomView = new FrameLayout()
+            {
+                Y = Application.GetRealHeight(591),
+                Height = Application.GetRealHeight(100),
+                BackgroundColor = CSS_Color.MainBackgroundColor,
+                Radius = (uint)Application.GetRealWidth(12),
+            };
+            this.AddChidren(bottomView);
+
+            btnConfrim = new Button()
+            {
+                Y = Application.GetRealHeight(12),
+                Gravity = Gravity.CenterHorizontal,
+                Width = Application.GetRealWidth(220),
+                Height = Application.GetRealHeight(44),
+                Radius = (uint)Application.GetRealHeight(22),
+                TextAlignment = TextAlignment.Center,
+                TextColor = CSS_Color.MainBackgroundColor,
+                BackgroundColor = CSS_Color.BackgroundColor,
+                TextID = StringId.Confirm,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                SelectedTextColor = CSS_Color.MainBackgroundColor,
+                SelectedBackgroundColor = CSS_Color.MainColor,
+                IsSelected = true
+            };
+            bottomView.AddChidren(btnConfrim);
+            btnConfrim.MouseUpEventHandler = (sender, e) => {
+                foreach(var function in functions)
+                {
+                    function.SaveFunctionFile();
+                }
+                    action?.Invoke();
+                    this.RemoveFromParent();
+            };
+
+            #endregion
+
+        }
+
+        /// <summary>
+        /// 鏄剧ず鐨勮澶囩殑鎬绘暟
+        /// </summary>
+        int showCount = -1;
+
+        /// <summary>
+        /// 鍔犺浇鍔熻兘row
+        /// </summary>
+        /// <param name="lightList"></param>
+        void LoadRow(List<Function> functions, bool isAppend = false)
+        {
+            var waitPage = new Loading();
+            bodyView.AddChidren(waitPage);
+            waitPage.Start("");
+
+            new System.Threading.Thread(() =>
+            {
+                try
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (!isAppend)
+                        {
+                            showCount = -1;
+                            functionListView.RemoveAll();
+                        }
+
+                        for(var i =0;i<100;i++)
+                        //foreach (var function in functions)
+                        {
+                            showCount++;
+                            if (showCount >= functions.Count)
+                            {
+                                break;
+                            }
+                            var function = functions[showCount];
+                            var functionDiv = new OrderFunctionRow()
+                            {
+                                Gravity = Gravity.CenterHorizontal,
+                                Width = Application.GetRealWidth(343),
+                                Height = Application.GetRealHeight(62),
+                                Radius = (uint)Application.GetMinRealAverage(12),
+                                BorderColor = 0x00FFFFFF,
+                                BorderWidth = 1,
+                                BackgroundColor = CSS_Color.MainBackgroundColor,
+                            };
+
+                            functionDiv.LoadDiv(function, orderNumber);
+
+
+                            functionListView.AddChidren(functionDiv);
+
+                            functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
+                        }
+
+                        if (functions.Count > showCount)
+                        {
+                            var btnAppend = new Button()
+                            {
+                                Height = Application.GetRealHeight(60),
+                                TextAlignment = TextAlignment.Center,
+                                TextSize = CSS_FontSize.SubheadingFontSize,
+                                TextColor = CSS_Color.FirstLevelTitleColor,
+                                TextID = StringId.LoadMore,
+                            };
+                            functionListView.AddChidren(btnAppend);
+                            btnAppend.MouseUpEventHandler = (sender, e) =>
+                            {
+                                btnAppend.RemoveFromParent();
+                                LoadRow(functions, true);
+                            };
+                        }
+                    });
+                }
+                catch (Exception ex)
+                {
+                    MainPage.Log("ShowFunctionRowError : " + ex.Message);
+                }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (waitPage != null)
+                        {
+                            waitPage.RemoveFromParent();
+                            waitPage = null;
+                        }
+                    });
+                }
+            })
+            { IsBackground = true }.Start();
+
+        }
+
+
+
+    }
+
+
+
+    public class OrderFunctionRow : FrameLayout
+    {
+        #region 鍖哄煙鎺т欢
+        static FrameLayout bodyDiv;
+        /// <summary>
+        /// 鍔熻兘/鍦烘櫙icon
+        /// </summary>
+        Button btnIcon;
+        /// <summary>
+        /// 鍔熻兘鍚嶇О/鍦烘櫙鍚嶇О
+        /// </summary>
+        Button btnName;
+        /// <summary>
+        /// 妤煎眰淇℃伅鏄剧ず鎸夐挳
+        /// </summary>
+        Button btnFromFloor;
+        /// <summary>
+        /// 閫変腑鎸夐挳
+        /// </summary>
+        Button btnSelect;
+        #endregion
+
+        public OrderFunctionRow()
+        {
+            bodyDiv = this;
+        }
+
+
+        /// <summary>
+        /// 鍔犺浇鎺у埗鍗$墖鍖哄煙
+        /// </summary>
+        public void LoadDiv(Function function, List<int> orderNumber)
+        {
+            btnIcon = new Button()
+            {
+                X = Application.GetRealWidth(10),
+                Y = Application.GetRealHeight(15),
+                Width = Application.GetRealWidth(32),
+                Height = Application.GetRealWidth(32),
+                UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png"
+            };
+            bodyDiv.AddChidren(btnIcon);
+
+            btnName = new Button()
+            {
+                X = Application.GetRealWidth(8 + 10 + 32),
+                Y = Application.GetRealHeight(10),
+                Width = Application.GetRealWidth(200),
+                Height = Application.GetRealHeight(24),
+                Text = function.name,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextSize = CSS_FontSize.TextFontSize,
+            };
+            bodyDiv.AddChidren(btnName);
+
+            btnFromFloor = new Button()
+            {
+                X = Application.GetRealWidth(8 + 10 + 32),
+                Y = Application.GetRealHeight(10 + 24),
+                Width = Application.GetRealWidth(200),
+                Height = Application.GetRealHeight(18),
+                Text = function.GetRoomListName(),
+                TextAlignment = TextAlignment.CenterLeft,
+                TextColor = CSS_Color.PromptingColor1,
+                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+            };
+            bodyDiv.AddChidren(btnFromFloor);
+
+            btnSelect = new Button()
+            {
+                X = Application.GetRealWidth(303),
+                Gravity = Gravity.CenterVertical,
+                Width = Application.GetRealWidth(32),
+                Height = Application.GetRealWidth(32),
+                Text = function.FunctionOrderNumber == 9999 ? "" : function.FunctionOrderNumber.ToString(),
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                TextAlignment = TextAlignment.Center,
+            };
+            bodyDiv.AddChidren(btnSelect);
+
+            EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
+                lock (orderNumber)
+                {
+                    if (function.FunctionOrderNumber == 9999)
+                    {
+                        function.FunctionOrderNumber = orderNumber[0];
+                        orderNumber.RemoveAt(0);
+                        btnSelect.Text = function.FunctionOrderNumber.ToString();
+                    }
+                    else
+                    {
+
+                        if (!orderNumber.Contains(function.FunctionOrderNumber))
+                        {
+                            for (var i = 0; i < orderNumber.Count; i++)
+                            {
+                                if (orderNumber[i] > function.FunctionOrderNumber)
+                                {
+                                    orderNumber.Insert(i, function.FunctionOrderNumber);
+                                    function.FunctionOrderNumber = 9999;
+                                    break;
+                                }
+                            }
+                        }
+                        if (function.FunctionOrderNumber != 9999)
+                        {
+                            orderNumber.Add(function.FunctionOrderNumber);
+                            function.FunctionOrderNumber = 9999;
+                        }
+                        btnSelect.Text = "";
+                    }
+                }   
+            };
+            btnName.MouseUpEventHandler = eventHandler;
+            btnSelect.MouseUpEventHandler = eventHandler;
+            bodyDiv.MouseUpEventHandler = eventHandler;
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index d13882a..57dae9c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -267,6 +267,7 @@
                     TextColor = CSS.CSS_Color.TextualColor,
                     TextAlignment = TextAlignment.Center,
                     Text = video.deviceName,
+                    IsMoreLines = true,
                 };
                 fLayout.AddChidren(deviceNameBtn);
 
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs
index d5a2001..8ab919c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/View/ShowDialog.cs
@@ -1,23 +1,49 @@
 锘縰sing System;
+using HDL_ON.UI.CSS;
 using HDL_ON.UI.Music;
 using Shared;
 namespace HDL_ON.UI.UI2.FuntionControlView.Video.View
 {
     public class ShowDialog
     {
+
+        private static ShowDialog showDialog;
+
+        public static ShowDialog Currnet
+        {
+            get
+            {
+                if (showDialog == null)
+                {
+
+                    showDialog = new ShowDialog();
+                }
+
+                return showDialog;
+
+            }
+        }
+
+
+        public Dialog dialog;
+
         /// <summary>
         /// 
         /// </summary>
         /// <param name="title">鏍囬</param>
-        /// <param name="action1">鍥炶皟鍑芥暟</param>
-        /// <param name="action2">鍥炶皟鍑芥暟</param>
-        public void ClickBox(string title, Action<Dialog> action1, Action<Dialog> action2)
+        /// <param name="jieTingAction">鍥炶皟鍑芥暟</param>
+        /// <param name="guanBiAction">鍥炶皟鍑芥暟</param>
+        public void ClickBox(string title, Action<Dialog> jieTingAction, Action<Dialog> guanBiAction)
         {
-            Dialog dialog = new Dialog()
+            if (dialog != null)
+            {
+                //闃叉浜岄噸鐣岄潰
+                dialog.Close();
+            }
+            dialog = new Dialog()
             {
                 BackgroundColor = MusicColor.PopupBackgroundColor,
             };
-
             FrameLayout whiteView = new FrameLayout()
             {
                 X = Application.GetRealWidth(56),
@@ -50,7 +76,7 @@
                 TextColor = MusicColor.TextColor,
                 TextSize = TextSize.Text16,
                 TextAlignment = TextAlignment.CenterLeft,
-                Text = "鏉ヨ嚜鈥滃洿澧欐満鈥濆懠鍙�",
+                Text = title,
 
             };
             whiteView.AddChidren(btnTitle);
@@ -77,14 +103,135 @@
 
             guaduanIconBtn.MouseUpEventHandler += (sender, e) =>
             {
-                action1(dialog);
+                guanBiAction(dialog);
             };
             jietingIconBtn.MouseUpEventHandler += (sender, e) =>
             {
-
-                action2(dialog);
+                jieTingAction(dialog);
             };
 
+        }
+
+        /// <summary>
+        /// 鍒濆鍖朌ialog
+        /// </summary>
+        /// <param name="titleStr">鏍囬</param>
+        /// <param name="msgStr">鎻愮ず淇℃伅</param>
+        /// <param name="okAction"></param>
+        /// <param name="cancelAction"></param>
+        /// <param name="cancelID"></param>
+        /// <param name="confirmID"></param>
+        public void ShowDialogBase(string titleStr, string msgStr, Action okAction, Action cancelAction, int cancelID = StringId.Cancel, int confirmID = StringId.Confirm, bool isAlarmColor = false)
+        {
+            if (dialog != null)
+            {
+                //闃叉浜岄噸鐣岄潰
+                dialog.Close();
+            }
+            dialog = new Dialog()
+            {
+                BackgroundColor = MusicColor.PopupBackgroundColor,
+            };
+
+            var bodyView = new FrameLayout();
+            dialog.AddChidren(bodyView);
+
+            FrameLayout contentView = new FrameLayout()
+            {
+                Gravity = Gravity.Center,
+                Width = Application.GetRealWidth(270),
+                Height = Application.GetRealHeight(140),
+                BackgroundColor = CSS_Color.MainBackgroundColor,
+                BorderColor = 0x00000000,
+                BorderWidth = 0,
+                Radius = (uint)Application.GetMinRealAverage(10),
+            };
+            bodyView.AddChidren(contentView);
+
+            Button btnTitle = new Button()
+            {
+                Y = Application.GetRealHeight(20),
+                Height = Application.GetRealHeight(22),
+                TextColor = CSS_Color.MainColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                TextAlignment = TextAlignment.Center,
+                IsBold = true,
+                Text = titleStr,
+            };
+            contentView.AddChidren(btnTitle);
+            int Width135 = Application.GetRealWidth(135);
+            //鎻愮ず鍐呭鎸夐挳
+            Button btnMsg = new Button()
+            {
+                Y = btnTitle.Bottom + Application.GetRealHeight(4),
+                X = Application.GetRealWidth(6),
+                Height = Application.GetRealHeight(46),
+                Width = Application.GetRealWidth(258),
+                TextAlignment = TextAlignment.Center,
+                TextColor = CSS_Color.TextualColor,
+                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                Text = msgStr,
+                IsMoreLines = true,
+            };
+            contentView.AddChidren(btnMsg);
+
+            Button btnLine = new Button()
+            {
+                Y = Application.GetRealHeight(96),
+                Height = Application.GetRealHeight(1),
+                Width = Application.GetRealWidth(270 / 2),
+                BackgroundColor = CSS_Color.DividingLineColor,
+            };
+            contentView.AddChidren(btnLine);
+
+            Button btnCancel = new Button()
+            {
+                Y = btnLine.Bottom,
+                Width = Width135,
+                Height = Application.GetRealHeight(43),
+                TextAlignment = TextAlignment.Center,
+                TextColor = CSS_Color.TextualColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                TextID = cancelID,
+            };
+            contentView.AddChidren(btnCancel);
+
+            Button btnConfirm = new Button()
+            {
+                X = contentView.Width - Width135,
+                Y = btnLine.Y,
+                Width = Width135,
+                Height = Application.GetRealHeight(45),
+                TextAlignment = TextAlignment.Center,
+                //TextColor = CSS_Color.TextualColor,
+                TextSize = CSS_FontSize.SubheadingFontSize,
+                TextColor = CSS_Color.MainBackgroundColor,
+                BackgroundColor = CSS_Color.MainColor,
+                TextID = confirmID,
+            };
+            contentView.AddChidren(btnConfirm);
+            //渚嬶細鍙充笅鍦嗚 澶у皬涓�50
+            int mRectCornerID = HDLUtils.RectCornerBottomRight;
+            btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
+
+            btnCancel.MouseUpEventHandler += (sender, e) =>
+            {
+                dialog.Close();
+                cancelAction?.Invoke();
+            };
+
+            btnConfirm.MouseUpEventHandler += (sender, e) =>
+            {
+                dialog.Close();
+                okAction?.Invoke();
+            };
+
+            if (isAlarmColor)
+            {
+                btnTitle.TextColor = CSS_Color.WarningColor;
+                btnConfirm.TextColor = CSS_Color.MainBackgroundColor;
+                btnConfirm.BackgroundColor = CSS_Color.WarningColor;
+            }
         }
 
 
@@ -94,7 +241,7 @@
         /// <param name="str1">鏍囬</param>
         public void QRcode(string str1)
         {
-            Dialog dialog = new Dialog() 
+            Dialog dialog = new Dialog()
             {
                 BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
             };
@@ -119,18 +266,18 @@
                 TextSize = TextSize.Text16,
                 TextAlignment = TextAlignment.Center,
                 IsBold = true,
-                TextID=StringId.linshimima,
+                TextID = StringId.linshimima,
             };
             whiteView.AddChidren(btnTitle);
             //瀵嗙爜
             Button btnpaw = new Button()
             {
-                X=Application.GetRealWidth(100),
+                X = Application.GetRealWidth(100),
                 Y = Application.GetRealHeight(62),
                 Height = Application.GetRealHeight(32),
                 Width = Application.GetRealWidth(82),
                 TextColor = MusicColor.SelectedColor,
-                TextSize =24,
+                TextSize = 24,
                 TextAlignment = TextAlignment.Center,
                 IsBold = true,
                 Text = str1,
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/WanderingAlarmPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/WanderingAlarmPage.cs
index d6b5a5e..b9af8de 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/WanderingAlarmPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/WanderingAlarmPage.cs
@@ -31,12 +31,8 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = CSS_Color.PromptingColor1,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                Text = "*鍙瀵硅鍙互鑷姩璇嗗埆闂ㄥ彛鍙枒浜哄憳锛屽苟鍙戣捣寰樺緤鎶ヨ璁板綍"
+                TextID =StringId.SmartDoorstepMachineAlarmPrompt,
             };
-            if(Language.CurrentLanguage != "Chinese")
-            {
-                btnTipMsg.Text = "*Visual intercom can automatically identify suspicious persons at the door and initiate wandering alarm records";
-            }
             bodyView.AddChidren(btnTipMsg);
 
             contentView = new VerticalScrolViewLayout()
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
new file mode 100644
index 0000000..1392b63
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -0,0 +1,622 @@
+锘縰sing System;
+using HDL_ON.Entity;
+using System.Collections.Generic;
+using Shared;
+using HDL_ON.DAL.Server;
+#if __IOS__
+using Foundation;
+#else
+using Com.Videogo.Hdl;
+#endif
+
+namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
+{
+    /// <summary>
+    /// 钀ょ煶瑙嗛闂ㄩ攣鍏叡鏂规硶绫�
+    /// </summary>
+    public class CommonMethod
+    {
+        
+        private Loading loading;
+        /// <summary>
+        /// 璁板綍褰撳墠鐣岄潰绱㈠紩鍊�
+        /// </summary>
+        private int pageLayoutIndexValue;
+
+        private static CommonMethod commonMethod = null;
+        /// <summary>
+        /// 鑾峰彇瀵硅薄
+        /// </summary>
+        public static CommonMethod Current
+        {
+            get
+            {
+                if (commonMethod == null)
+                {
+                    commonMethod = new CommonMethod();
+                }
+
+                return commonMethod;
+
+            }
+
+        }
+
+        #region  --------- 璺宠浆鍒癆ndroid锛宨os閭h竟鐨勬柟娉�(钀ょ煶瑙嗛闂ㄩ攣) --------
+        /// <summary>
+        /// android,ios婧愮敓娣诲姞璁惧鍒颁簯绔垚鍔熷悗鍥炶皟鏂规硶
+        /// 鍐嶈鍙栦簯绔殑涓婅悿鐭宠澶囧垪琛�
+        /// <paramref name="spk"/>spk</param>
+        public void SkipAddDeviceActivity(string spk)
+        {
+
+            this.InitializationAndroidData((isEzChildAccessToken) =>
+            {
+                this.SunThread(() =>
+                {
+                    var list = this.GetVideoDoorLockLockModelsList("notAllowedConfigNetworkModels");
+
+                    this.MainThread(() =>
+                    {
+#if __IOS__
+                        //璺宠浆娣诲姞钀ょ煶璁惧
+                        ezsdkDelegate = new IosIHdlInterface();
+                        ezsdkDelegate.mAction += (serials) =>
+                        {
+                            this.GetYingshiDeviceList(serials);
+                        };
+                        EZSDK.IOS.EZSDK.SharedInstance().Delegate = ezsdkDelegate;
+                        NSObject[] nSObject = new NSObject[list.Count];
+                        for (int i = 0; i < list.Count; i++)
+                        {
+                            string strValue = list[i];
+                            nSObject[i] = new NSString(strValue);
+                        }
+                        EZSDK.IOS.EZSDK.SharedInstance().ConnectTipModels = nSObject;
+                        EZSDK.IOS.EZSDK.SharedInstance().AddEzvizMonitorWithDeviceType(spk);
+
+#else
+                    HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity, spk,list);
+                        HDLEzvizSdk.SetAddCallback(new AndroidIHdlInterface((isBool, serials) =>
+                    {
+                        if (isBool)
+                        {
+                            this.GetYingshiDeviceList(serials);
+                        }
+
+                    }));
+#endif
+
+                    });
+
+
+                });
+            });
+
+
+
+
+
+        }
+        /// <summary>
+        /// 璇诲彇浜戠鐨勪笂钀ょ煶璁惧鍒楄〃
+        /// <paramref name="serials"/>搴忓垪鍙�</param>
+        private void GetYingshiDeviceList(string serials)
+        {
+            this.SunThread(() =>
+            {
+                var list = VideDoorLockSend.Current.GetVideoDoorLockDeviceList(SPK.VideoDoorLock);
+                this.MainThread(() =>
+                {
+                    if (list.Count > 0)
+                    {
+                        var function = list.Find((o) => o.sid == serials);
+                        if (function != null)
+                        {
+                            this.SaveFunctionFile(function);
+                        }
+                    }
+                });
+            });
+
+        }
+        /// <summary>
+        /// 鎵撳紑瀹炴椂瑙嗛鐢婚潰
+        /// </summary>
+        /// <param name="deviceSerial">璁惧搴忓垪鍙�</param>
+        /// <param name="deviceId">璁惧id(浜戠涓奷eviceId)</param>
+        /// <param name="spk">璁惧spk(浜戦泙涓婂畾涔夊ソ鐨�)</param>
+        /// <param name="isDialog">鏄惁闇�瑕佸脊妗�</param>
+        public void SkipRTVActivity(string deviceSerial, string deviceId, string spk, bool isDialog)
+        {
+            this.Loading.Start();
+            this.InitializationAndroidData((isEzChildAccessToken) =>
+            {
+                this.MainThread(() =>
+                {
+                    this.Loading.Hide();
+                    if (isDialog)
+                    {
+                        Video.View.ShowDialog.Currnet.ClickBox(Language.StringByID(StringId.laizimenlinghujiao), (dialog) =>
+                        {
+                            dialog.Close();
+                            this.SkipRTVActivity(deviceSerial, deviceId, spk);
+                        }, (dialog) => { dialog.Close(); });
+                    }
+                    else
+                    {
+                        this.SkipRTVActivity(deviceSerial, deviceId, spk);
+                    }
+
+                });
+            });
+
+        }
+        /// <summary>
+        /// 鎵撳紑瀹炴椂瑙嗛鐢婚潰
+        /// </summary>
+        /// <param name="deviceSerial">璁惧搴忓垪鍙�</param>
+        /// <param name="deviceId">璁惧id(浜戠涓奷eviceId)</param>
+        /// <param name="spk">璁惧spk(浜戦泙涓婂畾涔夊ソ鐨�)</param>
+        private void SkipRTVActivity(string deviceSerial, string deviceId, string spk)
+        {
+
+#if __IOS__
+            //鎵撳紑钀ょ煶瑙嗛鐣岄潰
+            EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk);
+
+#else
+            HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,deviceId,deviceSerial,spk);
+#endif
+
+
+        }
+
+        /// <summary>
+        /// 娴忚鍘嗗彶璁板綍
+        /// </summary>
+        public void SkipRecordActivity(string deviceId)
+        {
+            this.InitializationAndroidData((s) =>
+            {
+                this.MainThread(() =>
+                {
+#if __IOS__
+                    //鎵撳紑钀ょ煶鍘嗗彶璁板綍鐣岄潰
+                    EZSDK.IOS.EZSDK.SharedInstance().ToDeviceMsgListView(deviceId);
+#else
+                HDLEzvizSdk.Instance.JumpLockHistoryActivity(Application.Activity, deviceId);
+#endif
+                });
+            });
+
+        }
+        /// <summary>
+        /// 涓存椂瀵嗙爜寮�闂�
+        /// <paramref name="deviceId"/>
+        /// </summary>
+        public void SkipPSWActivity(string deviceId)
+        {
+            this.InitializationAndroidData((isBools) =>
+            {
+                this.MainThread(() =>
+                {
+#if __IOS__
+                    //鎵撳紑钀ょ煶涓存椂瀵嗙爜鐣岄潰
+                    EZSDK.IOS.EZSDK.SharedInstance().ToTemPassView(deviceId);
+#else
+                HDLEzvizSdk.Instance.JumpTempPasswordActivity(Application.Activity, deviceId); 
+#endif
+                });
+            });
+        }
+
+        /// <summary>
+        /// 鍒濆鍖栬悿鐭砈DK(瀹為檯灏辨槸浼犲弬鏁�,澶氭璋冪敤涔熸病鏈夊奖鍝�)
+        /// </summary>
+        public void InitializationAndroidData(Action<bool> action)
+        {
+            bool isBool = true;
+            //this.Loading.Start();
+            this.SunThread(() =>
+            {
+                try
+                {
+                    //鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken
+                    var ezChildAccessToken = VideDoorLockSend.Current.GetEZGetChildToken();
+                    this.MainThread(() =>
+                    {
+                        if (string.IsNullOrEmpty(ezChildAccessToken))
+                        {
+                            //Token
+                            isBool = false;
+                            //this.ShowTip("鑾峰彇钀ょ煶浜戝瓙璐﹀彿token澶辫触銆�");
+                            return;
+                        }
+
+                        string appKey = "1aa98a90489b4838b966b57018b4b04b";//姝e紡鏈嶅姟鍣�
+                        //if (OnAppConfig.Instance.RequestHttpsHost == "https://test-gz.hdlcontrol.com")
+                        //{
+                        //    appKey = "941b1b72b6294998acfd36c14931b675";//鐢ㄥ湪娴嬭瘯鏈嶅姟鍣ㄦ帹閫佺殑
+                        //}
+
+
+#if __IOS__
+                        //iOS
+                        //鍒濆鍖栬悿鐭充簯SDK锛屼腑鏂囧浗鍐卥ey銆佽嫳鏂囨捣澶杒ey 寮�鍙戣�呰处鍙蜂娇鐢ㄥ簲鐢ㄥ寘鍚嶇敵璇风殑APPKEY锛屼笉鍚屽寘鍚嶅簲鐢ㄩ渶閰嶇疆涓嶅悓鐨凙PPKEY
+                        EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey(appKey, appKey);
+                        //1.璁剧疆鎵�闇�娌充笢鐨凙ccessToken鍜孯efreshToken銆佸煙鍚嶅湴鍧�
+                        EZSDK.IOS.EZSDK.SharedInstance().SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken);
+                        EZSDK.IOS.EZSDK.SharedInstance().SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id);
+                        //2.璁剧疆钀ょ煶瀛愯处鍙风殑AccessToken鍒癝DK
+                        EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(ezChildAccessToken);
+                        //////3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
+                        //EZSDK.IOS.EZSDK.SharedInstance().Go2EZvizMonitor();
+                        //EZSDK.IOS.EZDeviceInfo info = new EZSDK.IOS.EZDeviceInfo();
+                        //info.de
+                        //EZSDK.IOS.EZSDK.Play(info);
+#else
+
+                            HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, appKey, 1, DB_ResidenceData.Instance.CurrentRegion.id);
+
+#endif
+
+
+                    });
+
+                }
+                catch (Exception e)
+                {
+                }
+                finally
+                {
+                    this.MainThread(() =>
+                    {
+                        //this.Loading.Hide();
+                        action?.Invoke(isBool);
+                    });
+                }
+            });
+        }
+
+        /// <summary>
+        /// 鏇存崲浣忓畢
+        /// </summary>
+        /// <param name="home">瀵硅薄</param>
+        public void ChangeCurrHome(RegionInfoRes home)
+        {
+
+            if (DB_ResidenceData.Instance.CurrentRegion.id == home.id || string.IsNullOrEmpty(home.id)) return;
+#if __IOS__
+#else
+                HDLEzvizSdk.Instance.SetHomeId(home.id);
+#endif
+
+        }
+        #endregion
+
+        /// <summary>
+        /// 鑾峰彇銆愰棬閿佸瀷鍙枫�戝垪琛�
+        /// </summary>
+        /// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
+        public List<string> GetVideoDoorLockLockModelsList(string mode = "lockModels")
+        {
+            var lockModels = VideDoorLockSend.Current.GetVideoDoorLockLockModelsList();
+            if (mode == "lockModels")
+            {
+                return lockModels.lockModels;
+            }
+            else
+            {
+                return lockModels.notAllowedConfigNetworkModels;
+            }
+        }
+        /// <summary>
+        /// 闂ㄩ攣鎺ㄩ��
+        /// </summary>
+        /// <param name="pushMessageType"></param>
+        /// <param name="jPushMessageInfo"></param>
+        public void DoorLockPush(JPushMessageInfo jpushMessageInfo)
+        {
+            this.MainThread(() =>
+            {
+                if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
+                //{ "deviceSid":"J92513662","type":"opendoormsg","extDevId":"J92513662","deviceId":"1641010144999936001","spk":"security.door.ezviz"}
+                var expantContent = Newtonsoft.Json.JsonConvert.DeserializeObject<ExpantContent>(jpushMessageInfo.expantContent);
+                if (expantContent == null)
+                {
+                    return;
+                }
+                if (expantContent.spk != SPK.VideoDoorLock)
+                {
+                    return;
+                }
+                if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
+                {
+                    ///鎵撳紑瑙嗛闂ㄩ攣
+                    this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, true);
+                }
+                else if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString()))
+                {
+                    //浣庣數閲忔帹閫�
+                    this.UpdateDoorLockState(PushMessageType.Alarm);
+                }
+                else if (jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString()))
+                {
+                    //寮�闂ㄦ帹閫�
+                    this.UpdateDoorLockState(PushMessageType.Prompt);
+                }
+            });
+
+        }
+        /// <summary>
+        /// 鏇存柊寮�閿佸浘鏍囧拰鐢垫睜鐘舵��
+        /// </summary>
+        private void UpdateDoorLockState(PushMessageType pushMessageType)
+        {
+            int childrenCount = MainPage.BasePageView.ChildrenCount - 1;
+            for (int i = childrenCount; childrenCount > i; i--)
+            {
+                View view = MainPage.BasePageView.GetChildren(i);
+                if (view is VideoDoorLockPage)
+                {
+                    VideoDoorLockPage videoDoorLockPage = (VideoDoorLockPage)view;
+                    if (videoDoorLockPage != null)
+                    {
+                        videoDoorLockPage.UpdateState(pushMessageType);
+                    }
+
+                }
+            }
+
+        }
+        /// <summary>
+        /// 鑾峰彇钀ょ煶瑙嗛銆愰棬閿併�戝垪琛�
+        /// </summary>
+        /// <returns></returns>
+        public List<Function> GetVideoDoorLockList()
+        {
+            var list = FunctionList.List.GetVideoDoorLockList();
+#if DEBUG
+            //list.Add(new Function { name = "瑙嗛闂ㄩ攣涓�", sid = "23456789", spk = SPK.VideoDoorLock });
+            //list.Add(new Function { name = "瑙嗛闂ㄩ攣浜�", sid = "2345678922", spk = SPK.VideoDoorLock });
+#endif
+            return list;
+        }
+        #region  --------- 鍔熻兘鏂囦欢淇濆瓨锛屽垹闄� --------
+        /// <summary>
+        /// 淇濆瓨鏈湴鏂囦欢
+        /// </summary>
+        /// <param name="function">褰撳墠璁惧</param>
+        public void SaveFunctionFile(Function function)
+        {
+            if (function == null) return;
+            function.AssembleStatus();
+            function.SaveFunctionFile();
+            FunctionList.List.IniFunctionList(function.savePath, true);
+            MainPage.Log($"鏂囦欢淇濆瓨->{function.name}-->{function.spk}");
+        }
+
+        /// <summary>
+        /// 鍒犻櫎鏈湴鏂囦欢
+        /// </summary>
+        /// <param name="function">褰撳墠璁惧</param>
+        public void DeleteFunction(Function function)
+        {
+            if (function == null) return;
+            FunctionList.List.DeleteFunction(function);
+            MainPage.Log($"鏂囦欢鍒犻櫎->{function.name}-->{function.spk}");
+        }
+        #endregion
+        /// <summary>
+        /// 钀ょ煶瑙嗛闂ㄩ攣鐨勫浘鏍�
+        /// <param name="comerom">鏉ヨ嚜閭i噷</param>
+        /// </summary>
+        public string GetVideoDoorLockIcon(Comerom comerom)
+        {
+
+            if (comerom == Comerom.collect)
+            {
+                return "FunctionIcon/DoorLock/VideoDoorLockOpen1.png";
+            }
+            else
+            {
+                return "FunctionIcon/DoorLock/VideoDoorlockClose1.png";
+            }
+
+        }
+
+        /// <summary>
+        /// 鑾峰彇Loading瀵硅薄
+        /// </summary>
+        /// <returns></returns>
+        public Loading Loading
+        {
+            get
+            {
+                this.MainThread(() =>
+                {
+                    //if (loading != null && this.pageLayoutIndexValue == MainPage.BasePageView.ChildrenCount - 1)
+                    //{
+                    //    //闃叉浜岄噸娣诲姞瀵硅薄
+                    //    return;
+                    //}
+                    if (loading == null)//|| MainPage.BasePageView.ChildrenCount < 1)
+                    {
+                        loading = new Loading();
+                    }
+                    //loading.BringToFront();
+                    Application.MainPage.AddChidren(loading);
+                    //View view = MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1);
+                    //if (view is ViewGroup)
+                    //{
+                    //    pageLayoutIndexValue = MainPage.BasePageView.ChildrenCount - 1;
+                    //    ((ViewGroup)view).AddChidren(loading);
+                    //}
+                });
+                return loading;
+            }
+
+        }
+
+       
+        #region  ---------鑷畾涔夌嚎绋�(瀛愮嚎绋嬶紝涓荤嚎绋�)--------
+        /// <summary>
+        /// 瀛愮嚎绋�
+        /// </summary>
+        /// <paramref name="tipType"/>鏄惁瑕佹彁绀洪敊璇俊鎭�(榛樿鏄剧ず)<paramref>
+        /// <param name="action"></param>
+        public void SunThread(Action action, TipType tipType = TipType.confirmation)
+        {
+            new System.Threading.Thread(() =>
+            {
+                try
+                {
+                    action?.Invoke();
+                }
+                catch (Exception e)
+                {
+                    this.ShowAlert(e, tipType);
+                }
+            })
+            { IsBackground = true }.Start();
+
+        }
+        /// <summary>
+        /// 涓荤嚎绋�(UI鏇存柊)
+        /// </summary>
+        /// <paramref name="tipType"/>鏄惁瑕佹彁绀洪敊璇俊鎭�(榛樿鏄剧ず)<paramref>
+        /// <param name="action"></param>
+        public void MainThread(Action action, TipType tipType = TipType.confirmation)
+        {
+            Application.RunOnMainThread(() =>
+            {
+                try
+                {
+                    action?.Invoke();
+                }
+                catch (Exception e)
+                {
+                    this.ShowAlert(e, tipType);
+                }
+            });
+
+        }
+        #endregion
+        #region  --------- 鎻愮ず妗嗭紝纭妗� --------
+        /// <summary>
+        /// 瀵硅瘽妗�(鍙绋嬪簭鎶ラ敊鐨勬椂鍊欐墠鐢ㄥ埌)
+        /// </summary>
+        /// <paramref name="e"/>寮傚父瀵硅薄<paramref>
+        /// <paramref name="tipType"/>鏄惁瑕佹彁绀洪敊璇俊鎭�(榛樿鏄剧ず)<paramref>
+        private void ShowAlert(Exception e, TipType tipType)
+        {
+
+            if (tipType != TipType.confirmation)
+            {
+                return;
+            }
+            Application.RunOnMainThread(() =>
+            {
+                string msg = e.Message + "\r\n" + e.StackTrace;
+                Alert alert = new Alert("鎶辨瓑绋嬪簭鍑洪敊浜�.", "鎸塡"纭畾\"鑳借幏鍙栨洿璇︾粏鐨勯敊璇俊鎭�.", "鍙栨秷", "纭畾");
+                alert.Show();
+                alert.ResultEventHandler += (alerts, isBool) =>
+                {
+                    alert.Dismiss();
+                    if (isBool)
+                    {
+                        StackTraceLog stackTraceLog = new StackTraceLog(msg);
+                        stackTraceLog.Show();
+                    }
+                };
+            });
+        }
+        /// <summary>
+        /// 淇℃伅鎻愮ず绐楀彛锛岃嚜鍔ㄥ叧闂�
+        /// </summary>
+        /// <param name="msg">鎻愮ず閿欒鏂囨湰</param>
+        public void ShowTip(string msg, int time = 2)
+        {
+            Application.RunOnMainThread(() =>
+            {
+                new PublicAssmebly().TipMsgAutoClose(msg, false, time * 1000);
+            });
+        }
+
+     
+        #endregion
+        /// <summary>
+        /// 寮规绫诲瀷
+        /// </summary>
+        public enum TipType
+        {
+            none,//鏃犳彁绀�
+            flicker,//闂儊妗�
+            confirmation//纭妗�
+        }
+        /// <summary>
+        /// 琛ㄧず鏉ヨ嚜閭d釜鐣岄潰
+        /// </summary>
+        public enum Comerom
+        {
+            function,//鍔熻兘
+            collect,//鏀惰棌
+            room,//鎴块棿
+            push,//鎺ㄩ��
+            sanfan,//娣诲姞绗笁鏂硅澶�
+        }
+
+#if __IOS__
+        IosIHdlInterface ezsdkDelegate;
+        /// <summary>
+        /// 涓撻棬瀹氫箟缁橧os鍥炶皟鐢�,娌℃湁鐗规畩鍚箟
+        /// </summary>
+        public class IosIHdlInterface : EZSDK.IOS.EZSDKDelegate
+        {
+            public Action<string> mAction;
+            public IosIHdlInterface()
+            {
+
+            }
+            /// <summary>
+            /// 
+            /// </summary>
+            /// <param name="p0">true鏄叆缃戞垚鍔�(婧愮敓鍥炶皟杩斿洖)</param>
+            /// <param name="p1">璁惧鐨勫簭鍒楀寲(婧愮敓鍥炶皟杩斿洖)</param>
+            public override void AddDeviceSuccessed(string deviceSerial)
+            {
+                mAction?.Invoke(deviceSerial);
+            }
+        }
+#else
+        /// <summary>
+        /// 涓撻棬瀹氫箟缁欏畨鍗撳洖璋冪敤,娌℃湁鐗规畩鍚箟
+        /// </summary>
+        public class AndroidIHdlInterface : Java.Lang.Object, IHdlInterface
+        {
+
+            Action<bool,string> mAction;
+            public AndroidIHdlInterface(Action<bool,string> action)
+            {
+                mAction = action;
+            }
+            /// <summary>
+            /// 
+            /// </summary>
+            /// <param name="p0">true鏄叆缃戞垚鍔�(婧愮敓鍥炶皟杩斿洖)</param>
+            /// <param name="p1">璁惧鐨勫簭鍒楀寲(婧愮敓鍥炶皟杩斿洖)</param>
+            public void AddCallback(bool p0, string p1)
+            {
+                mAction?.Invoke(p0,p1);
+            }
+
+           
+        }
+#endif
+
+
+    }
+
+
+}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs
new file mode 100644
index 0000000..73f68c0
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/ObjectClass.cs
@@ -0,0 +1,108 @@
+锘縰sing System;
+using System.Collections.Generic;
+using HDL_ON.Entity;
+
+namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
+{
+    public class ObjectClass
+    {
+
+
+    }
+    /// <summary>
+    /// 鐢ㄦ埛淇℃伅(钀ょ煶瑙嗛闂ㄩ攣) 
+    /// </summary>
+    public class UserVideoDoorLockInfo
+    {
+        /// <summary>
+        /// 鐢ㄦ埛id
+        /// </summary>
+        public string extUserId = string.Empty;
+        /// <summary>
+        /// 鐢ㄦ埛鍚嶇О
+        /// </summary>
+        public string extUserName = string.Empty;
+
+    }
+    /// <summary>
+    /// 闂ㄩ攣鐘舵��(钀ょ煶瑙嗛闂ㄩ攣)
+    /// </summary>
+    public class VideoDoorLockInfo
+    {
+        /// <summary>
+        /// 閿佺姸鎬侊紙lock:閿侊紱unlock:瑙i攣锛�
+        /// </summary>
+        public string lockStatus = string.Empty;
+        /// <summary>
+        /// 闂ㄧ姸鎬侊紙open锛氬紑锛沜lose锛氬叧锛�
+        /// </summary>
+        public string doorStatus = string.Empty;
+
+    }
+
+    /// <summary>
+    /// 鐢垫睜璇︽儏(钀ょ煶瑙嗛闂ㄩ攣)
+    /// </summary>
+    public class CellInfo
+    {
+        /// <summary>
+        /// 鐢甸噺
+        /// </summary>
+        public string remain = string.Empty;
+        /// <summary>
+        /// 鐢垫睜鍚嶇О
+        /// </summary>
+        public string name = string.Empty;
+
+    }
+    /// <summary>
+    /// 鑾峰彇闂ㄩ攣鍒楄〃
+    /// </summary>
+    public class DoorLockList
+    {
+        /// <summary>
+        /// 闂ㄩ攣璁惧鍒楄〃
+        /// </summary>
+        public List<Function> list = new List<Function>();
+    }
+    /// <summary>
+    /// 闂ㄩ攣鍨嬪彿鍒楄〃
+    /// </summary>
+    public class LockModels {
+        /// <summary>
+        /// 鍨嬪彿鍒楄〃
+        /// </summary>
+        public List<string> lockModels = new List<string>();
+        /// <summary>
+        /// 鍨嬪彿鍒楄〃
+        /// </summary>
+        public List<string> notAllowedConfigNetworkModels = new List<string>();
+    }
+    /// <summary>
+    /// 鎺ㄩ�佸唴瀹瑰璞�
+    /// </summary>
+    public class ExpantContent
+    {
+        /// <summary>
+        /// 璁惧搴忓垪鍙�
+        /// </summary>
+        public string devSerial = string.Empty;
+        /// <summary>
+        /// 璁惧id
+        /// </summary>
+        public string deviceId = string.Empty;
+        /// <summary>
+        /// 涓嶇煡閬撴槸鍟�
+        /// </summary>
+        public string interphoneTypeEnum = string.Empty;
+        /// <summary>
+        /// 涓嶇煡閬撴槸鍟�
+        /// </summary>
+        public string subToken = string.Empty;
+        /// <summary>
+        /// 浜戦泙涓婂畾涔夌殑璁惧spk
+        /// </summary>
+        public string spk = string.Empty;
+    }
+
+}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/StackTraceLog.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/StackTraceLog.cs
new file mode 100644
index 0000000..05ad631
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/StackTraceLog.cs
@@ -0,0 +1,58 @@
+锘縰sing System;
+using HDL_ON.UI.CSS;
+using HDL_ON.UI.Music;
+using Shared;
+
+namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
+{
+    public class StackTraceLog
+    {
+        /// <summary>
+        /// 鍫嗗彔璺熻釜鏃ュ織
+        /// </summary>
+        public string msg;
+
+        public StackTraceLog(string msg)
+        {
+            this.msg = msg;
+        }
+        public void Show()
+        {
+
+            Dialog dialog = new Dialog()
+            {
+                BackgroundColor = CSS_Color.textWhiteColor,
+            };
+            dialog.Show();
+            TopView topView = new TopView();
+            topView.topNameBtn.Text="閿欒鏃ュ織淇℃伅";
+            dialog.AddChidren(topView.TopFLayoutView());
+            topView.clickBackBtn.MouseUpEventHandler += (sen, e) =>
+            {
+                dialog.Close();
+            };
+           
+            var middleFl = new FrameLayout
+            {
+                Y = topView.fLayout.Bottom,
+                Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
+            };
+            dialog.AddChidren(middleFl);
+          
+            Button btnLogText = new Button 
+            {
+                //TextSize = TextSize.Text14,
+                TextColor = MusicColor.Text18Color,
+                Width = Application.GetRealWidth(H_W.W - 16 - 16),
+                Height = middleFl.Height,
+                X = Application.GetRealWidth(16),
+                Text = this.msg,
+                TextAlignment = TextAlignment.TopLeft,
+                IsMoreLines = true,
+            };
+            middleFl.AddChidren(btnLogText);
+
+
+        }
+    }
+}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs
new file mode 100644
index 0000000..c43b939
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideDoorLockSend.cs
@@ -0,0 +1,237 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Threading;
+using HDL_ON.DAL.Server;
+using HDL_ON.Entity;
+using Shared;
+using static HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod;
+
+
+namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
+{
+    /// <summary>
+    /// 钀ょ煶瑙嗛闂ㄩ攣鏁版嵁鍙戦��
+    /// </summary>
+    public class VideDoorLockSend
+    {
+
+        private static VideDoorLockSend send = null;
+        /// <summary>
+        /// 鑾峰彇褰撳墠鐨勫璞� 
+        /// </summary>
+        public static VideDoorLockSend Current
+        {
+            get
+            {
+                if (send == null)
+                {
+                    send = new VideDoorLockSend();
+                }
+
+                return send;
+            }
+        }
+        /// <summary>
+        /// 瑙g粦璁惧(钀ょ煶瑙嗛闂ㄩ攣)
+        /// </summary>
+        /// <param name="function">褰撳墠鐨勮澶�</param>
+        /// <param name="action">鍥炶皟缁撴灉</param>
+        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
+        public void DelDevice(Function function, Action<bool> action, TipType tipType = TipType.flicker)
+        {
+            new Thread(() =>
+            {
+                try
+                {
+                    Dictionary<string, object> d = new Dictionary<string, object>();
+                    d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+                    d.Add("deviceSerial", function.sid);//绛夊悓闂ㄩ攣搴忓垪鍙�
+                    d.Add("platform", 1);//骞冲彴
+                    var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_DeleteDevice, "鍒犻櫎钀ょ煶闂ㄩ攣璁惧");
+                    if (!this.DataChecking(responsePackNew, tipType))
+                    {
+                        return;
+                    }
+
+                    if (function != null)
+                    {
+                        action?.Invoke(true);
+                    }
+                }
+                catch (Exception s)
+                {
+                }
+            })
+            { IsBackground = true }.Start();
+
+        }
+        /// <summary>
+        /// 鑾峰彇闂ㄩ攣鐘舵��(钀ょ煶瑙嗛闂ㄩ攣)
+        /// </summary>
+        /// <param name="function">褰撳墠鐨勮澶�</param>
+        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
+        /// <param name="return">杩斿洖缁撴灉涓嶄細涓簄ull</param>
+        public VideoDoorLockInfo GetVideoDoorLockState(Function function, TipType tipType = TipType.flicker)
+        {
+
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("deviceId", function.deviceId);
+            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_Lockstatus, "鑾峰彇钀ょ煶瑙嗛闂ㄩ攣鐘舵��");
+            if (!this.DataChecking(responsePackNew,tipType))
+            {
+                return new VideoDoorLockInfo();
+            }
+
+            var videoDoorLockInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<VideoDoorLockInfo>(responsePackNew.Data.ToString());
+            if (videoDoorLockInfo == null)
+            {
+                return new VideoDoorLockInfo();
+            }
+            return videoDoorLockInfo;
+
+
+
+        }
+        /// <summary>
+        /// 鑾峰彇鐢垫睜鐢甸噺(钀ょ煶瑙嗛闂ㄩ攣)
+        /// </summary>
+        /// <param name="function">褰撳墠鐨勮澶�</param>
+        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
+        /// <param name="return">杩斿洖缁撴灉涓嶄細涓簄ull</param>
+        public CellInfo GetCellValue(Function function, TipType tipType = TipType.flicker)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("deviceId", function.deviceId);
+            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_Details, "鑾峰彇钀ょ煶闂ㄩ攣璁惧鐢甸噺");
+            if (!this.DataChecking(responsePackNew,tipType))
+            {
+                return new CellInfo();
+            }
+            var cellInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<CellInfo>(responsePackNew.Data.ToString());
+            if (cellInfo == null)
+            {
+                return new CellInfo();
+            }
+
+            return cellInfo;
+
+        }
+        /// <summary>
+        /// 鑾峰彇闂ㄩ攣鐢ㄦ埛鍒楄〃(钀ょ煶瑙嗛闂ㄩ攣)
+        /// </summary>
+        /// <param name="function">褰撳墠鐨勮澶�</param>
+        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
+        /// <param name="return">杩斿洖缁撴灉涓嶄細涓簄ull</param>
+        public List<UserVideoDoorLockInfo> GetVideoDoorLockUserListInfo(Function function, TipType tipType = TipType.flicker)
+        {
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("deviceId", function.deviceId);
+            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_UserList, "鑾峰彇钀ょ煶闂ㄩ攣鐢ㄦ埛鍒楄〃");
+            if (!this.DataChecking(responsePackNew, tipType))
+            {
+                return new List<UserVideoDoorLockInfo>();
+            }
+            var list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserVideoDoorLockInfo>>(responsePackNew.Data.ToString());
+            if (list == null)
+            {
+                return new List<UserVideoDoorLockInfo>();
+            }
+            return list;
+        }
+        /// <summary>
+        /// 鑾峰彇闂ㄩ攣璁惧鍒楄〃(钀ょ煶瑙嗛闂ㄩ攣)
+        /// </summary>
+        /// <param name="spk">鎸囧畾spk鑾峰彇</param>
+        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
+        /// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
+        public List<Function> GetVideoDoorLockDeviceList(string spk, TipType tipType = TipType.flicker)
+        {
+
+            Dictionary<string, object> d = new Dictionary<string, object>();
+            d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+            d.Add("spk", spk);
+            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(d, NewAPI.Api_Post_GetDevcieList, "鑾峰彇钀ょ煶闂ㄩ攣璁惧鍒楄〃");
+            if (!this.DataChecking(responsePackNew, tipType))
+            {
+                return new List<Function>();
+            }
+            var doorLockList = Newtonsoft.Json.JsonConvert.DeserializeObject<DoorLockList>(responsePackNew.Data.ToString());
+            if (doorLockList == null)
+            {
+                return new DoorLockList().list;
+            }
+            return doorLockList.list;
+        }
+
+        /// <summary>
+        /// 鑾峰彇闂ㄩ攣鍨嬪彿鍒楄〃(钀ょ煶瑙嗛闂ㄩ攣)
+        /// </summary>
+        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
+        /// <returns>杩斿洖缁撴灉涓嶄細涓簄ull</returns>
+        public LockModels GetVideoDoorLockLockModelsList(TipType tipType = TipType.flicker)
+        {
+            var responsePackNew = UI.Music.SendMethod.Current.RequestServerhomeId(new object { }, NewAPI.Api_Post_Lock_Models, "鑾峰彇钀ょ煶闂ㄩ攣鍨嬪彿鍒楄〃");
+            if (!this.DataChecking(responsePackNew, tipType))
+            {
+                return new LockModels();
+            }
+            var lockModels = Newtonsoft.Json.JsonConvert.DeserializeObject<LockModels>(responsePackNew.Data.ToString());
+            if (lockModels == null)
+            {
+                return new LockModels();
+            }
+            return lockModels;
+        }
+
+        /// <summary>
+        /// 鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken
+        /// </summary>
+        /// <param name="tipType">鏄惁闇�瑕佹彁绀�,榛樿鎻愮ず</param>
+        public string GetEZGetChildToken(TipType tipType = TipType.flicker)
+        {
+            //鍏堣幏鍙栬悿鐭充簯瀛愯处鍙穞oken
+            var responsePackNew = new HttpServerRequest().EZGetChildToken();
+            if (!this.DataChecking(responsePackNew, tipType))
+            {
+                return "";
+            }
+            return responsePackNew.Data.ToString();
+        }
+        /// <summary>
+        /// 妫�楠屾暟鎹洖澶嶆垚鍔熸垨鑰呭け璐�
+        /// </summary>
+        /// <param name="responsePackNew">鍥炲鏁版嵁瀵硅薄</param>
+        /// <param name="tipType">鏄惁闇�瑕佹彁绀�</param>
+        /// <returns></returns>
+        private bool DataChecking(ResponsePackNew responsePackNew, TipType tipType)
+        {
+            if (responsePackNew.Data == null || responsePackNew.Code != "0" || responsePackNew.Data.ToString() == "")
+            {
+                if (TipType.flicker == tipType)
+                {
+                    if (responsePackNew == null)
+                    {
+                        responsePackNew = new ResponsePackNew { message = "娌″洖澶�,璇风‘璁ょ綉缁滄槸鍚︽甯�.", Code = "-1", };
+                    }
+                    Application.RunOnMainThread(() =>
+                    {
+                        //new Tip()
+                        //{
+                        //    CloseTime = 1,
+                        //    Text = responsePackNew.message + "(" + responsePackNew.Code + ")",
+                        //    Direction = AMPopTipDirection.None,
+                        //}.Show(MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1));
+                        CommonMethod.Current.ShowTip(responsePackNew.message + "(" + responsePackNew.Code + ")");
+                    });
+                }
+                return false;
+            }
+            return true;
+        }
+
+
+    }
+}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs
new file mode 100644
index 0000000..11c271d
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs
@@ -0,0 +1,222 @@
+锘縰sing Shared;
+using HDL_ON.Stan;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using HDL_ON.UI.CSS;
+using HDL_ON.Entity;
+
+namespace HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock
+{
+    /// <summary>
+    /// 瑙嗛闂ㄩ攣鍒楄〃鐣岄潰
+    /// </summary>
+    public class VideoDoorLockListPage : EditorCommonForm
+    {
+        #region 鈻� 鍙橀噺澹版槑___________________________
+
+        /// <summary>
+        /// 闂ㄩ攣璁惧鍒楄〃
+        /// </summary>
+        private List<Function> listDevice = new List<Function>();
+        /// <summary>
+        /// 鐢垫睜鎺т欢鍒楄〃(key:璁惧鐨剆id)
+        /// </summary>
+        private Dictionary<string, BatteryPersentControl> dicBatteryContr = new Dictionary<string, BatteryPersentControl>();
+        /// <summary>
+        /// 鍒楄〃鎺т欢
+        /// </summary>
+        private VerticalListControl listView = null;
+        /// <summary>
+        /// 鍒犻櫎璁惧鍚庨渶瑕佹洿鏂扮晫闈㈢殑鍥炶皟
+        /// </summary>
+        public Action action;
+
+
+        #endregion
+
+        #region 鈻� 鍒濆鍖朹____________________________
+
+        public VideoDoorLockListPage(Action action) {
+            this.action = action;
+        }
+        
+
+        /// <summary>
+        /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+        /// </summary>
+        /// <param name="i_listDevice">闂ㄩ攣璁惧鍒楄〃</param>
+        public void ShowForm(List<Function> i_listDevice)
+        {
+            this.listDevice.AddRange(i_listDevice);
+            //鏅鸿兘闂ㄩ攣
+            base.SetTitleText(Language.StringByID(StringId.shipinmensuo));
+
+            //鍒濆鍖栦腑閮ㄤ俊鎭�
+            this.InitMiddleFrame();
+        }
+
+        /// <summary>
+        /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+        /// </summary>
+        private void InitMiddleFrame()
+        {
+            //娓呯┖bodyFrame
+            this.ClearBodyFrame();
+
+            string nowSelectId = string.Empty;
+            //妤煎眰涓嬫媺鍥炬爣
+            var btnFloor = new NormalViewControl(500, Application.GetRealHeight(16), false);
+            var btnFloorIcon = new IconViewControl(16);
+            btnFloorIcon.X = HdlControlResourse.XXLeft;
+            btnFloorIcon.Y = Application.GetRealHeight(18);
+            btnFloorIcon.UnSelectedImagePath = "Public/DownIcon.png";
+            bodyFrameLayout.AddChidren(btnFloorIcon);
+            btnFloorIcon.ButtonClickEvent += (sender, e) =>
+            {
+                //鏄剧ず涓嬫媺鍒楄〃
+                var form = new FloorRoomSelectPopupView();
+                form.ShowDeviceFunctionView(btnFloor, this.listDevice, (selectId, listFunc) =>
+                {
+                    btnFloor.Width = btnFloor.GetRealWidthByText();//閲嶇疆鏂囨湰瀹藉害
+                    nowSelectId = selectId;
+                    //閲嶆柊鍒濆鍖栭棬閿佸垪琛ㄦ帶浠�
+                    this.InitDoorListControl(listFunc);
+
+                }, nowSelectId);
+            };
+            //妤煎眰
+            btnFloor.X = btnFloorIcon.Right + Application.GetRealWidth(2);
+            btnFloor.TextColor = CSS_Color.FirstLevelTitleColor;
+            btnFloor.TextSize = CSS_FontSize.PromptFontSize_FirstLevel;
+            btnFloor.Text = DB_ResidenceData.Instance.CurFloor.roomName;
+            //btnFloor.Width = btnFloor.GetRealWidthByText();
+            bodyFrameLayout.AddChidren(btnFloor);
+            //璁╁畠鐩稿鍥炬爣灞呬腑
+            btnFloor.Y = btnFloorIcon.Y + (btnFloorIcon.Height - btnFloor.Height) / 2;
+            btnFloor.ButtonClickEvent += (sender, e) =>
+            {
+                btnFloorIcon.ButtonClickEvent(null, null);
+            };
+
+            //鍒楄〃鎺т欢
+            this.listView = new VerticalListControl();
+            listView.Y = Application.GetRealHeight(53);
+            listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(53);
+            bodyFrameLayout.AddChidren(listView);
+
+            //鍒濆鍖栭棬閿佸垪琛ㄦ帶浠�
+            this.InitDoorListControl(this.listDevice);
+        }
+
+        #endregion
+
+        #region 鈻� 娣诲姞闂ㄩ攣鎺т欢_______________________
+
+        /// <summary>
+        /// 鍒濆鍖栭棬閿佸垪琛ㄦ帶浠�
+        /// </summary>
+        private void InitDoorListControl(List<Function> i_listDevice)
+        {
+            this.listView.RemoveAll();
+            this.dicBatteryContr = new Dictionary<string, BatteryPersentControl>();
+
+            //鐢熸垚闂ㄩ攣鎺т欢
+            foreach (var device in i_listDevice)
+            {
+                this.AddDoorControl(device);
+            }
+        }
+
+        /// <summary>
+        /// 娣诲姞闂ㄩ攣鎺т欢
+        /// </summary>
+        /// <param name="i_device">闂ㄩ攣瀵硅薄</param>
+        private void AddDoorControl(Function i_device)
+        {
+            //鐧借壊鑳屾櫙瀹瑰櫒
+            var frameBack = new FrameLayoutStatuControl();
+            frameBack.Width = Application.GetRealWidth(343);
+            frameBack.Height = Application.GetRealHeight(96);
+            frameBack.Radius = (uint)Application.GetRealWidth(12);
+            frameBack.Gravity = Gravity.CenterHorizontal;
+            frameBack.BackgroundColor = CSS_Color.MainBackgroundColor;
+            this.listView.AddChidren(frameBack);
+            //闂ㄩ攣鍥炬爣
+            var btnIcon = new IconViewControl(32);
+            btnIcon.X = Application.GetRealWidth(10);
+            btnIcon.Y = Application.GetRealHeight(15);
+            btnIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/DoorLock.png";
+            frameBack.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
+            //璁惧鍚嶅瓧
+            var btnName = new Button();
+            btnName.X = btnIcon.Right + Application.GetRealWidth(12);
+            btnName.Y = Application.GetRealHeight(12);
+            btnName.Width = Application.GetRealWidth(150);
+            btnName.Height = Application.GetRealHeight(20);
+            btnName.TextColor = CSS_Color.FirstLevelTitleColor;
+            btnName.TextAlignment = TextAlignment.CenterLeft;
+            btnName.Text = i_device.name;
+            frameBack.AddChidren(btnName, ChidrenBindMode.BindEvent);
+            //鎴块棿
+            var btnRoom = new Button();
+            btnRoom.X = btnName.X;
+            btnRoom.Y = btnName.Bottom + Application.GetRealHeight(4);
+            btnRoom.Width = Application.GetRealWidth(150);
+            btnRoom.Height = Application.GetRealHeight(15);
+            btnRoom.TextColor = CSS_Color.PromptingColor1;
+            btnRoom.TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel;
+            btnRoom.TextAlignment = TextAlignment.CenterLeft;
+            btnRoom.Text = i_device.GetRoomListName();
+            frameBack.AddChidren(btnRoom, ChidrenBindMode.BindEvent);
+            //鐢垫睜鍥炬爣
+            var btnBattery = new BatteryPersentControl();
+            btnBattery.Y = Application.GetRealHeight(62);
+            //frameBack.AddChidren(btnBattery, ChidrenBindMode.BindEvent);
+            btnBattery.InitControl();
+            btnBattery.SetValue(80);
+            btnBattery.X = frameBack.Width - btnBattery.Width - Application.GetRealWidth(12);
+            this.dicBatteryContr[i_device.sid] = btnBattery;
+            frameBack.ButtonClickEvent += (sender, e) =>
+            {
+                
+                var form = new VideoDoorLockPage(i_device, btnName, btnRoom, CommonMethod.Comerom.function,()=> {
+                    this.CloseForm();
+                    this.action?.Invoke();
+                });
+                MainPage.BasePageView.AddChidren(form);
+                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                form.Show();
+              
+            };
+
+            //搴曢儴鍐嶅姞涓棿璺�
+            var frameSpace = new FrameLayout();
+            frameSpace.Height = Application.GetRealHeight(12);
+            this.listView.AddChidren(frameSpace);
+        }
+
+        #endregion
+
+
+        #region 鈻� 璁惧鐘舵�佹帹閫乢______________________
+
+        /// <summary>
+        /// 璁惧鐘舵�佹帹閫�
+        /// </summary>
+        /// <param name="i_LocalDevice"></param>
+        public override void DeviceStatuPush(Function i_LocalDevice)
+        {
+            //涓嶆槸鐩爣璁惧
+            if (this.dicBatteryContr.ContainsKey(i_LocalDevice.sid) == false)
+            {
+                return;
+            }
+
+        }
+
+        #endregion
+
+      
+    }
+}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
new file mode 100644
index 0000000..94be708
--- /dev/null
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs
@@ -0,0 +1,566 @@
+锘縰sing Shared;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using HDL_ON.UI.CSS;
+using HDL_ON.Entity;
+using HDL_ON.DriverLayer;
+using HDL_ON.UI.Music;
+using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
+
+namespace HDL_ON.UI
+{
+    /// <summary>
+    /// 瑙嗛闂ㄩ攣鐨勬帶鍒剁晫闈�
+    /// </summary>
+    public class VideoDoorLockPage : FrameLayout
+    {
+        #region 鈻� 鍙橀噺澹版槑___________________________
+        /// <summary>
+        /// 璁惧
+        /// </summary>
+        private Function device;
+        /// <summary>
+        /// 涓婁竴绾х晫闈㈢殑璁惧鍚嶅瓧鎺т欢
+        /// </summary>
+        private Button btnDeviceName;
+        /// <summary>
+        /// 涓婁竴绾х晫闈㈢殑鎴块棿鍚嶅瓧鎺т欢
+        /// </summary>
+        private Button btnRoomName;
+        /// <summary>
+        /// 澶撮儴甯冨眬
+        /// </summary>
+        private TopView topView;
+        /// <summary>
+        /// 褰撳墠璁惧鍚嶇О
+        /// </summary>
+        private Button btnCurrDeviceName;
+        /// <summary>
+        /// 鍖哄煙
+        /// </summary>
+        private Button btnCurrDeviceRoom;
+        /// <summary>
+        /// 鐢甸噺鐖舵帶浠�
+        /// </summary>
+        private FrameLayout cellFrame;
+        /// <summary>
+        /// 鐢甸噺
+        /// </summary>
+        private Button btnCell;
+        /// <summary>
+        /// 鐢甸噺杩涘害鏉�
+        /// </summary>
+        private DiyArcSeekBar cellDiyArcSeekBar;
+        /// <summary>
+        ///鏀惰棌鍥炬爣
+        /// </summary>
+        private Button btnCollectIcon;
+        /// <summary>
+        /// 闂ㄩ攣鐘舵��
+        /// </summary>
+        private Button btnDoorLockIcon;
+        /// <summary>
+        /// 瀹炴椂瑙嗛
+        /// </summary>
+        private CustomFrameLayout rtvFL;
+        /// <summary>
+        /// 涓存椂瀵嗙爜
+        /// </summary>
+        private CustomFrameLayout pswFL;
+        /// <summary>
+        /// 鍘嗗彶璁板綍
+        /// </summary>
+        private CustomFrameLayout recordFL;
+
+        /// <summary>
+        /// 琛ㄧず鏉ヨ嚜閭d釜鐣岄潰
+        /// </summary>
+        private CommonMethod.Comerom comerom;
+        /// <summary>
+        /// 鍒犻櫎璁惧鍚庨渶瑕佹洿鏂扮晫闈㈢殑鍥炶皟
+        /// </summary>
+        public Action action;
+        #endregion
+
+
+        /// <summary>
+        /// 鏋勯�犲嚱鏁�
+        /// </summary>
+        /// <param name="function">璁惧</param>
+        /// <param name="btnDeviceName">涓婁竴绾х晫闈㈢殑璁惧鍚嶅瓧鎺т欢(娉�:涓嶈兘浼爊ull,娌℃湁鍙互浼爊ew Button())</param>
+        /// <param name="btnRoomName">涓婁竴绾х晫闈㈢殑鎴块棿鍚嶅瓧鎺т欢(娉�:涓嶈兘浼爊ull,娌℃湁鍙互浼爊ew Button())</param> 
+        public VideoDoorLockPage(Function function, Button btnDeviceName, Button btnRoomName, CommonMethod.Comerom comerom, Action action)
+        {
+            this.device = function;
+            this.btnDeviceName = btnDeviceName;
+            this.btnRoomName = btnRoomName;
+            this.comerom = comerom;
+            this.action = action;
+
+        }
+
+        public void Show()
+        {
+            //鍒濆鍖朥I
+            this.InitUI();
+            //鍒濆鍖栦簨浠�
+            this.EventListener();
+            //璇诲彇鏁版嵁
+            this.ReadData();
+
+        }
+
+
+        /// <summary>
+        /// 鍒濆鍖栫晫闈�
+        /// </summary>
+        private void InitUI()
+        {
+            #region   ---鐣岄潰甯冨眬---
+            this.BackgroundColor = MusicColor.ViewColor;
+            this.topView = new TopView();
+            this.topView.setBtn.Visible = true;
+            this.topView.topNameBtn.TextID = StringId.shipinmensuo;
+            this.AddChidren(topView.TopFLayoutView());
+            var middleFl = new FrameLayout
+            {
+                Y = topView.fLayout.Bottom,
+                Height = Application.GetRealHeight(H_W.H - H_W.T_Height),
+            };
+            this.AddChidren(middleFl);
+
+            var whiteFl = new FrameLayout
+            {
+                Y = Application.GetRealHeight(24),
+                X = Application.GetRealWidth(24),
+                Height = Application.GetRealHeight(526),
+                Width = Application.GetRealWidth(327),
+                BackgroundImagePath = "MusicIcon/playBj.png",
+                Name = "fl",
+            };
+            middleFl.AddChidren(whiteFl);
+
+            btnCollectIcon = new Button
+            {
+                X = Application.GetRealWidth(264),
+                Y = Application.GetRealHeight(14),
+                Width = Application.GetRealWidth(40),
+                Height = Application.GetRealWidth(40),
+                UnSelectedImagePath = "MusicIcon/collect.png",
+                SelectedImagePath = "MusicIcon/collectSelected.png",
+                IsSelected = this.device.collect,
+                Name = "collect"
+            };
+            whiteFl.AddChidren(btnCollectIcon);
+
+            btnCurrDeviceName = new Button
+            {
+                TextSize = TextSize.Text24,
+                TextColor = MusicColor.Text18Color,
+                Width = Application.GetRealWidth(160),
+                Height = Application.GetRealHeight(33),
+                Y = Application.GetRealHeight(16),
+                X = Application.GetRealWidth(16),
+                Text = this.device.name,
+                TextAlignment = TextAlignment.CenterLeft,
+            };
+            whiteFl.AddChidren(btnCurrDeviceName);
+
+
+            btnCurrDeviceRoom = new Button
+            {
+                TextSize = TextSize.Text12,
+                TextColor = MusicColor.MusicNoTxetColor,
+                Width = Application.GetRealWidth(160),
+                Height = Application.GetRealHeight(17),
+                Y = btnCurrDeviceName.Bottom + Application.GetRealHeight(4),
+                X = Application.GetRealWidth(16),
+                Text = this.device.GetRoomListName(),
+                TextAlignment = TextAlignment.CenterLeft,
+            };
+            whiteFl.AddChidren(btnCurrDeviceRoom);
+
+            cellFrame = new FrameLayout
+            {
+                X = btnCurrDeviceRoom.Right + Application.GetRealWidth(20),
+                Y = btnCurrDeviceName.Bottom + Application.GetRealHeight(5),
+                Width = Application.GetRealWidth(30),
+                Height = Application.GetRealHeight(16),
+            };
+            whiteFl.AddChidren(cellFrame);
+
+            cellDiyArcSeekBar = new DiyArcSeekBar
+            {
+                X = Application.GetRealWidth(3),
+                Y = Application.GetRealHeight(3),
+                Width = cellFrame.Width + Application.GetRealWidth(-6),
+                Height = cellFrame.Height + Application.GetRealHeight(-6),
+                Progress = 60,
+                ProgressBarColor = MusicColor.MusicNoTxetColor,
+                MaxValue = 100,
+                MinValue = 0,
+
+                //IsCanMove = false,
+                //IsCanScrolled=false,
+            };
+            //cellFrame.AddChidren(cellDiyArcSeekBar);
+
+            btnCell = new Button
+            {
+                TextSize = TextSize.Text10,
+                TextColor = MusicColor.TextColor,
+                Text = "60" + "%",
+                TextAlignment = TextAlignment.Center,
+                UnSelectedImagePath = "FunctionIcon/DoorLock/Cell.png",
+            };
+            cellFrame.AddChidren(btnCell);
+
+
+#if __IOS__
+//btnCell.Padding = new Padding(0,0,0,0);
+            btnCell.Width += 5;
+            cellFrame.Width += 5;
+#else
+#endif
+
+
+            //闂ㄩ攣鐘舵��
+            btnDoorLockIcon = new Button
+            {
+                X = Application.GetRealWidth(65),
+                Y = Application.GetRealHeight(108),
+                Width = Application.GetRealWidth(198),
+                Height = Application.GetRealWidth(200),
+                UnSelectedImagePath = "FunctionIcon/DoorLock/UnLocked.png",
+                SelectedImagePath = "FunctionIcon/DoorLock/UnLocking.png",
+            };
+            whiteFl.AddChidren(btnDoorLockIcon);
+
+            this.CalculatedPosition();//閲嶆柊璁$畻瀹藉害
+
+            int heightY = btnDoorLockIcon.Bottom + Application.GetRealHeight(70);
+            //瀹炴椂瑙嗛
+            rtvFL = new CustomFrameLayout(CustomFrameLayout.widthFrameLayout, CustomFrameLayout.heightFrameLayout);
+            whiteFl.AddChidren(rtvFL);
+            rtvFL.Y = heightY;
+            rtvFL.X = Application.GetRealWidth(41);
+            rtvFL.AddImageView();
+            rtvFL.AddTextButtonView();
+            rtvFL.GetImageButton().UnSelectedImagePath = "FunctionIcon/DoorLock/RTV.png";
+            rtvFL.GetTextButton().TextID = StringId.shishishipin;
+            //鍘嗗彶璁板綍
+            recordFL = new CustomFrameLayout(CustomFrameLayout.widthFrameLayout, CustomFrameLayout.heightFrameLayout);
+            whiteFl.AddChidren(recordFL);
+            recordFL.Y = heightY;
+            recordFL.X = rtvFL.Right + Application.GetRealWidth(CustomFrameLayout.interval);
+            recordFL.AddImageView();
+            recordFL.AddTextButtonView();
+            recordFL.GetImageButton().UnSelectedImagePath = "FunctionIcon/DoorLock/HistoryList.png";
+            recordFL.GetTextButton().TextID = StringId.lishijilu;
+            //涓存椂瀵嗙爜
+            pswFL = new CustomFrameLayout(CustomFrameLayout.widthFrameLayout, CustomFrameLayout.heightFrameLayout);
+            whiteFl.AddChidren(pswFL);
+            pswFL.Y = heightY;
+            pswFL.X = recordFL.Right + Application.GetRealWidth(CustomFrameLayout.interval);
+            pswFL.AddImageView();
+            pswFL.AddTextButtonView();
+            pswFL.GetImageButton().UnSelectedImagePath = "FunctionIcon/DoorLock/OneOpenLock.png";
+            pswFL.GetTextButton().TextID = StringId.linshimima1;
+
+
+
+            #endregion
+
+
+        }
+        /// <summary>
+        /// 娉ㄥ唽浜嬩欢
+        /// </summary>
+        private void EventListener()
+        {
+            //杩斿洖
+            this.topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
+            {
+                this.RemoveFromParent();
+            };
+            //璁剧疆
+            this.topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
+            {
+                CommonMethod.Current.MainThread(() =>
+                {
+                    //璋冪敤绉�缁曠殑鐣岄潰
+                    var infoView = new UI.FunctionBaseInfoSetPage(this.device, () =>
+                     {
+                         if (this.btnDeviceName == null || this.btnRoomName == null || this.device == null)
+                         {
+                             return;
+                         }
+                         ////鍒锋柊鏄剧ず
+                         this.btnDeviceName.Text = this.device.name;
+                         this.btnRoomName.Text = this.device.GetRoomListName();
+                         this.btnCurrDeviceName.Text = this.device.name;
+                         this.btnCurrDeviceRoom.Text = this.device.GetRoomListName();
+                         this.CalculatedPosition();//閲嶆柊璁$畻瀹藉害
+
+                     });
+                    infoView.actionDel += () =>
+                      {
+                          //瑙g粦璁惧鍚�
+                          this.RemoveFromParent();
+                          this.action?.Invoke();
+
+                      };
+                    MainPage.BasePageView.AddChidren(infoView);
+                    infoView.LoadPage();
+                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                });
+            };
+            //鏀惰棌
+            this.btnCollectIcon.MouseUpEventHandler += (sender, e) =>
+            {
+                btnCollectIcon.IsSelected = this.device.collect = !btnCollectIcon.IsSelected;
+                this.device.CollectFunction();
+            };
+
+            int delayTimeMaxValue = 0;//
+            var startTime = DateTime.Now;
+            //瀹炴椂瑙嗛
+            this.rtvFL.SetClickListener((fl, btnStateImage, btnStateText) =>
+            {
+                bool isDeyayClick = false;
+                var clickTime = DateTime.Now;
+                if ((clickTime - startTime).TotalMilliseconds > delayTimeMaxValue)
+                {
+                    delayTimeMaxValue = 2*1000;
+                    startTime = clickTime;
+                    isDeyayClick = true;
+                }
+                if (!isDeyayClick)
+                {
+                    return;
+                }
+                CommonMethod.Current.SkipRTVActivity(this.device.sid, this.device.deviceId, this.device.spk, false);
+
+            });
+            //涓存椂瀵嗙爜
+            this.pswFL.SetClickListener((fl, btnStateImage, btnStateText) =>
+            {
+                CommonMethod.Current.SkipPSWActivity(this.device.deviceId);
+            });
+            //鍘嗗彶璁板綍
+            this.recordFL.SetClickListener((fl, btnStateImage, btnStateText) =>
+            {
+                CommonMethod.Current.SkipRecordActivity(this.device.deviceId);
+            });
+
+
+        }
+        /// <summary>
+        /// 鍒濆鏁版嵁
+        /// </summary>
+        private void ReadData()
+        {
+            CommonMethod.Current.Loading.Start();
+            CommonMethod.Current.SunThread(() =>
+            {
+                try
+                {
+                    var videoDoorLockInfo = VideDoorLockSend.Current.GetVideoDoorLockState(this.device);
+                    var cellInfo = VideDoorLockSend.Current.GetCellValue(this.device);
+                    CommonMethod.Current.MainThread(() =>
+                    {
+                        //this.cellDiyArcSeekBar.Progress = i;
+                        //鏇存柊鐢甸噺鍊�
+                        this.btnCell.Text = cellInfo.remain + "%";
+                        this.btnDoorLockIcon.IsSelected = videoDoorLockInfo.doorStatus == "open";
+                    });
+                }
+                catch { }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        CommonMethod.Current.Loading.Hide();
+                    });
+                }
+            });
+        }
+
+
+
+        /// <summary>
+        /// 閲嶆柊璁$畻瀹藉害(璁惧鍚嶇О,鎴块棿鎺т欢)
+        /// </summary>
+        private void CalculatedPosition()
+        {
+            this.btnCurrDeviceName.Width = this.btnCurrDeviceName.GetTextWidth();
+            this.btnCurrDeviceName.Width += 10; 
+            if (this.btnCurrDeviceName.GetTextWidth() > this.btnCollectIcon.X)
+            {
+                //閲嶆柊璁$畻瀹藉害
+                this.btnCurrDeviceName.Width = this.btnCollectIcon.X + Application.GetRealWidth(-10);
+            }
+            this.btnCurrDeviceRoom.Width = this.btnCurrDeviceRoom.GetTextWidth();
+            this.btnCurrDeviceRoom.Width += 10;
+            if (this.btnCurrDeviceRoom.GetTextWidth() > this.btnCollectIcon.X)
+            {
+                //閲嶆柊璁$畻瀹藉害
+                this.btnCurrDeviceRoom.Width = this.btnCollectIcon.X + Application.GetRealWidth(-20 - 10);
+            }
+            this.cellFrame.X = this.btnCurrDeviceRoom.Right + Application.GetRealWidth(20);
+        }
+
+        /// <summary>
+        /// 鏇存柊鐘舵��
+        /// </summary>
+        public void UpdateState(PushMessageType pushMessageType)
+        {
+            CommonMethod.Current.MainThread(() =>
+            {
+                if (pushMessageType == PushMessageType.Alarm)
+                {
+                    //闂ㄩ攣鐢垫睜鍊�
+                    if (this.btnCell != null)
+                    {
+                        //videoDoorLockPage.btnCell.Text = "";
+                    }
+                }
+                else
+                {
+                    if (this.btnDoorLockIcon != null && !this.btnDoorLockIcon.IsSelected)
+                    {
+                        this.btnDoorLockIcon.IsSelected = false;
+                    }
+                }
+
+            });
+
+        }
+
+    }
+    /// <summary>
+    /// 鑷繁寮勪竴涓狥rameLayout
+    /// </summary>
+    class CustomFrameLayout : FrameLayout
+    {
+        public const int widthFrameLayout = 48;
+        public const int heightFrameLayout = 53;
+        public const int yFrameLayout = 378;
+        public const int xFrameLayout = 41;
+        public const int interval = 51;//琛屼腑鐨勫垪闂撮殧鍊�
+
+        public CustomFrameLayout(int width, int height, int x = 0, int y = 0)
+        {
+            this.Width = Application.GetRealWidth(width);
+            this.Height = Application.GetRealHeight(height);
+            this.X = Application.GetRealWidth(x);
+            this.Y = Application.GetRealHeight(y);
+
+        }
+        Button btnStateImage = new Button
+        {
+            Width = Application.GetRealWidth(32),
+            Height = Application.GetRealWidth(32),
+            Gravity = Gravity.TopCenter,
+            Name = "btnStateImage",
+
+        };
+        Button btnStateText = new Button
+        {
+            Y = Application.GetRealHeight(4),
+            Width = Application.GetRealWidth(100),
+            Height = Application.GetRealWidth(20),
+            TextID = StringId.dangqianmenweiguan,
+            TextSize = TextSize.Text12,
+            TextColor = MusicColor.TextCancelColor,
+            TextAlignment = TextAlignment.Center,
+            Gravity = Gravity.CenterHorizontal,
+            Name = "btnStateText"
+        };
+        public void AddImageView()
+        {
+            this.AddChidren(btnStateImage);
+
+        }
+        public void AddTextButtonView()
+        {
+            btnStateText.Y += btnStateImage.Bottom;
+            this.AddChidren(btnStateText);
+        }
+        public Button GetImageButton()
+        {
+            //if (!this.AddWithout(this.btnStateImage))
+            //{
+            //    this.AddImageView();
+            //}
+            return this.btnStateImage;
+        }
+        public Button GetTextButton()
+        {
+            //if (!this.AddWithout(this.btnStateText))
+            //{
+            //    this.AddTextButtonView();
+            //}
+            return this.btnStateText;
+        }
+
+        /// <summary>
+        /// 浜嬩欢鐩戝惉鏂规硶
+        /// </summary>
+        /// <param name="action">鍥炶皟(绗竴涓槸鐖剁被瀵硅薄;绗簩涓槸鍥炬爣瀵硅薄;绗笁涓槸鐘舵�佸璞�</param>
+        /// <param name="button1">娉ㄦ剰:鍦⊿etClickListener()鍓嶉潰璋冪敤AddImageView()鎵嶆湁鏁�</param>
+        /// <param name="button2">娉ㄦ剰:鍦⊿etClickListener()鍓嶉潰璋冪敤AddImageView()鎵嶆湁鏁�</param>
+        public void SetClickListener(Action<FrameLayout, Button, Button> action)
+        {
+            EventHandler<MouseEventArgs> click = (sender, e) =>
+                    {
+                        action?.Invoke(this, btnStateImage, btnStateText);
+                    };
+            this.MouseUpEventHandler += click;
+            btnStateImage.MouseUpEventHandler += click;
+            btnStateText.MouseUpEventHandler += click;
+
+        }
+
+
+
+        /// <summary>
+        /// 鍦ㄧ埗甯冨眬鏌ユ壘瀛愭帶浠舵槸鍚﹀瓨鍦�
+        /// </summary>
+        /// <param name="btn">鏌ユ壘瀵硅薄</param>
+        /// <returns>瀛樺湪涓簍rue,鍚﹀垯涓篺alse</returns>
+        private bool AddWithout(View btn)
+        {
+
+            if (this.ChildrenCount <= 0 || btn == null)
+            {
+                return false;
+            }
+            for (int i = 0; i < this.ChildrenCount; i++)
+            {
+                View view = this.GetChildren(i);
+                if (view == null)
+                {
+                    continue;
+                }
+                if (view is Button)
+                {
+                    if (view.Name == btn.Name)
+                    {
+                        return true;
+                    }
+                }
+
+            }
+            return false;
+
+        }
+
+
+
+
+    }
+
+
+}
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 6a3074f..78690ae 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -132,7 +132,11 @@
                 //寮�鍚畾浣嶆湇鍔�
                 try
                 {
-                    Shared.Application.StartGPSLocationService();
+                    if (DB_ResidenceData.Instance.CheckGPS_IsFirst)
+                    {
+                        DB_ResidenceData.Instance.CheckGPS_IsFirst = false;
+                        Shared.Application.StartGPSLocationService();
+                    }
                 }catch(Exception ex)
                 {
                     MainPage.Log("寮�鍚畾浣嶆湇鍔″紓甯�:" + ex.Message);
@@ -485,9 +489,10 @@
                 {
                     btnNavigationSelectionIcon.SetRotation(0f);
                     ContextView.RemoveAll();
-                    var classificaitionView = new ClassificationPage();
+                    var classificaitionView = new ClassificationPage(); 
                     ContextView.AddChidren(classificaitionView);
                     classificaitionView.LoadPage();
+                    
                 });
             })
             { IsBackground = true, Priority = System.Threading.ThreadPriority.Lowest }.Start();
diff --git a/SiriIntents/Info.plist b/SiriIntents/Info.plist
index 967b921..d47547f 100644
--- a/SiriIntents/Info.plist
+++ b/SiriIntents/Info.plist
@@ -11,11 +11,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.202112271</string>
+	<string>1.7.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.12271</string>
+	<string>1.7.6</string>
 	<key>MinimumOSVersion</key>
-	<string>12.0</string>
+	<string>12.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/SiriIntents/Server/HttpUtil.cs b/SiriIntents/Server/HttpUtil.cs
index 7cc6482..8d4483c 100644
--- a/SiriIntents/Server/HttpUtil.cs
+++ b/SiriIntents/Server/HttpUtil.cs
@@ -16,8 +16,13 @@
         /// 鍥哄畾鍩熷悕,姝e紡鐜
         /// 鍏叡鍩熷悕灏辫繎瑙f瀽
         /// </summary>
-        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
-        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+        const string APP_KEY = "HDL-HOME-APP-TEST";
+        const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
+        //public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
+        //const string APP_KEY = "CPEVRLRT";
+        //const string SECRET_KEY = "CPEVRLSJCPEVRLSZ";
         /// <summary>
         /// RegionMark
         /// </summary>
@@ -248,14 +253,6 @@
         #endregion
 
         #region **********绛惧悕鏍¢獙**********
-        /// <summary>
-        /// 
-        /// </summary>
-        const string APP_KEY = "HDL-HOME-APP-TEST";
-        /// <summary>
-        /// 
-        /// </summary>
-        const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
 
         /// <summary>
         /// 鑾峰彇褰撳墠鏃堕棿鎴冲��
diff --git a/SiriIntents/SiriIntents.csproj b/SiriIntents/SiriIntents.csproj
index a36210c..9108b97 100644
--- a/SiriIntents/SiriIntents.csproj
+++ b/SiriIntents/SiriIntents.csproj
@@ -67,7 +67,7 @@
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodesignKey>iPhone Developer</CodesignKey>
+    <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
     <DeviceSpecificBuild>true</DeviceSpecificBuild>
     <MtouchDebug>true</MtouchDebug>
     <MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
@@ -79,6 +79,7 @@
     <MtouchArch>ARM64</MtouchArch>
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchVerbosity></MtouchVerbosity>
+    <CodesignProvision>OnProSiri230417-1-Dev</CodesignProvision>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/SiriIntentsUI/Info.plist b/SiriIntentsUI/Info.plist
index e4359f0..d8b4eff 100644
--- a/SiriIntentsUI/Info.plist
+++ b/SiriIntentsUI/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.202112271</string>
+	<string>1.7.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.12271</string>
+	<string>1.7.6</string>
 	<key>MinimumOSVersion</key>
-	<string>12.0</string>
+	<string>12.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>
diff --git a/SiriIntentsUI/SiriIntentsUI.csproj b/SiriIntentsUI/SiriIntentsUI.csproj
index da2da8b..283b79f 100644
--- a/SiriIntentsUI/SiriIntentsUI.csproj
+++ b/SiriIntentsUI/SiriIntentsUI.csproj
@@ -70,7 +70,7 @@
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodesignKey>iPhone Developer</CodesignKey>
+    <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
     <DeviceSpecificBuild>true</DeviceSpecificBuild>
     <MtouchDebug>true</MtouchDebug>
     <MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
@@ -83,6 +83,7 @@
     <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
     <MtouchVerbosity></MtouchVerbosity>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CodesignProvision>OnProSiriUI230417-1-Dev</CodesignProvision>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/ys/Additions/AboutAdditions.txt b/ys/Additions/AboutAdditions.txt
deleted file mode 100644
index c240307..0000000
--- a/ys/Additions/AboutAdditions.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-锘緼dditions allow you to add arbitrary C# to the generated classes
-before they are compiled.  This can be helpful for providing convenience
-methods or adding pure C# classes.
-
-== Adding Methods to Generated Classes ==
-
-Let's say the library being bound has a Rectangle class with a constructor
-that takes an x and y position, and a width and length size.  It will look like
-this:
-
-public partial class Rectangle
-{
-    public Rectangle (int x, int y, int width, int height)
-    {
-        // JNI bindings
-    }
-}
-
-Imagine we want to add a constructor to this class that takes a Point and
-Size structure instead of 4 ints.  We can add a new file called Rectangle.cs
-with a partial class containing our new method:
-
-public partial class Rectangle
-{
-    public Rectangle (Point location, Size size) :
-        this (location.X, location.Y, size.Width, size.Height)
-    {
-    }
-}
-
-At compile time, the additions class will be added to the generated class
-and the final assembly will a Rectangle class with both constructors.
-
-
-== Adding C# Classes ==
-
-Another thing that can be done is adding fully C# managed classes to the
-generated library.  In the above example, let's assume that there isn't a
-Point class available in Java or our library.  The one we create doesn't need
-to interact with Java, so we'll create it like a normal class in C#.
-
-By adding a Point.cs file with this class, it will end up in the binding library:
-
-public class Point
-{
-    public int X { get; set; }
-    public int Y { get; set; }
-}
\ No newline at end of file
diff --git a/ys/Jars/AboutJars.txt b/ys/Jars/AboutJars.txt
deleted file mode 100644
index c359b62..0000000
--- a/ys/Jars/AboutJars.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-锘縏his directory is for Android .jars.
-
-There are 2 types of jars that are supported:
-
-== Input Jar ==
-
-This is the jar that bindings should be generated for.
-
-For example, if you were binding the Google Maps library, this would
-be Google's "maps.jar".
-
-Set the build action for these jars in the properties page to "InputJar".
-
-
-== Reference Jars ==
-
-These are jars that are referenced by the input jar.  C# bindings will
-not be created for these jars.  These jars will be used to resolve
-types used by the input jar.
-
-NOTE: Do not add "android.jar" as a reference jar.  It will be added automatically
-based on the Target Framework selected.
-
-Set the build action for these jars in the properties page to "ReferenceJar".
\ No newline at end of file
diff --git a/ys/Properties/AssemblyInfo.cs b/ys/Properties/AssemblyInfo.cs
deleted file mode 100644
index e39619e..0000000
--- a/ys/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-锘縰sing System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Android.App;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ys")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ys")]
-[assembly: AssemblyCopyright("Copyright 漏  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ys/Transforms/EnumFields.xml b/ys/Transforms/EnumFields.xml
deleted file mode 100644
index e4a0f89..0000000
--- a/ys/Transforms/EnumFields.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-锘�<?xml version="1.0" encoding="UTF-8"?>
-<enum-field-mappings>
-    <!--
-  This example converts the constants Fragment_id, Fragment_name,
-  and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
-  to an enum called Android.Support.V4.App.FragmentTagType with values
-  Id, Name, and Tag.
-  
-  <mapping jni-class="android/support/v4/app/FragmentActivity$FragmentTag" clr-enum-type="Android.Support.V4.App.FragmentTagType">
-    <field jni-name="Fragment_name" clr-name="Name" value="0" />
-    <field jni-name="Fragment_id" clr-name="Id" value="1" />
-    <field jni-name="Fragment_tag" clr-name="Tag" value="2" />
-  </mapping>
-  -->
-</enum-field-mappings>
\ No newline at end of file
diff --git a/ys/Transforms/EnumMethods.xml b/ys/Transforms/EnumMethods.xml
deleted file mode 100644
index 6ff109b..0000000
--- a/ys/Transforms/EnumMethods.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-锘�<?xml version="1.0" encoding="UTF-8"?>
-<enum-method-mappings>
-    <!--
-  This example changes the Java method:
-    android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
-  to be:
-    android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags)
-  when bound in C#.
-  
-  <mapping jni-class="android/support/v4/app/Fragment.SavedState">
-    <method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" />
-  </mapping>
-  -->
-</enum-method-mappings>
\ No newline at end of file
diff --git a/ys/Transforms/Metadata.xml b/ys/Transforms/Metadata.xml
deleted file mode 100644
index ded745f..0000000
--- a/ys/Transforms/Metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-锘�<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-    <!--
-  This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask:
-  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" />
-  
-  This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
-  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
-  -->
-    <remove-node path="/api/package[starts-with(@name,'com')]"/>
-    <remove-node path="/api/package[starts-with(@name,'ezviz')]"/>
-</metadata>
\ No newline at end of file
diff --git a/ys/ys.csproj b/ys/ys.csproj
deleted file mode 100644
index b7ec06a..0000000
--- a/ys/ys.csproj
+++ /dev/null
@@ -1,72 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{DF065E3F-C3A1-4908-9582-000974B7C290}</ProjectGuid>
-    <ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TemplateGuid>{77efb91c-a7e9-4b0e-a7c5-31eeec3c6d46}</TemplateGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ys</RootNamespace>
-    <AssemblyName>ys</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>True</Deterministic>
-    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
-    <AndroidClassParser>class-parse</AndroidClassParser>
-    <AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>portable</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Mono.Android" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Jars\AboutJars.txt" />
-    <None Include="Additions\AboutAdditions.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <TransformFile Include="Transforms\Metadata.xml" />
-    <TransformFile Include="Transforms\EnumFields.xml" />
-    <TransformFile Include="Transforms\EnumMethods.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <LibraryProjectZip Include="Jars\app-release.aar" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Square.OkHttp3">
-      <Version>3.8.0</Version>
-    </PackageReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ys/ys.sln b/ys/ys.sln
deleted file mode 100644
index 18f9df9..0000000
--- a/ys/ys.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-锘�
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.809.3
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ys", "ys.csproj", "{DF065E3F-C3A1-4908-9582-000974B7C290}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DF065E3F-C3A1-4908-9582-000974B7C290}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DF065E3F-C3A1-4908-9582-000974B7C290}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DF065E3F-C3A1-4908-9582-000974B7C290}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DF065E3F-C3A1-4908-9582-000974B7C290}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {4EB8F1AD-9FD8-462E-B612-D63F4BA29B86}
-	EndGlobalSection
-EndGlobal

--
Gitblit v1.8.0