From 304dca51c28183a9dfc192c6b93ea1c00bdd5d97 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 01 七月 2020 15:00:40 +0800
Subject: [PATCH] 添加了写入功能类型

---
 ZigbeeApp/GateWay.Droid/Assets/Language.ini                                                                 |   14 
 ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs                                                      | 10094 ++++++++++----------
 ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs                                                  |    4 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs                                |    3 
 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs                                         |  308 
 ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs                                                         |   12 
 ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll                                                     |    0 
 ZigbeeApp/Shared/Phone/ZigBee/Device/ColorDimmerSwitch.cs                                                   |   13 
 ZigbeeApp/Shared/Phone/UserView/UserPage.cs                                                                 |    6 
 ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/Curtain.png                                                    |    0 
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs                                      |   62 
 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs                                  |   97 
 ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs                                  |    8 
 ZigbeeApp/Home.Ios/Entitlements.plist                                                                       |    2 
 ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/back1.png                                                     |    0 
 ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll                                                                 |    0 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs                                           |  207 
 ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/EmptyTargetsSelected.png                                       |    0 
 ZigbeeApp/Shared/Phone/Device/Logic/LogicView/LightView.cs                                                  |   81 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs               |    2 
 ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs                                      |    4 
 ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs                                                           |  496 +
 ZigbeeApp/Home.Ios/Resources/Phone/BindPic/Switch.png                                                       |    0 
 ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs                                                   |   14 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs                                       |   26 
 ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs                                                          |   17 
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs                                     |   78 
 ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/back1.png                                                   |    0 
 ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs                                                    |   96 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs                                   |  876 +
 ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll                                                               |    0 
 ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundControlForm.cs                                            |   89 
 ZigbeeApp/Home.Ios/Resources/Phone/BindPic/EmptyTargetsSelected.png                                         |    0 
 ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs                                                            |    2 
 ZigbeeApp/Home.Ios/Info.plist                                                                               |    5 
 ZigbeeApp/Shared/DLL/IOS/Shared.IOS.xml                                                                     | 4963 ++++++++++
 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs                                              |   54 
 ZigbeeApp/Home.Ios/Resources/Phone/BindPic/EmptyTargets.png                                                 |    0 
 ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundControlContentForm.cs                                     |   96 
 ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/seek.png                                                      |    0 
 ZigbeeApp/Home.Ios/Resources/Phone/BindPic/Roller.png                                                       |    0 
 ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundListForm.cs                                               |   63 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs                  |  161 
 ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs                                                               |    7 
 ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/Switch.png                                                     |    0 
 ZigbeeApp/Shared/DLL/Android/Shared.Droid.xml                                                               | 4106 ++++++++
 ZigbeeApp/Shared/Phone/ZigBee/Device/ColorTemperatureLight.cs                                               |    2 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs |    6 
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs                                       |   67 
 ZigbeeApp/Shared/Shared.projitems                                                                           |   13 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs                                               |  116 
 ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs                                                      |    8 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs                                              |    2 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs        |    6 
 ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs                                                             |  104 
 ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/nightLightSelected.png                                      |    0 
 ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll                                                                     |    0 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs                       |  998 ++
 ZigbeeApp/Shared/Phone/Device/Logic/Method.cs                                                               |   11 
 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj                                                                |   27 
 ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs                             |    4 
 ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/EmptyTargets.png                                               |    0 
 ZigbeeApp/Shared/Common/CommonPage.cs                                                                       |    2 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs         |   26 
 ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs                                                       |   12 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs                    | 1554 +++
 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs                                                         |    4 
 ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs                                |   12 
 ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/nightLight.png                                              |    0 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs           |    2 
 ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml                                                      |    2 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs                                                   |  830 +
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlCheckLogic.cs                                         |   20 
 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs                                      |   67 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs                                        | 1292 -
 ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs                                           |    4 
 ZigbeeApp/Shared/Phone/ZigBee/Device/WindowCoveringController.cs                                            |   14 
 ZigbeeApp/Home.Ios/Resources/Phone/BindPic/Curtain.png                                                      |    0 
 ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/nightLightSelected.png                                        |    0 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs                   |  545 +
 ZigbeeApp/Home.Ios/Resources/Language.ini                                                                   |   14 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs                     |  139 
 ZigbeeApp/Home.Ios/Home.IOS.csproj                                                                          |    9 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/FrameLayoutBase.cs             |   11 
 ZigbeeApp/Shared/R.cs                                                                                       |   42 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/RowLayoutBase.cs               |   11 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs                                 |  791 +
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListRefreshControl.cs  |   26 
 ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/seek.png                                                    |    0 
 ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs                                                    |    1 
 ZigbeeApp/Shared/Phone/ZigBee/Device/LevelControlSwitch.cs                                                  |   13 
 ZigbeeApp/Shared/Common/Device.cs                                                                           |  153 
 ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/Roller.png                                                     |    0 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs                                       |  132 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs                               |  168 
 ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/nightLight.png                                                |    0 
 ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs                                 |  158 
 ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs                                    |    8 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs     |   62 
 /dev/null                                                                                                   |   10 
 ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs                                                        |   16 
 ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs                              |    2 
 ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs                                          |    4 
 ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs                                        |    4 
 104 files changed, 22,890 insertions(+), 6,700 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index c2b864a..ee5fcfd 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -329,6 +329,14 @@
 325=鎵撳紑闈㈡澘涓昏彍鍗曪紝鍙充笂瑙掔偣鍑粄0}璁剧疆鎸夐挳锛岀偣鍑诲叆缃�
 326=闀挎寜鈥滃紑鍏斥�濇寜閿�5绉掞紝鎵�鏈夌伅姣忚繘琛寋0}2娆′寒鏆楀垏鎹紝鍗冲叆缃戞垚鍔�
 327=闀挎寜鈥滃紑鍏斥�濇寜閿�5绉�
+328=鏈�澶氬彲娣诲姞{0}涓�
+329=缁戝畾
+330=璇ヨ澶囨槸缁х數鍣紝褰撳墠鍙敮鎸佸甫鏈夎皟鍏夌殑鐏厜
+331=璇ヨ澶囨槸璋冨厜鐏紝褰撳墠鍙敮鎸佷笉甯︽湁璋冨厜鐨勭伅鍏�
+332=绌鸿皟鐩爣
+333=涓嶇粦瀹氫换浣曠洰鏍�
+334= 鐫$湢鏃堕棿
+335=璀﹀憡锛佹暟鎹嚭閿欙紝蹇呴』鍒锋柊鍒楄〃锛屽惁鍒欐帶鍒剁幇璞¢敊涔�
 
 5097=鍙栨秷
 5098=纭畾
@@ -602,7 +610,6 @@
 5396=鎴�
 5397=鏃堕棿涓虹┖
 5398=鍙敮鎸佹暟瀛楄緭鍏�
-
 5399=鍏抽棴澶辫触
 5400=寮�鍚父寮�妯″紡澶辫触
 5401=娣诲姞鏃舵晥鎬у父寮�璁剧疆澶辫触
@@ -610,6 +617,10 @@
 5403=鍒嗗叧闂�
 5404=鏃�
 5405=绫�
+5406=澶滅伅寮�鍏�
+5407=鑹叉俯
+5408=铚傞福鍣�
+
 
 10000=HDL Home
 10001=甯哥敤
@@ -1847,6 +1858,7 @@
 16131=蹇界暐
 16132=铚傞福鍣ㄥ紑鍏�
 16133=灏忓鐏紑鍏�
+16134=璁剧疆璁惧鍔熻兘绫诲瀷澶辫触
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
 18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/Curtain.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/Curtain.png
new file mode 100755
index 0000000..ff844b8
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/Curtain.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/EmptyTargets.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/EmptyTargets.png
new file mode 100755
index 0000000..a467884
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/EmptyTargets.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/EmptyTargetsSelected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/EmptyTargetsSelected.png
new file mode 100755
index 0000000..6a7220b
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/EmptyTargetsSelected.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/Roller.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/Roller.png
new file mode 100755
index 0000000..c345d33
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/Roller.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/Switch.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/Switch.png
new file mode 100755
index 0000000..2da4dcc
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/BindPic/Switch.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/back1.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/back1.png
new file mode 100755
index 0000000..df52c60
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/back1.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/nightLight.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/nightLight.png
new file mode 100755
index 0000000..714762c
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/nightLight.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/nightLightSelected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/nightLightSelected.png
new file mode 100755
index 0000000..8eca161
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/nightLightSelected.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/seek.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/seek.png
new file mode 100755
index 0000000..610b1ef
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/seek.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 28cc26b..301a96c 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -2257,6 +2257,33 @@
   <ItemGroup>
     <AndroidAsset Include="Assets\Phone\Item\ColorTemperatureBar.png" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidAsset Include="Assets\Phone\ZigeeLogic\back1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidAsset Include="Assets\Phone\ZigeeLogic\nightLight.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidAsset Include="Assets\Phone\ZigeeLogic\nightLightSelected.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidAsset Include="Assets\Phone\ZigeeLogic\seek.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidAsset Include="Assets\Phone\BindPic\Curtain.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidAsset Include="Assets\Phone\BindPic\EmptyTargets.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidAsset Include="Assets\Phone\BindPic\EmptyTargetsSelected.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidAsset Include="Assets\Phone\BindPic\Roller.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidAsset Include="Assets\Phone\BindPic\Switch.png" />
+  </ItemGroup>
   <Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets')" />
diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index 1eb6f00..00871f6 100644
--- a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
+++ b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="0120061701" android:installLocation="auto" android:versionName="1.1.0120061701">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="0120062401" android:installLocation="auto" android:versionName="1.1.0120062401">
 	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
 	<permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
index d393349..f118970 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -34,233 +34,233 @@
 		public partial class Animation
 		{
 			
-			// aapt resource value: 0x7F010000
-			public const int abc_fade_in = 2130771968;
+			// aapt resource value: 0x7f050000
+			public const int abc_fade_in = 2131034112;
 			
-			// aapt resource value: 0x7F010001
-			public const int abc_fade_out = 2130771969;
+			// aapt resource value: 0x7f050001
+			public const int abc_fade_out = 2131034113;
 			
-			// aapt resource value: 0x7F010002
-			public const int abc_grow_fade_in_from_bottom = 2130771970;
+			// aapt resource value: 0x7f050002
+			public const int abc_grow_fade_in_from_bottom = 2131034114;
 			
-			// aapt resource value: 0x7F010003
-			public const int abc_popup_enter = 2130771971;
+			// aapt resource value: 0x7f050003
+			public const int abc_popup_enter = 2131034115;
 			
-			// aapt resource value: 0x7F010004
-			public const int abc_popup_exit = 2130771972;
+			// aapt resource value: 0x7f050004
+			public const int abc_popup_exit = 2131034116;
 			
-			// aapt resource value: 0x7F010005
-			public const int abc_shrink_fade_out_from_bottom = 2130771973;
+			// aapt resource value: 0x7f050005
+			public const int abc_shrink_fade_out_from_bottom = 2131034117;
 			
-			// aapt resource value: 0x7F010006
-			public const int abc_slide_in_bottom = 2130771974;
+			// aapt resource value: 0x7f050006
+			public const int abc_slide_in_bottom = 2131034118;
 			
-			// aapt resource value: 0x7F010007
-			public const int abc_slide_in_top = 2130771975;
+			// aapt resource value: 0x7f050007
+			public const int abc_slide_in_top = 2131034119;
 			
-			// aapt resource value: 0x7F010008
-			public const int abc_slide_out_bottom = 2130771976;
+			// aapt resource value: 0x7f050008
+			public const int abc_slide_out_bottom = 2131034120;
 			
-			// aapt resource value: 0x7F010009
-			public const int abc_slide_out_top = 2130771977;
+			// aapt resource value: 0x7f050009
+			public const int abc_slide_out_top = 2131034121;
 			
-			// aapt resource value: 0x7F01000A
-			public const int design_bottom_sheet_slide_in = 2130771978;
+			// aapt resource value: 0x7f05000a
+			public const int design_bottom_sheet_slide_in = 2131034122;
 			
-			// aapt resource value: 0x7F01000B
-			public const int design_bottom_sheet_slide_out = 2130771979;
+			// aapt resource value: 0x7f05000b
+			public const int design_bottom_sheet_slide_out = 2131034123;
 			
-			// aapt resource value: 0x7F01000C
-			public const int design_snackbar_in = 2130771980;
+			// aapt resource value: 0x7f05000c
+			public const int design_snackbar_in = 2131034124;
 			
-			// aapt resource value: 0x7F01000D
-			public const int design_snackbar_out = 2130771981;
+			// aapt resource value: 0x7f05000d
+			public const int design_snackbar_out = 2131034125;
 			
-			// aapt resource value: 0x7F01000E
-			public const int fingerprint_draw_off_animation_interpolator_0 = 2130771982;
+			// aapt resource value: 0x7f05000e
+			public const int fingerprint_draw_off_animation_interpolator_0 = 2131034126;
 			
-			// aapt resource value: 0x7F01000F
-			public const int fingerprint_draw_off_animation_interpolator_1 = 2130771983;
+			// aapt resource value: 0x7f05000f
+			public const int fingerprint_draw_off_animation_interpolator_1 = 2131034127;
 			
-			// aapt resource value: 0x7F010010
-			public const int fingerprint_draw_off_ridge_1_path_animation = 2130771984;
+			// aapt resource value: 0x7f050010
+			public const int fingerprint_draw_off_ridge_1_path_animation = 2131034128;
 			
-			// aapt resource value: 0x7F010011
-			public const int fingerprint_draw_off_ridge_2_path_animation = 2130771985;
+			// aapt resource value: 0x7f050011
+			public const int fingerprint_draw_off_ridge_2_path_animation = 2131034129;
 			
-			// aapt resource value: 0x7F010012
-			public const int fingerprint_draw_off_ridge_5_path_animation = 2130771986;
+			// aapt resource value: 0x7f050012
+			public const int fingerprint_draw_off_ridge_5_path_animation = 2131034130;
 			
-			// aapt resource value: 0x7F010013
-			public const int fingerprint_draw_off_ridge_6_path_animation = 2130771987;
+			// aapt resource value: 0x7f050013
+			public const int fingerprint_draw_off_ridge_6_path_animation = 2131034131;
 			
-			// aapt resource value: 0x7F010014
-			public const int fingerprint_draw_off_ridge_7_path_animation = 2130771988;
+			// aapt resource value: 0x7f050014
+			public const int fingerprint_draw_off_ridge_7_path_animation = 2131034132;
 			
-			// aapt resource value: 0x7F010015
-			public const int fingerprint_draw_on_animation_interpolator_0 = 2130771989;
+			// aapt resource value: 0x7f050015
+			public const int fingerprint_draw_on_animation_interpolator_0 = 2131034133;
 			
-			// aapt resource value: 0x7F010016
-			public const int fingerprint_draw_on_animation_interpolator_1 = 2130771990;
+			// aapt resource value: 0x7f050016
+			public const int fingerprint_draw_on_animation_interpolator_1 = 2131034134;
 			
-			// aapt resource value: 0x7F010017
-			public const int fingerprint_draw_on_ridge_1_path_animation = 2130771991;
+			// aapt resource value: 0x7f050017
+			public const int fingerprint_draw_on_ridge_1_path_animation = 2131034135;
 			
-			// aapt resource value: 0x7F010018
-			public const int fingerprint_draw_on_ridge_2_path_animation = 2130771992;
+			// aapt resource value: 0x7f050018
+			public const int fingerprint_draw_on_ridge_2_path_animation = 2131034136;
 			
-			// aapt resource value: 0x7F010019
-			public const int fingerprint_draw_on_ridge_5_path_animation = 2130771993;
+			// aapt resource value: 0x7f050019
+			public const int fingerprint_draw_on_ridge_5_path_animation = 2131034137;
 			
-			// aapt resource value: 0x7F01001A
-			public const int fingerprint_draw_on_ridge_6_path_animation = 2130771994;
+			// aapt resource value: 0x7f05001a
+			public const int fingerprint_draw_on_ridge_6_path_animation = 2131034138;
 			
-			// aapt resource value: 0x7F01001B
-			public const int fingerprint_draw_on_ridge_7_path_animation = 2130771995;
+			// aapt resource value: 0x7f05001b
+			public const int fingerprint_draw_on_ridge_7_path_animation = 2131034139;
 			
-			// aapt resource value: 0x7F01001C
-			public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2130771996;
+			// aapt resource value: 0x7f05001c
+			public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2131034140;
 			
-			// aapt resource value: 0x7F01001D
-			public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2130771997;
+			// aapt resource value: 0x7f05001d
+			public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2131034141;
 			
-			// aapt resource value: 0x7F01001E
-			public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2130771998;
+			// aapt resource value: 0x7f05001e
+			public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2131034142;
 			
-			// aapt resource value: 0x7F01001F
-			public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2130771999;
+			// aapt resource value: 0x7f05001f
+			public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2131034143;
 			
-			// aapt resource value: 0x7F010020
-			public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2130772000;
+			// aapt resource value: 0x7f050020
+			public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2131034144;
 			
-			// aapt resource value: 0x7F010021
-			public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2130772001;
+			// aapt resource value: 0x7f050021
+			public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2131034145;
 			
-			// aapt resource value: 0x7F010022
-			public const int fingerprint_error_state_to_fp_group_1_animation = 2130772002;
+			// aapt resource value: 0x7f050022
+			public const int fingerprint_error_state_to_fp_group_1_animation = 2131034146;
 			
-			// aapt resource value: 0x7F010023
-			public const int fingerprint_error_state_to_fp_group_2_animation = 2130772003;
+			// aapt resource value: 0x7f050023
+			public const int fingerprint_error_state_to_fp_group_2_animation = 2131034147;
 			
-			// aapt resource value: 0x7F010024
-			public const int fingerprint_error_state_to_fp_path_1_animation = 2130772004;
+			// aapt resource value: 0x7f050024
+			public const int fingerprint_error_state_to_fp_path_1_animation = 2131034148;
 			
-			// aapt resource value: 0x7F010025
-			public const int fingerprint_error_state_to_fp_path_2_animation = 2130772005;
+			// aapt resource value: 0x7f050025
+			public const int fingerprint_error_state_to_fp_path_2_animation = 2131034149;
 			
-			// aapt resource value: 0x7F010026
-			public const int fingerprint_error_state_to_fp_path_3_animation = 2130772006;
+			// aapt resource value: 0x7f050026
+			public const int fingerprint_error_state_to_fp_path_3_animation = 2131034150;
 			
-			// aapt resource value: 0x7F010027
-			public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2130772007;
+			// aapt resource value: 0x7f050027
+			public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2131034151;
 			
-			// aapt resource value: 0x7F010028
-			public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2130772008;
+			// aapt resource value: 0x7f050028
+			public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2131034152;
 			
-			// aapt resource value: 0x7F010029
-			public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2130772009;
+			// aapt resource value: 0x7f050029
+			public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2131034153;
 			
-			// aapt resource value: 0x7F01002A
-			public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2130772010;
+			// aapt resource value: 0x7f05002a
+			public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2131034154;
 			
-			// aapt resource value: 0x7F01002B
-			public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2130772011;
+			// aapt resource value: 0x7f05002b
+			public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2131034155;
 			
-			// aapt resource value: 0x7F01002C
-			public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2130772012;
+			// aapt resource value: 0x7f05002c
+			public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2131034156;
 			
-			// aapt resource value: 0x7F01002D
-			public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2130772013;
+			// aapt resource value: 0x7f05002d
+			public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2131034157;
 			
-			// aapt resource value: 0x7F01002E
-			public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2130772014;
+			// aapt resource value: 0x7f05002e
+			public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2131034158;
 			
-			// aapt resource value: 0x7F01002F
-			public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2130772015;
+			// aapt resource value: 0x7f05002f
+			public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2131034159;
 			
-			// aapt resource value: 0x7F010030
-			public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2130772016;
+			// aapt resource value: 0x7f050030
+			public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2131034160;
 			
-			// aapt resource value: 0x7F010031
-			public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2130772017;
+			// aapt resource value: 0x7f050031
+			public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2131034161;
 			
-			// aapt resource value: 0x7F010032
-			public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2130772018;
+			// aapt resource value: 0x7f050032
+			public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2131034162;
 			
-			// aapt resource value: 0x7F010033
-			public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2130772019;
+			// aapt resource value: 0x7f050033
+			public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2131034163;
 			
-			// aapt resource value: 0x7F010034
-			public const int fingerprint_fp_to_error_state_group_1_animation = 2130772020;
+			// aapt resource value: 0x7f050034
+			public const int fingerprint_fp_to_error_state_group_1_animation = 2131034164;
 			
-			// aapt resource value: 0x7F010035
-			public const int fingerprint_fp_to_error_state_group_2_animation = 2130772021;
+			// aapt resource value: 0x7f050035
+			public const int fingerprint_fp_to_error_state_group_2_animation = 2131034165;
 			
-			// aapt resource value: 0x7F010036
-			public const int fingerprint_fp_to_error_state_path_1_animation = 2130772022;
+			// aapt resource value: 0x7f050036
+			public const int fingerprint_fp_to_error_state_path_1_animation = 2131034166;
 			
-			// aapt resource value: 0x7F010037
-			public const int fingerprint_fp_to_error_state_path_2_animation = 2130772023;
+			// aapt resource value: 0x7f050037
+			public const int fingerprint_fp_to_error_state_path_2_animation = 2131034167;
 			
-			// aapt resource value: 0x7F010038
-			public const int fingerprint_fp_to_error_state_path_3_animation = 2130772024;
+			// aapt resource value: 0x7f050038
+			public const int fingerprint_fp_to_error_state_path_3_animation = 2131034168;
 			
-			// aapt resource value: 0x7F010039
-			public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2130772025;
+			// aapt resource value: 0x7f050039
+			public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2131034169;
 			
-			// aapt resource value: 0x7F01003A
-			public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2130772026;
+			// aapt resource value: 0x7f05003a
+			public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2131034170;
 			
-			// aapt resource value: 0x7F01003B
-			public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2130772027;
+			// aapt resource value: 0x7f05003b
+			public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2131034171;
 			
-			// aapt resource value: 0x7F01003C
-			public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2130772028;
+			// aapt resource value: 0x7f05003c
+			public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2131034172;
 			
-			// aapt resource value: 0x7F01003D
-			public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2130772029;
+			// aapt resource value: 0x7f05003d
+			public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2131034173;
 			
-			// aapt resource value: 0x7F01003E
-			public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2130772030;
+			// aapt resource value: 0x7f05003e
+			public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2131034174;
 			
-			// aapt resource value: 0x7F01003F
-			public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2130772031;
+			// aapt resource value: 0x7f05003f
+			public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2131034175;
 			
-			// aapt resource value: 0x7F010040
-			public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2130772032;
+			// aapt resource value: 0x7f050040
+			public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2131034176;
 			
-			// aapt resource value: 0x7F010041
-			public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2130772033;
+			// aapt resource value: 0x7f050041
+			public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2131034177;
 			
-			// aapt resource value: 0x7F010042
-			public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2130772034;
+			// aapt resource value: 0x7f050042
+			public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2131034178;
 			
-			// aapt resource value: 0x7F010043
-			public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2130772035;
+			// aapt resource value: 0x7f050043
+			public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2131034179;
 			
-			// aapt resource value: 0x7F010044
-			public const int move_in = 2130772036;
+			// aapt resource value: 0x7f050044
+			public const int move_in = 2131034180;
 			
-			// aapt resource value: 0x7F010045
-			public const int move_out = 2130772037;
+			// aapt resource value: 0x7f050045
+			public const int move_out = 2131034181;
 			
-			// aapt resource value: 0x7F010046
-			public const int pickerview_dialog_scale_in = 2130772038;
+			// aapt resource value: 0x7f050046
+			public const int pickerview_dialog_scale_in = 2131034182;
 			
-			// aapt resource value: 0x7F010047
-			public const int pickerview_dialog_scale_out = 2130772039;
+			// aapt resource value: 0x7f050047
+			public const int pickerview_dialog_scale_out = 2131034183;
 			
-			// aapt resource value: 0x7F010048
-			public const int pickerview_slide_in_bottom = 2130772040;
+			// aapt resource value: 0x7f050048
+			public const int pickerview_slide_in_bottom = 2131034184;
 			
-			// aapt resource value: 0x7F010049
-			public const int pickerview_slide_out_bottom = 2130772041;
+			// aapt resource value: 0x7f050049
+			public const int pickerview_slide_out_bottom = 2131034185;
 			
-			// aapt resource value: 0x7F01004A
-			public const int tooltip_enter = 2130772042;
+			// aapt resource value: 0x7f05004a
+			public const int tooltip_enter = 2131034186;
 			
-			// aapt resource value: 0x7F01004B
-			public const int tooltip_exit = 2130772043;
+			// aapt resource value: 0x7f05004b
+			public const int tooltip_exit = 2131034187;
 			
 			static Animation()
 			{
@@ -275,8 +275,8 @@
 		public partial class Animator
 		{
 			
-			// aapt resource value: 0x7F020000
-			public const int design_appbar_state_list_animator = 2130837504;
+			// aapt resource value: 0x7f060000
+			public const int design_appbar_state_list_animator = 2131099648;
 			
 			static Animator()
 			{
@@ -291,8 +291,8 @@
 		public partial class Array
 		{
 			
-			// aapt resource value: 0x7F030000
-			public const int arc_colors_default = 2130903040;
+			// aapt resource value: 0x7f0f0000
+			public const int arc_colors_default = 2131689472;
 			
 			static Array()
 			{
@@ -307,1355 +307,1355 @@
 		public partial class Attribute
 		{
 			
-			// aapt resource value: 0x7F040000
-			public const int actionBarDivider = 2130968576;
+			// aapt resource value: 0x7f010052
+			public const int actionBarDivider = 2130772050;
 			
-			// aapt resource value: 0x7F040001
-			public const int actionBarItemBackground = 2130968577;
+			// aapt resource value: 0x7f010053
+			public const int actionBarItemBackground = 2130772051;
 			
-			// aapt resource value: 0x7F040002
-			public const int actionBarPopupTheme = 2130968578;
+			// aapt resource value: 0x7f01004c
+			public const int actionBarPopupTheme = 2130772044;
 			
-			// aapt resource value: 0x7F040003
-			public const int actionBarSize = 2130968579;
+			// aapt resource value: 0x7f010051
+			public const int actionBarSize = 2130772049;
 			
-			// aapt resource value: 0x7F040004
-			public const int actionBarSplitStyle = 2130968580;
+			// aapt resource value: 0x7f01004e
+			public const int actionBarSplitStyle = 2130772046;
 			
-			// aapt resource value: 0x7F040005
-			public const int actionBarStyle = 2130968581;
+			// aapt resource value: 0x7f01004d
+			public const int actionBarStyle = 2130772045;
 			
-			// aapt resource value: 0x7F040006
-			public const int actionBarTabBarStyle = 2130968582;
+			// aapt resource value: 0x7f010048
+			public const int actionBarTabBarStyle = 2130772040;
 			
-			// aapt resource value: 0x7F040007
-			public const int actionBarTabStyle = 2130968583;
+			// aapt resource value: 0x7f010047
+			public const int actionBarTabStyle = 2130772039;
 			
-			// aapt resource value: 0x7F040008
-			public const int actionBarTabTextStyle = 2130968584;
+			// aapt resource value: 0x7f010049
+			public const int actionBarTabTextStyle = 2130772041;
 			
-			// aapt resource value: 0x7F040009
-			public const int actionBarTheme = 2130968585;
+			// aapt resource value: 0x7f01004f
+			public const int actionBarTheme = 2130772047;
 			
-			// aapt resource value: 0x7F04000A
-			public const int actionBarWidgetTheme = 2130968586;
+			// aapt resource value: 0x7f010050
+			public const int actionBarWidgetTheme = 2130772048;
 			
-			// aapt resource value: 0x7F04000B
-			public const int actionButtonStyle = 2130968587;
+			// aapt resource value: 0x7f01006d
+			public const int actionButtonStyle = 2130772077;
 			
-			// aapt resource value: 0x7F04000C
-			public const int actionDropDownStyle = 2130968588;
+			// aapt resource value: 0x7f010069
+			public const int actionDropDownStyle = 2130772073;
 			
-			// aapt resource value: 0x7F04000D
-			public const int actionLayout = 2130968589;
+			// aapt resource value: 0x7f0100c4
+			public const int actionLayout = 2130772164;
 			
-			// aapt resource value: 0x7F04000E
-			public const int actionMenuTextAppearance = 2130968590;
+			// aapt resource value: 0x7f010054
+			public const int actionMenuTextAppearance = 2130772052;
 			
-			// aapt resource value: 0x7F04000F
-			public const int actionMenuTextColor = 2130968591;
+			// aapt resource value: 0x7f010055
+			public const int actionMenuTextColor = 2130772053;
 			
-			// aapt resource value: 0x7F040010
-			public const int actionModeBackground = 2130968592;
+			// aapt resource value: 0x7f010058
+			public const int actionModeBackground = 2130772056;
 			
-			// aapt resource value: 0x7F040011
-			public const int actionModeCloseButtonStyle = 2130968593;
+			// aapt resource value: 0x7f010057
+			public const int actionModeCloseButtonStyle = 2130772055;
 			
-			// aapt resource value: 0x7F040012
-			public const int actionModeCloseDrawable = 2130968594;
+			// aapt resource value: 0x7f01005a
+			public const int actionModeCloseDrawable = 2130772058;
 			
-			// aapt resource value: 0x7F040013
-			public const int actionModeCopyDrawable = 2130968595;
+			// aapt resource value: 0x7f01005c
+			public const int actionModeCopyDrawable = 2130772060;
 			
-			// aapt resource value: 0x7F040014
-			public const int actionModeCutDrawable = 2130968596;
+			// aapt resource value: 0x7f01005b
+			public const int actionModeCutDrawable = 2130772059;
 			
-			// aapt resource value: 0x7F040015
-			public const int actionModeFindDrawable = 2130968597;
+			// aapt resource value: 0x7f010060
+			public const int actionModeFindDrawable = 2130772064;
 			
-			// aapt resource value: 0x7F040016
-			public const int actionModePasteDrawable = 2130968598;
+			// aapt resource value: 0x7f01005d
+			public const int actionModePasteDrawable = 2130772061;
 			
-			// aapt resource value: 0x7F040017
-			public const int actionModePopupWindowStyle = 2130968599;
+			// aapt resource value: 0x7f010062
+			public const int actionModePopupWindowStyle = 2130772066;
 			
-			// aapt resource value: 0x7F040018
-			public const int actionModeSelectAllDrawable = 2130968600;
+			// aapt resource value: 0x7f01005e
+			public const int actionModeSelectAllDrawable = 2130772062;
 			
-			// aapt resource value: 0x7F040019
-			public const int actionModeShareDrawable = 2130968601;
+			// aapt resource value: 0x7f01005f
+			public const int actionModeShareDrawable = 2130772063;
 			
-			// aapt resource value: 0x7F04001A
-			public const int actionModeSplitBackground = 2130968602;
+			// aapt resource value: 0x7f010059
+			public const int actionModeSplitBackground = 2130772057;
 			
-			// aapt resource value: 0x7F04001B
-			public const int actionModeStyle = 2130968603;
+			// aapt resource value: 0x7f010056
+			public const int actionModeStyle = 2130772054;
 			
-			// aapt resource value: 0x7F04001C
-			public const int actionModeWebSearchDrawable = 2130968604;
+			// aapt resource value: 0x7f010061
+			public const int actionModeWebSearchDrawable = 2130772065;
 			
-			// aapt resource value: 0x7F04001D
-			public const int actionOverflowButtonStyle = 2130968605;
+			// aapt resource value: 0x7f01004a
+			public const int actionOverflowButtonStyle = 2130772042;
 			
-			// aapt resource value: 0x7F04001E
-			public const int actionOverflowMenuStyle = 2130968606;
+			// aapt resource value: 0x7f01004b
+			public const int actionOverflowMenuStyle = 2130772043;
 			
-			// aapt resource value: 0x7F04001F
-			public const int actionProviderClass = 2130968607;
+			// aapt resource value: 0x7f0100c6
+			public const int actionProviderClass = 2130772166;
 			
-			// aapt resource value: 0x7F040020
-			public const int actionViewClass = 2130968608;
+			// aapt resource value: 0x7f0100c5
+			public const int actionViewClass = 2130772165;
 			
-			// aapt resource value: 0x7F040021
-			public const int activityChooserViewStyle = 2130968609;
+			// aapt resource value: 0x7f010075
+			public const int activityChooserViewStyle = 2130772085;
 			
-			// aapt resource value: 0x7F040022
-			public const int alertDialogButtonGroupStyle = 2130968610;
+			// aapt resource value: 0x7f01009a
+			public const int alertDialogButtonGroupStyle = 2130772122;
 			
-			// aapt resource value: 0x7F040023
-			public const int alertDialogCenterButtons = 2130968611;
+			// aapt resource value: 0x7f01009b
+			public const int alertDialogCenterButtons = 2130772123;
 			
-			// aapt resource value: 0x7F040024
-			public const int alertDialogStyle = 2130968612;
+			// aapt resource value: 0x7f010099
+			public const int alertDialogStyle = 2130772121;
 			
-			// aapt resource value: 0x7F040025
-			public const int alertDialogTheme = 2130968613;
+			// aapt resource value: 0x7f01009c
+			public const int alertDialogTheme = 2130772124;
 			
-			// aapt resource value: 0x7F040026
-			public const int allowStacking = 2130968614;
+			// aapt resource value: 0x7f0100b2
+			public const int allowStacking = 2130772146;
 			
-			// aapt resource value: 0x7F040027
-			public const int alpha = 2130968615;
+			// aapt resource value: 0x7f0100b3
+			public const int alpha = 2130772147;
 			
-			// aapt resource value: 0x7F040028
-			public const int alphabeticModifiers = 2130968616;
+			// aapt resource value: 0x7f0100c1
+			public const int alphabeticModifiers = 2130772161;
 			
-			// aapt resource value: 0x7F040029
-			public const int arc_border_color = 2130968617;
+			// aapt resource value: 0x7f0101a3
+			public const int arc_border_color = 2130772387;
 			
-			// aapt resource value: 0x7F04002A
-			public const int arc_border_width = 2130968618;
+			// aapt resource value: 0x7f0101a2
+			public const int arc_border_width = 2130772386;
 			
-			// aapt resource value: 0x7F04002B
-			public const int arc_colors = 2130968619;
+			// aapt resource value: 0x7f0101a1
+			public const int arc_colors = 2130772385;
 			
-			// aapt resource value: 0x7F04002C
-			public const int arc_max = 2130968620;
+			// aapt resource value: 0x7f0101a4
+			public const int arc_max = 2130772388;
 			
-			// aapt resource value: 0x7F04002D
-			public const int arc_min = 2130968621;
+			// aapt resource value: 0x7f0101a5
+			public const int arc_min = 2130772389;
 			
-			// aapt resource value: 0x7F04002E
-			public const int arc_open_angle = 2130968622;
+			// aapt resource value: 0x7f01019f
+			public const int arc_open_angle = 2130772383;
 			
-			// aapt resource value: 0x7F04002F
-			public const int arc_progress = 2130968623;
+			// aapt resource value: 0x7f0101a6
+			public const int arc_progress = 2130772390;
 			
-			// aapt resource value: 0x7F040030
-			public const int arc_progress_bar_color = 2130968624;
+			// aapt resource value: 0x7f0101ae
+			public const int arc_progress_bar_color = 2130772398;
 			
-			// aapt resource value: 0x7F040031
-			public const int arc_progress_bar_text_unit = 2130968625;
+			// aapt resource value: 0x7f0101af
+			public const int arc_progress_bar_text_unit = 2130772399;
 			
-			// aapt resource value: 0x7F040032
-			public const int arc_rotate_angle = 2130968626;
+			// aapt resource value: 0x7f0101a0
+			public const int arc_rotate_angle = 2130772384;
 			
-			// aapt resource value: 0x7F040033
-			public const int arc_shadow_radius = 2130968627;
+			// aapt resource value: 0x7f0101ad
+			public const int arc_shadow_radius = 2130772397;
 			
-			// aapt resource value: 0x7F040034
-			public const int arc_thumb_color = 2130968628;
+			// aapt resource value: 0x7f0101a8
+			public const int arc_thumb_color = 2130772392;
 			
-			// aapt resource value: 0x7F040035
-			public const int arc_thumb_radius = 2130968629;
+			// aapt resource value: 0x7f0101a9
+			public const int arc_thumb_radius = 2130772393;
 			
-			// aapt resource value: 0x7F040036
-			public const int arc_thumb_shadow_color = 2130968630;
+			// aapt resource value: 0x7f0101ab
+			public const int arc_thumb_shadow_color = 2130772395;
 			
-			// aapt resource value: 0x7F040037
-			public const int arc_thumb_shadow_radius = 2130968631;
+			// aapt resource value: 0x7f0101aa
+			public const int arc_thumb_shadow_radius = 2130772394;
 			
-			// aapt resource value: 0x7F040038
-			public const int arc_thumb_width = 2130968632;
+			// aapt resource value: 0x7f0101a7
+			public const int arc_thumb_width = 2130772391;
 			
-			// aapt resource value: 0x7F040039
-			public const int arc_width = 2130968633;
+			// aapt resource value: 0x7f01019e
+			public const int arc_width = 2130772382;
 			
-			// aapt resource value: 0x7F04003A
-			public const int arrowHeadLength = 2130968634;
+			// aapt resource value: 0x7f0100ba
+			public const int arrowHeadLength = 2130772154;
 			
-			// aapt resource value: 0x7F04003B
-			public const int arrowShaftLength = 2130968635;
+			// aapt resource value: 0x7f0100bb
+			public const int arrowShaftLength = 2130772155;
 			
-			// aapt resource value: 0x7F04003C
-			public const int autoCompleteTextViewStyle = 2130968636;
+			// aapt resource value: 0x7f0100a1
+			public const int autoCompleteTextViewStyle = 2130772129;
 			
-			// aapt resource value: 0x7F04003D
-			public const int autoSizeMaxTextSize = 2130968637;
+			// aapt resource value: 0x7f01003b
+			public const int autoSizeMaxTextSize = 2130772027;
 			
-			// aapt resource value: 0x7F04003E
-			public const int autoSizeMinTextSize = 2130968638;
+			// aapt resource value: 0x7f01003a
+			public const int autoSizeMinTextSize = 2130772026;
 			
-			// aapt resource value: 0x7F04003F
-			public const int autoSizePresetSizes = 2130968639;
+			// aapt resource value: 0x7f010039
+			public const int autoSizePresetSizes = 2130772025;
 			
-			// aapt resource value: 0x7F040040
-			public const int autoSizeStepGranularity = 2130968640;
+			// aapt resource value: 0x7f010038
+			public const int autoSizeStepGranularity = 2130772024;
 			
-			// aapt resource value: 0x7F040041
-			public const int autoSizeTextType = 2130968641;
+			// aapt resource value: 0x7f010037
+			public const int autoSizeTextType = 2130772023;
 			
-			// aapt resource value: 0x7F040042
-			public const int background = 2130968642;
+			// aapt resource value: 0x7f010015
+			public const int background = 2130771989;
 			
-			// aapt resource value: 0x7F040043
-			public const int backgroundSplit = 2130968643;
+			// aapt resource value: 0x7f010017
+			public const int backgroundSplit = 2130771991;
 			
-			// aapt resource value: 0x7F040044
-			public const int backgroundStacked = 2130968644;
+			// aapt resource value: 0x7f010016
+			public const int backgroundStacked = 2130771990;
 			
-			// aapt resource value: 0x7F040045
-			public const int backgroundTint = 2130968645;
+			// aapt resource value: 0x7f0100fd
+			public const int backgroundTint = 2130772221;
 			
-			// aapt resource value: 0x7F040046
-			public const int backgroundTintMode = 2130968646;
+			// aapt resource value: 0x7f0100fe
+			public const int backgroundTintMode = 2130772222;
 			
-			// aapt resource value: 0x7F040047
-			public const int barLength = 2130968647;
+			// aapt resource value: 0x7f0100bc
+			public const int barLength = 2130772156;
 			
-			// aapt resource value: 0x7F040048
-			public const int behavior_autoHide = 2130968648;
+			// aapt resource value: 0x7f010128
+			public const int behavior_autoHide = 2130772264;
 			
-			// aapt resource value: 0x7F040049
-			public const int behavior_hideable = 2130968649;
+			// aapt resource value: 0x7f010105
+			public const int behavior_hideable = 2130772229;
 			
-			// aapt resource value: 0x7F04004A
-			public const int behavior_overlapTop = 2130968650;
+			// aapt resource value: 0x7f010131
+			public const int behavior_overlapTop = 2130772273;
 			
-			// aapt resource value: 0x7F04004B
-			public const int behavior_peekHeight = 2130968651;
+			// aapt resource value: 0x7f010104
+			public const int behavior_peekHeight = 2130772228;
 			
-			// aapt resource value: 0x7F04004C
-			public const int behavior_skipCollapsed = 2130968652;
+			// aapt resource value: 0x7f010106
+			public const int behavior_skipCollapsed = 2130772230;
 			
-			// aapt resource value: 0x7F04004D
-			public const int biometricPromptDialogTheme = 2130968653;
+			// aapt resource value: 0x7f01015a
+			public const int biometricPromptDialogTheme = 2130772314;
 			
-			// aapt resource value: 0x7F04004F
-			public const int borderlessButtonStyle = 2130968655;
+			// aapt resource value: 0x7f010126
+			public const int borderWidth = 2130772262;
 			
-			// aapt resource value: 0x7F04004E
-			public const int borderWidth = 2130968654;
+			// aapt resource value: 0x7f010072
+			public const int borderlessButtonStyle = 2130772082;
 			
-			// aapt resource value: 0x7F040050
-			public const int bottomSheetDialogTheme = 2130968656;
+			// aapt resource value: 0x7f010120
+			public const int bottomSheetDialogTheme = 2130772256;
 			
-			// aapt resource value: 0x7F040051
-			public const int bottomSheetStyle = 2130968657;
+			// aapt resource value: 0x7f010121
+			public const int bottomSheetStyle = 2130772257;
 			
-			// aapt resource value: 0x7F040052
-			public const int buttonBarButtonStyle = 2130968658;
+			// aapt resource value: 0x7f01006f
+			public const int buttonBarButtonStyle = 2130772079;
 			
-			// aapt resource value: 0x7F040053
-			public const int buttonBarNegativeButtonStyle = 2130968659;
+			// aapt resource value: 0x7f01009f
+			public const int buttonBarNegativeButtonStyle = 2130772127;
 			
-			// aapt resource value: 0x7F040054
-			public const int buttonBarNeutralButtonStyle = 2130968660;
+			// aapt resource value: 0x7f0100a0
+			public const int buttonBarNeutralButtonStyle = 2130772128;
 			
-			// aapt resource value: 0x7F040055
-			public const int buttonBarPositiveButtonStyle = 2130968661;
+			// aapt resource value: 0x7f01009e
+			public const int buttonBarPositiveButtonStyle = 2130772126;
 			
-			// aapt resource value: 0x7F040056
-			public const int buttonBarStyle = 2130968662;
+			// aapt resource value: 0x7f01006e
+			public const int buttonBarStyle = 2130772078;
 			
-			// aapt resource value: 0x7F040057
-			public const int buttonGravity = 2130968663;
+			// aapt resource value: 0x7f0100f2
+			public const int buttonGravity = 2130772210;
 			
-			// aapt resource value: 0x7F040058
-			public const int buttonPanelSideLayout = 2130968664;
+			// aapt resource value: 0x7f01002a
+			public const int buttonPanelSideLayout = 2130772010;
 			
-			// aapt resource value: 0x7F040059
-			public const int buttonStyle = 2130968665;
+			// aapt resource value: 0x7f0100a2
+			public const int buttonStyle = 2130772130;
 			
-			// aapt resource value: 0x7F04005A
-			public const int buttonStyleSmall = 2130968666;
+			// aapt resource value: 0x7f0100a3
+			public const int buttonStyleSmall = 2130772131;
 			
-			// aapt resource value: 0x7F04005B
-			public const int buttonTint = 2130968667;
+			// aapt resource value: 0x7f0100b4
+			public const int buttonTint = 2130772148;
 			
-			// aapt resource value: 0x7F04005C
-			public const int buttonTintMode = 2130968668;
+			// aapt resource value: 0x7f0100b5
+			public const int buttonTintMode = 2130772149;
 			
-			// aapt resource value: 0x7F04005D
-			public const int checkboxStyle = 2130968669;
+			// aapt resource value: 0x7f0100a4
+			public const int checkboxStyle = 2130772132;
 			
-			// aapt resource value: 0x7F04005E
-			public const int checkedTextViewStyle = 2130968670;
+			// aapt resource value: 0x7f0100a5
+			public const int checkedTextViewStyle = 2130772133;
 			
-			// aapt resource value: 0x7F04005F
-			public const int closeIcon = 2130968671;
+			// aapt resource value: 0x7f0100d5
+			public const int closeIcon = 2130772181;
 			
-			// aapt resource value: 0x7F040060
-			public const int closeItemLayout = 2130968672;
+			// aapt resource value: 0x7f010027
+			public const int closeItemLayout = 2130772007;
 			
-			// aapt resource value: 0x7F040061
-			public const int collapseContentDescription = 2130968673;
+			// aapt resource value: 0x7f0100f4
+			public const int collapseContentDescription = 2130772212;
 			
-			// aapt resource value: 0x7F040063
-			public const int collapsedTitleGravity = 2130968675;
+			// aapt resource value: 0x7f0100f3
+			public const int collapseIcon = 2130772211;
 			
-			// aapt resource value: 0x7F040064
-			public const int collapsedTitleTextAppearance = 2130968676;
+			// aapt resource value: 0x7f010113
+			public const int collapsedTitleGravity = 2130772243;
 			
-			// aapt resource value: 0x7F040062
-			public const int collapseIcon = 2130968674;
+			// aapt resource value: 0x7f01010d
+			public const int collapsedTitleTextAppearance = 2130772237;
 			
-			// aapt resource value: 0x7F040065
-			public const int color = 2130968677;
+			// aapt resource value: 0x7f0100b6
+			public const int color = 2130772150;
 			
-			// aapt resource value: 0x7F040066
-			public const int colorAccent = 2130968678;
+			// aapt resource value: 0x7f010091
+			public const int colorAccent = 2130772113;
 			
-			// aapt resource value: 0x7F040067
-			public const int colorBackgroundFloating = 2130968679;
+			// aapt resource value: 0x7f010098
+			public const int colorBackgroundFloating = 2130772120;
 			
-			// aapt resource value: 0x7F040068
-			public const int colorButtonNormal = 2130968680;
+			// aapt resource value: 0x7f010095
+			public const int colorButtonNormal = 2130772117;
 			
-			// aapt resource value: 0x7F040069
-			public const int colorControlActivated = 2130968681;
+			// aapt resource value: 0x7f010093
+			public const int colorControlActivated = 2130772115;
 			
-			// aapt resource value: 0x7F04006A
-			public const int colorControlHighlight = 2130968682;
+			// aapt resource value: 0x7f010094
+			public const int colorControlHighlight = 2130772116;
 			
-			// aapt resource value: 0x7F04006B
-			public const int colorControlNormal = 2130968683;
+			// aapt resource value: 0x7f010092
+			public const int colorControlNormal = 2130772114;
 			
-			// aapt resource value: 0x7F04006C
-			public const int colorError = 2130968684;
+			// aapt resource value: 0x7f0100b1
+			public const int colorError = 2130772145;
 			
-			// aapt resource value: 0x7F04006D
-			public const int colorPrimary = 2130968685;
+			// aapt resource value: 0x7f01008f
+			public const int colorPrimary = 2130772111;
 			
-			// aapt resource value: 0x7F04006E
-			public const int colorPrimaryDark = 2130968686;
+			// aapt resource value: 0x7f010090
+			public const int colorPrimaryDark = 2130772112;
 			
-			// aapt resource value: 0x7F04006F
-			public const int colorSwitchThumbNormal = 2130968687;
+			// aapt resource value: 0x7f010096
+			public const int colorSwitchThumbNormal = 2130772118;
 			
-			// aapt resource value: 0x7F040070
-			public const int commitIcon = 2130968688;
+			// aapt resource value: 0x7f0100da
+			public const int commitIcon = 2130772186;
 			
-			// aapt resource value: 0x7F040071
-			public const int contentDescription = 2130968689;
+			// aapt resource value: 0x7f0100c7
+			public const int contentDescription = 2130772167;
 			
-			// aapt resource value: 0x7F040072
-			public const int contentInsetEnd = 2130968690;
+			// aapt resource value: 0x7f010020
+			public const int contentInsetEnd = 2130772000;
 			
-			// aapt resource value: 0x7F040073
-			public const int contentInsetEndWithActions = 2130968691;
+			// aapt resource value: 0x7f010024
+			public const int contentInsetEndWithActions = 2130772004;
 			
-			// aapt resource value: 0x7F040074
-			public const int contentInsetLeft = 2130968692;
+			// aapt resource value: 0x7f010021
+			public const int contentInsetLeft = 2130772001;
 			
-			// aapt resource value: 0x7F040075
-			public const int contentInsetRight = 2130968693;
+			// aapt resource value: 0x7f010022
+			public const int contentInsetRight = 2130772002;
 			
-			// aapt resource value: 0x7F040076
-			public const int contentInsetStart = 2130968694;
+			// aapt resource value: 0x7f01001f
+			public const int contentInsetStart = 2130771999;
 			
-			// aapt resource value: 0x7F040077
-			public const int contentInsetStartWithNavigation = 2130968695;
+			// aapt resource value: 0x7f010023
+			public const int contentInsetStartWithNavigation = 2130772003;
 			
-			// aapt resource value: 0x7F040078
-			public const int contentScrim = 2130968696;
+			// aapt resource value: 0x7f01010e
+			public const int contentScrim = 2130772238;
 			
-			// aapt resource value: 0x7F040079
-			public const int controlBackground = 2130968697;
+			// aapt resource value: 0x7f010097
+			public const int controlBackground = 2130772119;
 			
-			// aapt resource value: 0x7F04007A
-			public const int counterEnabled = 2130968698;
+			// aapt resource value: 0x7f010147
+			public const int counterEnabled = 2130772295;
 			
-			// aapt resource value: 0x7F04007B
-			public const int counterMaxLength = 2130968699;
+			// aapt resource value: 0x7f010148
+			public const int counterMaxLength = 2130772296;
 			
-			// aapt resource value: 0x7F04007C
-			public const int counterOverflowTextAppearance = 2130968700;
+			// aapt resource value: 0x7f01014a
+			public const int counterOverflowTextAppearance = 2130772298;
 			
-			// aapt resource value: 0x7F04007D
-			public const int counterTextAppearance = 2130968701;
+			// aapt resource value: 0x7f010149
+			public const int counterTextAppearance = 2130772297;
 			
-			// aapt resource value: 0x7F04007E
-			public const int curtain_bar_bg_color = 2130968702;
+			// aapt resource value: 0x7f0101b2
+			public const int curtain_bar_bg_color = 2130772402;
 			
-			// aapt resource value: 0x7F04007F
-			public const int curtain_bar_border_color = 2130968703;
+			// aapt resource value: 0x7f0101b3
+			public const int curtain_bar_border_color = 2130772403;
 			
-			// aapt resource value: 0x7F040080
-			public const int curtain_bar_color = 2130968704;
+			// aapt resource value: 0x7f0101b0
+			public const int curtain_bar_color = 2130772400;
 			
-			// aapt resource value: 0x7F040081
-			public const int curtain_bar_height = 2130968705;
+			// aapt resource value: 0x7f0101b5
+			public const int curtain_bar_height = 2130772405;
 			
-			// aapt resource value: 0x7F040082
-			public const int curtain_bar_width = 2130968706;
+			// aapt resource value: 0x7f0101b4
+			public const int curtain_bar_width = 2130772404;
 			
-			// aapt resource value: 0x7F040083
-			public const int customNavigationLayout = 2130968707;
+			// aapt resource value: 0x7f010018
+			public const int customNavigationLayout = 2130771992;
 			
-			// aapt resource value: 0x7F040084
-			public const int defaultQueryHint = 2130968708;
+			// aapt resource value: 0x7f0100d4
+			public const int defaultQueryHint = 2130772180;
 			
-			// aapt resource value: 0x7F040085
-			public const int dialogPreferredPadding = 2130968709;
+			// aapt resource value: 0x7f010067
+			public const int dialogPreferredPadding = 2130772071;
 			
-			// aapt resource value: 0x7F040086
-			public const int dialogTheme = 2130968710;
+			// aapt resource value: 0x7f010066
+			public const int dialogTheme = 2130772070;
 			
-			// aapt resource value: 0x7F040087
-			public const int displayOptions = 2130968711;
+			// aapt resource value: 0x7f01000e
+			public const int displayOptions = 2130771982;
 			
-			// aapt resource value: 0x7F040088
-			public const int divider = 2130968712;
+			// aapt resource value: 0x7f010014
+			public const int divider = 2130771988;
 			
-			// aapt resource value: 0x7F040089
-			public const int dividerHorizontal = 2130968713;
+			// aapt resource value: 0x7f010074
+			public const int dividerHorizontal = 2130772084;
 			
-			// aapt resource value: 0x7F04008A
-			public const int dividerPadding = 2130968714;
+			// aapt resource value: 0x7f0100c0
+			public const int dividerPadding = 2130772160;
 			
-			// aapt resource value: 0x7F04008B
-			public const int dividerVertical = 2130968715;
+			// aapt resource value: 0x7f010073
+			public const int dividerVertical = 2130772083;
 			
-			// aapt resource value: 0x7F04008C
-			public const int drawableSize = 2130968716;
+			// aapt resource value: 0x7f0100b8
+			public const int drawableSize = 2130772152;
 			
-			// aapt resource value: 0x7F04008D
-			public const int drawerArrowStyle = 2130968717;
+			// aapt resource value: 0x7f010009
+			public const int drawerArrowStyle = 2130771977;
 			
-			// aapt resource value: 0x7F04008F
-			public const int dropdownListPreferredItemHeight = 2130968719;
+			// aapt resource value: 0x7f010086
+			public const int dropDownListViewStyle = 2130772102;
 			
-			// aapt resource value: 0x7F04008E
-			public const int dropDownListViewStyle = 2130968718;
+			// aapt resource value: 0x7f01006a
+			public const int dropdownListPreferredItemHeight = 2130772074;
 			
-			// aapt resource value: 0x7F040090
-			public const int editTextBackground = 2130968720;
+			// aapt resource value: 0x7f01007b
+			public const int editTextBackground = 2130772091;
 			
-			// aapt resource value: 0x7F040091
-			public const int editTextColor = 2130968721;
+			// aapt resource value: 0x7f01007a
+			public const int editTextColor = 2130772090;
 			
-			// aapt resource value: 0x7F040092
-			public const int editTextStyle = 2130968722;
+			// aapt resource value: 0x7f0100a6
+			public const int editTextStyle = 2130772134;
 			
-			// aapt resource value: 0x7F040093
-			public const int elevation = 2130968723;
+			// aapt resource value: 0x7f010025
+			public const int elevation = 2130772005;
 			
-			// aapt resource value: 0x7F040094
-			public const int errorEnabled = 2130968724;
+			// aapt resource value: 0x7f010145
+			public const int errorEnabled = 2130772293;
 			
-			// aapt resource value: 0x7F040095
-			public const int errorTextAppearance = 2130968725;
+			// aapt resource value: 0x7f010146
+			public const int errorTextAppearance = 2130772294;
 			
-			// aapt resource value: 0x7F040096
-			public const int expandActivityOverflowButtonDrawable = 2130968726;
+			// aapt resource value: 0x7f010029
+			public const int expandActivityOverflowButtonDrawable = 2130772009;
 			
-			// aapt resource value: 0x7F040097
-			public const int expanded = 2130968727;
+			// aapt resource value: 0x7f0100ff
+			public const int expanded = 2130772223;
 			
-			// aapt resource value: 0x7F040098
-			public const int expandedTitleGravity = 2130968728;
+			// aapt resource value: 0x7f010114
+			public const int expandedTitleGravity = 2130772244;
 			
-			// aapt resource value: 0x7F040099
-			public const int expandedTitleMargin = 2130968729;
+			// aapt resource value: 0x7f010107
+			public const int expandedTitleMargin = 2130772231;
 			
-			// aapt resource value: 0x7F04009A
-			public const int expandedTitleMarginBottom = 2130968730;
+			// aapt resource value: 0x7f01010b
+			public const int expandedTitleMarginBottom = 2130772235;
 			
-			// aapt resource value: 0x7F04009B
-			public const int expandedTitleMarginEnd = 2130968731;
+			// aapt resource value: 0x7f01010a
+			public const int expandedTitleMarginEnd = 2130772234;
 			
-			// aapt resource value: 0x7F04009C
-			public const int expandedTitleMarginStart = 2130968732;
+			// aapt resource value: 0x7f010108
+			public const int expandedTitleMarginStart = 2130772232;
 			
-			// aapt resource value: 0x7F04009D
-			public const int expandedTitleMarginTop = 2130968733;
+			// aapt resource value: 0x7f010109
+			public const int expandedTitleMarginTop = 2130772233;
 			
-			// aapt resource value: 0x7F04009E
-			public const int expandedTitleTextAppearance = 2130968734;
+			// aapt resource value: 0x7f01010c
+			public const int expandedTitleTextAppearance = 2130772236;
 			
-			// aapt resource value: 0x7F04009F
-			public const int fabSize = 2130968735;
+			// aapt resource value: 0x7f010124
+			public const int fabSize = 2130772260;
 			
-			// aapt resource value: 0x7F0400A0
-			public const int fastScrollEnabled = 2130968736;
+			// aapt resource value: 0x7f010004
+			public const int fastScrollEnabled = 2130771972;
 			
-			// aapt resource value: 0x7F0400A1
-			public const int fastScrollHorizontalThumbDrawable = 2130968737;
+			// aapt resource value: 0x7f010007
+			public const int fastScrollHorizontalThumbDrawable = 2130771975;
 			
-			// aapt resource value: 0x7F0400A2
-			public const int fastScrollHorizontalTrackDrawable = 2130968738;
+			// aapt resource value: 0x7f010008
+			public const int fastScrollHorizontalTrackDrawable = 2130771976;
 			
-			// aapt resource value: 0x7F0400A3
-			public const int fastScrollVerticalThumbDrawable = 2130968739;
+			// aapt resource value: 0x7f010005
+			public const int fastScrollVerticalThumbDrawable = 2130771973;
 			
-			// aapt resource value: 0x7F0400A4
-			public const int fastScrollVerticalTrackDrawable = 2130968740;
+			// aapt resource value: 0x7f010006
+			public const int fastScrollVerticalTrackDrawable = 2130771974;
 			
-			// aapt resource value: 0x7F0400A5
-			public const int font = 2130968741;
+			// aapt resource value: 0x7f010158
+			public const int font = 2130772312;
 			
-			// aapt resource value: 0x7F0400A6
-			public const int fontFamily = 2130968742;
+			// aapt resource value: 0x7f01003c
+			public const int fontFamily = 2130772028;
 			
-			// aapt resource value: 0x7F0400A7
-			public const int fontProviderAuthority = 2130968743;
+			// aapt resource value: 0x7f010151
+			public const int fontProviderAuthority = 2130772305;
 			
-			// aapt resource value: 0x7F0400A8
-			public const int fontProviderCerts = 2130968744;
+			// aapt resource value: 0x7f010154
+			public const int fontProviderCerts = 2130772308;
 			
-			// aapt resource value: 0x7F0400A9
-			public const int fontProviderFetchStrategy = 2130968745;
+			// aapt resource value: 0x7f010155
+			public const int fontProviderFetchStrategy = 2130772309;
 			
-			// aapt resource value: 0x7F0400AA
-			public const int fontProviderFetchTimeout = 2130968746;
+			// aapt resource value: 0x7f010156
+			public const int fontProviderFetchTimeout = 2130772310;
 			
-			// aapt resource value: 0x7F0400AB
-			public const int fontProviderPackage = 2130968747;
+			// aapt resource value: 0x7f010152
+			public const int fontProviderPackage = 2130772306;
 			
-			// aapt resource value: 0x7F0400AC
-			public const int fontProviderQuery = 2130968748;
+			// aapt resource value: 0x7f010153
+			public const int fontProviderQuery = 2130772307;
 			
-			// aapt resource value: 0x7F0400AD
-			public const int fontStyle = 2130968749;
+			// aapt resource value: 0x7f010157
+			public const int fontStyle = 2130772311;
 			
-			// aapt resource value: 0x7F0400AE
-			public const int fontWeight = 2130968750;
+			// aapt resource value: 0x7f010159
+			public const int fontWeight = 2130772313;
 			
-			// aapt resource value: 0x7F0400AF
-			public const int foregroundInsidePadding = 2130968751;
+			// aapt resource value: 0x7f010129
+			public const int foregroundInsidePadding = 2130772265;
 			
-			// aapt resource value: 0x7F0400B0
-			public const int gapBetweenBars = 2130968752;
+			// aapt resource value: 0x7f0100b9
+			public const int gapBetweenBars = 2130772153;
 			
-			// aapt resource value: 0x7F0400B1
-			public const int goIcon = 2130968753;
+			// aapt resource value: 0x7f0100d6
+			public const int goIcon = 2130772182;
 			
-			// aapt resource value: 0x7F0400B2
-			public const int hdl_arc_thumb_mode = 2130968754;
+			// aapt resource value: 0x7f0101ac
+			public const int hdl_arc_thumb_mode = 2130772396;
 			
-			// aapt resource value: 0x7F0400B3
-			public const int headerLayout = 2130968755;
+			// aapt resource value: 0x7f01012f
+			public const int headerLayout = 2130772271;
 			
-			// aapt resource value: 0x7F0400B4
-			public const int height = 2130968756;
+			// aapt resource value: 0x7f01000a
+			public const int height = 2130771978;
 			
-			// aapt resource value: 0x7F0400B5
-			public const int hideOnContentScroll = 2130968757;
+			// aapt resource value: 0x7f01001e
+			public const int hideOnContentScroll = 2130771998;
 			
-			// aapt resource value: 0x7F0400B6
-			public const int hintAnimationEnabled = 2130968758;
+			// aapt resource value: 0x7f01014b
+			public const int hintAnimationEnabled = 2130772299;
 			
-			// aapt resource value: 0x7F0400B7
-			public const int hintEnabled = 2130968759;
+			// aapt resource value: 0x7f010144
+			public const int hintEnabled = 2130772292;
 			
-			// aapt resource value: 0x7F0400B8
-			public const int hintTextAppearance = 2130968760;
+			// aapt resource value: 0x7f010143
+			public const int hintTextAppearance = 2130772291;
 			
-			// aapt resource value: 0x7F0400B9
-			public const int homeAsUpIndicator = 2130968761;
+			// aapt resource value: 0x7f01006c
+			public const int homeAsUpIndicator = 2130772076;
 			
-			// aapt resource value: 0x7F0400BA
-			public const int homeLayout = 2130968762;
+			// aapt resource value: 0x7f010019
+			public const int homeLayout = 2130771993;
 			
-			// aapt resource value: 0x7F0400BB
-			public const int icon = 2130968763;
+			// aapt resource value: 0x7f010012
+			public const int icon = 2130771986;
 			
-			// aapt resource value: 0x7F0400BE
-			public const int iconifiedByDefault = 2130968766;
+			// aapt resource value: 0x7f0100c9
+			public const int iconTint = 2130772169;
 			
-			// aapt resource value: 0x7F0400BC
-			public const int iconTint = 2130968764;
+			// aapt resource value: 0x7f0100ca
+			public const int iconTintMode = 2130772170;
 			
-			// aapt resource value: 0x7F0400BD
-			public const int iconTintMode = 2130968765;
+			// aapt resource value: 0x7f0100d2
+			public const int iconifiedByDefault = 2130772178;
 			
-			// aapt resource value: 0x7F0400BF
-			public const int imageButtonStyle = 2130968767;
+			// aapt resource value: 0x7f01007c
+			public const int imageButtonStyle = 2130772092;
 			
-			// aapt resource value: 0x7F0400C0
-			public const int indeterminateProgressStyle = 2130968768;
+			// aapt resource value: 0x7f01001b
+			public const int indeterminateProgressStyle = 2130771995;
 			
-			// aapt resource value: 0x7F0400C1
-			public const int initialActivityCount = 2130968769;
+			// aapt resource value: 0x7f010028
+			public const int initialActivityCount = 2130772008;
 			
-			// aapt resource value: 0x7F0400C2
-			public const int insetForeground = 2130968770;
+			// aapt resource value: 0x7f010130
+			public const int insetForeground = 2130772272;
 			
-			// aapt resource value: 0x7F0400C3
-			public const int isLightTheme = 2130968771;
+			// aapt resource value: 0x7f01000b
+			public const int isLightTheme = 2130771979;
 			
-			// aapt resource value: 0x7F0400C4
-			public const int itemBackground = 2130968772;
+			// aapt resource value: 0x7f01012d
+			public const int itemBackground = 2130772269;
 			
-			// aapt resource value: 0x7F0400C5
-			public const int itemIconTint = 2130968773;
+			// aapt resource value: 0x7f01012b
+			public const int itemIconTint = 2130772267;
 			
-			// aapt resource value: 0x7F0400C6
-			public const int itemPadding = 2130968774;
+			// aapt resource value: 0x7f01001d
+			public const int itemPadding = 2130771997;
 			
-			// aapt resource value: 0x7F0400C7
-			public const int itemTextAppearance = 2130968775;
+			// aapt resource value: 0x7f01012e
+			public const int itemTextAppearance = 2130772270;
 			
-			// aapt resource value: 0x7F0400C8
-			public const int itemTextColor = 2130968776;
+			// aapt resource value: 0x7f01012c
+			public const int itemTextColor = 2130772268;
 			
-			// aapt resource value: 0x7F0400C9
-			public const int keylines = 2130968777;
+			// aapt resource value: 0x7f010118
+			public const int keylines = 2130772248;
 			
-			// aapt resource value: 0x7F0400CA
-			public const int layout = 2130968778;
+			// aapt resource value: 0x7f0100d1
+			public const int layout = 2130772177;
 			
-			// aapt resource value: 0x7F0400CB
-			public const int layoutManager = 2130968779;
+			// aapt resource value: 0x7f010000
+			public const int layoutManager = 2130771968;
 			
-			// aapt resource value: 0x7F0400CC
-			public const int layout_anchor = 2130968780;
+			// aapt resource value: 0x7f01011b
+			public const int layout_anchor = 2130772251;
 			
-			// aapt resource value: 0x7F0400CD
-			public const int layout_anchorGravity = 2130968781;
+			// aapt resource value: 0x7f01011d
+			public const int layout_anchorGravity = 2130772253;
 			
-			// aapt resource value: 0x7F0400CE
-			public const int layout_behavior = 2130968782;
+			// aapt resource value: 0x7f01011a
+			public const int layout_behavior = 2130772250;
 			
-			// aapt resource value: 0x7F0400CF
-			public const int layout_collapseMode = 2130968783;
+			// aapt resource value: 0x7f010116
+			public const int layout_collapseMode = 2130772246;
 			
-			// aapt resource value: 0x7F0400D0
-			public const int layout_collapseParallaxMultiplier = 2130968784;
+			// aapt resource value: 0x7f010117
+			public const int layout_collapseParallaxMultiplier = 2130772247;
 			
-			// aapt resource value: 0x7F0400D1
-			public const int layout_dodgeInsetEdges = 2130968785;
+			// aapt resource value: 0x7f01011f
+			public const int layout_dodgeInsetEdges = 2130772255;
 			
-			// aapt resource value: 0x7F0400D2
-			public const int layout_insetEdge = 2130968786;
+			// aapt resource value: 0x7f01011e
+			public const int layout_insetEdge = 2130772254;
 			
-			// aapt resource value: 0x7F0400D3
-			public const int layout_keyline = 2130968787;
+			// aapt resource value: 0x7f01011c
+			public const int layout_keyline = 2130772252;
 			
-			// aapt resource value: 0x7F0400D4
-			public const int layout_scrollFlags = 2130968788;
+			// aapt resource value: 0x7f010102
+			public const int layout_scrollFlags = 2130772226;
 			
-			// aapt resource value: 0x7F0400D5
-			public const int layout_scrollInterpolator = 2130968789;
+			// aapt resource value: 0x7f010103
+			public const int layout_scrollInterpolator = 2130772227;
 			
-			// aapt resource value: 0x7F0400D6
-			public const int layout_srlBackgroundColor = 2130968790;
+			// aapt resource value: 0x7f010197
+			public const int layout_srlBackgroundColor = 2130772375;
 			
-			// aapt resource value: 0x7F0400D7
-			public const int layout_srlSpinnerStyle = 2130968791;
+			// aapt resource value: 0x7f01015b
+			public const int layout_srlSpinnerStyle = 2130772315;
 			
-			// aapt resource value: 0x7F0400D8
-			public const int listChoiceBackgroundIndicator = 2130968792;
+			// aapt resource value: 0x7f01008e
+			public const int listChoiceBackgroundIndicator = 2130772110;
 			
-			// aapt resource value: 0x7F0400D9
-			public const int listDividerAlertDialog = 2130968793;
+			// aapt resource value: 0x7f010068
+			public const int listDividerAlertDialog = 2130772072;
 			
-			// aapt resource value: 0x7F0400DA
-			public const int listItemLayout = 2130968794;
+			// aapt resource value: 0x7f01002e
+			public const int listItemLayout = 2130772014;
 			
-			// aapt resource value: 0x7F0400DB
-			public const int listLayout = 2130968795;
+			// aapt resource value: 0x7f01002b
+			public const int listLayout = 2130772011;
 			
-			// aapt resource value: 0x7F0400DC
-			public const int listMenuViewStyle = 2130968796;
+			// aapt resource value: 0x7f0100ae
+			public const int listMenuViewStyle = 2130772142;
 			
-			// aapt resource value: 0x7F0400DD
-			public const int listPopupWindowStyle = 2130968797;
+			// aapt resource value: 0x7f010087
+			public const int listPopupWindowStyle = 2130772103;
 			
-			// aapt resource value: 0x7F0400DE
-			public const int listPreferredItemHeight = 2130968798;
+			// aapt resource value: 0x7f010081
+			public const int listPreferredItemHeight = 2130772097;
 			
-			// aapt resource value: 0x7F0400DF
-			public const int listPreferredItemHeightLarge = 2130968799;
+			// aapt resource value: 0x7f010083
+			public const int listPreferredItemHeightLarge = 2130772099;
 			
-			// aapt resource value: 0x7F0400E0
-			public const int listPreferredItemHeightSmall = 2130968800;
+			// aapt resource value: 0x7f010082
+			public const int listPreferredItemHeightSmall = 2130772098;
 			
-			// aapt resource value: 0x7F0400E1
-			public const int listPreferredItemPaddingLeft = 2130968801;
+			// aapt resource value: 0x7f010084
+			public const int listPreferredItemPaddingLeft = 2130772100;
 			
-			// aapt resource value: 0x7F0400E2
-			public const int listPreferredItemPaddingRight = 2130968802;
+			// aapt resource value: 0x7f010085
+			public const int listPreferredItemPaddingRight = 2130772101;
 			
-			// aapt resource value: 0x7F0400E3
-			public const int logo = 2130968803;
+			// aapt resource value: 0x7f010013
+			public const int logo = 2130771987;
 			
-			// aapt resource value: 0x7F0400E4
-			public const int logoDescription = 2130968804;
+			// aapt resource value: 0x7f0100f7
+			public const int logoDescription = 2130772215;
 			
-			// aapt resource value: 0x7F0400E5
-			public const int maxActionInlineWidth = 2130968805;
+			// aapt resource value: 0x7f010132
+			public const int maxActionInlineWidth = 2130772274;
 			
-			// aapt resource value: 0x7F0400E6
-			public const int maxButtonHeight = 2130968806;
+			// aapt resource value: 0x7f0100f1
+			public const int maxButtonHeight = 2130772209;
 			
-			// aapt resource value: 0x7F0400E7
-			public const int measureWithLargestChild = 2130968807;
+			// aapt resource value: 0x7f0100be
+			public const int measureWithLargestChild = 2130772158;
 			
-			// aapt resource value: 0x7F0400E8
-			public const int menu = 2130968808;
+			// aapt resource value: 0x7f01012a
+			public const int menu = 2130772266;
 			
-			// aapt resource value: 0x7F0400E9
-			public const int multiChoiceItemLayout = 2130968809;
+			// aapt resource value: 0x7f01002c
+			public const int multiChoiceItemLayout = 2130772012;
 			
-			// aapt resource value: 0x7F0400EA
-			public const int navigationContentDescription = 2130968810;
+			// aapt resource value: 0x7f0100f6
+			public const int navigationContentDescription = 2130772214;
 			
-			// aapt resource value: 0x7F0400EB
-			public const int navigationIcon = 2130968811;
+			// aapt resource value: 0x7f0100f5
+			public const int navigationIcon = 2130772213;
 			
-			// aapt resource value: 0x7F0400EC
-			public const int navigationMode = 2130968812;
+			// aapt resource value: 0x7f01000d
+			public const int navigationMode = 2130771981;
 			
-			// aapt resource value: 0x7F0400ED
-			public const int numericModifiers = 2130968813;
+			// aapt resource value: 0x7f0100c2
+			public const int numericModifiers = 2130772162;
 			
-			// aapt resource value: 0x7F0400EE
-			public const int overlapAnchor = 2130968814;
+			// aapt resource value: 0x7f0100cd
+			public const int overlapAnchor = 2130772173;
 			
-			// aapt resource value: 0x7F0400EF
-			public const int paddingBottomNoButtons = 2130968815;
+			// aapt resource value: 0x7f0100cf
+			public const int paddingBottomNoButtons = 2130772175;
 			
-			// aapt resource value: 0x7F0400F0
-			public const int paddingEnd = 2130968816;
+			// aapt resource value: 0x7f0100fb
+			public const int paddingEnd = 2130772219;
 			
-			// aapt resource value: 0x7F0400F1
-			public const int paddingStart = 2130968817;
+			// aapt resource value: 0x7f0100fa
+			public const int paddingStart = 2130772218;
 			
-			// aapt resource value: 0x7F0400F2
-			public const int paddingTopNoTitle = 2130968818;
+			// aapt resource value: 0x7f0100d0
+			public const int paddingTopNoTitle = 2130772176;
 			
-			// aapt resource value: 0x7F0400F3
-			public const int panelBackground = 2130968819;
+			// aapt resource value: 0x7f01008b
+			public const int panelBackground = 2130772107;
 			
-			// aapt resource value: 0x7F0400F4
-			public const int panelMenuListTheme = 2130968820;
+			// aapt resource value: 0x7f01008d
+			public const int panelMenuListTheme = 2130772109;
 			
-			// aapt resource value: 0x7F0400F5
-			public const int panelMenuListWidth = 2130968821;
+			// aapt resource value: 0x7f01008c
+			public const int panelMenuListWidth = 2130772108;
 			
-			// aapt resource value: 0x7F0400F6
-			public const int passwordToggleContentDescription = 2130968822;
+			// aapt resource value: 0x7f01014e
+			public const int passwordToggleContentDescription = 2130772302;
 			
-			// aapt resource value: 0x7F0400F7
-			public const int passwordToggleDrawable = 2130968823;
+			// aapt resource value: 0x7f01014d
+			public const int passwordToggleDrawable = 2130772301;
 			
-			// aapt resource value: 0x7F0400F8
-			public const int passwordToggleEnabled = 2130968824;
+			// aapt resource value: 0x7f01014c
+			public const int passwordToggleEnabled = 2130772300;
 			
-			// aapt resource value: 0x7F0400F9
-			public const int passwordToggleTint = 2130968825;
+			// aapt resource value: 0x7f01014f
+			public const int passwordToggleTint = 2130772303;
 			
-			// aapt resource value: 0x7F0400FA
-			public const int passwordToggleTintMode = 2130968826;
+			// aapt resource value: 0x7f010150
+			public const int passwordToggleTintMode = 2130772304;
 			
-			// aapt resource value: 0x7F0400FB
-			public const int popupMenuStyle = 2130968827;
+			// aapt resource value: 0x7f010078
+			public const int popupMenuStyle = 2130772088;
 			
-			// aapt resource value: 0x7F0400FC
-			public const int popupTheme = 2130968828;
+			// aapt resource value: 0x7f010026
+			public const int popupTheme = 2130772006;
 			
-			// aapt resource value: 0x7F0400FD
-			public const int popupWindowStyle = 2130968829;
+			// aapt resource value: 0x7f010079
+			public const int popupWindowStyle = 2130772089;
 			
-			// aapt resource value: 0x7F0400FE
-			public const int preserveIconSpacing = 2130968830;
+			// aapt resource value: 0x7f0100cb
+			public const int preserveIconSpacing = 2130772171;
 			
-			// aapt resource value: 0x7F0400FF
-			public const int pressedTranslationZ = 2130968831;
+			// aapt resource value: 0x7f010125
+			public const int pressedTranslationZ = 2130772261;
 			
-			// aapt resource value: 0x7F040100
-			public const int progressBarPadding = 2130968832;
+			// aapt resource value: 0x7f01001c
+			public const int progressBarPadding = 2130771996;
 			
-			// aapt resource value: 0x7F040101
-			public const int progressBarStyle = 2130968833;
+			// aapt resource value: 0x7f01001a
+			public const int progressBarStyle = 2130771994;
 			
-			// aapt resource value: 0x7F040102
-			public const int queryBackground = 2130968834;
+			// aapt resource value: 0x7f0100dc
+			public const int queryBackground = 2130772188;
 			
-			// aapt resource value: 0x7F040103
-			public const int queryHint = 2130968835;
+			// aapt resource value: 0x7f0100d3
+			public const int queryHint = 2130772179;
 			
-			// aapt resource value: 0x7F040104
-			public const int radioButtonStyle = 2130968836;
+			// aapt resource value: 0x7f0100a7
+			public const int radioButtonStyle = 2130772135;
 			
-			// aapt resource value: 0x7F040105
-			public const int ratingBarStyle = 2130968837;
+			// aapt resource value: 0x7f0100a8
+			public const int ratingBarStyle = 2130772136;
 			
-			// aapt resource value: 0x7F040106
-			public const int ratingBarStyleIndicator = 2130968838;
+			// aapt resource value: 0x7f0100a9
+			public const int ratingBarStyleIndicator = 2130772137;
 			
-			// aapt resource value: 0x7F040107
-			public const int ratingBarStyleSmall = 2130968839;
+			// aapt resource value: 0x7f0100aa
+			public const int ratingBarStyleSmall = 2130772138;
 			
-			// aapt resource value: 0x7F040108
-			public const int reverseLayout = 2130968840;
+			// aapt resource value: 0x7f010002
+			public const int reverseLayout = 2130771970;
 			
-			// aapt resource value: 0x7F040109
-			public const int rippleColor = 2130968841;
+			// aapt resource value: 0x7f010123
+			public const int rippleColor = 2130772259;
 			
-			// aapt resource value: 0x7F04010A
-			public const int scrimAnimationDuration = 2130968842;
+			// aapt resource value: 0x7f010112
+			public const int scrimAnimationDuration = 2130772242;
 			
-			// aapt resource value: 0x7F04010B
-			public const int scrimVisibleHeightTrigger = 2130968843;
+			// aapt resource value: 0x7f010111
+			public const int scrimVisibleHeightTrigger = 2130772241;
 			
-			// aapt resource value: 0x7F04010C
-			public const int searchHintIcon = 2130968844;
+			// aapt resource value: 0x7f0100d8
+			public const int searchHintIcon = 2130772184;
 			
-			// aapt resource value: 0x7F04010D
-			public const int searchIcon = 2130968845;
+			// aapt resource value: 0x7f0100d7
+			public const int searchIcon = 2130772183;
 			
-			// aapt resource value: 0x7F04010E
-			public const int searchViewStyle = 2130968846;
+			// aapt resource value: 0x7f010080
+			public const int searchViewStyle = 2130772096;
 			
-			// aapt resource value: 0x7F04010F
-			public const int second_curtain_bar_color = 2130968847;
+			// aapt resource value: 0x7f0101b1
+			public const int second_curtain_bar_color = 2130772401;
 			
-			// aapt resource value: 0x7F040110
-			public const int second_wave_color = 2130968848;
+			// aapt resource value: 0x7f0101b7
+			public const int second_wave_color = 2130772407;
 			
-			// aapt resource value: 0x7F040111
-			public const int seekBarStyle = 2130968849;
+			// aapt resource value: 0x7f0100ab
+			public const int seekBarStyle = 2130772139;
 			
-			// aapt resource value: 0x7F040112
-			public const int selectableItemBackground = 2130968850;
+			// aapt resource value: 0x7f010070
+			public const int selectableItemBackground = 2130772080;
 			
-			// aapt resource value: 0x7F040113
-			public const int selectableItemBackgroundBorderless = 2130968851;
+			// aapt resource value: 0x7f010071
+			public const int selectableItemBackgroundBorderless = 2130772081;
 			
-			// aapt resource value: 0x7F040114
-			public const int showAsAction = 2130968852;
+			// aapt resource value: 0x7f0100c3
+			public const int showAsAction = 2130772163;
 			
-			// aapt resource value: 0x7F040115
-			public const int showDividers = 2130968853;
+			// aapt resource value: 0x7f0100bf
+			public const int showDividers = 2130772159;
 			
-			// aapt resource value: 0x7F040116
-			public const int showText = 2130968854;
+			// aapt resource value: 0x7f0100e8
+			public const int showText = 2130772200;
 			
-			// aapt resource value: 0x7F040117
-			public const int showTitle = 2130968855;
+			// aapt resource value: 0x7f01002f
+			public const int showTitle = 2130772015;
 			
-			// aapt resource value: 0x7F040118
-			public const int singleChoiceItemLayout = 2130968856;
+			// aapt resource value: 0x7f01002d
+			public const int singleChoiceItemLayout = 2130772013;
 			
-			// aapt resource value: 0x7F040119
-			public const int spanCount = 2130968857;
+			// aapt resource value: 0x7f010001
+			public const int spanCount = 2130771969;
 			
-			// aapt resource value: 0x7F04011A
-			public const int spinBars = 2130968858;
+			// aapt resource value: 0x7f0100b7
+			public const int spinBars = 2130772151;
 			
-			// aapt resource value: 0x7F04011B
-			public const int spinnerDropDownItemStyle = 2130968859;
+			// aapt resource value: 0x7f01006b
+			public const int spinnerDropDownItemStyle = 2130772075;
 			
-			// aapt resource value: 0x7F04011C
-			public const int spinnerStyle = 2130968860;
+			// aapt resource value: 0x7f0100ac
+			public const int spinnerStyle = 2130772140;
 			
-			// aapt resource value: 0x7F04011D
-			public const int splitTrack = 2130968861;
+			// aapt resource value: 0x7f0100e7
+			public const int splitTrack = 2130772199;
 			
-			// aapt resource value: 0x7F04011E
-			public const int srcCompat = 2130968862;
+			// aapt resource value: 0x7f010030
+			public const int srcCompat = 2130772016;
 			
-			// aapt resource value: 0x7F04011F
-			public const int srlAccentColor = 2130968863;
+			// aapt resource value: 0x7f01015c
+			public const int srlAccentColor = 2130772316;
 			
-			// aapt resource value: 0x7F040120
-			public const int srlAnimatingColor = 2130968864;
+			// aapt resource value: 0x7f010172
+			public const int srlAnimatingColor = 2130772338;
 			
-			// aapt resource value: 0x7F040121
-			public const int srlClassicsSpinnerStyle = 2130968865;
+			// aapt resource value: 0x7f01015d
+			public const int srlClassicsSpinnerStyle = 2130772317;
 			
-			// aapt resource value: 0x7F040122
-			public const int srlDisableContentWhenLoading = 2130968866;
+			// aapt resource value: 0x7f010194
+			public const int srlDisableContentWhenLoading = 2130772372;
 			
-			// aapt resource value: 0x7F040123
-			public const int srlDisableContentWhenRefresh = 2130968867;
+			// aapt resource value: 0x7f010193
+			public const int srlDisableContentWhenRefresh = 2130772371;
 			
-			// aapt resource value: 0x7F040124
-			public const int srlDragRate = 2130968868;
+			// aapt resource value: 0x7f01017b
+			public const int srlDragRate = 2130772347;
 			
-			// aapt resource value: 0x7F040125
-			public const int srlDrawableArrow = 2130968869;
+			// aapt resource value: 0x7f01015e
+			public const int srlDrawableArrow = 2130772318;
 			
-			// aapt resource value: 0x7F040126
-			public const int srlDrawableArrowSize = 2130968870;
+			// aapt resource value: 0x7f01015f
+			public const int srlDrawableArrowSize = 2130772319;
 			
-			// aapt resource value: 0x7F040127
-			public const int srlDrawableMarginRight = 2130968871;
+			// aapt resource value: 0x7f010160
+			public const int srlDrawableMarginRight = 2130772320;
 			
-			// aapt resource value: 0x7F040128
-			public const int srlDrawableProgress = 2130968872;
+			// aapt resource value: 0x7f010161
+			public const int srlDrawableProgress = 2130772321;
 			
-			// aapt resource value: 0x7F040129
-			public const int srlDrawableProgressSize = 2130968873;
+			// aapt resource value: 0x7f010162
+			public const int srlDrawableProgressSize = 2130772322;
 			
-			// aapt resource value: 0x7F04012A
-			public const int srlDrawableSize = 2130968874;
+			// aapt resource value: 0x7f010163
+			public const int srlDrawableSize = 2130772323;
 			
-			// aapt resource value: 0x7F04012B
-			public const int srlEnableAutoLoadMore = 2130968875;
+			// aapt resource value: 0x7f010187
+			public const int srlEnableAutoLoadMore = 2130772359;
 			
-			// aapt resource value: 0x7F04012C
-			public const int srlEnableClipFooterWhenFixedBehind = 2130968876;
+			// aapt resource value: 0x7f010191
+			public const int srlEnableClipFooterWhenFixedBehind = 2130772369;
 			
-			// aapt resource value: 0x7F04012D
-			public const int srlEnableClipHeaderWhenFixedBehind = 2130968877;
+			// aapt resource value: 0x7f010190
+			public const int srlEnableClipHeaderWhenFixedBehind = 2130772368;
 			
-			// aapt resource value: 0x7F04012E
-			public const int srlEnableFooterFollowWhenLoadFinished = 2130968878;
+			// aapt resource value: 0x7f01018e
+			public const int srlEnableFooterFollowWhenLoadFinished = 2130772366;
 			
-			// aapt resource value: 0x7F04012F
-			public const int srlEnableFooterFollowWhenNoMoreData = 2130968879;
+			// aapt resource value: 0x7f01018f
+			public const int srlEnableFooterFollowWhenNoMoreData = 2130772367;
 			
-			// aapt resource value: 0x7F040130
-			public const int srlEnableFooterTranslationContent = 2130968880;
+			// aapt resource value: 0x7f010183
+			public const int srlEnableFooterTranslationContent = 2130772355;
 			
-			// aapt resource value: 0x7F040131
-			public const int srlEnableHeaderTranslationContent = 2130968881;
+			// aapt resource value: 0x7f010182
+			public const int srlEnableHeaderTranslationContent = 2130772354;
 			
-			// aapt resource value: 0x7F040132
-			public const int srlEnableHorizontalDrag = 2130968882;
+			// aapt resource value: 0x7f010164
+			public const int srlEnableHorizontalDrag = 2130772324;
 			
-			// aapt resource value: 0x7F040133
-			public const int srlEnableLastTime = 2130968883;
+			// aapt resource value: 0x7f010175
+			public const int srlEnableLastTime = 2130772341;
 			
-			// aapt resource value: 0x7F040134
-			public const int srlEnableLoadMore = 2130968884;
+			// aapt resource value: 0x7f010181
+			public const int srlEnableLoadMore = 2130772353;
 			
-			// aapt resource value: 0x7F040135
-			public const int srlEnableLoadMoreWhenContentNotFull = 2130968885;
+			// aapt resource value: 0x7f01018d
+			public const int srlEnableLoadMoreWhenContentNotFull = 2130772365;
 			
-			// aapt resource value: 0x7F040136
-			public const int srlEnableNestedScrolling = 2130968886;
+			// aapt resource value: 0x7f01018a
+			public const int srlEnableNestedScrolling = 2130772362;
 			
-			// aapt resource value: 0x7F040137
-			public const int srlEnableOverScrollBounce = 2130968887;
+			// aapt resource value: 0x7f010188
+			public const int srlEnableOverScrollBounce = 2130772360;
 			
-			// aapt resource value: 0x7F040138
-			public const int srlEnableOverScrollDrag = 2130968888;
+			// aapt resource value: 0x7f010192
+			public const int srlEnableOverScrollDrag = 2130772370;
 			
-			// aapt resource value: 0x7F040139
-			public const int srlEnablePreviewInEditMode = 2130968889;
+			// aapt resource value: 0x7f010186
+			public const int srlEnablePreviewInEditMode = 2130772358;
 			
-			// aapt resource value: 0x7F04013A
-			public const int srlEnablePullToCloseTwoLevel = 2130968890;
+			// aapt resource value: 0x7f01019d
+			public const int srlEnablePullToCloseTwoLevel = 2130772381;
 			
-			// aapt resource value: 0x7F04013B
-			public const int srlEnablePureScrollMode = 2130968891;
+			// aapt resource value: 0x7f010189
+			public const int srlEnablePureScrollMode = 2130772361;
 			
-			// aapt resource value: 0x7F04013C
-			public const int srlEnableRefresh = 2130968892;
+			// aapt resource value: 0x7f010180
+			public const int srlEnableRefresh = 2130772352;
 			
-			// aapt resource value: 0x7F04013D
-			public const int srlEnableScrollContentWhenLoaded = 2130968893;
+			// aapt resource value: 0x7f01018b
+			public const int srlEnableScrollContentWhenLoaded = 2130772363;
 			
-			// aapt resource value: 0x7F04013E
-			public const int srlEnableScrollContentWhenRefreshed = 2130968894;
+			// aapt resource value: 0x7f01018c
+			public const int srlEnableScrollContentWhenRefreshed = 2130772364;
 			
-			// aapt resource value: 0x7F04013F
-			public const int srlEnableTwoLevel = 2130968895;
+			// aapt resource value: 0x7f01019c
+			public const int srlEnableTwoLevel = 2130772380;
 			
-			// aapt resource value: 0x7F040140
-			public const int srlFinishDuration = 2130968896;
+			// aapt resource value: 0x7f010165
+			public const int srlFinishDuration = 2130772325;
 			
-			// aapt resource value: 0x7F040141
-			public const int srlFixedFooterViewId = 2130968897;
+			// aapt resource value: 0x7f010196
+			public const int srlFixedFooterViewId = 2130772374;
 			
-			// aapt resource value: 0x7F040142
-			public const int srlFixedHeaderViewId = 2130968898;
+			// aapt resource value: 0x7f010195
+			public const int srlFixedHeaderViewId = 2130772373;
 			
-			// aapt resource value: 0x7F040143
-			public const int srlFloorDuration = 2130968899;
+			// aapt resource value: 0x7f01019b
+			public const int srlFloorDuration = 2130772379;
 			
-			// aapt resource value: 0x7F040144
-			public const int srlFloorRage = 2130968900;
+			// aapt resource value: 0x7f010199
+			public const int srlFloorRage = 2130772377;
 			
-			// aapt resource value: 0x7F040145
-			public const int srlFooterHeight = 2130968901;
+			// aapt resource value: 0x7f010178
+			public const int srlFooterHeight = 2130772344;
 			
-			// aapt resource value: 0x7F040146
-			public const int srlFooterInsetStart = 2130968902;
+			// aapt resource value: 0x7f01017a
+			public const int srlFooterInsetStart = 2130772346;
 			
-			// aapt resource value: 0x7F040147
-			public const int srlFooterMaxDragRate = 2130968903;
+			// aapt resource value: 0x7f01017d
+			public const int srlFooterMaxDragRate = 2130772349;
 			
-			// aapt resource value: 0x7F040148
-			public const int srlFooterTranslationViewId = 2130968904;
+			// aapt resource value: 0x7f010185
+			public const int srlFooterTranslationViewId = 2130772357;
 			
-			// aapt resource value: 0x7F040149
-			public const int srlFooterTriggerRate = 2130968905;
+			// aapt resource value: 0x7f01017f
+			public const int srlFooterTriggerRate = 2130772351;
 			
-			// aapt resource value: 0x7F04014A
-			public const int srlHeaderHeight = 2130968906;
+			// aapt resource value: 0x7f010177
+			public const int srlHeaderHeight = 2130772343;
 			
-			// aapt resource value: 0x7F04014B
-			public const int srlHeaderInsetStart = 2130968907;
+			// aapt resource value: 0x7f010179
+			public const int srlHeaderInsetStart = 2130772345;
 			
-			// aapt resource value: 0x7F04014C
-			public const int srlHeaderMaxDragRate = 2130968908;
+			// aapt resource value: 0x7f01017c
+			public const int srlHeaderMaxDragRate = 2130772348;
 			
-			// aapt resource value: 0x7F04014D
-			public const int srlHeaderTranslationViewId = 2130968909;
+			// aapt resource value: 0x7f010184
+			public const int srlHeaderTranslationViewId = 2130772356;
 			
-			// aapt resource value: 0x7F04014E
-			public const int srlHeaderTriggerRate = 2130968910;
+			// aapt resource value: 0x7f01017e
+			public const int srlHeaderTriggerRate = 2130772350;
 			
-			// aapt resource value: 0x7F04014F
-			public const int srlMaxRage = 2130968911;
+			// aapt resource value: 0x7f010198
+			public const int srlMaxRage = 2130772376;
 			
-			// aapt resource value: 0x7F040150
-			public const int srlNormalColor = 2130968912;
+			// aapt resource value: 0x7f010173
+			public const int srlNormalColor = 2130772339;
 			
-			// aapt resource value: 0x7F040151
-			public const int srlPrimaryColor = 2130968913;
+			// aapt resource value: 0x7f010166
+			public const int srlPrimaryColor = 2130772326;
 			
-			// aapt resource value: 0x7F040152
-			public const int srlReboundDuration = 2130968914;
+			// aapt resource value: 0x7f010176
+			public const int srlReboundDuration = 2130772342;
 			
-			// aapt resource value: 0x7F040153
-			public const int srlRefreshRage = 2130968915;
+			// aapt resource value: 0x7f01019a
+			public const int srlRefreshRage = 2130772378;
 			
-			// aapt resource value: 0x7F040154
-			public const int srlTextFailed = 2130968916;
+			// aapt resource value: 0x7f010167
+			public const int srlTextFailed = 2130772327;
 			
-			// aapt resource value: 0x7F040155
-			public const int srlTextFinish = 2130968917;
+			// aapt resource value: 0x7f010168
+			public const int srlTextFinish = 2130772328;
 			
-			// aapt resource value: 0x7F040156
-			public const int srlTextLoading = 2130968918;
+			// aapt resource value: 0x7f010169
+			public const int srlTextLoading = 2130772329;
 			
-			// aapt resource value: 0x7F040157
-			public const int srlTextNothing = 2130968919;
+			// aapt resource value: 0x7f01016a
+			public const int srlTextNothing = 2130772330;
 			
-			// aapt resource value: 0x7F040158
-			public const int srlTextPulling = 2130968920;
+			// aapt resource value: 0x7f01016b
+			public const int srlTextPulling = 2130772331;
 			
-			// aapt resource value: 0x7F040159
-			public const int srlTextRefreshing = 2130968921;
+			// aapt resource value: 0x7f01016c
+			public const int srlTextRefreshing = 2130772332;
 			
-			// aapt resource value: 0x7F04015A
-			public const int srlTextRelease = 2130968922;
+			// aapt resource value: 0x7f01016d
+			public const int srlTextRelease = 2130772333;
 			
-			// aapt resource value: 0x7F04015B
-			public const int srlTextSecondary = 2130968923;
+			// aapt resource value: 0x7f01016e
+			public const int srlTextSecondary = 2130772334;
 			
-			// aapt resource value: 0x7F04015C
-			public const int srlTextSizeTime = 2130968924;
+			// aapt resource value: 0x7f01016f
+			public const int srlTextSizeTime = 2130772335;
 			
-			// aapt resource value: 0x7F04015D
-			public const int srlTextSizeTitle = 2130968925;
+			// aapt resource value: 0x7f010170
+			public const int srlTextSizeTitle = 2130772336;
 			
-			// aapt resource value: 0x7F04015E
-			public const int srlTextTimeMarginTop = 2130968926;
+			// aapt resource value: 0x7f010174
+			public const int srlTextTimeMarginTop = 2130772340;
 			
-			// aapt resource value: 0x7F04015F
-			public const int srlTextUpdate = 2130968927;
+			// aapt resource value: 0x7f010171
+			public const int srlTextUpdate = 2130772337;
 			
-			// aapt resource value: 0x7F040160
-			public const int stackFromEnd = 2130968928;
+			// aapt resource value: 0x7f010003
+			public const int stackFromEnd = 2130771971;
 			
-			// aapt resource value: 0x7F040161
-			public const int state_above_anchor = 2130968929;
+			// aapt resource value: 0x7f0100ce
+			public const int state_above_anchor = 2130772174;
 			
-			// aapt resource value: 0x7F040162
-			public const int state_collapsed = 2130968930;
+			// aapt resource value: 0x7f010100
+			public const int state_collapsed = 2130772224;
 			
-			// aapt resource value: 0x7F040163
-			public const int state_collapsible = 2130968931;
+			// aapt resource value: 0x7f010101
+			public const int state_collapsible = 2130772225;
 			
-			// aapt resource value: 0x7F040164
-			public const int statusBarBackground = 2130968932;
+			// aapt resource value: 0x7f010119
+			public const int statusBarBackground = 2130772249;
 			
-			// aapt resource value: 0x7F040165
-			public const int statusBarScrim = 2130968933;
+			// aapt resource value: 0x7f01010f
+			public const int statusBarScrim = 2130772239;
 			
-			// aapt resource value: 0x7F040166
-			public const int subMenuArrow = 2130968934;
+			// aapt resource value: 0x7f0100cc
+			public const int subMenuArrow = 2130772172;
 			
-			// aapt resource value: 0x7F040167
-			public const int submitBackground = 2130968935;
+			// aapt resource value: 0x7f0100dd
+			public const int submitBackground = 2130772189;
 			
-			// aapt resource value: 0x7F040168
-			public const int subtitle = 2130968936;
+			// aapt resource value: 0x7f01000f
+			public const int subtitle = 2130771983;
 			
-			// aapt resource value: 0x7F040169
-			public const int subtitleTextAppearance = 2130968937;
+			// aapt resource value: 0x7f0100ea
+			public const int subtitleTextAppearance = 2130772202;
 			
-			// aapt resource value: 0x7F04016A
-			public const int subtitleTextColor = 2130968938;
+			// aapt resource value: 0x7f0100f9
+			public const int subtitleTextColor = 2130772217;
 			
-			// aapt resource value: 0x7F04016B
-			public const int subtitleTextStyle = 2130968939;
+			// aapt resource value: 0x7f010011
+			public const int subtitleTextStyle = 2130771985;
 			
-			// aapt resource value: 0x7F04016C
-			public const int suggestionRowLayout = 2130968940;
+			// aapt resource value: 0x7f0100db
+			public const int suggestionRowLayout = 2130772187;
 			
-			// aapt resource value: 0x7F04016D
-			public const int switchMinWidth = 2130968941;
+			// aapt resource value: 0x7f0100e5
+			public const int switchMinWidth = 2130772197;
 			
-			// aapt resource value: 0x7F04016E
-			public const int switchPadding = 2130968942;
+			// aapt resource value: 0x7f0100e6
+			public const int switchPadding = 2130772198;
 			
-			// aapt resource value: 0x7F04016F
-			public const int switchStyle = 2130968943;
+			// aapt resource value: 0x7f0100ad
+			public const int switchStyle = 2130772141;
 			
-			// aapt resource value: 0x7F040170
-			public const int switchTextAppearance = 2130968944;
+			// aapt resource value: 0x7f0100e4
+			public const int switchTextAppearance = 2130772196;
 			
-			// aapt resource value: 0x7F040171
-			public const int tabBackground = 2130968945;
+			// aapt resource value: 0x7f010136
+			public const int tabBackground = 2130772278;
 			
-			// aapt resource value: 0x7F040172
-			public const int tabContentStart = 2130968946;
+			// aapt resource value: 0x7f010135
+			public const int tabContentStart = 2130772277;
 			
-			// aapt resource value: 0x7F040173
-			public const int tabGravity = 2130968947;
+			// aapt resource value: 0x7f010138
+			public const int tabGravity = 2130772280;
 			
-			// aapt resource value: 0x7F040174
-			public const int tabIndicatorColor = 2130968948;
+			// aapt resource value: 0x7f010133
+			public const int tabIndicatorColor = 2130772275;
 			
-			// aapt resource value: 0x7F040175
-			public const int tabIndicatorHeight = 2130968949;
+			// aapt resource value: 0x7f010134
+			public const int tabIndicatorHeight = 2130772276;
 			
-			// aapt resource value: 0x7F040176
-			public const int tabMaxWidth = 2130968950;
+			// aapt resource value: 0x7f01013a
+			public const int tabMaxWidth = 2130772282;
 			
-			// aapt resource value: 0x7F040177
-			public const int tabMinWidth = 2130968951;
+			// aapt resource value: 0x7f010139
+			public const int tabMinWidth = 2130772281;
 			
-			// aapt resource value: 0x7F040178
-			public const int tabMode = 2130968952;
+			// aapt resource value: 0x7f010137
+			public const int tabMode = 2130772279;
 			
-			// aapt resource value: 0x7F040179
-			public const int tabPadding = 2130968953;
+			// aapt resource value: 0x7f010142
+			public const int tabPadding = 2130772290;
 			
-			// aapt resource value: 0x7F04017A
-			public const int tabPaddingBottom = 2130968954;
+			// aapt resource value: 0x7f010141
+			public const int tabPaddingBottom = 2130772289;
 			
-			// aapt resource value: 0x7F04017B
-			public const int tabPaddingEnd = 2130968955;
+			// aapt resource value: 0x7f010140
+			public const int tabPaddingEnd = 2130772288;
 			
-			// aapt resource value: 0x7F04017C
-			public const int tabPaddingStart = 2130968956;
+			// aapt resource value: 0x7f01013e
+			public const int tabPaddingStart = 2130772286;
 			
-			// aapt resource value: 0x7F04017D
-			public const int tabPaddingTop = 2130968957;
+			// aapt resource value: 0x7f01013f
+			public const int tabPaddingTop = 2130772287;
 			
-			// aapt resource value: 0x7F04017E
-			public const int tabSelectedTextColor = 2130968958;
+			// aapt resource value: 0x7f01013d
+			public const int tabSelectedTextColor = 2130772285;
 			
-			// aapt resource value: 0x7F04017F
-			public const int tabTextAppearance = 2130968959;
+			// aapt resource value: 0x7f01013b
+			public const int tabTextAppearance = 2130772283;
 			
-			// aapt resource value: 0x7F040180
-			public const int tabTextColor = 2130968960;
+			// aapt resource value: 0x7f01013c
+			public const int tabTextColor = 2130772284;
 			
-			// aapt resource value: 0x7F040181
-			public const int textAllCaps = 2130968961;
+			// aapt resource value: 0x7f010036
+			public const int textAllCaps = 2130772022;
 			
-			// aapt resource value: 0x7F040182
-			public const int textAppearanceLargePopupMenu = 2130968962;
+			// aapt resource value: 0x7f010063
+			public const int textAppearanceLargePopupMenu = 2130772067;
 			
-			// aapt resource value: 0x7F040183
-			public const int textAppearanceListItem = 2130968963;
+			// aapt resource value: 0x7f010088
+			public const int textAppearanceListItem = 2130772104;
 			
-			// aapt resource value: 0x7F040184
-			public const int textAppearanceListItemSecondary = 2130968964;
+			// aapt resource value: 0x7f010089
+			public const int textAppearanceListItemSecondary = 2130772105;
 			
-			// aapt resource value: 0x7F040185
-			public const int textAppearanceListItemSmall = 2130968965;
+			// aapt resource value: 0x7f01008a
+			public const int textAppearanceListItemSmall = 2130772106;
 			
-			// aapt resource value: 0x7F040186
-			public const int textAppearancePopupMenuHeader = 2130968966;
+			// aapt resource value: 0x7f010065
+			public const int textAppearancePopupMenuHeader = 2130772069;
 			
-			// aapt resource value: 0x7F040187
-			public const int textAppearanceSearchResultSubtitle = 2130968967;
+			// aapt resource value: 0x7f01007e
+			public const int textAppearanceSearchResultSubtitle = 2130772094;
 			
-			// aapt resource value: 0x7F040188
-			public const int textAppearanceSearchResultTitle = 2130968968;
+			// aapt resource value: 0x7f01007d
+			public const int textAppearanceSearchResultTitle = 2130772093;
 			
-			// aapt resource value: 0x7F040189
-			public const int textAppearanceSmallPopupMenu = 2130968969;
+			// aapt resource value: 0x7f010064
+			public const int textAppearanceSmallPopupMenu = 2130772068;
 			
-			// aapt resource value: 0x7F04018A
-			public const int textColorAlertDialogListItem = 2130968970;
+			// aapt resource value: 0x7f01009d
+			public const int textColorAlertDialogListItem = 2130772125;
 			
-			// aapt resource value: 0x7F04018B
-			public const int textColorError = 2130968971;
+			// aapt resource value: 0x7f010122
+			public const int textColorError = 2130772258;
 			
-			// aapt resource value: 0x7F04018C
-			public const int textColorSearchUrl = 2130968972;
+			// aapt resource value: 0x7f01007f
+			public const int textColorSearchUrl = 2130772095;
 			
-			// aapt resource value: 0x7F04018D
-			public const int theme = 2130968973;
+			// aapt resource value: 0x7f0100fc
+			public const int theme = 2130772220;
 			
-			// aapt resource value: 0x7F04018E
-			public const int thickness = 2130968974;
+			// aapt resource value: 0x7f0100bd
+			public const int thickness = 2130772157;
 			
-			// aapt resource value: 0x7F04018F
-			public const int thumbTextPadding = 2130968975;
+			// aapt resource value: 0x7f0100e3
+			public const int thumbTextPadding = 2130772195;
 			
-			// aapt resource value: 0x7F040190
-			public const int thumbTint = 2130968976;
+			// aapt resource value: 0x7f0100de
+			public const int thumbTint = 2130772190;
 			
-			// aapt resource value: 0x7F040191
-			public const int thumbTintMode = 2130968977;
+			// aapt resource value: 0x7f0100df
+			public const int thumbTintMode = 2130772191;
 			
-			// aapt resource value: 0x7F040192
-			public const int tickMark = 2130968978;
+			// aapt resource value: 0x7f010033
+			public const int tickMark = 2130772019;
 			
-			// aapt resource value: 0x7F040193
-			public const int tickMarkTint = 2130968979;
+			// aapt resource value: 0x7f010034
+			public const int tickMarkTint = 2130772020;
 			
-			// aapt resource value: 0x7F040194
-			public const int tickMarkTintMode = 2130968980;
+			// aapt resource value: 0x7f010035
+			public const int tickMarkTintMode = 2130772021;
 			
-			// aapt resource value: 0x7F040195
-			public const int tint = 2130968981;
+			// aapt resource value: 0x7f010031
+			public const int tint = 2130772017;
 			
-			// aapt resource value: 0x7F040196
-			public const int tintMode = 2130968982;
+			// aapt resource value: 0x7f010032
+			public const int tintMode = 2130772018;
 			
-			// aapt resource value: 0x7F040197
-			public const int title = 2130968983;
+			// aapt resource value: 0x7f01000c
+			public const int title = 2130771980;
 			
-			// aapt resource value: 0x7F040198
-			public const int titleEnabled = 2130968984;
+			// aapt resource value: 0x7f010115
+			public const int titleEnabled = 2130772245;
 			
-			// aapt resource value: 0x7F040199
-			public const int titleMargin = 2130968985;
+			// aapt resource value: 0x7f0100eb
+			public const int titleMargin = 2130772203;
 			
-			// aapt resource value: 0x7F04019A
-			public const int titleMarginBottom = 2130968986;
+			// aapt resource value: 0x7f0100ef
+			public const int titleMarginBottom = 2130772207;
 			
-			// aapt resource value: 0x7F04019B
-			public const int titleMarginEnd = 2130968987;
+			// aapt resource value: 0x7f0100ed
+			public const int titleMarginEnd = 2130772205;
 			
-			// aapt resource value: 0x7F04019E
-			public const int titleMargins = 2130968990;
+			// aapt resource value: 0x7f0100ec
+			public const int titleMarginStart = 2130772204;
 			
-			// aapt resource value: 0x7F04019C
-			public const int titleMarginStart = 2130968988;
+			// aapt resource value: 0x7f0100ee
+			public const int titleMarginTop = 2130772206;
 			
-			// aapt resource value: 0x7F04019D
-			public const int titleMarginTop = 2130968989;
+			// aapt resource value: 0x7f0100f0
+			public const int titleMargins = 2130772208;
 			
-			// aapt resource value: 0x7F04019F
-			public const int titleTextAppearance = 2130968991;
+			// aapt resource value: 0x7f0100e9
+			public const int titleTextAppearance = 2130772201;
 			
-			// aapt resource value: 0x7F0401A0
-			public const int titleTextColor = 2130968992;
+			// aapt resource value: 0x7f0100f8
+			public const int titleTextColor = 2130772216;
 			
-			// aapt resource value: 0x7F0401A1
-			public const int titleTextStyle = 2130968993;
+			// aapt resource value: 0x7f010010
+			public const int titleTextStyle = 2130771984;
 			
-			// aapt resource value: 0x7F0401A2
-			public const int toolbarId = 2130968994;
+			// aapt resource value: 0x7f010110
+			public const int toolbarId = 2130772240;
 			
-			// aapt resource value: 0x7F0401A3
-			public const int toolbarNavigationButtonStyle = 2130968995;
+			// aapt resource value: 0x7f010077
+			public const int toolbarNavigationButtonStyle = 2130772087;
 			
-			// aapt resource value: 0x7F0401A4
-			public const int toolbarStyle = 2130968996;
+			// aapt resource value: 0x7f010076
+			public const int toolbarStyle = 2130772086;
 			
-			// aapt resource value: 0x7F0401A5
-			public const int tooltipForegroundColor = 2130968997;
+			// aapt resource value: 0x7f0100b0
+			public const int tooltipForegroundColor = 2130772144;
 			
-			// aapt resource value: 0x7F0401A6
-			public const int tooltipFrameBackground = 2130968998;
+			// aapt resource value: 0x7f0100af
+			public const int tooltipFrameBackground = 2130772143;
 			
-			// aapt resource value: 0x7F0401A7
-			public const int tooltipText = 2130968999;
+			// aapt resource value: 0x7f0100c8
+			public const int tooltipText = 2130772168;
 			
-			// aapt resource value: 0x7F0401A8
-			public const int track = 2130969000;
+			// aapt resource value: 0x7f0100e0
+			public const int track = 2130772192;
 			
-			// aapt resource value: 0x7F0401A9
-			public const int trackTint = 2130969001;
+			// aapt resource value: 0x7f0100e1
+			public const int trackTint = 2130772193;
 			
-			// aapt resource value: 0x7F0401AA
-			public const int trackTintMode = 2130969002;
+			// aapt resource value: 0x7f0100e2
+			public const int trackTintMode = 2130772194;
 			
-			// aapt resource value: 0x7F0401AB
-			public const int useCompatPadding = 2130969003;
+			// aapt resource value: 0x7f010127
+			public const int useCompatPadding = 2130772263;
 			
-			// aapt resource value: 0x7F0401AC
-			public const int voiceIcon = 2130969004;
+			// aapt resource value: 0x7f0100d9
+			public const int voiceIcon = 2130772185;
 			
-			// aapt resource value: 0x7F0401AD
-			public const int wave_bg_color = 2130969005;
+			// aapt resource value: 0x7f0101b8
+			public const int wave_bg_color = 2130772408;
 			
-			// aapt resource value: 0x7F0401AE
-			public const int wave_border_color = 2130969006;
+			// aapt resource value: 0x7f0101b9
+			public const int wave_border_color = 2130772409;
 			
-			// aapt resource value: 0x7F0401AF
-			public const int wave_color = 2130969007;
+			// aapt resource value: 0x7f0101b6
+			public const int wave_color = 2130772406;
 			
-			// aapt resource value: 0x7F0401B0
-			public const int wave_height = 2130969008;
+			// aapt resource value: 0x7f0101bb
+			public const int wave_height = 2130772411;
 			
-			// aapt resource value: 0x7F0401B1
-			public const int wave_width = 2130969009;
+			// aapt resource value: 0x7f0101ba
+			public const int wave_width = 2130772410;
 			
-			// aapt resource value: 0x7F0401B2
-			public const int wheelview_dividerColor = 2130969010;
+			// aapt resource value: 0x7f0101c0
+			public const int wheelview_dividerColor = 2130772416;
 			
-			// aapt resource value: 0x7F0401B3
-			public const int wheelview_gravity = 2130969011;
+			// aapt resource value: 0x7f0101bc
+			public const int wheelview_gravity = 2130772412;
 			
-			// aapt resource value: 0x7F0401B4
-			public const int wheelview_lineSpacingMultiplier = 2130969012;
+			// aapt resource value: 0x7f0101c1
+			public const int wheelview_lineSpacingMultiplier = 2130772417;
 			
-			// aapt resource value: 0x7F0401B5
-			public const int wheelview_textColorCenter = 2130969013;
+			// aapt resource value: 0x7f0101bf
+			public const int wheelview_textColorCenter = 2130772415;
 			
-			// aapt resource value: 0x7F0401B6
-			public const int wheelview_textColorOut = 2130969014;
+			// aapt resource value: 0x7f0101be
+			public const int wheelview_textColorOut = 2130772414;
 			
-			// aapt resource value: 0x7F0401B7
-			public const int wheelview_textSize = 2130969015;
+			// aapt resource value: 0x7f0101bd
+			public const int wheelview_textSize = 2130772413;
 			
-			// aapt resource value: 0x7F0401B8
-			public const int windowActionBar = 2130969016;
+			// aapt resource value: 0x7f01003d
+			public const int windowActionBar = 2130772029;
 			
-			// aapt resource value: 0x7F0401B9
-			public const int windowActionBarOverlay = 2130969017;
+			// aapt resource value: 0x7f01003f
+			public const int windowActionBarOverlay = 2130772031;
 			
-			// aapt resource value: 0x7F0401BA
-			public const int windowActionModeOverlay = 2130969018;
+			// aapt resource value: 0x7f010040
+			public const int windowActionModeOverlay = 2130772032;
 			
-			// aapt resource value: 0x7F0401BB
-			public const int windowFixedHeightMajor = 2130969019;
+			// aapt resource value: 0x7f010044
+			public const int windowFixedHeightMajor = 2130772036;
 			
-			// aapt resource value: 0x7F0401BC
-			public const int windowFixedHeightMinor = 2130969020;
+			// aapt resource value: 0x7f010042
+			public const int windowFixedHeightMinor = 2130772034;
 			
-			// aapt resource value: 0x7F0401BD
-			public const int windowFixedWidthMajor = 2130969021;
+			// aapt resource value: 0x7f010041
+			public const int windowFixedWidthMajor = 2130772033;
 			
-			// aapt resource value: 0x7F0401BE
-			public const int windowFixedWidthMinor = 2130969022;
+			// aapt resource value: 0x7f010043
+			public const int windowFixedWidthMinor = 2130772035;
 			
-			// aapt resource value: 0x7F0401BF
-			public const int windowMinWidthMajor = 2130969023;
+			// aapt resource value: 0x7f010045
+			public const int windowMinWidthMajor = 2130772037;
 			
-			// aapt resource value: 0x7F0401C0
-			public const int windowMinWidthMinor = 2130969024;
+			// aapt resource value: 0x7f010046
+			public const int windowMinWidthMinor = 2130772038;
 			
-			// aapt resource value: 0x7F0401C1
-			public const int windowNoTitle = 2130969025;
+			// aapt resource value: 0x7f01003e
+			public const int windowNoTitle = 2130772030;
 			
 			static Attribute()
 			{
@@ -1670,20 +1670,20 @@
 		public partial class Boolean
 		{
 			
-			// aapt resource value: 0x7F050000
-			public const int abc_action_bar_embed_tabs = 2131034112;
+			// aapt resource value: 0x7f0c0000
+			public const int abc_action_bar_embed_tabs = 2131492864;
 			
-			// aapt resource value: 0x7F050001
-			public const int abc_allow_stacked_button_bar = 2131034113;
+			// aapt resource value: 0x7f0c0001
+			public const int abc_allow_stacked_button_bar = 2131492865;
 			
-			// aapt resource value: 0x7F050002
-			public const int abc_config_actionMenuItemAllCaps = 2131034114;
+			// aapt resource value: 0x7f0c0002
+			public const int abc_config_actionMenuItemAllCaps = 2131492866;
 			
-			// aapt resource value: 0x7F050003
-			public const int abc_config_closeDialogWhenTouchOutside = 2131034115;
+			// aapt resource value: 0x7f0c0003
+			public const int abc_config_closeDialogWhenTouchOutside = 2131492867;
 			
-			// aapt resource value: 0x7F050004
-			public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131034116;
+			// aapt resource value: 0x7f0c0004
+			public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131492868;
 			
 			static Boolean()
 			{
@@ -1698,323 +1698,323 @@
 		public partial class Color
 		{
 			
-			// aapt resource value: 0x7F060000
-			public const int abc_background_cache_hint_selector_material_dark = 2131099648;
+			// aapt resource value: 0x7f0d0052
+			public const int abc_background_cache_hint_selector_material_dark = 2131558482;
 			
-			// aapt resource value: 0x7F060001
-			public const int abc_background_cache_hint_selector_material_light = 2131099649;
+			// aapt resource value: 0x7f0d0053
+			public const int abc_background_cache_hint_selector_material_light = 2131558483;
 			
-			// aapt resource value: 0x7F060002
-			public const int abc_btn_colored_borderless_text_material = 2131099650;
+			// aapt resource value: 0x7f0d0054
+			public const int abc_btn_colored_borderless_text_material = 2131558484;
 			
-			// aapt resource value: 0x7F060003
-			public const int abc_btn_colored_text_material = 2131099651;
+			// aapt resource value: 0x7f0d0055
+			public const int abc_btn_colored_text_material = 2131558485;
 			
-			// aapt resource value: 0x7F060004
-			public const int abc_color_highlight_material = 2131099652;
+			// aapt resource value: 0x7f0d0056
+			public const int abc_color_highlight_material = 2131558486;
 			
-			// aapt resource value: 0x7F060005
-			public const int abc_hint_foreground_material_dark = 2131099653;
+			// aapt resource value: 0x7f0d0057
+			public const int abc_hint_foreground_material_dark = 2131558487;
 			
-			// aapt resource value: 0x7F060006
-			public const int abc_hint_foreground_material_light = 2131099654;
+			// aapt resource value: 0x7f0d0058
+			public const int abc_hint_foreground_material_light = 2131558488;
 			
-			// aapt resource value: 0x7F060007
-			public const int abc_input_method_navigation_guard = 2131099655;
+			// aapt resource value: 0x7f0d0000
+			public const int abc_input_method_navigation_guard = 2131558400;
 			
-			// aapt resource value: 0x7F060008
-			public const int abc_primary_text_disable_only_material_dark = 2131099656;
+			// aapt resource value: 0x7f0d0059
+			public const int abc_primary_text_disable_only_material_dark = 2131558489;
 			
-			// aapt resource value: 0x7F060009
-			public const int abc_primary_text_disable_only_material_light = 2131099657;
+			// aapt resource value: 0x7f0d005a
+			public const int abc_primary_text_disable_only_material_light = 2131558490;
 			
-			// aapt resource value: 0x7F06000A
-			public const int abc_primary_text_material_dark = 2131099658;
+			// aapt resource value: 0x7f0d005b
+			public const int abc_primary_text_material_dark = 2131558491;
 			
-			// aapt resource value: 0x7F06000B
-			public const int abc_primary_text_material_light = 2131099659;
+			// aapt resource value: 0x7f0d005c
+			public const int abc_primary_text_material_light = 2131558492;
 			
-			// aapt resource value: 0x7F06000C
-			public const int abc_search_url_text = 2131099660;
+			// aapt resource value: 0x7f0d005d
+			public const int abc_search_url_text = 2131558493;
 			
-			// aapt resource value: 0x7F06000D
-			public const int abc_search_url_text_normal = 2131099661;
+			// aapt resource value: 0x7f0d0001
+			public const int abc_search_url_text_normal = 2131558401;
 			
-			// aapt resource value: 0x7F06000E
-			public const int abc_search_url_text_pressed = 2131099662;
+			// aapt resource value: 0x7f0d0002
+			public const int abc_search_url_text_pressed = 2131558402;
 			
-			// aapt resource value: 0x7F06000F
-			public const int abc_search_url_text_selected = 2131099663;
+			// aapt resource value: 0x7f0d0003
+			public const int abc_search_url_text_selected = 2131558403;
 			
-			// aapt resource value: 0x7F060010
-			public const int abc_secondary_text_material_dark = 2131099664;
+			// aapt resource value: 0x7f0d005e
+			public const int abc_secondary_text_material_dark = 2131558494;
 			
-			// aapt resource value: 0x7F060011
-			public const int abc_secondary_text_material_light = 2131099665;
+			// aapt resource value: 0x7f0d005f
+			public const int abc_secondary_text_material_light = 2131558495;
 			
-			// aapt resource value: 0x7F060012
-			public const int abc_tint_btn_checkable = 2131099666;
+			// aapt resource value: 0x7f0d0060
+			public const int abc_tint_btn_checkable = 2131558496;
 			
-			// aapt resource value: 0x7F060013
-			public const int abc_tint_default = 2131099667;
+			// aapt resource value: 0x7f0d0061
+			public const int abc_tint_default = 2131558497;
 			
-			// aapt resource value: 0x7F060014
-			public const int abc_tint_edittext = 2131099668;
+			// aapt resource value: 0x7f0d0062
+			public const int abc_tint_edittext = 2131558498;
 			
-			// aapt resource value: 0x7F060015
-			public const int abc_tint_seek_thumb = 2131099669;
+			// aapt resource value: 0x7f0d0063
+			public const int abc_tint_seek_thumb = 2131558499;
 			
-			// aapt resource value: 0x7F060016
-			public const int abc_tint_spinner = 2131099670;
+			// aapt resource value: 0x7f0d0064
+			public const int abc_tint_spinner = 2131558500;
 			
-			// aapt resource value: 0x7F060017
-			public const int abc_tint_switch_track = 2131099671;
+			// aapt resource value: 0x7f0d0065
+			public const int abc_tint_switch_track = 2131558501;
 			
-			// aapt resource value: 0x7F060018
-			public const int accent_material_dark = 2131099672;
+			// aapt resource value: 0x7f0d0004
+			public const int accent_material_dark = 2131558404;
 			
-			// aapt resource value: 0x7F060019
-			public const int accent_material_light = 2131099673;
+			// aapt resource value: 0x7f0d0005
+			public const int accent_material_light = 2131558405;
 			
-			// aapt resource value: 0x7F06001A
-			public const int background_floating_material_dark = 2131099674;
+			// aapt resource value: 0x7f0d0006
+			public const int background_floating_material_dark = 2131558406;
 			
-			// aapt resource value: 0x7F06001B
-			public const int background_floating_material_light = 2131099675;
+			// aapt resource value: 0x7f0d0007
+			public const int background_floating_material_light = 2131558407;
 			
-			// aapt resource value: 0x7F06001C
-			public const int background_material_dark = 2131099676;
+			// aapt resource value: 0x7f0d0008
+			public const int background_material_dark = 2131558408;
 			
-			// aapt resource value: 0x7F06001D
-			public const int background_material_light = 2131099677;
+			// aapt resource value: 0x7f0d0009
+			public const int background_material_light = 2131558409;
 			
-			// aapt resource value: 0x7F06001E
-			public const int bright_foreground_disabled_material_dark = 2131099678;
+			// aapt resource value: 0x7f0d000a
+			public const int bright_foreground_disabled_material_dark = 2131558410;
 			
-			// aapt resource value: 0x7F06001F
-			public const int bright_foreground_disabled_material_light = 2131099679;
+			// aapt resource value: 0x7f0d000b
+			public const int bright_foreground_disabled_material_light = 2131558411;
 			
-			// aapt resource value: 0x7F060020
-			public const int bright_foreground_inverse_material_dark = 2131099680;
+			// aapt resource value: 0x7f0d000c
+			public const int bright_foreground_inverse_material_dark = 2131558412;
 			
-			// aapt resource value: 0x7F060021
-			public const int bright_foreground_inverse_material_light = 2131099681;
+			// aapt resource value: 0x7f0d000d
+			public const int bright_foreground_inverse_material_light = 2131558413;
 			
-			// aapt resource value: 0x7F060022
-			public const int bright_foreground_material_dark = 2131099682;
+			// aapt resource value: 0x7f0d000e
+			public const int bright_foreground_material_dark = 2131558414;
 			
-			// aapt resource value: 0x7F060023
-			public const int bright_foreground_material_light = 2131099683;
+			// aapt resource value: 0x7f0d000f
+			public const int bright_foreground_material_light = 2131558415;
 			
-			// aapt resource value: 0x7F060024
-			public const int button_material_dark = 2131099684;
+			// aapt resource value: 0x7f0d0010
+			public const int button_material_dark = 2131558416;
 			
-			// aapt resource value: 0x7F060025
-			public const int button_material_light = 2131099685;
+			// aapt resource value: 0x7f0d0011
+			public const int button_material_light = 2131558417;
 			
-			// aapt resource value: 0x7F060026
-			public const int design_bottom_navigation_shadow_color = 2131099686;
+			// aapt resource value: 0x7f0d003c
+			public const int design_bottom_navigation_shadow_color = 2131558460;
 			
-			// aapt resource value: 0x7F060027
-			public const int design_error = 2131099687;
+			// aapt resource value: 0x7f0d0066
+			public const int design_error = 2131558502;
 			
-			// aapt resource value: 0x7F060028
-			public const int design_fab_shadow_end_color = 2131099688;
+			// aapt resource value: 0x7f0d003d
+			public const int design_fab_shadow_end_color = 2131558461;
 			
-			// aapt resource value: 0x7F060029
-			public const int design_fab_shadow_mid_color = 2131099689;
+			// aapt resource value: 0x7f0d003e
+			public const int design_fab_shadow_mid_color = 2131558462;
 			
-			// aapt resource value: 0x7F06002A
-			public const int design_fab_shadow_start_color = 2131099690;
+			// aapt resource value: 0x7f0d003f
+			public const int design_fab_shadow_start_color = 2131558463;
 			
-			// aapt resource value: 0x7F06002B
-			public const int design_fab_stroke_end_inner_color = 2131099691;
+			// aapt resource value: 0x7f0d0040
+			public const int design_fab_stroke_end_inner_color = 2131558464;
 			
-			// aapt resource value: 0x7F06002C
-			public const int design_fab_stroke_end_outer_color = 2131099692;
+			// aapt resource value: 0x7f0d0041
+			public const int design_fab_stroke_end_outer_color = 2131558465;
 			
-			// aapt resource value: 0x7F06002D
-			public const int design_fab_stroke_top_inner_color = 2131099693;
+			// aapt resource value: 0x7f0d0042
+			public const int design_fab_stroke_top_inner_color = 2131558466;
 			
-			// aapt resource value: 0x7F06002E
-			public const int design_fab_stroke_top_outer_color = 2131099694;
+			// aapt resource value: 0x7f0d0043
+			public const int design_fab_stroke_top_outer_color = 2131558467;
 			
-			// aapt resource value: 0x7F06002F
-			public const int design_snackbar_background_color = 2131099695;
+			// aapt resource value: 0x7f0d0044
+			public const int design_snackbar_background_color = 2131558468;
 			
-			// aapt resource value: 0x7F060030
-			public const int design_tint_password_toggle = 2131099696;
+			// aapt resource value: 0x7f0d0067
+			public const int design_tint_password_toggle = 2131558503;
 			
-			// aapt resource value: 0x7F060031
-			public const int dim_foreground_disabled_material_dark = 2131099697;
+			// aapt resource value: 0x7f0d0012
+			public const int dim_foreground_disabled_material_dark = 2131558418;
 			
-			// aapt resource value: 0x7F060032
-			public const int dim_foreground_disabled_material_light = 2131099698;
+			// aapt resource value: 0x7f0d0013
+			public const int dim_foreground_disabled_material_light = 2131558419;
 			
-			// aapt resource value: 0x7F060033
-			public const int dim_foreground_material_dark = 2131099699;
+			// aapt resource value: 0x7f0d0014
+			public const int dim_foreground_material_dark = 2131558420;
 			
-			// aapt resource value: 0x7F060034
-			public const int dim_foreground_material_light = 2131099700;
+			// aapt resource value: 0x7f0d0015
+			public const int dim_foreground_material_light = 2131558421;
 			
-			// aapt resource value: 0x7F060035
-			public const int error_color_material = 2131099701;
+			// aapt resource value: 0x7f0d0016
+			public const int error_color_material = 2131558422;
 			
-			// aapt resource value: 0x7F060036
-			public const int foreground_material_dark = 2131099702;
+			// aapt resource value: 0x7f0d0017
+			public const int foreground_material_dark = 2131558423;
 			
-			// aapt resource value: 0x7F060037
-			public const int foreground_material_light = 2131099703;
+			// aapt resource value: 0x7f0d0018
+			public const int foreground_material_light = 2131558424;
 			
-			// aapt resource value: 0x7F060038
-			public const int gd_top_view = 2131099704;
+			// aapt resource value: 0x7f0d0048
+			public const int gd_top_view = 2131558472;
 			
-			// aapt resource value: 0x7F060039
-			public const int highlighted_text_material_dark = 2131099705;
+			// aapt resource value: 0x7f0d0019
+			public const int highlighted_text_material_dark = 2131558425;
 			
-			// aapt resource value: 0x7F06003A
-			public const int highlighted_text_material_light = 2131099706;
+			// aapt resource value: 0x7f0d001a
+			public const int highlighted_text_material_light = 2131558426;
 			
-			// aapt resource value: 0x7F06003B
-			public const int material_blue_grey_800 = 2131099707;
+			// aapt resource value: 0x7f0d001b
+			public const int material_blue_grey_800 = 2131558427;
 			
-			// aapt resource value: 0x7F06003C
-			public const int material_blue_grey_900 = 2131099708;
+			// aapt resource value: 0x7f0d001c
+			public const int material_blue_grey_900 = 2131558428;
 			
-			// aapt resource value: 0x7F06003D
-			public const int material_blue_grey_950 = 2131099709;
+			// aapt resource value: 0x7f0d001d
+			public const int material_blue_grey_950 = 2131558429;
 			
-			// aapt resource value: 0x7F06003E
-			public const int material_deep_teal_200 = 2131099710;
+			// aapt resource value: 0x7f0d001e
+			public const int material_deep_teal_200 = 2131558430;
 			
-			// aapt resource value: 0x7F06003F
-			public const int material_deep_teal_500 = 2131099711;
+			// aapt resource value: 0x7f0d001f
+			public const int material_deep_teal_500 = 2131558431;
 			
-			// aapt resource value: 0x7F060040
-			public const int material_grey_100 = 2131099712;
+			// aapt resource value: 0x7f0d0020
+			public const int material_grey_100 = 2131558432;
 			
-			// aapt resource value: 0x7F060041
-			public const int material_grey_300 = 2131099713;
+			// aapt resource value: 0x7f0d0021
+			public const int material_grey_300 = 2131558433;
 			
-			// aapt resource value: 0x7F060042
-			public const int material_grey_50 = 2131099714;
+			// aapt resource value: 0x7f0d0022
+			public const int material_grey_50 = 2131558434;
 			
-			// aapt resource value: 0x7F060043
-			public const int material_grey_600 = 2131099715;
+			// aapt resource value: 0x7f0d0023
+			public const int material_grey_600 = 2131558435;
 			
-			// aapt resource value: 0x7F060044
-			public const int material_grey_800 = 2131099716;
+			// aapt resource value: 0x7f0d0024
+			public const int material_grey_800 = 2131558436;
 			
-			// aapt resource value: 0x7F060045
-			public const int material_grey_850 = 2131099717;
+			// aapt resource value: 0x7f0d0025
+			public const int material_grey_850 = 2131558437;
 			
-			// aapt resource value: 0x7F060046
-			public const int material_grey_900 = 2131099718;
+			// aapt resource value: 0x7f0d0026
+			public const int material_grey_900 = 2131558438;
 			
-			// aapt resource value: 0x7F060047
-			public const int material_red_500 = 2131099719;
+			// aapt resource value: 0x7f0d0047
+			public const int material_red_500 = 2131558471;
 			
-			// aapt resource value: 0x7F060048
-			public const int notification_action_color_filter = 2131099720;
+			// aapt resource value: 0x7f0d0045
+			public const int notification_action_color_filter = 2131558469;
 			
-			// aapt resource value: 0x7F060049
-			public const int notification_icon_bg_color = 2131099721;
+			// aapt resource value: 0x7f0d0046
+			public const int notification_icon_bg_color = 2131558470;
 			
-			// aapt resource value: 0x7F06004A
-			public const int notification_material_background_media_default_color = 2131099722;
+			// aapt resource value: 0x7f0d003b
+			public const int notification_material_background_media_default_color = 2131558459;
 			
-			// aapt resource value: 0x7F06004B
-			public const int pickerview_bgColor_default = 2131099723;
+			// aapt resource value: 0x7f0d0049
+			public const int pickerview_bgColor_default = 2131558473;
 			
-			// aapt resource value: 0x7F06004C
-			public const int pickerview_bgColor_overlay = 2131099724;
+			// aapt resource value: 0x7f0d004a
+			public const int pickerview_bgColor_overlay = 2131558474;
 			
-			// aapt resource value: 0x7F06004D
-			public const int pickerview_bg_topbar = 2131099725;
+			// aapt resource value: 0x7f0d004b
+			public const int pickerview_bg_topbar = 2131558475;
 			
-			// aapt resource value: 0x7F06004E
-			public const int pickerview_timebtn_nor = 2131099726;
+			// aapt resource value: 0x7f0d004c
+			public const int pickerview_timebtn_nor = 2131558476;
 			
-			// aapt resource value: 0x7F06004F
-			public const int pickerview_timebtn_pre = 2131099727;
+			// aapt resource value: 0x7f0d004d
+			public const int pickerview_timebtn_pre = 2131558477;
 			
-			// aapt resource value: 0x7F060050
-			public const int pickerview_topbar_title = 2131099728;
+			// aapt resource value: 0x7f0d004e
+			public const int pickerview_topbar_title = 2131558478;
 			
-			// aapt resource value: 0x7F060051
-			public const int pickerview_wheelview_textcolor_center = 2131099729;
+			// aapt resource value: 0x7f0d004f
+			public const int pickerview_wheelview_textcolor_center = 2131558479;
 			
-			// aapt resource value: 0x7F060052
-			public const int pickerview_wheelview_textcolor_divider = 2131099730;
+			// aapt resource value: 0x7f0d0050
+			public const int pickerview_wheelview_textcolor_divider = 2131558480;
 			
-			// aapt resource value: 0x7F060053
-			public const int pickerview_wheelview_textcolor_out = 2131099731;
+			// aapt resource value: 0x7f0d0051
+			public const int pickerview_wheelview_textcolor_out = 2131558481;
 			
-			// aapt resource value: 0x7F060054
-			public const int primary_dark_material_dark = 2131099732;
+			// aapt resource value: 0x7f0d0027
+			public const int primary_dark_material_dark = 2131558439;
 			
-			// aapt resource value: 0x7F060055
-			public const int primary_dark_material_light = 2131099733;
+			// aapt resource value: 0x7f0d0028
+			public const int primary_dark_material_light = 2131558440;
 			
-			// aapt resource value: 0x7F060056
-			public const int primary_material_dark = 2131099734;
+			// aapt resource value: 0x7f0d0029
+			public const int primary_material_dark = 2131558441;
 			
-			// aapt resource value: 0x7F060057
-			public const int primary_material_light = 2131099735;
+			// aapt resource value: 0x7f0d002a
+			public const int primary_material_light = 2131558442;
 			
-			// aapt resource value: 0x7F060058
-			public const int primary_text_default_material_dark = 2131099736;
+			// aapt resource value: 0x7f0d002b
+			public const int primary_text_default_material_dark = 2131558443;
 			
-			// aapt resource value: 0x7F060059
-			public const int primary_text_default_material_light = 2131099737;
+			// aapt resource value: 0x7f0d002c
+			public const int primary_text_default_material_light = 2131558444;
 			
-			// aapt resource value: 0x7F06005A
-			public const int primary_text_disabled_material_dark = 2131099738;
+			// aapt resource value: 0x7f0d002d
+			public const int primary_text_disabled_material_dark = 2131558445;
 			
-			// aapt resource value: 0x7F06005B
-			public const int primary_text_disabled_material_light = 2131099739;
+			// aapt resource value: 0x7f0d002e
+			public const int primary_text_disabled_material_light = 2131558446;
 			
-			// aapt resource value: 0x7F06005C
-			public const int ripple_material_dark = 2131099740;
+			// aapt resource value: 0x7f0d002f
+			public const int ripple_material_dark = 2131558447;
 			
-			// aapt resource value: 0x7F06005D
-			public const int ripple_material_light = 2131099741;
+			// aapt resource value: 0x7f0d0030
+			public const int ripple_material_light = 2131558448;
 			
-			// aapt resource value: 0x7F06005E
-			public const int secondary_text_default_material_dark = 2131099742;
+			// aapt resource value: 0x7f0d0031
+			public const int secondary_text_default_material_dark = 2131558449;
 			
-			// aapt resource value: 0x7F06005F
-			public const int secondary_text_default_material_light = 2131099743;
+			// aapt resource value: 0x7f0d0032
+			public const int secondary_text_default_material_light = 2131558450;
 			
-			// aapt resource value: 0x7F060060
-			public const int secondary_text_disabled_material_dark = 2131099744;
+			// aapt resource value: 0x7f0d0033
+			public const int secondary_text_disabled_material_dark = 2131558451;
 			
-			// aapt resource value: 0x7F060061
-			public const int secondary_text_disabled_material_light = 2131099745;
+			// aapt resource value: 0x7f0d0034
+			public const int secondary_text_disabled_material_light = 2131558452;
 			
-			// aapt resource value: 0x7F060062
-			public const int switch_thumb_disabled_material_dark = 2131099746;
+			// aapt resource value: 0x7f0d0035
+			public const int switch_thumb_disabled_material_dark = 2131558453;
 			
-			// aapt resource value: 0x7F060063
-			public const int switch_thumb_disabled_material_light = 2131099747;
+			// aapt resource value: 0x7f0d0036
+			public const int switch_thumb_disabled_material_light = 2131558454;
 			
-			// aapt resource value: 0x7F060064
-			public const int switch_thumb_material_dark = 2131099748;
+			// aapt resource value: 0x7f0d0068
+			public const int switch_thumb_material_dark = 2131558504;
 			
-			// aapt resource value: 0x7F060065
-			public const int switch_thumb_material_light = 2131099749;
+			// aapt resource value: 0x7f0d0069
+			public const int switch_thumb_material_light = 2131558505;
 			
-			// aapt resource value: 0x7F060066
-			public const int switch_thumb_normal_material_dark = 2131099750;
+			// aapt resource value: 0x7f0d0037
+			public const int switch_thumb_normal_material_dark = 2131558455;
 			
-			// aapt resource value: 0x7F060067
-			public const int switch_thumb_normal_material_light = 2131099751;
+			// aapt resource value: 0x7f0d0038
+			public const int switch_thumb_normal_material_light = 2131558456;
 			
-			// aapt resource value: 0x7F060068
-			public const int tooltip_background_dark = 2131099752;
+			// aapt resource value: 0x7f0d0039
+			public const int tooltip_background_dark = 2131558457;
 			
-			// aapt resource value: 0x7F060069
-			public const int tooltip_background_light = 2131099753;
+			// aapt resource value: 0x7f0d003a
+			public const int tooltip_background_light = 2131558458;
 			
 			static Color()
 			{
@@ -2029,491 +2029,491 @@
 		public partial class Dimension
 		{
 			
-			// aapt resource value: 0x7F070000
-			public const int abc_action_bar_content_inset_material = 2131165184;
+			// aapt resource value: 0x7f080012
+			public const int abc_action_bar_content_inset_material = 2131230738;
 			
-			// aapt resource value: 0x7F070001
-			public const int abc_action_bar_content_inset_with_nav = 2131165185;
+			// aapt resource value: 0x7f080013
+			public const int abc_action_bar_content_inset_with_nav = 2131230739;
 			
-			// aapt resource value: 0x7F070002
-			public const int abc_action_bar_default_height_material = 2131165186;
+			// aapt resource value: 0x7f080007
+			public const int abc_action_bar_default_height_material = 2131230727;
 			
-			// aapt resource value: 0x7F070003
-			public const int abc_action_bar_default_padding_end_material = 2131165187;
+			// aapt resource value: 0x7f080014
+			public const int abc_action_bar_default_padding_end_material = 2131230740;
 			
-			// aapt resource value: 0x7F070004
-			public const int abc_action_bar_default_padding_start_material = 2131165188;
+			// aapt resource value: 0x7f080015
+			public const int abc_action_bar_default_padding_start_material = 2131230741;
 			
-			// aapt resource value: 0x7F070005
-			public const int abc_action_bar_elevation_material = 2131165189;
+			// aapt resource value: 0x7f080017
+			public const int abc_action_bar_elevation_material = 2131230743;
 			
-			// aapt resource value: 0x7F070006
-			public const int abc_action_bar_icon_vertical_padding_material = 2131165190;
+			// aapt resource value: 0x7f080018
+			public const int abc_action_bar_icon_vertical_padding_material = 2131230744;
 			
-			// aapt resource value: 0x7F070007
-			public const int abc_action_bar_overflow_padding_end_material = 2131165191;
+			// aapt resource value: 0x7f080019
+			public const int abc_action_bar_overflow_padding_end_material = 2131230745;
 			
-			// aapt resource value: 0x7F070008
-			public const int abc_action_bar_overflow_padding_start_material = 2131165192;
+			// aapt resource value: 0x7f08001a
+			public const int abc_action_bar_overflow_padding_start_material = 2131230746;
 			
-			// aapt resource value: 0x7F070009
-			public const int abc_action_bar_progress_bar_size = 2131165193;
+			// aapt resource value: 0x7f080008
+			public const int abc_action_bar_progress_bar_size = 2131230728;
 			
-			// aapt resource value: 0x7F07000A
-			public const int abc_action_bar_stacked_max_height = 2131165194;
+			// aapt resource value: 0x7f08001b
+			public const int abc_action_bar_stacked_max_height = 2131230747;
 			
-			// aapt resource value: 0x7F07000B
-			public const int abc_action_bar_stacked_tab_max_width = 2131165195;
+			// aapt resource value: 0x7f08001c
+			public const int abc_action_bar_stacked_tab_max_width = 2131230748;
 			
-			// aapt resource value: 0x7F07000C
-			public const int abc_action_bar_subtitle_bottom_margin_material = 2131165196;
+			// aapt resource value: 0x7f08001d
+			public const int abc_action_bar_subtitle_bottom_margin_material = 2131230749;
 			
-			// aapt resource value: 0x7F07000D
-			public const int abc_action_bar_subtitle_top_margin_material = 2131165197;
+			// aapt resource value: 0x7f08001e
+			public const int abc_action_bar_subtitle_top_margin_material = 2131230750;
 			
-			// aapt resource value: 0x7F07000E
-			public const int abc_action_button_min_height_material = 2131165198;
+			// aapt resource value: 0x7f08001f
+			public const int abc_action_button_min_height_material = 2131230751;
 			
-			// aapt resource value: 0x7F07000F
-			public const int abc_action_button_min_width_material = 2131165199;
+			// aapt resource value: 0x7f080020
+			public const int abc_action_button_min_width_material = 2131230752;
 			
-			// aapt resource value: 0x7F070010
-			public const int abc_action_button_min_width_overflow_material = 2131165200;
+			// aapt resource value: 0x7f080021
+			public const int abc_action_button_min_width_overflow_material = 2131230753;
 			
-			// aapt resource value: 0x7F070011
-			public const int abc_alert_dialog_button_bar_height = 2131165201;
+			// aapt resource value: 0x7f080006
+			public const int abc_alert_dialog_button_bar_height = 2131230726;
 			
-			// aapt resource value: 0x7F070012
-			public const int abc_button_inset_horizontal_material = 2131165202;
+			// aapt resource value: 0x7f080022
+			public const int abc_button_inset_horizontal_material = 2131230754;
 			
-			// aapt resource value: 0x7F070013
-			public const int abc_button_inset_vertical_material = 2131165203;
+			// aapt resource value: 0x7f080023
+			public const int abc_button_inset_vertical_material = 2131230755;
 			
-			// aapt resource value: 0x7F070014
-			public const int abc_button_padding_horizontal_material = 2131165204;
+			// aapt resource value: 0x7f080024
+			public const int abc_button_padding_horizontal_material = 2131230756;
 			
-			// aapt resource value: 0x7F070015
-			public const int abc_button_padding_vertical_material = 2131165205;
+			// aapt resource value: 0x7f080025
+			public const int abc_button_padding_vertical_material = 2131230757;
 			
-			// aapt resource value: 0x7F070016
-			public const int abc_cascading_menus_min_smallest_width = 2131165206;
+			// aapt resource value: 0x7f080026
+			public const int abc_cascading_menus_min_smallest_width = 2131230758;
 			
-			// aapt resource value: 0x7F070017
-			public const int abc_config_prefDialogWidth = 2131165207;
+			// aapt resource value: 0x7f08000b
+			public const int abc_config_prefDialogWidth = 2131230731;
 			
-			// aapt resource value: 0x7F070018
-			public const int abc_control_corner_material = 2131165208;
+			// aapt resource value: 0x7f080027
+			public const int abc_control_corner_material = 2131230759;
 			
-			// aapt resource value: 0x7F070019
-			public const int abc_control_inset_material = 2131165209;
+			// aapt resource value: 0x7f080028
+			public const int abc_control_inset_material = 2131230760;
 			
-			// aapt resource value: 0x7F07001A
-			public const int abc_control_padding_material = 2131165210;
+			// aapt resource value: 0x7f080029
+			public const int abc_control_padding_material = 2131230761;
 			
-			// aapt resource value: 0x7F07001B
-			public const int abc_dialog_fixed_height_major = 2131165211;
+			// aapt resource value: 0x7f08000c
+			public const int abc_dialog_fixed_height_major = 2131230732;
 			
-			// aapt resource value: 0x7F07001C
-			public const int abc_dialog_fixed_height_minor = 2131165212;
+			// aapt resource value: 0x7f08000d
+			public const int abc_dialog_fixed_height_minor = 2131230733;
 			
-			// aapt resource value: 0x7F07001D
-			public const int abc_dialog_fixed_width_major = 2131165213;
+			// aapt resource value: 0x7f08000e
+			public const int abc_dialog_fixed_width_major = 2131230734;
 			
-			// aapt resource value: 0x7F07001E
-			public const int abc_dialog_fixed_width_minor = 2131165214;
+			// aapt resource value: 0x7f08000f
+			public const int abc_dialog_fixed_width_minor = 2131230735;
 			
-			// aapt resource value: 0x7F07001F
-			public const int abc_dialog_list_padding_bottom_no_buttons = 2131165215;
+			// aapt resource value: 0x7f08002a
+			public const int abc_dialog_list_padding_bottom_no_buttons = 2131230762;
 			
-			// aapt resource value: 0x7F070020
-			public const int abc_dialog_list_padding_top_no_title = 2131165216;
+			// aapt resource value: 0x7f08002b
+			public const int abc_dialog_list_padding_top_no_title = 2131230763;
 			
-			// aapt resource value: 0x7F070021
-			public const int abc_dialog_min_width_major = 2131165217;
+			// aapt resource value: 0x7f080010
+			public const int abc_dialog_min_width_major = 2131230736;
 			
-			// aapt resource value: 0x7F070022
-			public const int abc_dialog_min_width_minor = 2131165218;
+			// aapt resource value: 0x7f080011
+			public const int abc_dialog_min_width_minor = 2131230737;
 			
-			// aapt resource value: 0x7F070023
-			public const int abc_dialog_padding_material = 2131165219;
+			// aapt resource value: 0x7f08002c
+			public const int abc_dialog_padding_material = 2131230764;
 			
-			// aapt resource value: 0x7F070024
-			public const int abc_dialog_padding_top_material = 2131165220;
+			// aapt resource value: 0x7f08002d
+			public const int abc_dialog_padding_top_material = 2131230765;
 			
-			// aapt resource value: 0x7F070025
-			public const int abc_dialog_title_divider_material = 2131165221;
+			// aapt resource value: 0x7f08002e
+			public const int abc_dialog_title_divider_material = 2131230766;
 			
-			// aapt resource value: 0x7F070026
-			public const int abc_disabled_alpha_material_dark = 2131165222;
+			// aapt resource value: 0x7f08002f
+			public const int abc_disabled_alpha_material_dark = 2131230767;
 			
-			// aapt resource value: 0x7F070027
-			public const int abc_disabled_alpha_material_light = 2131165223;
+			// aapt resource value: 0x7f080030
+			public const int abc_disabled_alpha_material_light = 2131230768;
 			
-			// aapt resource value: 0x7F070028
-			public const int abc_dropdownitem_icon_width = 2131165224;
+			// aapt resource value: 0x7f080031
+			public const int abc_dropdownitem_icon_width = 2131230769;
 			
-			// aapt resource value: 0x7F070029
-			public const int abc_dropdownitem_text_padding_left = 2131165225;
+			// aapt resource value: 0x7f080032
+			public const int abc_dropdownitem_text_padding_left = 2131230770;
 			
-			// aapt resource value: 0x7F07002A
-			public const int abc_dropdownitem_text_padding_right = 2131165226;
+			// aapt resource value: 0x7f080033
+			public const int abc_dropdownitem_text_padding_right = 2131230771;
 			
-			// aapt resource value: 0x7F07002B
-			public const int abc_edit_text_inset_bottom_material = 2131165227;
+			// aapt resource value: 0x7f080034
+			public const int abc_edit_text_inset_bottom_material = 2131230772;
 			
-			// aapt resource value: 0x7F07002C
-			public const int abc_edit_text_inset_horizontal_material = 2131165228;
+			// aapt resource value: 0x7f080035
+			public const int abc_edit_text_inset_horizontal_material = 2131230773;
 			
-			// aapt resource value: 0x7F07002D
-			public const int abc_edit_text_inset_top_material = 2131165229;
+			// aapt resource value: 0x7f080036
+			public const int abc_edit_text_inset_top_material = 2131230774;
 			
-			// aapt resource value: 0x7F07002E
-			public const int abc_floating_window_z = 2131165230;
+			// aapt resource value: 0x7f080037
+			public const int abc_floating_window_z = 2131230775;
 			
-			// aapt resource value: 0x7F07002F
-			public const int abc_list_item_padding_horizontal_material = 2131165231;
+			// aapt resource value: 0x7f080038
+			public const int abc_list_item_padding_horizontal_material = 2131230776;
 			
-			// aapt resource value: 0x7F070030
-			public const int abc_panel_menu_list_width = 2131165232;
+			// aapt resource value: 0x7f080039
+			public const int abc_panel_menu_list_width = 2131230777;
 			
-			// aapt resource value: 0x7F070031
-			public const int abc_progress_bar_height_material = 2131165233;
+			// aapt resource value: 0x7f08003a
+			public const int abc_progress_bar_height_material = 2131230778;
 			
-			// aapt resource value: 0x7F070032
-			public const int abc_search_view_preferred_height = 2131165234;
+			// aapt resource value: 0x7f08003b
+			public const int abc_search_view_preferred_height = 2131230779;
 			
-			// aapt resource value: 0x7F070033
-			public const int abc_search_view_preferred_width = 2131165235;
+			// aapt resource value: 0x7f08003c
+			public const int abc_search_view_preferred_width = 2131230780;
 			
-			// aapt resource value: 0x7F070034
-			public const int abc_seekbar_track_background_height_material = 2131165236;
+			// aapt resource value: 0x7f08003d
+			public const int abc_seekbar_track_background_height_material = 2131230781;
 			
-			// aapt resource value: 0x7F070035
-			public const int abc_seekbar_track_progress_height_material = 2131165237;
+			// aapt resource value: 0x7f08003e
+			public const int abc_seekbar_track_progress_height_material = 2131230782;
 			
-			// aapt resource value: 0x7F070036
-			public const int abc_select_dialog_padding_start_material = 2131165238;
+			// aapt resource value: 0x7f08003f
+			public const int abc_select_dialog_padding_start_material = 2131230783;
 			
-			// aapt resource value: 0x7F070037
-			public const int abc_switch_padding = 2131165239;
+			// aapt resource value: 0x7f080016
+			public const int abc_switch_padding = 2131230742;
 			
-			// aapt resource value: 0x7F070038
-			public const int abc_text_size_body_1_material = 2131165240;
+			// aapt resource value: 0x7f080040
+			public const int abc_text_size_body_1_material = 2131230784;
 			
-			// aapt resource value: 0x7F070039
-			public const int abc_text_size_body_2_material = 2131165241;
+			// aapt resource value: 0x7f080041
+			public const int abc_text_size_body_2_material = 2131230785;
 			
-			// aapt resource value: 0x7F07003A
-			public const int abc_text_size_button_material = 2131165242;
+			// aapt resource value: 0x7f080042
+			public const int abc_text_size_button_material = 2131230786;
 			
-			// aapt resource value: 0x7F07003B
-			public const int abc_text_size_caption_material = 2131165243;
+			// aapt resource value: 0x7f080043
+			public const int abc_text_size_caption_material = 2131230787;
 			
-			// aapt resource value: 0x7F07003C
-			public const int abc_text_size_display_1_material = 2131165244;
+			// aapt resource value: 0x7f080044
+			public const int abc_text_size_display_1_material = 2131230788;
 			
-			// aapt resource value: 0x7F07003D
-			public const int abc_text_size_display_2_material = 2131165245;
+			// aapt resource value: 0x7f080045
+			public const int abc_text_size_display_2_material = 2131230789;
 			
-			// aapt resource value: 0x7F07003E
-			public const int abc_text_size_display_3_material = 2131165246;
+			// aapt resource value: 0x7f080046
+			public const int abc_text_size_display_3_material = 2131230790;
 			
-			// aapt resource value: 0x7F07003F
-			public const int abc_text_size_display_4_material = 2131165247;
+			// aapt resource value: 0x7f080047
+			public const int abc_text_size_display_4_material = 2131230791;
 			
-			// aapt resource value: 0x7F070040
-			public const int abc_text_size_headline_material = 2131165248;
+			// aapt resource value: 0x7f080048
+			public const int abc_text_size_headline_material = 2131230792;
 			
-			// aapt resource value: 0x7F070041
-			public const int abc_text_size_large_material = 2131165249;
+			// aapt resource value: 0x7f080049
+			public const int abc_text_size_large_material = 2131230793;
 			
-			// aapt resource value: 0x7F070042
-			public const int abc_text_size_medium_material = 2131165250;
+			// aapt resource value: 0x7f08004a
+			public const int abc_text_size_medium_material = 2131230794;
 			
-			// aapt resource value: 0x7F070043
-			public const int abc_text_size_menu_header_material = 2131165251;
+			// aapt resource value: 0x7f08004b
+			public const int abc_text_size_menu_header_material = 2131230795;
 			
-			// aapt resource value: 0x7F070044
-			public const int abc_text_size_menu_material = 2131165252;
+			// aapt resource value: 0x7f08004c
+			public const int abc_text_size_menu_material = 2131230796;
 			
-			// aapt resource value: 0x7F070045
-			public const int abc_text_size_small_material = 2131165253;
+			// aapt resource value: 0x7f08004d
+			public const int abc_text_size_small_material = 2131230797;
 			
-			// aapt resource value: 0x7F070046
-			public const int abc_text_size_subhead_material = 2131165254;
+			// aapt resource value: 0x7f08004e
+			public const int abc_text_size_subhead_material = 2131230798;
 			
-			// aapt resource value: 0x7F070047
-			public const int abc_text_size_subtitle_material_toolbar = 2131165255;
+			// aapt resource value: 0x7f080009
+			public const int abc_text_size_subtitle_material_toolbar = 2131230729;
 			
-			// aapt resource value: 0x7F070048
-			public const int abc_text_size_title_material = 2131165256;
+			// aapt resource value: 0x7f08004f
+			public const int abc_text_size_title_material = 2131230799;
 			
-			// aapt resource value: 0x7F070049
-			public const int abc_text_size_title_material_toolbar = 2131165257;
+			// aapt resource value: 0x7f08000a
+			public const int abc_text_size_title_material_toolbar = 2131230730;
 			
-			// aapt resource value: 0x7F07004A
-			public const int compat_button_inset_horizontal_material = 2131165258;
+			// aapt resource value: 0x7f08008b
+			public const int compat_button_inset_horizontal_material = 2131230859;
 			
-			// aapt resource value: 0x7F07004B
-			public const int compat_button_inset_vertical_material = 2131165259;
+			// aapt resource value: 0x7f08008c
+			public const int compat_button_inset_vertical_material = 2131230860;
 			
-			// aapt resource value: 0x7F07004C
-			public const int compat_button_padding_horizontal_material = 2131165260;
+			// aapt resource value: 0x7f08008d
+			public const int compat_button_padding_horizontal_material = 2131230861;
 			
-			// aapt resource value: 0x7F07004D
-			public const int compat_button_padding_vertical_material = 2131165261;
+			// aapt resource value: 0x7f08008e
+			public const int compat_button_padding_vertical_material = 2131230862;
 			
-			// aapt resource value: 0x7F07004E
-			public const int compat_control_corner_material = 2131165262;
+			// aapt resource value: 0x7f08008f
+			public const int compat_control_corner_material = 2131230863;
 			
-			// aapt resource value: 0x7F07004F
-			public const int design_appbar_elevation = 2131165263;
+			// aapt resource value: 0x7f080069
+			public const int design_appbar_elevation = 2131230825;
 			
-			// aapt resource value: 0x7F070050
-			public const int design_bottom_navigation_active_item_max_width = 2131165264;
+			// aapt resource value: 0x7f08006a
+			public const int design_bottom_navigation_active_item_max_width = 2131230826;
 			
-			// aapt resource value: 0x7F070051
-			public const int design_bottom_navigation_active_text_size = 2131165265;
+			// aapt resource value: 0x7f08006b
+			public const int design_bottom_navigation_active_text_size = 2131230827;
 			
-			// aapt resource value: 0x7F070052
-			public const int design_bottom_navigation_elevation = 2131165266;
+			// aapt resource value: 0x7f08006c
+			public const int design_bottom_navigation_elevation = 2131230828;
 			
-			// aapt resource value: 0x7F070053
-			public const int design_bottom_navigation_height = 2131165267;
+			// aapt resource value: 0x7f08006d
+			public const int design_bottom_navigation_height = 2131230829;
 			
-			// aapt resource value: 0x7F070054
-			public const int design_bottom_navigation_item_max_width = 2131165268;
+			// aapt resource value: 0x7f08006e
+			public const int design_bottom_navigation_item_max_width = 2131230830;
 			
-			// aapt resource value: 0x7F070055
-			public const int design_bottom_navigation_item_min_width = 2131165269;
+			// aapt resource value: 0x7f08006f
+			public const int design_bottom_navigation_item_min_width = 2131230831;
 			
-			// aapt resource value: 0x7F070056
-			public const int design_bottom_navigation_margin = 2131165270;
+			// aapt resource value: 0x7f080070
+			public const int design_bottom_navigation_margin = 2131230832;
 			
-			// aapt resource value: 0x7F070057
-			public const int design_bottom_navigation_shadow_height = 2131165271;
+			// aapt resource value: 0x7f080071
+			public const int design_bottom_navigation_shadow_height = 2131230833;
 			
-			// aapt resource value: 0x7F070058
-			public const int design_bottom_navigation_text_size = 2131165272;
+			// aapt resource value: 0x7f080072
+			public const int design_bottom_navigation_text_size = 2131230834;
 			
-			// aapt resource value: 0x7F070059
-			public const int design_bottom_sheet_modal_elevation = 2131165273;
+			// aapt resource value: 0x7f080073
+			public const int design_bottom_sheet_modal_elevation = 2131230835;
 			
-			// aapt resource value: 0x7F07005A
-			public const int design_bottom_sheet_peek_height_min = 2131165274;
+			// aapt resource value: 0x7f080074
+			public const int design_bottom_sheet_peek_height_min = 2131230836;
 			
-			// aapt resource value: 0x7F07005B
-			public const int design_fab_border_width = 2131165275;
+			// aapt resource value: 0x7f080075
+			public const int design_fab_border_width = 2131230837;
 			
-			// aapt resource value: 0x7F07005C
-			public const int design_fab_elevation = 2131165276;
+			// aapt resource value: 0x7f080076
+			public const int design_fab_elevation = 2131230838;
 			
-			// aapt resource value: 0x7F07005D
-			public const int design_fab_image_size = 2131165277;
+			// aapt resource value: 0x7f080077
+			public const int design_fab_image_size = 2131230839;
 			
-			// aapt resource value: 0x7F07005E
-			public const int design_fab_size_mini = 2131165278;
+			// aapt resource value: 0x7f080078
+			public const int design_fab_size_mini = 2131230840;
 			
-			// aapt resource value: 0x7F07005F
-			public const int design_fab_size_normal = 2131165279;
+			// aapt resource value: 0x7f080079
+			public const int design_fab_size_normal = 2131230841;
 			
-			// aapt resource value: 0x7F070060
-			public const int design_fab_translation_z_pressed = 2131165280;
+			// aapt resource value: 0x7f08007a
+			public const int design_fab_translation_z_pressed = 2131230842;
 			
-			// aapt resource value: 0x7F070061
-			public const int design_navigation_elevation = 2131165281;
+			// aapt resource value: 0x7f08007b
+			public const int design_navigation_elevation = 2131230843;
 			
-			// aapt resource value: 0x7F070062
-			public const int design_navigation_icon_padding = 2131165282;
+			// aapt resource value: 0x7f08007c
+			public const int design_navigation_icon_padding = 2131230844;
 			
-			// aapt resource value: 0x7F070063
-			public const int design_navigation_icon_size = 2131165283;
+			// aapt resource value: 0x7f08007d
+			public const int design_navigation_icon_size = 2131230845;
 			
-			// aapt resource value: 0x7F070064
-			public const int design_navigation_max_width = 2131165284;
+			// aapt resource value: 0x7f080061
+			public const int design_navigation_max_width = 2131230817;
 			
-			// aapt resource value: 0x7F070065
-			public const int design_navigation_padding_bottom = 2131165285;
+			// aapt resource value: 0x7f08007e
+			public const int design_navigation_padding_bottom = 2131230846;
 			
-			// aapt resource value: 0x7F070066
-			public const int design_navigation_separator_vertical_padding = 2131165286;
+			// aapt resource value: 0x7f08007f
+			public const int design_navigation_separator_vertical_padding = 2131230847;
 			
-			// aapt resource value: 0x7F070067
-			public const int design_snackbar_action_inline_max_width = 2131165287;
+			// aapt resource value: 0x7f080062
+			public const int design_snackbar_action_inline_max_width = 2131230818;
 			
-			// aapt resource value: 0x7F070068
-			public const int design_snackbar_background_corner_radius = 2131165288;
+			// aapt resource value: 0x7f080063
+			public const int design_snackbar_background_corner_radius = 2131230819;
 			
-			// aapt resource value: 0x7F070069
-			public const int design_snackbar_elevation = 2131165289;
+			// aapt resource value: 0x7f080080
+			public const int design_snackbar_elevation = 2131230848;
 			
-			// aapt resource value: 0x7F07006A
-			public const int design_snackbar_extra_spacing_horizontal = 2131165290;
+			// aapt resource value: 0x7f080064
+			public const int design_snackbar_extra_spacing_horizontal = 2131230820;
 			
-			// aapt resource value: 0x7F07006B
-			public const int design_snackbar_max_width = 2131165291;
+			// aapt resource value: 0x7f080065
+			public const int design_snackbar_max_width = 2131230821;
 			
-			// aapt resource value: 0x7F07006C
-			public const int design_snackbar_min_width = 2131165292;
+			// aapt resource value: 0x7f080066
+			public const int design_snackbar_min_width = 2131230822;
 			
-			// aapt resource value: 0x7F07006D
-			public const int design_snackbar_padding_horizontal = 2131165293;
+			// aapt resource value: 0x7f080081
+			public const int design_snackbar_padding_horizontal = 2131230849;
 			
-			// aapt resource value: 0x7F07006E
-			public const int design_snackbar_padding_vertical = 2131165294;
+			// aapt resource value: 0x7f080082
+			public const int design_snackbar_padding_vertical = 2131230850;
 			
-			// aapt resource value: 0x7F07006F
-			public const int design_snackbar_padding_vertical_2lines = 2131165295;
+			// aapt resource value: 0x7f080067
+			public const int design_snackbar_padding_vertical_2lines = 2131230823;
 			
-			// aapt resource value: 0x7F070070
-			public const int design_snackbar_text_size = 2131165296;
+			// aapt resource value: 0x7f080083
+			public const int design_snackbar_text_size = 2131230851;
 			
-			// aapt resource value: 0x7F070071
-			public const int design_tab_max_width = 2131165297;
+			// aapt resource value: 0x7f080084
+			public const int design_tab_max_width = 2131230852;
 			
-			// aapt resource value: 0x7F070072
-			public const int design_tab_scrollable_min_width = 2131165298;
+			// aapt resource value: 0x7f080068
+			public const int design_tab_scrollable_min_width = 2131230824;
 			
-			// aapt resource value: 0x7F070073
-			public const int design_tab_text_size = 2131165299;
+			// aapt resource value: 0x7f080085
+			public const int design_tab_text_size = 2131230853;
 			
-			// aapt resource value: 0x7F070074
-			public const int design_tab_text_size_2line = 2131165300;
+			// aapt resource value: 0x7f080086
+			public const int design_tab_text_size_2line = 2131230854;
 			
-			// aapt resource value: 0x7F070075
-			public const int disabled_alpha_material_dark = 2131165301;
+			// aapt resource value: 0x7f080050
+			public const int disabled_alpha_material_dark = 2131230800;
 			
-			// aapt resource value: 0x7F070076
-			public const int disabled_alpha_material_light = 2131165302;
+			// aapt resource value: 0x7f080051
+			public const int disabled_alpha_material_light = 2131230801;
 			
-			// aapt resource value: 0x7F070077
-			public const int fastscroll_default_thickness = 2131165303;
+			// aapt resource value: 0x7f080000
+			public const int fastscroll_default_thickness = 2131230720;
 			
-			// aapt resource value: 0x7F070078
-			public const int fastscroll_margin = 2131165304;
+			// aapt resource value: 0x7f080001
+			public const int fastscroll_margin = 2131230721;
 			
-			// aapt resource value: 0x7F070079
-			public const int fastscroll_minimum_range = 2131165305;
+			// aapt resource value: 0x7f080002
+			public const int fastscroll_minimum_range = 2131230722;
 			
-			// aapt resource value: 0x7F07007A
-			public const int fingerprint_icon_size = 2131165306;
+			// aapt resource value: 0x7f08009c
+			public const int fingerprint_icon_size = 2131230876;
 			
-			// aapt resource value: 0x7F07007B
-			public const int fingerprint_status_layout_margin_vertical = 2131165307;
+			// aapt resource value: 0x7f08009b
+			public const int fingerprint_status_layout_margin_vertical = 2131230875;
 			
-			// aapt resource value: 0x7F07007C
-			public const int highlight_alpha_material_colored = 2131165308;
+			// aapt resource value: 0x7f080052
+			public const int highlight_alpha_material_colored = 2131230802;
 			
-			// aapt resource value: 0x7F07007D
-			public const int highlight_alpha_material_dark = 2131165309;
+			// aapt resource value: 0x7f080053
+			public const int highlight_alpha_material_dark = 2131230803;
 			
-			// aapt resource value: 0x7F07007E
-			public const int highlight_alpha_material_light = 2131165310;
+			// aapt resource value: 0x7f080054
+			public const int highlight_alpha_material_light = 2131230804;
 			
-			// aapt resource value: 0x7F07007F
-			public const int hint_alpha_material_dark = 2131165311;
+			// aapt resource value: 0x7f080055
+			public const int hint_alpha_material_dark = 2131230805;
 			
-			// aapt resource value: 0x7F070080
-			public const int hint_alpha_material_light = 2131165312;
+			// aapt resource value: 0x7f080056
+			public const int hint_alpha_material_light = 2131230806;
 			
-			// aapt resource value: 0x7F070081
-			public const int hint_pressed_alpha_material_dark = 2131165313;
+			// aapt resource value: 0x7f080057
+			public const int hint_pressed_alpha_material_dark = 2131230807;
 			
-			// aapt resource value: 0x7F070082
-			public const int hint_pressed_alpha_material_light = 2131165314;
+			// aapt resource value: 0x7f080058
+			public const int hint_pressed_alpha_material_light = 2131230808;
 			
-			// aapt resource value: 0x7F070083
-			public const int item_touch_helper_max_drag_scroll_per_frame = 2131165315;
+			// aapt resource value: 0x7f080003
+			public const int item_touch_helper_max_drag_scroll_per_frame = 2131230723;
 			
-			// aapt resource value: 0x7F070084
-			public const int item_touch_helper_swipe_escape_max_velocity = 2131165316;
+			// aapt resource value: 0x7f080004
+			public const int item_touch_helper_swipe_escape_max_velocity = 2131230724;
 			
-			// aapt resource value: 0x7F070085
-			public const int item_touch_helper_swipe_escape_velocity = 2131165317;
+			// aapt resource value: 0x7f080005
+			public const int item_touch_helper_swipe_escape_velocity = 2131230725;
 			
-			// aapt resource value: 0x7F070086
-			public const int notification_action_icon_size = 2131165318;
+			// aapt resource value: 0x7f080090
+			public const int notification_action_icon_size = 2131230864;
 			
-			// aapt resource value: 0x7F070087
-			public const int notification_action_text_size = 2131165319;
+			// aapt resource value: 0x7f080091
+			public const int notification_action_text_size = 2131230865;
 			
-			// aapt resource value: 0x7F070088
-			public const int notification_big_circle_margin = 2131165320;
+			// aapt resource value: 0x7f080092
+			public const int notification_big_circle_margin = 2131230866;
 			
-			// aapt resource value: 0x7F070089
-			public const int notification_content_margin_start = 2131165321;
+			// aapt resource value: 0x7f080088
+			public const int notification_content_margin_start = 2131230856;
 			
-			// aapt resource value: 0x7F07008A
-			public const int notification_large_icon_height = 2131165322;
+			// aapt resource value: 0x7f080093
+			public const int notification_large_icon_height = 2131230867;
 			
-			// aapt resource value: 0x7F07008B
-			public const int notification_large_icon_width = 2131165323;
+			// aapt resource value: 0x7f080094
+			public const int notification_large_icon_width = 2131230868;
 			
-			// aapt resource value: 0x7F07008C
-			public const int notification_main_column_padding_top = 2131165324;
+			// aapt resource value: 0x7f080089
+			public const int notification_main_column_padding_top = 2131230857;
 			
-			// aapt resource value: 0x7F07008D
-			public const int notification_media_narrow_margin = 2131165325;
+			// aapt resource value: 0x7f08008a
+			public const int notification_media_narrow_margin = 2131230858;
 			
-			// aapt resource value: 0x7F07008E
-			public const int notification_right_icon_size = 2131165326;
+			// aapt resource value: 0x7f080095
+			public const int notification_right_icon_size = 2131230869;
 			
-			// aapt resource value: 0x7F07008F
-			public const int notification_right_side_padding_top = 2131165327;
+			// aapt resource value: 0x7f080087
+			public const int notification_right_side_padding_top = 2131230855;
 			
-			// aapt resource value: 0x7F070090
-			public const int notification_small_icon_background_padding = 2131165328;
+			// aapt resource value: 0x7f080096
+			public const int notification_small_icon_background_padding = 2131230870;
 			
-			// aapt resource value: 0x7F070091
-			public const int notification_small_icon_size_as_large = 2131165329;
+			// aapt resource value: 0x7f080097
+			public const int notification_small_icon_size_as_large = 2131230871;
 			
-			// aapt resource value: 0x7F070092
-			public const int notification_subtext_size = 2131165330;
+			// aapt resource value: 0x7f080098
+			public const int notification_subtext_size = 2131230872;
 			
-			// aapt resource value: 0x7F070093
-			public const int notification_top_pad = 2131165331;
+			// aapt resource value: 0x7f080099
+			public const int notification_top_pad = 2131230873;
 			
-			// aapt resource value: 0x7F070094
-			public const int notification_top_pad_large_text = 2131165332;
+			// aapt resource value: 0x7f08009a
+			public const int notification_top_pad_large_text = 2131230874;
 			
-			// aapt resource value: 0x7F070095
-			public const int pickerview_textsize = 2131165333;
+			// aapt resource value: 0x7f08009d
+			public const int pickerview_textsize = 2131230877;
 			
-			// aapt resource value: 0x7F070096
-			public const int pickerview_topbar_btn_textsize = 2131165334;
+			// aapt resource value: 0x7f08009e
+			public const int pickerview_topbar_btn_textsize = 2131230878;
 			
-			// aapt resource value: 0x7F070097
-			public const int pickerview_topbar_height = 2131165335;
+			// aapt resource value: 0x7f08009f
+			public const int pickerview_topbar_height = 2131230879;
 			
-			// aapt resource value: 0x7F070098
-			public const int pickerview_topbar_padding = 2131165336;
+			// aapt resource value: 0x7f0800a0
+			public const int pickerview_topbar_padding = 2131230880;
 			
-			// aapt resource value: 0x7F070099
-			public const int pickerview_topbar_title_textsize = 2131165337;
+			// aapt resource value: 0x7f0800a1
+			public const int pickerview_topbar_title_textsize = 2131230881;
 			
-			// aapt resource value: 0x7F07009A
-			public const int tooltip_corner_radius = 2131165338;
+			// aapt resource value: 0x7f080059
+			public const int tooltip_corner_radius = 2131230809;
 			
-			// aapt resource value: 0x7F07009B
-			public const int tooltip_horizontal_padding = 2131165339;
+			// aapt resource value: 0x7f08005a
+			public const int tooltip_horizontal_padding = 2131230810;
 			
-			// aapt resource value: 0x7F07009C
-			public const int tooltip_margin = 2131165340;
+			// aapt resource value: 0x7f08005b
+			public const int tooltip_margin = 2131230811;
 			
-			// aapt resource value: 0x7F07009D
-			public const int tooltip_precise_anchor_extra_offset = 2131165341;
+			// aapt resource value: 0x7f08005c
+			public const int tooltip_precise_anchor_extra_offset = 2131230812;
 			
-			// aapt resource value: 0x7F07009E
-			public const int tooltip_precise_anchor_threshold = 2131165342;
+			// aapt resource value: 0x7f08005d
+			public const int tooltip_precise_anchor_threshold = 2131230813;
 			
-			// aapt resource value: 0x7F07009F
-			public const int tooltip_vertical_padding = 2131165343;
+			// aapt resource value: 0x7f08005e
+			public const int tooltip_vertical_padding = 2131230814;
 			
-			// aapt resource value: 0x7F0700A0
-			public const int tooltip_y_offset_non_touch = 2131165344;
+			// aapt resource value: 0x7f08005f
+			public const int tooltip_y_offset_non_touch = 2131230815;
 			
-			// aapt resource value: 0x7F0700A1
-			public const int tooltip_y_offset_touch = 2131165345;
+			// aapt resource value: 0x7f080060
+			public const int tooltip_y_offset_touch = 2131230816;
 			
 			static Dimension()
 			{
@@ -2528,443 +2528,497 @@
 		public partial class Drawable
 		{
 			
-			// aapt resource value: 0x7F080006
-			public const int abc_ab_share_pack_mtrl_alpha = 2131230726;
+			// aapt resource value: 0x7f020000
+			public const int abc_ab_share_pack_mtrl_alpha = 2130837504;
 			
-			// aapt resource value: 0x7F080007
-			public const int abc_action_bar_item_background_material = 2131230727;
+			// aapt resource value: 0x7f020001
+			public const int abc_action_bar_item_background_material = 2130837505;
 			
-			// aapt resource value: 0x7F080008
-			public const int abc_btn_borderless_material = 2131230728;
+			// aapt resource value: 0x7f020002
+			public const int abc_btn_borderless_material = 2130837506;
 			
-			// aapt resource value: 0x7F080009
-			public const int abc_btn_check_material = 2131230729;
+			// aapt resource value: 0x7f020003
+			public const int abc_btn_check_material = 2130837507;
 			
-			// aapt resource value: 0x7F08000A
-			public const int abc_btn_check_to_on_mtrl_000 = 2131230730;
+			// aapt resource value: 0x7f020004
+			public const int abc_btn_check_to_on_mtrl_000 = 2130837508;
 			
-			// aapt resource value: 0x7F08000B
-			public const int abc_btn_check_to_on_mtrl_015 = 2131230731;
+			// aapt resource value: 0x7f020005
+			public const int abc_btn_check_to_on_mtrl_015 = 2130837509;
 			
-			// aapt resource value: 0x7F08000C
-			public const int abc_btn_colored_material = 2131230732;
+			// aapt resource value: 0x7f020006
+			public const int abc_btn_colored_material = 2130837510;
 			
-			// aapt resource value: 0x7F08000D
-			public const int abc_btn_default_mtrl_shape = 2131230733;
+			// aapt resource value: 0x7f020007
+			public const int abc_btn_default_mtrl_shape = 2130837511;
 			
-			// aapt resource value: 0x7F08000E
-			public const int abc_btn_radio_material = 2131230734;
+			// aapt resource value: 0x7f020008
+			public const int abc_btn_radio_material = 2130837512;
 			
-			// aapt resource value: 0x7F08000F
-			public const int abc_btn_radio_to_on_mtrl_000 = 2131230735;
+			// aapt resource value: 0x7f020009
+			public const int abc_btn_radio_to_on_mtrl_000 = 2130837513;
 			
-			// aapt resource value: 0x7F080010
-			public const int abc_btn_radio_to_on_mtrl_015 = 2131230736;
+			// aapt resource value: 0x7f02000a
+			public const int abc_btn_radio_to_on_mtrl_015 = 2130837514;
 			
-			// aapt resource value: 0x7F080011
-			public const int abc_btn_switch_to_on_mtrl_00001 = 2131230737;
+			// aapt resource value: 0x7f02000b
+			public const int abc_btn_switch_to_on_mtrl_00001 = 2130837515;
 			
-			// aapt resource value: 0x7F080012
-			public const int abc_btn_switch_to_on_mtrl_00012 = 2131230738;
+			// aapt resource value: 0x7f02000c
+			public const int abc_btn_switch_to_on_mtrl_00012 = 2130837516;
 			
-			// aapt resource value: 0x7F080013
-			public const int abc_cab_background_internal_bg = 2131230739;
+			// aapt resource value: 0x7f02000d
+			public const int abc_cab_background_internal_bg = 2130837517;
 			
-			// aapt resource value: 0x7F080014
-			public const int abc_cab_background_top_material = 2131230740;
+			// aapt resource value: 0x7f02000e
+			public const int abc_cab_background_top_material = 2130837518;
 			
-			// aapt resource value: 0x7F080015
-			public const int abc_cab_background_top_mtrl_alpha = 2131230741;
+			// aapt resource value: 0x7f02000f
+			public const int abc_cab_background_top_mtrl_alpha = 2130837519;
 			
-			// aapt resource value: 0x7F080016
-			public const int abc_control_background_material = 2131230742;
+			// aapt resource value: 0x7f020010
+			public const int abc_control_background_material = 2130837520;
 			
-			// aapt resource value: 0x7F080017
-			public const int abc_dialog_material_background = 2131230743;
+			// aapt resource value: 0x7f020011
+			public const int abc_dialog_material_background = 2130837521;
 			
-			// aapt resource value: 0x7F080018
-			public const int abc_edit_text_material = 2131230744;
+			// aapt resource value: 0x7f020012
+			public const int abc_edit_text_material = 2130837522;
 			
-			// aapt resource value: 0x7F080019
-			public const int abc_ic_ab_back_material = 2131230745;
+			// aapt resource value: 0x7f020013
+			public const int abc_ic_ab_back_material = 2130837523;
 			
-			// aapt resource value: 0x7F08001A
-			public const int abc_ic_arrow_drop_right_black_24dp = 2131230746;
+			// aapt resource value: 0x7f020014
+			public const int abc_ic_arrow_drop_right_black_24dp = 2130837524;
 			
-			// aapt resource value: 0x7F08001B
-			public const int abc_ic_clear_material = 2131230747;
+			// aapt resource value: 0x7f020015
+			public const int abc_ic_clear_material = 2130837525;
 			
-			// aapt resource value: 0x7F08001C
-			public const int abc_ic_commit_search_api_mtrl_alpha = 2131230748;
+			// aapt resource value: 0x7f020016
+			public const int abc_ic_commit_search_api_mtrl_alpha = 2130837526;
 			
-			// aapt resource value: 0x7F08001D
-			public const int abc_ic_go_search_api_material = 2131230749;
+			// aapt resource value: 0x7f020017
+			public const int abc_ic_go_search_api_material = 2130837527;
 			
-			// aapt resource value: 0x7F08001E
-			public const int abc_ic_menu_copy_mtrl_am_alpha = 2131230750;
+			// aapt resource value: 0x7f020018
+			public const int abc_ic_menu_copy_mtrl_am_alpha = 2130837528;
 			
-			// aapt resource value: 0x7F08001F
-			public const int abc_ic_menu_cut_mtrl_alpha = 2131230751;
+			// aapt resource value: 0x7f020019
+			public const int abc_ic_menu_cut_mtrl_alpha = 2130837529;
 			
-			// aapt resource value: 0x7F080020
-			public const int abc_ic_menu_overflow_material = 2131230752;
+			// aapt resource value: 0x7f02001a
+			public const int abc_ic_menu_overflow_material = 2130837530;
 			
-			// aapt resource value: 0x7F080021
-			public const int abc_ic_menu_paste_mtrl_am_alpha = 2131230753;
+			// aapt resource value: 0x7f02001b
+			public const int abc_ic_menu_paste_mtrl_am_alpha = 2130837531;
 			
-			// aapt resource value: 0x7F080022
-			public const int abc_ic_menu_selectall_mtrl_alpha = 2131230754;
+			// aapt resource value: 0x7f02001c
+			public const int abc_ic_menu_selectall_mtrl_alpha = 2130837532;
 			
-			// aapt resource value: 0x7F080023
-			public const int abc_ic_menu_share_mtrl_alpha = 2131230755;
+			// aapt resource value: 0x7f02001d
+			public const int abc_ic_menu_share_mtrl_alpha = 2130837533;
 			
-			// aapt resource value: 0x7F080024
-			public const int abc_ic_search_api_material = 2131230756;
+			// aapt resource value: 0x7f02001e
+			public const int abc_ic_search_api_material = 2130837534;
 			
-			// aapt resource value: 0x7F080025
-			public const int abc_ic_star_black_16dp = 2131230757;
+			// aapt resource value: 0x7f02001f
+			public const int abc_ic_star_black_16dp = 2130837535;
 			
-			// aapt resource value: 0x7F080026
-			public const int abc_ic_star_black_36dp = 2131230758;
+			// aapt resource value: 0x7f020020
+			public const int abc_ic_star_black_36dp = 2130837536;
 			
-			// aapt resource value: 0x7F080027
-			public const int abc_ic_star_black_48dp = 2131230759;
+			// aapt resource value: 0x7f020021
+			public const int abc_ic_star_black_48dp = 2130837537;
 			
-			// aapt resource value: 0x7F080028
-			public const int abc_ic_star_half_black_16dp = 2131230760;
+			// aapt resource value: 0x7f020022
+			public const int abc_ic_star_half_black_16dp = 2130837538;
 			
-			// aapt resource value: 0x7F080029
-			public const int abc_ic_star_half_black_36dp = 2131230761;
+			// aapt resource value: 0x7f020023
+			public const int abc_ic_star_half_black_36dp = 2130837539;
 			
-			// aapt resource value: 0x7F08002A
-			public const int abc_ic_star_half_black_48dp = 2131230762;
+			// aapt resource value: 0x7f020024
+			public const int abc_ic_star_half_black_48dp = 2130837540;
 			
-			// aapt resource value: 0x7F08002B
-			public const int abc_ic_voice_search_api_material = 2131230763;
+			// aapt resource value: 0x7f020025
+			public const int abc_ic_voice_search_api_material = 2130837541;
 			
-			// aapt resource value: 0x7F08002C
-			public const int abc_item_background_holo_dark = 2131230764;
+			// aapt resource value: 0x7f020026
+			public const int abc_item_background_holo_dark = 2130837542;
 			
-			// aapt resource value: 0x7F08002D
-			public const int abc_item_background_holo_light = 2131230765;
+			// aapt resource value: 0x7f020027
+			public const int abc_item_background_holo_light = 2130837543;
 			
-			// aapt resource value: 0x7F08002E
-			public const int abc_list_divider_mtrl_alpha = 2131230766;
+			// aapt resource value: 0x7f020028
+			public const int abc_list_divider_mtrl_alpha = 2130837544;
 			
-			// aapt resource value: 0x7F08002F
-			public const int abc_list_focused_holo = 2131230767;
+			// aapt resource value: 0x7f020029
+			public const int abc_list_focused_holo = 2130837545;
 			
-			// aapt resource value: 0x7F080030
-			public const int abc_list_longpressed_holo = 2131230768;
+			// aapt resource value: 0x7f02002a
+			public const int abc_list_longpressed_holo = 2130837546;
 			
-			// aapt resource value: 0x7F080031
-			public const int abc_list_pressed_holo_dark = 2131230769;
+			// aapt resource value: 0x7f02002b
+			public const int abc_list_pressed_holo_dark = 2130837547;
 			
-			// aapt resource value: 0x7F080032
-			public const int abc_list_pressed_holo_light = 2131230770;
+			// aapt resource value: 0x7f02002c
+			public const int abc_list_pressed_holo_light = 2130837548;
 			
-			// aapt resource value: 0x7F080033
-			public const int abc_list_selector_background_transition_holo_dark = 2131230771;
+			// aapt resource value: 0x7f02002d
+			public const int abc_list_selector_background_transition_holo_dark = 2130837549;
 			
-			// aapt resource value: 0x7F080034
-			public const int abc_list_selector_background_transition_holo_light = 2131230772;
+			// aapt resource value: 0x7f02002e
+			public const int abc_list_selector_background_transition_holo_light = 2130837550;
 			
-			// aapt resource value: 0x7F080035
-			public const int abc_list_selector_disabled_holo_dark = 2131230773;
+			// aapt resource value: 0x7f02002f
+			public const int abc_list_selector_disabled_holo_dark = 2130837551;
 			
-			// aapt resource value: 0x7F080036
-			public const int abc_list_selector_disabled_holo_light = 2131230774;
+			// aapt resource value: 0x7f020030
+			public const int abc_list_selector_disabled_holo_light = 2130837552;
 			
-			// aapt resource value: 0x7F080037
-			public const int abc_list_selector_holo_dark = 2131230775;
+			// aapt resource value: 0x7f020031
+			public const int abc_list_selector_holo_dark = 2130837553;
 			
-			// aapt resource value: 0x7F080038
-			public const int abc_list_selector_holo_light = 2131230776;
+			// aapt resource value: 0x7f020032
+			public const int abc_list_selector_holo_light = 2130837554;
 			
-			// aapt resource value: 0x7F080039
-			public const int abc_menu_hardkey_panel_mtrl_mult = 2131230777;
+			// aapt resource value: 0x7f020033
+			public const int abc_menu_hardkey_panel_mtrl_mult = 2130837555;
 			
-			// aapt resource value: 0x7F08003A
-			public const int abc_popup_background_mtrl_mult = 2131230778;
+			// aapt resource value: 0x7f020034
+			public const int abc_popup_background_mtrl_mult = 2130837556;
 			
-			// aapt resource value: 0x7F08003B
-			public const int abc_ratingbar_indicator_material = 2131230779;
+			// aapt resource value: 0x7f020035
+			public const int abc_ratingbar_indicator_material = 2130837557;
 			
-			// aapt resource value: 0x7F08003C
-			public const int abc_ratingbar_material = 2131230780;
+			// aapt resource value: 0x7f020036
+			public const int abc_ratingbar_material = 2130837558;
 			
-			// aapt resource value: 0x7F08003D
-			public const int abc_ratingbar_small_material = 2131230781;
+			// aapt resource value: 0x7f020037
+			public const int abc_ratingbar_small_material = 2130837559;
 			
-			// aapt resource value: 0x7F08003E
-			public const int abc_scrubber_control_off_mtrl_alpha = 2131230782;
+			// aapt resource value: 0x7f020038
+			public const int abc_scrubber_control_off_mtrl_alpha = 2130837560;
 			
-			// aapt resource value: 0x7F08003F
-			public const int abc_scrubber_control_to_pressed_mtrl_000 = 2131230783;
+			// aapt resource value: 0x7f020039
+			public const int abc_scrubber_control_to_pressed_mtrl_000 = 2130837561;
 			
-			// aapt resource value: 0x7F080040
-			public const int abc_scrubber_control_to_pressed_mtrl_005 = 2131230784;
+			// aapt resource value: 0x7f02003a
+			public const int abc_scrubber_control_to_pressed_mtrl_005 = 2130837562;
 			
-			// aapt resource value: 0x7F080041
-			public const int abc_scrubber_primary_mtrl_alpha = 2131230785;
+			// aapt resource value: 0x7f02003b
+			public const int abc_scrubber_primary_mtrl_alpha = 2130837563;
 			
-			// aapt resource value: 0x7F080042
-			public const int abc_scrubber_track_mtrl_alpha = 2131230786;
+			// aapt resource value: 0x7f02003c
+			public const int abc_scrubber_track_mtrl_alpha = 2130837564;
 			
-			// aapt resource value: 0x7F080043
-			public const int abc_seekbar_thumb_material = 2131230787;
+			// aapt resource value: 0x7f02003d
+			public const int abc_seekbar_thumb_material = 2130837565;
 			
-			// aapt resource value: 0x7F080044
-			public const int abc_seekbar_tick_mark_material = 2131230788;
+			// aapt resource value: 0x7f02003e
+			public const int abc_seekbar_tick_mark_material = 2130837566;
 			
-			// aapt resource value: 0x7F080045
-			public const int abc_seekbar_track_material = 2131230789;
+			// aapt resource value: 0x7f02003f
+			public const int abc_seekbar_track_material = 2130837567;
 			
-			// aapt resource value: 0x7F080046
-			public const int abc_spinner_mtrl_am_alpha = 2131230790;
+			// aapt resource value: 0x7f020040
+			public const int abc_spinner_mtrl_am_alpha = 2130837568;
 			
-			// aapt resource value: 0x7F080047
-			public const int abc_spinner_textfield_background_material = 2131230791;
+			// aapt resource value: 0x7f020041
+			public const int abc_spinner_textfield_background_material = 2130837569;
 			
-			// aapt resource value: 0x7F080048
-			public const int abc_switch_thumb_material = 2131230792;
+			// aapt resource value: 0x7f020042
+			public const int abc_switch_thumb_material = 2130837570;
+			
+			// aapt resource value: 0x7f020043
+			public const int abc_switch_track_mtrl_alpha = 2130837571;
+			
+			// aapt resource value: 0x7f020044
+			public const int abc_tab_indicator_material = 2130837572;
+			
+			// aapt resource value: 0x7f020045
+			public const int abc_tab_indicator_mtrl_alpha = 2130837573;
+			
+			// aapt resource value: 0x7f020046
+			public const int abc_text_cursor_material = 2130837574;
+			
+			// aapt resource value: 0x7f020047
+			public const int abc_text_select_handle_left_mtrl_dark = 2130837575;
+			
+			// aapt resource value: 0x7f020048
+			public const int abc_text_select_handle_left_mtrl_light = 2130837576;
+			
+			// aapt resource value: 0x7f020049
+			public const int abc_text_select_handle_middle_mtrl_dark = 2130837577;
+			
+			// aapt resource value: 0x7f02004a
+			public const int abc_text_select_handle_middle_mtrl_light = 2130837578;
+			
+			// aapt resource value: 0x7f02004b
+			public const int abc_text_select_handle_right_mtrl_dark = 2130837579;
+			
+			// aapt resource value: 0x7f02004c
+			public const int abc_text_select_handle_right_mtrl_light = 2130837580;
+			
+			// aapt resource value: 0x7f02004d
+			public const int abc_textfield_activated_mtrl_alpha = 2130837581;
+			
+			// aapt resource value: 0x7f02004e
+			public const int abc_textfield_default_mtrl_alpha = 2130837582;
+			
+			// aapt resource value: 0x7f02004f
+			public const int abc_textfield_search_activated_mtrl_alpha = 2130837583;
+			
+			// aapt resource value: 0x7f020050
+			public const int abc_textfield_search_default_mtrl_alpha = 2130837584;
+			
+			// aapt resource value: 0x7f020051
+			public const int abc_textfield_search_material = 2130837585;
+			
+			// aapt resource value: 0x7f020052
+			public const int abc_vector_test = 2130837586;
+			
+			// aapt resource value: 0x7f020053
+			public const int avd_hide_password = 2130837587;
+			
+			// aapt resource value: 0x7f02009e
+			public const int avd_hide_password_1 = 2130837662;
 			
-			// aapt resource value: 0x7F080049
-			public const int abc_switch_track_mtrl_alpha = 2131230793;
+			// aapt resource value: 0x7f02009f
+			public const int avd_hide_password_2 = 2130837663;
 			
-			// aapt resource value: 0x7F08004A
-			public const int abc_tab_indicator_material = 2131230794;
+			// aapt resource value: 0x7f0200a0
+			public const int avd_hide_password_3 = 2130837664;
 			
-			// aapt resource value: 0x7F08004B
-			public const int abc_tab_indicator_mtrl_alpha = 2131230795;
+			// aapt resource value: 0x7f020054
+			public const int avd_show_password = 2130837588;
 			
-			// aapt resource value: 0x7F080053
-			public const int abc_textfield_activated_mtrl_alpha = 2131230803;
+			// aapt resource value: 0x7f0200a1
+			public const int avd_show_password_1 = 2130837665;
 			
-			// aapt resource value: 0x7F080054
-			public const int abc_textfield_default_mtrl_alpha = 2131230804;
+			// aapt resource value: 0x7f0200a2
+			public const int avd_show_password_2 = 2130837666;
 			
-			// aapt resource value: 0x7F080055
-			public const int abc_textfield_search_activated_mtrl_alpha = 2131230805;
+			// aapt resource value: 0x7f0200a3
+			public const int avd_show_password_3 = 2130837667;
 			
-			// aapt resource value: 0x7F080056
-			public const int abc_textfield_search_default_mtrl_alpha = 2131230806;
+			// aapt resource value: 0x7f020055
+			public const int design_bottom_navigation_item_background = 2130837589;
 			
-			// aapt resource value: 0x7F080057
-			public const int abc_textfield_search_material = 2131230807;
+			// aapt resource value: 0x7f020056
+			public const int design_fab_background = 2130837590;
 			
-			// aapt resource value: 0x7F08004C
-			public const int abc_text_cursor_material = 2131230796;
+			// aapt resource value: 0x7f020057
+			public const int design_ic_visibility = 2130837591;
 			
-			// aapt resource value: 0x7F08004D
-			public const int abc_text_select_handle_left_mtrl_dark = 2131230797;
+			// aapt resource value: 0x7f020058
+			public const int design_ic_visibility_off = 2130837592;
 			
-			// aapt resource value: 0x7F08004E
-			public const int abc_text_select_handle_left_mtrl_light = 2131230798;
+			// aapt resource value: 0x7f020059
+			public const int design_password_eye = 2130837593;
 			
-			// aapt resource value: 0x7F08004F
-			public const int abc_text_select_handle_middle_mtrl_dark = 2131230799;
+			// aapt resource value: 0x7f02005a
+			public const int design_snackbar_background = 2130837594;
 			
-			// aapt resource value: 0x7F080050
-			public const int abc_text_select_handle_middle_mtrl_light = 2131230800;
+			// aapt resource value: 0x7f02005b
+			public const int fingerprint_draw_off = 2130837595;
 			
-			// aapt resource value: 0x7F080051
-			public const int abc_text_select_handle_right_mtrl_dark = 2131230801;
+			// aapt resource value: 0x7f02005c
+			public const int fingerprint_draw_off_animation = 2130837596;
 			
-			// aapt resource value: 0x7F080052
-			public const int abc_text_select_handle_right_mtrl_light = 2131230802;
+			// aapt resource value: 0x7f02005d
+			public const int fingerprint_draw_on = 2130837597;
 			
-			// aapt resource value: 0x7F080058
-			public const int abc_vector_test = 2131230808;
+			// aapt resource value: 0x7f02005e
+			public const int fingerprint_draw_on_animation = 2130837598;
 			
-			// aapt resource value: 0x7F080059
-			public const int avd_hide_password = 2131230809;
+			// aapt resource value: 0x7f02005f
+			public const int fingerprint_error = 2130837599;
 			
-			// aapt resource value: 0x7F08005A
-			public const int avd_show_password = 2131230810;
+			// aapt resource value: 0x7f020060
+			public const int fingerprint_error_off = 2130837600;
 			
-			// aapt resource value: 0x7F08005B
-			public const int design_bottom_navigation_item_background = 2131230811;
+			// aapt resource value: 0x7f020061
+			public const int fingerprint_error_off_animation = 2130837601;
 			
-			// aapt resource value: 0x7F08005C
-			public const int design_fab_background = 2131230812;
+			// aapt resource value: 0x7f020062
+			public const int fingerprint_error_on = 2130837602;
 			
-			// aapt resource value: 0x7F08005D
-			public const int design_ic_visibility = 2131230813;
+			// aapt resource value: 0x7f020063
+			public const int fingerprint_error_on_animation = 2130837603;
 			
-			// aapt resource value: 0x7F08005E
-			public const int design_ic_visibility_off = 2131230814;
+			// aapt resource value: 0x7f020064
+			public const int fingerprint_error_state_to_fp = 2130837604;
 			
-			// aapt resource value: 0x7F08005F
-			public const int design_password_eye = 2131230815;
+			// aapt resource value: 0x7f020065
+			public const int fingerprint_error_state_to_fp_animation = 2130837605;
 			
-			// aapt resource value: 0x7F080060
-			public const int design_snackbar_background = 2131230816;
+			// aapt resource value: 0x7f020066
+			public const int fingerprint_fingerprint = 2130837606;
 			
-			// aapt resource value: 0x7F080061
-			public const int fingerprint_draw_off = 2131230817;
+			// aapt resource value: 0x7f020067
+			public const int fingerprint_fp_to_error_state = 2130837607;
 			
-			// aapt resource value: 0x7F080062
-			public const int fingerprint_draw_off_animation = 2131230818;
+			// aapt resource value: 0x7f020068
+			public const int fingerprint_fp_to_error_state_animation = 2130837608;
 			
-			// aapt resource value: 0x7F080063
-			public const int fingerprint_draw_on = 2131230819;
+			// aapt resource value: 0x7f020069
+			public const int gd_btn_shape_app_b = 2130837609;
 			
-			// aapt resource value: 0x7F080064
-			public const int fingerprint_draw_on_animation = 2131230820;
+			// aapt resource value: 0x7f02006a
+			public const int gd_btn_shape_app_g = 2130837610;
 			
-			// aapt resource value: 0x7F080065
-			public const int fingerprint_error = 2131230821;
+			// aapt resource value: 0x7f02006b
+			public const int gd_btn_shape_app_w = 2130837611;
 			
-			// aapt resource value: 0x7F080066
-			public const int fingerprint_error_off = 2131230822;
+			// aapt resource value: 0x7f02006c
+			public const int gd_btn_shape_shadow_w = 2130837612;
 			
-			// aapt resource value: 0x7F080067
-			public const int fingerprint_error_off_animation = 2131230823;
+			// aapt resource value: 0x7f02006d
+			public const int gd_click_effect_select = 2130837613;
 			
-			// aapt resource value: 0x7F080068
-			public const int fingerprint_error_on = 2131230824;
+			// aapt resource value: 0x7f02006e
+			public const int ic_gdmap_add = 2130837614;
 			
-			// aapt resource value: 0x7F080069
-			public const int fingerprint_error_on_animation = 2131230825;
+			// aapt resource value: 0x7f02006f
+			public const int ic_gdmap_back = 2130837615;
 			
-			// aapt resource value: 0x7F08006A
-			public const int fingerprint_error_state_to_fp = 2131230826;
+			// aapt resource value: 0x7f020070
+			public const int ic_gdmap_delete = 2130837616;
 			
-			// aapt resource value: 0x7F08006B
-			public const int fingerprint_error_state_to_fp_animation = 2131230827;
+			// aapt resource value: 0x7f020071
+			public const int ic_gdmap_home = 2130837617;
 			
-			// aapt resource value: 0x7F08006C
-			public const int fingerprint_fingerprint = 2131230828;
+			// aapt resource value: 0x7f020072
+			public const int ic_gdmap_mylocation = 2130837618;
 			
-			// aapt resource value: 0x7F08006D
-			public const int fingerprint_fp_to_error_state = 2131230829;
+			// aapt resource value: 0x7f020073
+			public const int ic_gdmap_now = 2130837619;
 			
-			// aapt resource value: 0x7F08006E
-			public const int fingerprint_fp_to_error_state_animation = 2131230830;
+			// aapt resource value: 0x7f020074
+			public const int ic_gdmap_search = 2130837620;
 			
-			// aapt resource value: 0x7F08006F
-			public const int gd_btn_shape_app_b = 2131230831;
+			// aapt resource value: 0x7f020075
+			public const int ic_gdmap_zoom_out = 2130837621;
 			
-			// aapt resource value: 0x7F080070
-			public const int gd_btn_shape_app_g = 2131230832;
+			// aapt resource value: 0x7f020076
+			public const int ic_gps_point = 2130837622;
 			
-			// aapt resource value: 0x7F080071
-			public const int gd_btn_shape_app_w = 2131230833;
+			// aapt resource value: 0x7f020077
+			public const int ic_wd_arc_scale_bg = 2130837623;
 			
-			// aapt resource value: 0x7F080072
-			public const int gd_btn_shape_shadow_w = 2131230834;
+			// aapt resource value: 0x7f020078
+			public const int ic_wd_curtain_bg_top = 2130837624;
 			
-			// aapt resource value: 0x7F080073
-			public const int gd_click_effect_select = 2131230835;
+			// aapt resource value: 0x7f020079
+			public const int ic_wd_curtain_h_bg = 2130837625;
 			
-			// aapt resource value: 0x7F080086
-			public const int Icon = 2131230854;
+			// aapt resource value: 0x7f02007a
+			public const int ic_wd_curtain_h_open = 2130837626;
 			
-			// aapt resource value: 0x7F080074
-			public const int ic_gdmap_add = 2131230836;
+			// aapt resource value: 0x7f02007b
+			public const int ic_wd_curtain_h_progress = 2130837627;
 			
-			// aapt resource value: 0x7F080075
-			public const int ic_gdmap_back = 2131230837;
+			// aapt resource value: 0x7f02007c
+			public const int ic_wd_curtain_h_top = 2130837628;
 			
-			// aapt resource value: 0x7F080076
-			public const int ic_gdmap_delete = 2131230838;
+			// aapt resource value: 0x7f02007d
+			public const int ic_wd_curtain_open = 2130837629;
 			
-			// aapt resource value: 0x7F080077
-			public const int ic_gdmap_home = 2131230839;
+			// aapt resource value: 0x7f02007e
+			public const int ic_wd_curtain_roll_bg = 2130837630;
 			
-			// aapt resource value: 0x7F080078
-			public const int ic_gdmap_mylocation = 2131230840;
+			// aapt resource value: 0x7f02007f
+			public const int ic_wd_curtain_roll_progress = 2130837631;
 			
-			// aapt resource value: 0x7F080079
-			public const int ic_gdmap_now = 2131230841;
+			// aapt resource value: 0x7f020080
+			public const int ic_wd_on_curtain_blinds_progress = 2130837632;
 			
-			// aapt resource value: 0x7F08007A
-			public const int ic_gdmap_search = 2131230842;
+			// aapt resource value: 0x7f020081
+			public const int ic_wd_on_curtain_blinds_progress2 = 2130837633;
 			
-			// aapt resource value: 0x7F08007B
-			public const int ic_gdmap_zoom_out = 2131230843;
+			// aapt resource value: 0x7f020082
+			public const int ic_wd_on_curtain_blinds_progress_close = 2130837634;
 			
-			// aapt resource value: 0x7F08007C
-			public const int ic_gps_point = 2131230844;
+			// aapt resource value: 0x7f020083
+			public const int ic_wd_on_curtain_blinds_progress_close2 = 2130837635;
 			
-			// aapt resource value: 0x7F08007D
-			public const int ic_wd_arc_scale_bg = 2131230845;
+			// aapt resource value: 0x7f020084
+			public const int ic_wd_on_curtain_h_bg = 2130837636;
 			
-			// aapt resource value: 0x7F08007E
-			public const int ic_wd_curtain_bg_top = 2131230846;
+			// aapt resource value: 0x7f020085
+			public const int ic_wd_on_curtain_h_open = 2130837637;
 			
-			// aapt resource value: 0x7F08007F
-			public const int ic_wd_curtain_h_bg = 2131230847;
+			// aapt resource value: 0x7f020086
+			public const int ic_wd_on_curtain_h_progress = 2130837638;
 			
-			// aapt resource value: 0x7F080080
-			public const int ic_wd_curtain_h_open = 2131230848;
+			// aapt resource value: 0x7f020087
+			public const int ic_wd_on_curtain_h_progress_close = 2130837639;
 			
-			// aapt resource value: 0x7F080081
-			public const int ic_wd_curtain_h_progress = 2131230849;
+			// aapt resource value: 0x7f020088
+			public const int ic_wd_on_curtain_open = 2130837640;
 			
-			// aapt resource value: 0x7F080082
-			public const int ic_wd_curtain_h_top = 2131230850;
+			// aapt resource value: 0x7f020089
+			public const int ic_wd_on_curtain_roll_bg = 2130837641;
 			
-			// aapt resource value: 0x7F080083
-			public const int ic_wd_curtain_open = 2131230851;
+			// aapt resource value: 0x7f02008a
+			public const int ic_wd_on_curtain_roll_progress = 2130837642;
 			
-			// aapt resource value: 0x7F080084
-			public const int ic_wd_curtain_roll_bg = 2131230852;
+			// aapt resource value: 0x7f02008b
+			public const int ic_wd_on_curtain_roll_progress_close = 2130837643;
 			
-			// aapt resource value: 0x7F080085
-			public const int ic_wd_curtain_roll_progress = 2131230853;
+			// aapt resource value: 0x7f02008c
+			public const int Icon = 2130837644;
 			
-			// aapt resource value: 0x7F080087
-			public const int Loading = 2131230855;
+			// aapt resource value: 0x7f02008d
+			public const int Loading = 2130837645;
 			
-			// aapt resource value: 0x7F080088
-			public const int navigation_empty_icon = 2131230856;
+			// aapt resource value: 0x7f02008e
+			public const int navigation_empty_icon = 2130837646;
 			
-			// aapt resource value: 0x7F080089
-			public const int notification_action_background = 2131230857;
+			// aapt resource value: 0x7f02008f
+			public const int notification_action_background = 2130837647;
 			
-			// aapt resource value: 0x7F08008A
-			public const int notification_bg = 2131230858;
+			// aapt resource value: 0x7f020090
+			public const int notification_bg = 2130837648;
 			
-			// aapt resource value: 0x7F08008B
-			public const int notification_bg_low = 2131230859;
+			// aapt resource value: 0x7f020091
+			public const int notification_bg_low = 2130837649;
 			
-			// aapt resource value: 0x7F08008C
-			public const int notification_bg_low_normal = 2131230860;
+			// aapt resource value: 0x7f020092
+			public const int notification_bg_low_normal = 2130837650;
 			
-			// aapt resource value: 0x7F08008D
-			public const int notification_bg_low_pressed = 2131230861;
+			// aapt resource value: 0x7f020093
+			public const int notification_bg_low_pressed = 2130837651;
 			
-			// aapt resource value: 0x7F08008E
-			public const int notification_bg_normal = 2131230862;
+			// aapt resource value: 0x7f020094
+			public const int notification_bg_normal = 2130837652;
 			
-			// aapt resource value: 0x7F08008F
-			public const int notification_bg_normal_pressed = 2131230863;
+			// aapt resource value: 0x7f020095
+			public const int notification_bg_normal_pressed = 2130837653;
 			
-			// aapt resource value: 0x7F080090
-			public const int notification_icon_background = 2131230864;
+			// aapt resource value: 0x7f020096
+			public const int notification_icon_background = 2130837654;
 			
-			// aapt resource value: 0x7F080091
-			public const int notification_template_icon_bg = 2131230865;
+			// aapt resource value: 0x7f02009c
+			public const int notification_template_icon_bg = 2130837660;
 			
-			// aapt resource value: 0x7F080092
-			public const int notification_template_icon_low_bg = 2131230866;
+			// aapt resource value: 0x7f02009d
+			public const int notification_template_icon_low_bg = 2130837661;
 			
-			// aapt resource value: 0x7F080093
-			public const int notification_tile_bg = 2131230867;
+			// aapt resource value: 0x7f020097
+			public const int notification_tile_bg = 2130837655;
 			
-			// aapt resource value: 0x7F080094
-			public const int notify_panel_notification_icon_bg = 2131230868;
+			// aapt resource value: 0x7f020098
+			public const int notify_panel_notification_icon_bg = 2130837656;
 			
-			// aapt resource value: 0x7F080095
-			public const int selector_pickerview_btn = 2131230869;
+			// aapt resource value: 0x7f020099
+			public const int selector_pickerview_btn = 2130837657;
 			
-			// aapt resource value: 0x7F080096
-			public const int tooltip_frame_dark = 2131230870;
+			// aapt resource value: 0x7f02009a
+			public const int tooltip_frame_dark = 2130837658;
 			
-			// aapt resource value: 0x7F080097
-			public const int tooltip_frame_light = 2131230871;
+			// aapt resource value: 0x7f02009b
+			public const int tooltip_frame_light = 2130837659;
 			
 			static Drawable()
 			{
@@ -2979,665 +3033,665 @@
 		public partial class Id
 		{
 			
-			// aapt resource value: 0x7F09000E
-			public const int action0 = 2131296270;
+			// aapt resource value: 0x7f090027
+			public const int ALT = 2131296295;
 			
-			// aapt resource value: 0x7F090020
-			public const int actions = 2131296288;
+			// aapt resource value: 0x7f090028
+			public const int CTRL = 2131296296;
 			
-			// aapt resource value: 0x7F09000F
-			public const int action_bar = 2131296271;
+			// aapt resource value: 0x7f090054
+			public const int FILL = 2131296340;
 			
-			// aapt resource value: 0x7F090010
-			public const int action_bar_activity_content = 2131296272;
+			// aapt resource value: 0x7f090055
+			public const int FILL_STROKE = 2131296341;
 			
-			// aapt resource value: 0x7F090011
-			public const int action_bar_container = 2131296273;
+			// aapt resource value: 0x7f090029
+			public const int FUNCTION = 2131296297;
 			
-			// aapt resource value: 0x7F090012
-			public const int action_bar_root = 2131296274;
+			// aapt resource value: 0x7f09004f
+			public const int FixedBehind = 2131296335;
 			
-			// aapt resource value: 0x7F090013
-			public const int action_bar_spinner = 2131296275;
+			// aapt resource value: 0x7f090050
+			public const int FixedFront = 2131296336;
 			
-			// aapt resource value: 0x7F090014
-			public const int action_bar_subtitle = 2131296276;
+			// aapt resource value: 0x7f09002a
+			public const int META = 2131296298;
 			
-			// aapt resource value: 0x7F090015
-			public const int action_bar_title = 2131296277;
+			// aapt resource value: 0x7f090051
+			public const int MatchLayout = 2131296337;
 			
-			// aapt resource value: 0x7F090016
-			public const int action_container = 2131296278;
+			// aapt resource value: 0x7f09002b
+			public const int SHIFT = 2131296299;
 			
-			// aapt resource value: 0x7F090017
-			public const int action_context_bar = 2131296279;
+			// aapt resource value: 0x7f090056
+			public const int STROKE = 2131296342;
 			
-			// aapt resource value: 0x7F090018
-			public const int action_divider = 2131296280;
+			// aapt resource value: 0x7f09002c
+			public const int SYM = 2131296300;
 			
-			// aapt resource value: 0x7F090019
-			public const int action_image = 2131296281;
+			// aapt resource value: 0x7f090052
+			public const int Scale = 2131296338;
 			
-			// aapt resource value: 0x7F09001A
-			public const int action_menu_divider = 2131296282;
+			// aapt resource value: 0x7f090053
+			public const int Translate = 2131296339;
 			
-			// aapt resource value: 0x7F09001B
-			public const int action_menu_presenter = 2131296283;
+			// aapt resource value: 0x7f0900c0
+			public const int action0 = 2131296448;
 			
-			// aapt resource value: 0x7F09001C
-			public const int action_mode_bar = 2131296284;
+			// aapt resource value: 0x7f090079
+			public const int action_bar = 2131296377;
 			
-			// aapt resource value: 0x7F09001D
-			public const int action_mode_bar_stub = 2131296285;
+			// aapt resource value: 0x7f090001
+			public const int action_bar_activity_content = 2131296257;
 			
-			// aapt resource value: 0x7F09001E
-			public const int action_mode_close_button = 2131296286;
+			// aapt resource value: 0x7f090078
+			public const int action_bar_container = 2131296376;
 			
-			// aapt resource value: 0x7F09001F
-			public const int action_text = 2131296287;
+			// aapt resource value: 0x7f090074
+			public const int action_bar_root = 2131296372;
 			
-			// aapt resource value: 0x7F090021
-			public const int activity_chooser_view_content = 2131296289;
+			// aapt resource value: 0x7f090002
+			public const int action_bar_spinner = 2131296258;
 			
-			// aapt resource value: 0x7F090022
-			public const int add = 2131296290;
+			// aapt resource value: 0x7f090058
+			public const int action_bar_subtitle = 2131296344;
 			
-			// aapt resource value: 0x7F090023
-			public const int alertTitle = 2131296291;
+			// aapt resource value: 0x7f090057
+			public const int action_bar_title = 2131296343;
 			
-			// aapt resource value: 0x7F090024
-			public const int all = 2131296292;
+			// aapt resource value: 0x7f0900bd
+			public const int action_container = 2131296445;
 			
-			// aapt resource value: 0x7F090000
-			public const int ALT = 2131296256;
+			// aapt resource value: 0x7f09007a
+			public const int action_context_bar = 2131296378;
 			
-			// aapt resource value: 0x7F090025
-			public const int always = 2131296293;
+			// aapt resource value: 0x7f0900c4
+			public const int action_divider = 2131296452;
 			
-			// aapt resource value: 0x7F090026
-			public const int async = 2131296294;
+			// aapt resource value: 0x7f0900be
+			public const int action_image = 2131296446;
 			
-			// aapt resource value: 0x7F090027
-			public const int auto = 2131296295;
+			// aapt resource value: 0x7f090003
+			public const int action_menu_divider = 2131296259;
 			
-			// aapt resource value: 0x7F090028
-			public const int beginning = 2131296296;
+			// aapt resource value: 0x7f090004
+			public const int action_menu_presenter = 2131296260;
 			
-			// aapt resource value: 0x7F090029
-			public const int blocking = 2131296297;
+			// aapt resource value: 0x7f090076
+			public const int action_mode_bar = 2131296374;
 			
-			// aapt resource value: 0x7F09002A
-			public const int bottom = 2131296298;
+			// aapt resource value: 0x7f090075
+			public const int action_mode_bar_stub = 2131296373;
 			
-			// aapt resource value: 0x7F09002B
-			public const int btnCancel = 2131296299;
+			// aapt resource value: 0x7f090059
+			public const int action_mode_close_button = 2131296345;
 			
-			// aapt resource value: 0x7F09002C
-			public const int btnSubmit = 2131296300;
+			// aapt resource value: 0x7f0900bf
+			public const int action_text = 2131296447;
 			
-			// aapt resource value: 0x7F09002D
-			public const int buttonPanel = 2131296301;
+			// aapt resource value: 0x7f0900cd
+			public const int actions = 2131296461;
 			
-			// aapt resource value: 0x7F09002E
-			public const int cancel_action = 2131296302;
+			// aapt resource value: 0x7f09005a
+			public const int activity_chooser_view_content = 2131296346;
 			
-			// aapt resource value: 0x7F09002F
-			public const int center = 2131296303;
+			// aapt resource value: 0x7f090021
+			public const int add = 2131296289;
 			
-			// aapt resource value: 0x7F090030
-			public const int center_horizontal = 2131296304;
+			// aapt resource value: 0x7f09006d
+			public const int alertTitle = 2131296365;
 			
-			// aapt resource value: 0x7F090031
-			public const int center_vertical = 2131296305;
+			// aapt resource value: 0x7f090047
+			public const int all = 2131296327;
 			
-			// aapt resource value: 0x7F090032
-			public const int checkbox = 2131296306;
+			// aapt resource value: 0x7f09002d
+			public const int always = 2131296301;
 			
-			// aapt resource value: 0x7F090033
-			public const int chronometer = 2131296307;
+			// aapt resource value: 0x7f09004b
+			public const int async = 2131296331;
 			
-			// aapt resource value: 0x7F090034
-			public const int clip_horizontal = 2131296308;
+			// aapt resource value: 0x7f090039
+			public const int auto = 2131296313;
 			
-			// aapt resource value: 0x7F090035
-			public const int clip_vertical = 2131296309;
+			// aapt resource value: 0x7f090024
+			public const int beginning = 2131296292;
 			
-			// aapt resource value: 0x7F090036
-			public const int collapseActionView = 2131296310;
+			// aapt resource value: 0x7f09004c
+			public const int blocking = 2131296332;
 			
-			// aapt resource value: 0x7F090037
-			public const int container = 2131296311;
+			// aapt resource value: 0x7f090032
+			public const int bottom = 2131296306;
 			
-			// aapt resource value: 0x7F090038
-			public const int contentFrame = 2131296312;
+			// aapt resource value: 0x7f0900a8
+			public const int btnCancel = 2131296424;
 			
-			// aapt resource value: 0x7F090039
-			public const int contentPanel = 2131296313;
+			// aapt resource value: 0x7f0900aa
+			public const int btnSubmit = 2131296426;
 			
-			// aapt resource value: 0x7F09003A
-			public const int content_container = 2131296314;
+			// aapt resource value: 0x7f090060
+			public const int buttonPanel = 2131296352;
 			
-			// aapt resource value: 0x7F09003B
-			public const int coordinator = 2131296315;
+			// aapt resource value: 0x7f0900c1
+			public const int cancel_action = 2131296449;
 			
-			// aapt resource value: 0x7F090001
-			public const int CTRL = 2131296257;
+			// aapt resource value: 0x7f09003a
+			public const int center = 2131296314;
 			
-			// aapt resource value: 0x7F09003C
-			public const int custom = 2131296316;
+			// aapt resource value: 0x7f09003b
+			public const int center_horizontal = 2131296315;
 			
-			// aapt resource value: 0x7F09003D
-			public const int customPanel = 2131296317;
+			// aapt resource value: 0x7f09003c
+			public const int center_vertical = 2131296316;
 			
-			// aapt resource value: 0x7F09003E
-			public const int day = 2131296318;
+			// aapt resource value: 0x7f090070
+			public const int checkbox = 2131296368;
 			
-			// aapt resource value: 0x7F09003F
-			public const int decor_content_parent = 2131296319;
+			// aapt resource value: 0x7f0900c9
+			public const int chronometer = 2131296457;
 			
-			// aapt resource value: 0x7F090040
-			public const int default_activity_button = 2131296320;
+			// aapt resource value: 0x7f090043
+			public const int clip_horizontal = 2131296323;
 			
-			// aapt resource value: 0x7F090041
-			public const int description = 2131296321;
+			// aapt resource value: 0x7f090044
+			public const int clip_vertical = 2131296324;
 			
-			// aapt resource value: 0x7F090042
-			public const int design_bottom_sheet = 2131296322;
+			// aapt resource value: 0x7f09002e
+			public const int collapseActionView = 2131296302;
 			
-			// aapt resource value: 0x7F090043
-			public const int design_menu_item_action_area = 2131296323;
+			// aapt resource value: 0x7f09008e
+			public const int container = 2131296398;
 			
-			// aapt resource value: 0x7F090044
-			public const int design_menu_item_action_area_stub = 2131296324;
+			// aapt resource value: 0x7f0900d9
+			public const int contentFrame = 2131296473;
 			
-			// aapt resource value: 0x7F090045
-			public const int design_menu_item_text = 2131296325;
+			// aapt resource value: 0x7f090063
+			public const int contentPanel = 2131296355;
 			
-			// aapt resource value: 0x7F090046
-			public const int design_navigation_view = 2131296326;
+			// aapt resource value: 0x7f0900ac
+			public const int content_container = 2131296428;
 			
-			// aapt resource value: 0x7F090047
-			public const int disableHome = 2131296327;
+			// aapt resource value: 0x7f09008f
+			public const int coordinator = 2131296399;
 			
-			// aapt resource value: 0x7F090048
-			public const int edit_query = 2131296328;
+			// aapt resource value: 0x7f09006a
+			public const int custom = 2131296362;
 			
-			// aapt resource value: 0x7F090049
-			public const int end = 2131296329;
+			// aapt resource value: 0x7f090069
+			public const int customPanel = 2131296361;
 			
-			// aapt resource value: 0x7F09004A
-			public const int end_padder = 2131296330;
+			// aapt resource value: 0x7f0900b8
+			public const int day = 2131296440;
 			
-			// aapt resource value: 0x7F09004B
-			public const int enterAlways = 2131296331;
+			// aapt resource value: 0x7f090077
+			public const int decor_content_parent = 2131296375;
 			
-			// aapt resource value: 0x7F09004C
-			public const int enterAlwaysCollapsed = 2131296332;
+			// aapt resource value: 0x7f09005d
+			public const int default_activity_button = 2131296349;
 			
-			// aapt resource value: 0x7F09004D
-			public const int exitUntilCollapsed = 2131296333;
+			// aapt resource value: 0x7f090089
+			public const int description = 2131296393;
 			
-			// aapt resource value: 0x7F09004F
-			public const int expanded_menu = 2131296335;
+			// aapt resource value: 0x7f090091
+			public const int design_bottom_sheet = 2131296401;
 			
-			// aapt resource value: 0x7F09004E
-			public const int expand_activities_button = 2131296334;
+			// aapt resource value: 0x7f090098
+			public const int design_menu_item_action_area = 2131296408;
 			
-			// aapt resource value: 0x7F090050
-			public const int fill = 2131296336;
+			// aapt resource value: 0x7f090097
+			public const int design_menu_item_action_area_stub = 2131296407;
 			
-			// aapt resource value: 0x7F090002
-			public const int FILL = 2131296258;
+			// aapt resource value: 0x7f090096
+			public const int design_menu_item_text = 2131296406;
 			
-			// aapt resource value: 0x7F090051
-			public const int fill_horizontal = 2131296337;
+			// aapt resource value: 0x7f090095
+			public const int design_navigation_view = 2131296405;
 			
-			// aapt resource value: 0x7F090003
-			public const int FILL_STROKE = 2131296259;
+			// aapt resource value: 0x7f090015
+			public const int disableHome = 2131296277;
 			
-			// aapt resource value: 0x7F090052
-			public const int fill_vertical = 2131296338;
+			// aapt resource value: 0x7f09007b
+			public const int edit_query = 2131296379;
 			
-			// aapt resource value: 0x7F090053
-			public const int fingerprint_icon = 2131296339;
+			// aapt resource value: 0x7f090025
+			public const int end = 2131296293;
 			
-			// aapt resource value: 0x7F090054
-			public const int @fixed = 2131296340;
+			// aapt resource value: 0x7f0900cf
+			public const int end_padder = 2131296463;
 			
-			// aapt resource value: 0x7F090005
-			public const int FixedBehind = 2131296261;
+			// aapt resource value: 0x7f090034
+			public const int enterAlways = 2131296308;
 			
-			// aapt resource value: 0x7F090006
-			public const int FixedFront = 2131296262;
+			// aapt resource value: 0x7f090035
+			public const int enterAlwaysCollapsed = 2131296309;
 			
-			// aapt resource value: 0x7F090055
-			public const int forever = 2131296341;
+			// aapt resource value: 0x7f090036
+			public const int exitUntilCollapsed = 2131296310;
 			
-			// aapt resource value: 0x7F090004
-			public const int FUNCTION = 2131296260;
+			// aapt resource value: 0x7f09005b
+			public const int expand_activities_button = 2131296347;
 			
-			// aapt resource value: 0x7F090056
-			public const int gd_btn_back = 2131296342;
+			// aapt resource value: 0x7f09006f
+			public const int expanded_menu = 2131296367;
 			
-			// aapt resource value: 0x7F090057
-			public const int gd_btn_myLocation = 2131296343;
+			// aapt resource value: 0x7f090045
+			public const int fill = 2131296325;
 			
-			// aapt resource value: 0x7F090058
-			public const int gd_btn_save = 2131296344;
+			// aapt resource value: 0x7f090046
+			public const int fill_horizontal = 2131296326;
 			
-			// aapt resource value: 0x7F090059
-			public const int gd_img_search_delete = 2131296345;
+			// aapt resource value: 0x7f09003d
+			public const int fill_vertical = 2131296317;
 			
-			// aapt resource value: 0x7F09005A
-			public const int gd_ll_myhome = 2131296346;
+			// aapt resource value: 0x7f09008a
+			public const int fingerprint_icon = 2131296394;
 			
-			// aapt resource value: 0x7F09005B
-			public const int gd_ll_search = 2131296347;
+			// aapt resource value: 0x7f090049
+			public const int @fixed = 2131296329;
 			
-			// aapt resource value: 0x7F09005C
-			public const int gd_mapView = 2131296348;
+			// aapt resource value: 0x7f09004d
+			public const int forever = 2131296333;
 			
-			// aapt resource value: 0x7F09005D
-			public const int gd_rl_topview = 2131296349;
+			// aapt resource value: 0x7f09009d
+			public const int gd_btn_back = 2131296413;
 			
-			// aapt resource value: 0x7F09005E
-			public const int gd_tv_activity_title = 2131296350;
+			// aapt resource value: 0x7f0900a6
+			public const int gd_btn_myLocation = 2131296422;
 			
-			// aapt resource value: 0x7F09005F
-			public const int gd_tv_radius = 2131296351;
+			// aapt resource value: 0x7f0900a5
+			public const int gd_btn_save = 2131296421;
 			
-			// aapt resource value: 0x7F090060
-			public const int gd_tv_search_title = 2131296352;
+			// aapt resource value: 0x7f0900a2
+			public const int gd_img_search_delete = 2131296418;
 			
-			// aapt resource value: 0x7F090061
-			public const int hdl_gallery_rootView = 2131296353;
+			// aapt resource value: 0x7f0900a4
+			public const int gd_ll_myhome = 2131296420;
 			
-			// aapt resource value: 0x7F090062
-			public const int hdl_gallery_viewPager = 2131296354;
+			// aapt resource value: 0x7f0900a0
+			public const int gd_ll_search = 2131296416;
 			
-			// aapt resource value: 0x7F090063
-			public const int hdl_options1 = 2131296355;
+			// aapt resource value: 0x7f09009f
+			public const int gd_mapView = 2131296415;
 			
-			// aapt resource value: 0x7F090064
-			public const int hdl_options2 = 2131296356;
+			// aapt resource value: 0x7f09009c
+			public const int gd_rl_topview = 2131296412;
 			
-			// aapt resource value: 0x7F090065
-			public const int hdl_options3 = 2131296357;
+			// aapt resource value: 0x7f09009e
+			public const int gd_tv_activity_title = 2131296414;
 			
-			// aapt resource value: 0x7F090066
-			public const int hdl_pickerview_ll = 2131296358;
+			// aapt resource value: 0x7f0900a3
+			public const int gd_tv_radius = 2131296419;
 			
-			// aapt resource value: 0x7F090067
-			public const int home = 2131296359;
+			// aapt resource value: 0x7f0900a1
+			public const int gd_tv_search_title = 2131296417;
 			
-			// aapt resource value: 0x7F090068
-			public const int homeAsUp = 2131296360;
+			// aapt resource value: 0x7f09009a
+			public const int hdl_gallery_rootView = 2131296410;
 			
-			// aapt resource value: 0x7F090069
-			public const int hour = 2131296361;
+			// aapt resource value: 0x7f09009b
+			public const int hdl_gallery_viewPager = 2131296411;
 			
-			// aapt resource value: 0x7F09006A
-			public const int icon = 2131296362;
+			// aapt resource value: 0x7f0900ae
+			public const int hdl_options1 = 2131296430;
+			
+			// aapt resource value: 0x7f0900af
+			public const int hdl_options2 = 2131296431;
 			
-			// aapt resource value: 0x7F09006B
-			public const int icon_group = 2131296363;
+			// aapt resource value: 0x7f0900b0
+			public const int hdl_options3 = 2131296432;
 			
-			// aapt resource value: 0x7F09006C
-			public const int ifRoom = 2131296364;
+			// aapt resource value: 0x7f0900ad
+			public const int hdl_pickerview_ll = 2131296429;
 			
-			// aapt resource value: 0x7F09006D
-			public const int image = 2131296365;
+			// aapt resource value: 0x7f090005
+			public const int home = 2131296261;
 			
-			// aapt resource value: 0x7F09006E
-			public const int info = 2131296366;
+			// aapt resource value: 0x7f090016
+			public const int homeAsUp = 2131296278;
 			
-			// aapt resource value: 0x7F09006F
-			public const int italic = 2131296367;
+			// aapt resource value: 0x7f0900b9
+			public const int hour = 2131296441;
 			
-			// aapt resource value: 0x7F090070
-			public const int item_touch_helper_previous_elevation = 2131296368;
+			// aapt resource value: 0x7f09005f
+			public const int icon = 2131296351;
 			
-			// aapt resource value: 0x7F090071
-			public const int largeLabel = 2131296369;
+			// aapt resource value: 0x7f0900ce
+			public const int icon_group = 2131296462;
 			
-			// aapt resource value: 0x7F090072
-			public const int left = 2131296370;
+			// aapt resource value: 0x7f09002f
+			public const int ifRoom = 2131296303;
 			
-			// aapt resource value: 0x7F090073
-			public const int line1 = 2131296371;
+			// aapt resource value: 0x7f09005c
+			public const int image = 2131296348;
 			
-			// aapt resource value: 0x7F090074
-			public const int line3 = 2131296372;
+			// aapt resource value: 0x7f0900ca
+			public const int info = 2131296458;
 			
-			// aapt resource value: 0x7F090075
-			public const int listMode = 2131296373;
+			// aapt resource value: 0x7f09004e
+			public const int italic = 2131296334;
 			
-			// aapt resource value: 0x7F090076
-			public const int list_item = 2131296374;
+			// aapt resource value: 0x7f090000
+			public const int item_touch_helper_previous_elevation = 2131296256;
 			
-			// aapt resource value: 0x7F090077
-			public const int masked = 2131296375;
+			// aapt resource value: 0x7f09008d
+			public const int largeLabel = 2131296397;
 			
-			// aapt resource value: 0x7F090008
-			public const int MatchLayout = 2131296264;
+			// aapt resource value: 0x7f09003e
+			public const int left = 2131296318;
 			
-			// aapt resource value: 0x7F090078
-			public const int media_actions = 2131296376;
+			// aapt resource value: 0x7f09000d
+			public const int line1 = 2131296269;
 			
-			// aapt resource value: 0x7F090079
-			public const int message = 2131296377;
+			// aapt resource value: 0x7f09000e
+			public const int line3 = 2131296270;
 			
-			// aapt resource value: 0x7F090007
-			public const int META = 2131296263;
+			// aapt resource value: 0x7f090012
+			public const int listMode = 2131296274;
 			
-			// aapt resource value: 0x7F09007A
-			public const int middle = 2131296378;
+			// aapt resource value: 0x7f09005e
+			public const int list_item = 2131296350;
 			
-			// aapt resource value: 0x7F09007B
-			public const int min = 2131296379;
+			// aapt resource value: 0x7f0900db
+			public const int masked = 2131296475;
 			
-			// aapt resource value: 0x7F09007C
-			public const int mini = 2131296380;
+			// aapt resource value: 0x7f0900c3
+			public const int media_actions = 2131296451;
 			
-			// aapt resource value: 0x7F09007D
-			public const int month = 2131296381;
+			// aapt resource value: 0x7f0900d5
+			public const int message = 2131296469;
 			
-			// aapt resource value: 0x7F09007E
-			public const int multiply = 2131296382;
+			// aapt resource value: 0x7f090026
+			public const int middle = 2131296294;
 			
-			// aapt resource value: 0x7F09007F
-			public const int myButton = 2131296383;
+			// aapt resource value: 0x7f0900ba
+			public const int min = 2131296442;
 			
-			// aapt resource value: 0x7F090080
-			public const int navigation_header_container = 2131296384;
+			// aapt resource value: 0x7f090048
+			public const int mini = 2131296328;
 			
-			// aapt resource value: 0x7F090081
-			public const int never = 2131296385;
+			// aapt resource value: 0x7f0900b7
+			public const int month = 2131296439;
 			
-			// aapt resource value: 0x7F090082
-			public const int none = 2131296386;
+			// aapt resource value: 0x7f09001c
+			public const int multiply = 2131296284;
 			
-			// aapt resource value: 0x7F090083
-			public const int normal = 2131296387;
+			// aapt resource value: 0x7f0900bc
+			public const int myButton = 2131296444;
 			
-			// aapt resource value: 0x7F090084
-			public const int notification_background = 2131296388;
+			// aapt resource value: 0x7f090094
+			public const int navigation_header_container = 2131296404;
 			
-			// aapt resource value: 0x7F090085
-			public const int notification_main_column = 2131296389;
+			// aapt resource value: 0x7f090030
+			public const int never = 2131296304;
 			
-			// aapt resource value: 0x7F090086
-			public const int notification_main_column_container = 2131296390;
+			// aapt resource value: 0x7f090017
+			public const int none = 2131296279;
 			
-			// aapt resource value: 0x7F090087
-			public const int options1 = 2131296391;
+			// aapt resource value: 0x7f090013
+			public const int normal = 2131296275;
 			
-			// aapt resource value: 0x7F090088
-			public const int options2 = 2131296392;
+			// aapt resource value: 0x7f0900cc
+			public const int notification_background = 2131296460;
 			
-			// aapt resource value: 0x7F090089
-			public const int options3 = 2131296393;
+			// aapt resource value: 0x7f0900c6
+			public const int notification_main_column = 2131296454;
 			
-			// aapt resource value: 0x7F09008A
-			public const int optionspicker = 2131296394;
+			// aapt resource value: 0x7f0900c5
+			public const int notification_main_column_container = 2131296453;
 			
-			// aapt resource value: 0x7F09008B
-			public const int outmost_container = 2131296395;
+			// aapt resource value: 0x7f0900b2
+			public const int options1 = 2131296434;
 			
-			// aapt resource value: 0x7F09008C
-			public const int parallax = 2131296396;
+			// aapt resource value: 0x7f0900b3
+			public const int options2 = 2131296435;
 			
-			// aapt resource value: 0x7F09008D
-			public const int parentPanel = 2131296397;
+			// aapt resource value: 0x7f0900b4
+			public const int options3 = 2131296436;
 			
-			// aapt resource value: 0x7F09008E
-			public const int pin = 2131296398;
+			// aapt resource value: 0x7f0900b1
+			public const int optionspicker = 2131296433;
 			
-			// aapt resource value: 0x7F09008F
-			public const int progress_circular = 2131296399;
+			// aapt resource value: 0x7f0900ab
+			public const int outmost_container = 2131296427;
 			
-			// aapt resource value: 0x7F090090
-			public const int progress_horizontal = 2131296400;
+			// aapt resource value: 0x7f090041
+			public const int parallax = 2131296321;
 			
-			// aapt resource value: 0x7F090091
-			public const int radio = 2131296401;
+			// aapt resource value: 0x7f090062
+			public const int parentPanel = 2131296354;
 			
-			// aapt resource value: 0x7F090092
-			public const int right = 2131296402;
+			// aapt resource value: 0x7f090042
+			public const int pin = 2131296322;
 			
-			// aapt resource value: 0x7F090093
-			public const int right_icon = 2131296403;
+			// aapt resource value: 0x7f090006
+			public const int progress_circular = 2131296262;
 			
-			// aapt resource value: 0x7F090094
-			public const int right_side = 2131296404;
+			// aapt resource value: 0x7f090007
+			public const int progress_horizontal = 2131296263;
 			
-			// aapt resource value: 0x7F090095
-			public const int rv_topbar = 2131296405;
+			// aapt resource value: 0x7f090072
+			public const int radio = 2131296370;
 			
-			// aapt resource value: 0x7F09000C
-			public const int Scale = 2131296268;
+			// aapt resource value: 0x7f09003f
+			public const int right = 2131296319;
 			
-			// aapt resource value: 0x7F090096
-			public const int screen = 2131296406;
+			// aapt resource value: 0x7f0900cb
+			public const int right_icon = 2131296459;
 			
-			// aapt resource value: 0x7F090097
-			public const int scroll = 2131296407;
+			// aapt resource value: 0x7f0900c7
+			public const int right_side = 2131296455;
 			
-			// aapt resource value: 0x7F09009B
-			public const int scrollable = 2131296411;
+			// aapt resource value: 0x7f0900a7
+			public const int rv_topbar = 2131296423;
 			
-			// aapt resource value: 0x7F090098
-			public const int scrollIndicatorDown = 2131296408;
+			// aapt resource value: 0x7f09001d
+			public const int screen = 2131296285;
 			
-			// aapt resource value: 0x7F090099
-			public const int scrollIndicatorUp = 2131296409;
+			// aapt resource value: 0x7f090037
+			public const int scroll = 2131296311;
 			
-			// aapt resource value: 0x7F09009A
-			public const int scrollView = 2131296410;
+			// aapt resource value: 0x7f090068
+			public const int scrollIndicatorDown = 2131296360;
 			
-			// aapt resource value: 0x7F09009C
-			public const int search_badge = 2131296412;
+			// aapt resource value: 0x7f090064
+			public const int scrollIndicatorUp = 2131296356;
 			
-			// aapt resource value: 0x7F09009D
-			public const int search_bar = 2131296413;
+			// aapt resource value: 0x7f090065
+			public const int scrollView = 2131296357;
 			
-			// aapt resource value: 0x7F09009E
-			public const int search_button = 2131296414;
+			// aapt resource value: 0x7f09004a
+			public const int scrollable = 2131296330;
 			
-			// aapt resource value: 0x7F09009F
-			public const int search_close_btn = 2131296415;
+			// aapt resource value: 0x7f09007d
+			public const int search_badge = 2131296381;
 			
-			// aapt resource value: 0x7F0900A0
-			public const int search_edit_frame = 2131296416;
+			// aapt resource value: 0x7f09007c
+			public const int search_bar = 2131296380;
 			
-			// aapt resource value: 0x7F0900A1
-			public const int search_go_btn = 2131296417;
+			// aapt resource value: 0x7f09007e
+			public const int search_button = 2131296382;
 			
-			// aapt resource value: 0x7F0900A2
-			public const int search_mag_icon = 2131296418;
+			// aapt resource value: 0x7f090083
+			public const int search_close_btn = 2131296387;
 			
-			// aapt resource value: 0x7F0900A3
-			public const int search_plate = 2131296419;
+			// aapt resource value: 0x7f09007f
+			public const int search_edit_frame = 2131296383;
 			
-			// aapt resource value: 0x7F0900A4
-			public const int search_src_text = 2131296420;
+			// aapt resource value: 0x7f090085
+			public const int search_go_btn = 2131296389;
 			
-			// aapt resource value: 0x7F0900A5
-			public const int search_voice_btn = 2131296421;
+			// aapt resource value: 0x7f090080
+			public const int search_mag_icon = 2131296384;
 			
-			// aapt resource value: 0x7F0900A6
-			public const int second = 2131296422;
+			// aapt resource value: 0x7f090081
+			public const int search_plate = 2131296385;
 			
-			// aapt resource value: 0x7F0900A7
-			public const int select_dialog_listview = 2131296423;
+			// aapt resource value: 0x7f090082
+			public const int search_src_text = 2131296386;
 			
-			// aapt resource value: 0x7F090009
-			public const int SHIFT = 2131296265;
+			// aapt resource value: 0x7f090086
+			public const int search_voice_btn = 2131296390;
 			
-			// aapt resource value: 0x7F0900A8
-			public const int shortcut = 2131296424;
+			// aapt resource value: 0x7f0900bb
+			public const int second = 2131296443;
 			
-			// aapt resource value: 0x7F0900A9
-			public const int showCustom = 2131296425;
+			// aapt resource value: 0x7f090087
+			public const int select_dialog_listview = 2131296391;
 			
-			// aapt resource value: 0x7F0900AA
-			public const int showHome = 2131296426;
+			// aapt resource value: 0x7f090071
+			public const int shortcut = 2131296369;
 			
-			// aapt resource value: 0x7F0900AB
-			public const int showTitle = 2131296427;
+			// aapt resource value: 0x7f090018
+			public const int showCustom = 2131296280;
 			
-			// aapt resource value: 0x7F0900AC
-			public const int smallLabel = 2131296428;
+			// aapt resource value: 0x7f090019
+			public const int showHome = 2131296281;
 			
-			// aapt resource value: 0x7F0900AD
-			public const int snackbar_action = 2131296429;
+			// aapt resource value: 0x7f09001a
+			public const int showTitle = 2131296282;
 			
-			// aapt resource value: 0x7F0900AE
-			public const int snackbar_text = 2131296430;
+			// aapt resource value: 0x7f09008c
+			public const int smallLabel = 2131296396;
 			
-			// aapt resource value: 0x7F0900AF
-			public const int snap = 2131296431;
+			// aapt resource value: 0x7f090093
+			public const int snackbar_action = 2131296403;
 			
-			// aapt resource value: 0x7F0900B0
-			public const int spacer = 2131296432;
+			// aapt resource value: 0x7f090092
+			public const int snackbar_text = 2131296402;
 			
-			// aapt resource value: 0x7F0900B1
-			public const int split_action_bar = 2131296433;
+			// aapt resource value: 0x7f090038
+			public const int snap = 2131296312;
 			
-			// aapt resource value: 0x7F0900B2
-			public const int src_atop = 2131296434;
+			// aapt resource value: 0x7f090061
+			public const int spacer = 2131296353;
 			
-			// aapt resource value: 0x7F0900B3
-			public const int src_in = 2131296435;
+			// aapt resource value: 0x7f090008
+			public const int split_action_bar = 2131296264;
 			
-			// aapt resource value: 0x7F0900B4
-			public const int src_over = 2131296436;
+			// aapt resource value: 0x7f09001e
+			public const int src_atop = 2131296286;
 			
-			// aapt resource value: 0x7F0900B5
-			public const int srl_classics_arrow = 2131296437;
+			// aapt resource value: 0x7f09001f
+			public const int src_in = 2131296287;
 			
-			// aapt resource value: 0x7F0900B6
-			public const int srl_classics_center = 2131296438;
+			// aapt resource value: 0x7f090020
+			public const int src_over = 2131296288;
 			
-			// aapt resource value: 0x7F0900B7
-			public const int srl_classics_progress = 2131296439;
+			// aapt resource value: 0x7f0900d0
+			public const int srl_classics_arrow = 2131296464;
 			
-			// aapt resource value: 0x7F0900B8
-			public const int srl_classics_title = 2131296440;
+			// aapt resource value: 0x7f0900d3
+			public const int srl_classics_center = 2131296467;
 			
-			// aapt resource value: 0x7F0900B9
-			public const int srl_classics_update = 2131296441;
+			// aapt resource value: 0x7f0900d2
+			public const int srl_classics_progress = 2131296466;
 			
-			// aapt resource value: 0x7F0900BA
-			public const int start = 2131296442;
+			// aapt resource value: 0x7f0900d1
+			public const int srl_classics_title = 2131296465;
 			
-			// aapt resource value: 0x7F0900BB
-			public const int status = 2131296443;
+			// aapt resource value: 0x7f0900d4
+			public const int srl_classics_update = 2131296468;
 			
-			// aapt resource value: 0x7F0900BC
-			public const int status_bar_latest_event_content = 2131296444;
+			// aapt resource value: 0x7f090040
+			public const int start = 2131296320;
 			
-			// aapt resource value: 0x7F09000A
-			public const int STROKE = 2131296266;
+			// aapt resource value: 0x7f09008b
+			public const int status = 2131296395;
 			
-			// aapt resource value: 0x7F0900BD
-			public const int submenuarrow = 2131296445;
+			// aapt resource value: 0x7f0900c2
+			public const int status_bar_latest_event_content = 2131296450;
 			
-			// aapt resource value: 0x7F0900BE
-			public const int submit_area = 2131296446;
+			// aapt resource value: 0x7f090073
+			public const int submenuarrow = 2131296371;
 			
-			// aapt resource value: 0x7F0900BF
-			public const int subtitle = 2131296447;
+			// aapt resource value: 0x7f090084
+			public const int submit_area = 2131296388;
 			
-			// aapt resource value: 0x7F09000B
-			public const int SYM = 2131296267;
+			// aapt resource value: 0x7f090088
+			public const int subtitle = 2131296392;
 			
-			// aapt resource value: 0x7F0900C0
-			public const int tabMode = 2131296448;
+			// aapt resource value: 0x7f090014
+			public const int tabMode = 2131296276;
 			
-			// aapt resource value: 0x7F0900C1
-			public const int text = 2131296449;
+			// aapt resource value: 0x7f09000f
+			public const int text = 2131296271;
 			
-			// aapt resource value: 0x7F0900C2
-			public const int text2 = 2131296450;
+			// aapt resource value: 0x7f090010
+			public const int text2 = 2131296272;
 			
-			// aapt resource value: 0x7F0900C6
-			public const int textinput_counter = 2131296454;
+			// aapt resource value: 0x7f090067
+			public const int textSpacerNoButtons = 2131296359;
 			
-			// aapt resource value: 0x7F0900C7
-			public const int textinput_error = 2131296455;
+			// aapt resource value: 0x7f090066
+			public const int textSpacerNoTitle = 2131296358;
 			
-			// aapt resource value: 0x7F0900C3
-			public const int textSpacerNoButtons = 2131296451;
+			// aapt resource value: 0x7f090099
+			public const int text_input_password_toggle = 2131296409;
 			
-			// aapt resource value: 0x7F0900C4
-			public const int textSpacerNoTitle = 2131296452;
+			// aapt resource value: 0x7f09000a
+			public const int textinput_counter = 2131296266;
 			
-			// aapt resource value: 0x7F0900C5
-			public const int text_input_password_toggle = 2131296453;
+			// aapt resource value: 0x7f09000b
+			public const int textinput_error = 2131296267;
 			
-			// aapt resource value: 0x7F0900C8
+			// aapt resource value: 0x7f0900c8
 			public const int time = 2131296456;
 			
-			// aapt resource value: 0x7F0900C9
-			public const int timepicker = 2131296457;
+			// aapt resource value: 0x7f0900b5
+			public const int timepicker = 2131296437;
 			
-			// aapt resource value: 0x7F0900CA
-			public const int title = 2131296458;
+			// aapt resource value: 0x7f090011
+			public const int title = 2131296273;
 			
-			// aapt resource value: 0x7F0900CB
-			public const int titleDividerNoCustom = 2131296459;
+			// aapt resource value: 0x7f09006e
+			public const int titleDividerNoCustom = 2131296366;
 			
-			// aapt resource value: 0x7F0900CC
-			public const int title_template = 2131296460;
+			// aapt resource value: 0x7f09006c
+			public const int title_template = 2131296364;
 			
-			// aapt resource value: 0x7F0900CD
-			public const int top = 2131296461;
+			// aapt resource value: 0x7f090033
+			public const int top = 2131296307;
 			
-			// aapt resource value: 0x7F0900CE
-			public const int topPanel = 2131296462;
+			// aapt resource value: 0x7f09006b
+			public const int topPanel = 2131296363;
 			
-			// aapt resource value: 0x7F0900CF
-			public const int touch_outside = 2131296463;
+			// aapt resource value: 0x7f090090
+			public const int touch_outside = 2131296400;
 			
-			// aapt resource value: 0x7F09000D
-			public const int Translate = 2131296269;
+			// aapt resource value: 0x7f0900a9
+			public const int tvTitle = 2131296425;
 			
-			// aapt resource value: 0x7F0900D0
-			public const int tvTitle = 2131296464;
+			// aapt resource value: 0x7f0900d7
+			public const int tv_zxing_back = 2131296471;
 			
-			// aapt resource value: 0x7F0900D1
-			public const int tv_zxing_back = 2131296465;
+			// aapt resource value: 0x7f0900d8
+			public const int tv_zxing_flash = 2131296472;
 			
-			// aapt resource value: 0x7F0900D2
-			public const int tv_zxing_flash = 2131296466;
+			// aapt resource value: 0x7f0900d6
+			public const int tv_zxing_scan = 2131296470;
 			
-			// aapt resource value: 0x7F0900D3
-			public const int tv_zxing_scan = 2131296467;
+			// aapt resource value: 0x7f090022
+			public const int uniform = 2131296290;
 			
-			// aapt resource value: 0x7F0900D4
-			public const int uniform = 2131296468;
+			// aapt resource value: 0x7f090009
+			public const int up = 2131296265;
 			
-			// aapt resource value: 0x7F0900D5
-			public const int up = 2131296469;
+			// aapt resource value: 0x7f09001b
+			public const int useLogo = 2131296283;
 			
-			// aapt resource value: 0x7F0900D6
-			public const int useLogo = 2131296470;
+			// aapt resource value: 0x7f09000c
+			public const int view_offset_helper = 2131296268;
 			
-			// aapt resource value: 0x7F0900D7
-			public const int view_offset_helper = 2131296471;
+			// aapt resource value: 0x7f0900da
+			public const int visible = 2131296474;
 			
-			// aapt resource value: 0x7F0900D8
-			public const int visible = 2131296472;
+			// aapt resource value: 0x7f090031
+			public const int withText = 2131296305;
 			
-			// aapt resource value: 0x7F0900D9
-			public const int withText = 2131296473;
+			// aapt resource value: 0x7f090023
+			public const int wrap_content = 2131296291;
 			
-			// aapt resource value: 0x7F0900DA
-			public const int wrap_content = 2131296474;
-			
-			// aapt resource value: 0x7F0900DB
-			public const int year = 2131296475;
+			// aapt resource value: 0x7f0900b6
+			public const int year = 2131296438;
 			
 			static Id()
 			{
@@ -3652,38 +3706,38 @@
 		public partial class Integer
 		{
 			
-			// aapt resource value: 0x7F0A0000
-			public const int abc_config_activityDefaultDur = 2131361792;
+			// aapt resource value: 0x7f0e0000
+			public const int abc_config_activityDefaultDur = 2131623936;
 			
-			// aapt resource value: 0x7F0A0001
-			public const int abc_config_activityShortDur = 2131361793;
+			// aapt resource value: 0x7f0e0001
+			public const int abc_config_activityShortDur = 2131623937;
 			
-			// aapt resource value: 0x7F0A0002
-			public const int animation_default_duration = 2131361794;
+			// aapt resource value: 0x7f0e000a
+			public const int animation_default_duration = 2131623946;
 			
-			// aapt resource value: 0x7F0A0003
-			public const int app_bar_elevation_anim_duration = 2131361795;
+			// aapt resource value: 0x7f0e0005
+			public const int app_bar_elevation_anim_duration = 2131623941;
 			
-			// aapt resource value: 0x7F0A0004
-			public const int bottom_sheet_slide_duration = 2131361796;
+			// aapt resource value: 0x7f0e0006
+			public const int bottom_sheet_slide_duration = 2131623942;
 			
-			// aapt resource value: 0x7F0A0005
-			public const int cancel_button_image_alpha = 2131361797;
+			// aapt resource value: 0x7f0e0002
+			public const int cancel_button_image_alpha = 2131623938;
 			
-			// aapt resource value: 0x7F0A0006
-			public const int config_tooltipAnimTime = 2131361798;
+			// aapt resource value: 0x7f0e0003
+			public const int config_tooltipAnimTime = 2131623939;
 			
-			// aapt resource value: 0x7F0A0007
-			public const int design_snackbar_text_max_lines = 2131361799;
+			// aapt resource value: 0x7f0e0004
+			public const int design_snackbar_text_max_lines = 2131623940;
 			
-			// aapt resource value: 0x7F0A0008
-			public const int hide_password_duration = 2131361800;
+			// aapt resource value: 0x7f0e0007
+			public const int hide_password_duration = 2131623943;
 			
-			// aapt resource value: 0x7F0A0009
-			public const int show_password_duration = 2131361801;
+			// aapt resource value: 0x7f0e0008
+			public const int show_password_duration = 2131623944;
 			
-			// aapt resource value: 0x7F0A000A
-			public const int status_bar_notification_info_maxnum = 2131361802;
+			// aapt resource value: 0x7f0e0009
+			public const int status_bar_notification_info_maxnum = 2131623945;
 			
 			static Integer()
 			{
@@ -3698,236 +3752,236 @@
 		public partial class Layout
 		{
 			
-			// aapt resource value: 0x7F0B0000
-			public const int abc_action_bar_title_item = 2131427328;
+			// aapt resource value: 0x7f040000
+			public const int abc_action_bar_title_item = 2130968576;
 			
-			// aapt resource value: 0x7F0B0001
-			public const int abc_action_bar_up_container = 2131427329;
+			// aapt resource value: 0x7f040001
+			public const int abc_action_bar_up_container = 2130968577;
 			
-			// aapt resource value: 0x7F0B0002
-			public const int abc_action_bar_view_list_nav_layout = 2131427330;
+			// aapt resource value: 0x7f040002
+			public const int abc_action_bar_view_list_nav_layout = 2130968578;
 			
-			// aapt resource value: 0x7F0B0003
-			public const int abc_action_menu_item_layout = 2131427331;
+			// aapt resource value: 0x7f040003
+			public const int abc_action_menu_item_layout = 2130968579;
 			
-			// aapt resource value: 0x7F0B0004
-			public const int abc_action_menu_layout = 2131427332;
+			// aapt resource value: 0x7f040004
+			public const int abc_action_menu_layout = 2130968580;
 			
-			// aapt resource value: 0x7F0B0005
-			public const int abc_action_mode_bar = 2131427333;
+			// aapt resource value: 0x7f040005
+			public const int abc_action_mode_bar = 2130968581;
 			
-			// aapt resource value: 0x7F0B0006
-			public const int abc_action_mode_close_item_material = 2131427334;
+			// aapt resource value: 0x7f040006
+			public const int abc_action_mode_close_item_material = 2130968582;
 			
-			// aapt resource value: 0x7F0B0007
-			public const int abc_activity_chooser_view = 2131427335;
+			// aapt resource value: 0x7f040007
+			public const int abc_activity_chooser_view = 2130968583;
 			
-			// aapt resource value: 0x7F0B0008
-			public const int abc_activity_chooser_view_list_item = 2131427336;
+			// aapt resource value: 0x7f040008
+			public const int abc_activity_chooser_view_list_item = 2130968584;
 			
-			// aapt resource value: 0x7F0B0009
-			public const int abc_alert_dialog_button_bar_material = 2131427337;
+			// aapt resource value: 0x7f040009
+			public const int abc_alert_dialog_button_bar_material = 2130968585;
 			
-			// aapt resource value: 0x7F0B000A
-			public const int abc_alert_dialog_material = 2131427338;
+			// aapt resource value: 0x7f04000a
+			public const int abc_alert_dialog_material = 2130968586;
 			
-			// aapt resource value: 0x7F0B000B
-			public const int abc_alert_dialog_title_material = 2131427339;
+			// aapt resource value: 0x7f04000b
+			public const int abc_alert_dialog_title_material = 2130968587;
 			
-			// aapt resource value: 0x7F0B000C
-			public const int abc_dialog_title_material = 2131427340;
+			// aapt resource value: 0x7f04000c
+			public const int abc_dialog_title_material = 2130968588;
 			
-			// aapt resource value: 0x7F0B000D
-			public const int abc_expanded_menu_layout = 2131427341;
+			// aapt resource value: 0x7f04000d
+			public const int abc_expanded_menu_layout = 2130968589;
 			
-			// aapt resource value: 0x7F0B000E
-			public const int abc_list_menu_item_checkbox = 2131427342;
+			// aapt resource value: 0x7f04000e
+			public const int abc_list_menu_item_checkbox = 2130968590;
 			
-			// aapt resource value: 0x7F0B000F
-			public const int abc_list_menu_item_icon = 2131427343;
+			// aapt resource value: 0x7f04000f
+			public const int abc_list_menu_item_icon = 2130968591;
 			
-			// aapt resource value: 0x7F0B0010
-			public const int abc_list_menu_item_layout = 2131427344;
+			// aapt resource value: 0x7f040010
+			public const int abc_list_menu_item_layout = 2130968592;
 			
-			// aapt resource value: 0x7F0B0011
-			public const int abc_list_menu_item_radio = 2131427345;
+			// aapt resource value: 0x7f040011
+			public const int abc_list_menu_item_radio = 2130968593;
 			
-			// aapt resource value: 0x7F0B0012
-			public const int abc_popup_menu_header_item_layout = 2131427346;
+			// aapt resource value: 0x7f040012
+			public const int abc_popup_menu_header_item_layout = 2130968594;
 			
-			// aapt resource value: 0x7F0B0013
-			public const int abc_popup_menu_item_layout = 2131427347;
+			// aapt resource value: 0x7f040013
+			public const int abc_popup_menu_item_layout = 2130968595;
 			
-			// aapt resource value: 0x7F0B0014
-			public const int abc_screen_content_include = 2131427348;
+			// aapt resource value: 0x7f040014
+			public const int abc_screen_content_include = 2130968596;
 			
-			// aapt resource value: 0x7F0B0015
-			public const int abc_screen_simple = 2131427349;
+			// aapt resource value: 0x7f040015
+			public const int abc_screen_simple = 2130968597;
 			
-			// aapt resource value: 0x7F0B0016
-			public const int abc_screen_simple_overlay_action_mode = 2131427350;
+			// aapt resource value: 0x7f040016
+			public const int abc_screen_simple_overlay_action_mode = 2130968598;
 			
-			// aapt resource value: 0x7F0B0017
-			public const int abc_screen_toolbar = 2131427351;
+			// aapt resource value: 0x7f040017
+			public const int abc_screen_toolbar = 2130968599;
 			
-			// aapt resource value: 0x7F0B0018
-			public const int abc_search_dropdown_item_icons_2line = 2131427352;
+			// aapt resource value: 0x7f040018
+			public const int abc_search_dropdown_item_icons_2line = 2130968600;
 			
-			// aapt resource value: 0x7F0B0019
-			public const int abc_search_view = 2131427353;
+			// aapt resource value: 0x7f040019
+			public const int abc_search_view = 2130968601;
 			
-			// aapt resource value: 0x7F0B001A
-			public const int abc_select_dialog_material = 2131427354;
+			// aapt resource value: 0x7f04001a
+			public const int abc_select_dialog_material = 2130968602;
 			
-			// aapt resource value: 0x7F0B001B
-			public const int biometric_prompt_dialog_content = 2131427355;
+			// aapt resource value: 0x7f04001b
+			public const int biometric_prompt_dialog_content = 2130968603;
 			
-			// aapt resource value: 0x7F0B001C
-			public const int design_bottom_navigation_item = 2131427356;
+			// aapt resource value: 0x7f04001c
+			public const int design_bottom_navigation_item = 2130968604;
 			
-			// aapt resource value: 0x7F0B001D
-			public const int design_bottom_sheet_dialog = 2131427357;
+			// aapt resource value: 0x7f04001d
+			public const int design_bottom_sheet_dialog = 2130968605;
 			
-			// aapt resource value: 0x7F0B001E
-			public const int design_layout_snackbar = 2131427358;
+			// aapt resource value: 0x7f04001e
+			public const int design_layout_snackbar = 2130968606;
 			
-			// aapt resource value: 0x7F0B001F
-			public const int design_layout_snackbar_include = 2131427359;
+			// aapt resource value: 0x7f04001f
+			public const int design_layout_snackbar_include = 2130968607;
 			
-			// aapt resource value: 0x7F0B0020
-			public const int design_layout_tab_icon = 2131427360;
+			// aapt resource value: 0x7f040020
+			public const int design_layout_tab_icon = 2130968608;
 			
-			// aapt resource value: 0x7F0B0021
-			public const int design_layout_tab_text = 2131427361;
+			// aapt resource value: 0x7f040021
+			public const int design_layout_tab_text = 2130968609;
 			
-			// aapt resource value: 0x7F0B0022
-			public const int design_menu_item_action_area = 2131427362;
+			// aapt resource value: 0x7f040022
+			public const int design_menu_item_action_area = 2130968610;
 			
-			// aapt resource value: 0x7F0B0023
-			public const int design_navigation_item = 2131427363;
+			// aapt resource value: 0x7f040023
+			public const int design_navigation_item = 2130968611;
 			
-			// aapt resource value: 0x7F0B0024
-			public const int design_navigation_item_header = 2131427364;
+			// aapt resource value: 0x7f040024
+			public const int design_navigation_item_header = 2130968612;
 			
-			// aapt resource value: 0x7F0B0025
-			public const int design_navigation_item_separator = 2131427365;
+			// aapt resource value: 0x7f040025
+			public const int design_navigation_item_separator = 2130968613;
 			
-			// aapt resource value: 0x7F0B0026
-			public const int design_navigation_item_subheader = 2131427366;
+			// aapt resource value: 0x7f040026
+			public const int design_navigation_item_subheader = 2130968614;
 			
-			// aapt resource value: 0x7F0B0027
-			public const int design_navigation_menu = 2131427367;
+			// aapt resource value: 0x7f040027
+			public const int design_navigation_menu = 2130968615;
 			
-			// aapt resource value: 0x7F0B0028
-			public const int design_navigation_menu_item = 2131427368;
+			// aapt resource value: 0x7f040028
+			public const int design_navigation_menu_item = 2130968616;
 			
-			// aapt resource value: 0x7F0B0029
-			public const int design_text_input_password_icon = 2131427369;
+			// aapt resource value: 0x7f040029
+			public const int design_text_input_password_icon = 2130968617;
 			
-			// aapt resource value: 0x7F0B002A
-			public const int hdl_gallery_banner_view_layout = 2131427370;
+			// aapt resource value: 0x7f04002a
+			public const int hdl_gallery_banner_view_layout = 2130968618;
 			
-			// aapt resource value: 0x7F0B002B
-			public const int hdl_widget_activity_crop_image = 2131427371;
+			// aapt resource value: 0x7f04002b
+			public const int hdl_widget_activity_crop_image = 2130968619;
 			
-			// aapt resource value: 0x7F0B002C
-			public const int hdl_widget_activity_geofence_round = 2131427372;
+			// aapt resource value: 0x7f04002c
+			public const int hdl_widget_activity_geofence_round = 2130968620;
 			
-			// aapt resource value: 0x7F0B002D
-			public const int hdl_widget_air_button = 2131427373;
+			// aapt resource value: 0x7f04002d
+			public const int hdl_widget_air_button = 2130968621;
 			
-			// aapt resource value: 0x7F0B002E
-			public const int hdl_widget_include_pickerview_topbar = 2131427374;
+			// aapt resource value: 0x7f04002e
+			public const int hdl_widget_include_pickerview_topbar = 2130968622;
 			
-			// aapt resource value: 0x7F0B002F
-			public const int hdl_widget_layout_basepickerview = 2131427375;
+			// aapt resource value: 0x7f04002f
+			public const int hdl_widget_layout_basepickerview = 2130968623;
 			
-			// aapt resource value: 0x7F0B0030
-			public const int hdl_widget_pickerview = 2131427376;
+			// aapt resource value: 0x7f040030
+			public const int hdl_widget_pickerview = 2130968624;
 			
-			// aapt resource value: 0x7F0B0031
-			public const int hdl_widget_pickerview_options = 2131427377;
+			// aapt resource value: 0x7f040031
+			public const int hdl_widget_pickerview_options = 2130968625;
 			
-			// aapt resource value: 0x7F0B0032
-			public const int hdl_widget_pickerview_time = 2131427378;
+			// aapt resource value: 0x7f040032
+			public const int hdl_widget_pickerview_time = 2130968626;
 			
-			// aapt resource value: 0x7F0B0033
-			public const int Main = 2131427379;
+			// aapt resource value: 0x7f040033
+			public const int Main = 2130968627;
 			
-			// aapt resource value: 0x7F0B0034
-			public const int notification_action = 2131427380;
+			// aapt resource value: 0x7f040034
+			public const int notification_action = 2130968628;
 			
-			// aapt resource value: 0x7F0B0035
-			public const int notification_action_tombstone = 2131427381;
+			// aapt resource value: 0x7f040035
+			public const int notification_action_tombstone = 2130968629;
 			
-			// aapt resource value: 0x7F0B0036
-			public const int notification_media_action = 2131427382;
+			// aapt resource value: 0x7f040036
+			public const int notification_media_action = 2130968630;
 			
-			// aapt resource value: 0x7F0B0037
-			public const int notification_media_cancel_action = 2131427383;
+			// aapt resource value: 0x7f040037
+			public const int notification_media_cancel_action = 2130968631;
 			
-			// aapt resource value: 0x7F0B0038
-			public const int notification_template_big_media = 2131427384;
+			// aapt resource value: 0x7f040038
+			public const int notification_template_big_media = 2130968632;
 			
-			// aapt resource value: 0x7F0B0039
-			public const int notification_template_big_media_custom = 2131427385;
+			// aapt resource value: 0x7f040039
+			public const int notification_template_big_media_custom = 2130968633;
 			
-			// aapt resource value: 0x7F0B003A
-			public const int notification_template_big_media_narrow = 2131427386;
+			// aapt resource value: 0x7f04003a
+			public const int notification_template_big_media_narrow = 2130968634;
 			
-			// aapt resource value: 0x7F0B003B
-			public const int notification_template_big_media_narrow_custom = 2131427387;
+			// aapt resource value: 0x7f04003b
+			public const int notification_template_big_media_narrow_custom = 2130968635;
 			
-			// aapt resource value: 0x7F0B003C
-			public const int notification_template_custom_big = 2131427388;
+			// aapt resource value: 0x7f04003c
+			public const int notification_template_custom_big = 2130968636;
 			
-			// aapt resource value: 0x7F0B003D
-			public const int notification_template_icon_group = 2131427389;
+			// aapt resource value: 0x7f04003d
+			public const int notification_template_icon_group = 2130968637;
 			
-			// aapt resource value: 0x7F0B003E
-			public const int notification_template_lines_media = 2131427390;
+			// aapt resource value: 0x7f04003e
+			public const int notification_template_lines_media = 2130968638;
 			
-			// aapt resource value: 0x7F0B003F
-			public const int notification_template_media = 2131427391;
+			// aapt resource value: 0x7f04003f
+			public const int notification_template_media = 2130968639;
 			
-			// aapt resource value: 0x7F0B0040
-			public const int notification_template_media_custom = 2131427392;
+			// aapt resource value: 0x7f040040
+			public const int notification_template_media_custom = 2130968640;
 			
-			// aapt resource value: 0x7F0B0041
-			public const int notification_template_part_chronometer = 2131427393;
+			// aapt resource value: 0x7f040041
+			public const int notification_template_part_chronometer = 2130968641;
 			
-			// aapt resource value: 0x7F0B0042
-			public const int notification_template_part_time = 2131427394;
+			// aapt resource value: 0x7f040042
+			public const int notification_template_part_time = 2130968642;
 			
-			// aapt resource value: 0x7F0B0043
-			public const int select_dialog_item_material = 2131427395;
+			// aapt resource value: 0x7f040043
+			public const int select_dialog_item_material = 2130968643;
 			
-			// aapt resource value: 0x7F0B0044
-			public const int select_dialog_multichoice_material = 2131427396;
+			// aapt resource value: 0x7f040044
+			public const int select_dialog_multichoice_material = 2130968644;
 			
-			// aapt resource value: 0x7F0B0045
-			public const int select_dialog_singlechoice_material = 2131427397;
+			// aapt resource value: 0x7f040045
+			public const int select_dialog_singlechoice_material = 2130968645;
 			
-			// aapt resource value: 0x7F0B0046
-			public const int srl_classics_footer = 2131427398;
+			// aapt resource value: 0x7f040046
+			public const int srl_classics_footer = 2130968646;
 			
-			// aapt resource value: 0x7F0B0047
-			public const int srl_classics_header = 2131427399;
+			// aapt resource value: 0x7f040047
+			public const int srl_classics_header = 2130968647;
 			
-			// aapt resource value: 0x7F0B0048
-			public const int support_simple_spinner_dropdown_item = 2131427400;
+			// aapt resource value: 0x7f040048
+			public const int support_simple_spinner_dropdown_item = 2130968648;
 			
-			// aapt resource value: 0x7F0B0049
-			public const int tooltip = 2131427401;
+			// aapt resource value: 0x7f040049
+			public const int tooltip = 2130968649;
 			
-			// aapt resource value: 0x7F0B004B
-			public const int zxingscanneractivitylayout = 2131427403;
+			// aapt resource value: 0x7f04004a
+			public const int zxing_layout = 2130968650;
 			
-			// aapt resource value: 0x7F0B004C
-			public const int zxingscannerfragmentlayout = 2131427404;
+			// aapt resource value: 0x7f04004b
+			public const int zxingscanneractivitylayout = 2130968651;
 			
-			// aapt resource value: 0x7F0B004A
-			public const int zxing_layout = 2131427402;
+			// aapt resource value: 0x7f04004c
+			public const int zxingscannerfragmentlayout = 2130968652;
 			
 			static Layout()
 			{
@@ -3942,8 +3996,8 @@
 		public partial class Mipmap
 		{
 			
-			// aapt resource value: 0x7F0C0000
-			public const int Icon = 2131492864;
+			// aapt resource value: 0x7f030000
+			public const int Icon = 2130903040;
 			
 			static Mipmap()
 			{
@@ -3958,242 +4012,242 @@
 		public partial class String
 		{
 			
-			// aapt resource value: 0x7F0D0000
-			public const int abc_action_bar_home_description = 2131558400;
+			// aapt resource value: 0x7f0a0000
+			public const int abc_action_bar_home_description = 2131361792;
 			
-			// aapt resource value: 0x7F0D0001
-			public const int abc_action_bar_home_description_format = 2131558401;
+			// aapt resource value: 0x7f0a0001
+			public const int abc_action_bar_home_description_format = 2131361793;
 			
-			// aapt resource value: 0x7F0D0002
-			public const int abc_action_bar_home_subtitle_description_format = 2131558402;
+			// aapt resource value: 0x7f0a0002
+			public const int abc_action_bar_home_subtitle_description_format = 2131361794;
 			
-			// aapt resource value: 0x7F0D0003
-			public const int abc_action_bar_up_description = 2131558403;
+			// aapt resource value: 0x7f0a0003
+			public const int abc_action_bar_up_description = 2131361795;
 			
-			// aapt resource value: 0x7F0D0004
-			public const int abc_action_menu_overflow_description = 2131558404;
+			// aapt resource value: 0x7f0a0004
+			public const int abc_action_menu_overflow_description = 2131361796;
 			
-			// aapt resource value: 0x7F0D0005
-			public const int abc_action_mode_done = 2131558405;
+			// aapt resource value: 0x7f0a0005
+			public const int abc_action_mode_done = 2131361797;
 			
-			// aapt resource value: 0x7F0D0007
-			public const int abc_activitychooserview_choose_application = 2131558407;
+			// aapt resource value: 0x7f0a0006
+			public const int abc_activity_chooser_view_see_all = 2131361798;
 			
-			// aapt resource value: 0x7F0D0006
-			public const int abc_activity_chooser_view_see_all = 2131558406;
+			// aapt resource value: 0x7f0a0007
+			public const int abc_activitychooserview_choose_application = 2131361799;
 			
-			// aapt resource value: 0x7F0D0008
-			public const int abc_capital_off = 2131558408;
+			// aapt resource value: 0x7f0a0008
+			public const int abc_capital_off = 2131361800;
 			
-			// aapt resource value: 0x7F0D0009
-			public const int abc_capital_on = 2131558409;
+			// aapt resource value: 0x7f0a0009
+			public const int abc_capital_on = 2131361801;
 			
-			// aapt resource value: 0x7F0D000A
-			public const int abc_font_family_body_1_material = 2131558410;
+			// aapt resource value: 0x7f0a0015
+			public const int abc_font_family_body_1_material = 2131361813;
 			
-			// aapt resource value: 0x7F0D000B
-			public const int abc_font_family_body_2_material = 2131558411;
+			// aapt resource value: 0x7f0a0016
+			public const int abc_font_family_body_2_material = 2131361814;
 			
-			// aapt resource value: 0x7F0D000C
-			public const int abc_font_family_button_material = 2131558412;
+			// aapt resource value: 0x7f0a0017
+			public const int abc_font_family_button_material = 2131361815;
 			
-			// aapt resource value: 0x7F0D000D
-			public const int abc_font_family_caption_material = 2131558413;
+			// aapt resource value: 0x7f0a0018
+			public const int abc_font_family_caption_material = 2131361816;
 			
-			// aapt resource value: 0x7F0D000E
-			public const int abc_font_family_display_1_material = 2131558414;
+			// aapt resource value: 0x7f0a0019
+			public const int abc_font_family_display_1_material = 2131361817;
 			
-			// aapt resource value: 0x7F0D000F
-			public const int abc_font_family_display_2_material = 2131558415;
+			// aapt resource value: 0x7f0a001a
+			public const int abc_font_family_display_2_material = 2131361818;
 			
-			// aapt resource value: 0x7F0D0010
-			public const int abc_font_family_display_3_material = 2131558416;
+			// aapt resource value: 0x7f0a001b
+			public const int abc_font_family_display_3_material = 2131361819;
 			
-			// aapt resource value: 0x7F0D0011
-			public const int abc_font_family_display_4_material = 2131558417;
+			// aapt resource value: 0x7f0a001c
+			public const int abc_font_family_display_4_material = 2131361820;
 			
-			// aapt resource value: 0x7F0D0012
-			public const int abc_font_family_headline_material = 2131558418;
+			// aapt resource value: 0x7f0a001d
+			public const int abc_font_family_headline_material = 2131361821;
 			
-			// aapt resource value: 0x7F0D0013
-			public const int abc_font_family_menu_material = 2131558419;
+			// aapt resource value: 0x7f0a001e
+			public const int abc_font_family_menu_material = 2131361822;
 			
-			// aapt resource value: 0x7F0D0014
-			public const int abc_font_family_subhead_material = 2131558420;
+			// aapt resource value: 0x7f0a001f
+			public const int abc_font_family_subhead_material = 2131361823;
 			
-			// aapt resource value: 0x7F0D0015
-			public const int abc_font_family_title_material = 2131558421;
+			// aapt resource value: 0x7f0a0020
+			public const int abc_font_family_title_material = 2131361824;
 			
-			// aapt resource value: 0x7F0D0017
-			public const int abc_searchview_description_clear = 2131558423;
+			// aapt resource value: 0x7f0a000a
+			public const int abc_search_hint = 2131361802;
 			
-			// aapt resource value: 0x7F0D0018
-			public const int abc_searchview_description_query = 2131558424;
+			// aapt resource value: 0x7f0a000b
+			public const int abc_searchview_description_clear = 2131361803;
 			
-			// aapt resource value: 0x7F0D0019
-			public const int abc_searchview_description_search = 2131558425;
+			// aapt resource value: 0x7f0a000c
+			public const int abc_searchview_description_query = 2131361804;
 			
-			// aapt resource value: 0x7F0D001A
-			public const int abc_searchview_description_submit = 2131558426;
+			// aapt resource value: 0x7f0a000d
+			public const int abc_searchview_description_search = 2131361805;
 			
-			// aapt resource value: 0x7F0D001B
-			public const int abc_searchview_description_voice = 2131558427;
+			// aapt resource value: 0x7f0a000e
+			public const int abc_searchview_description_submit = 2131361806;
 			
-			// aapt resource value: 0x7F0D0016
-			public const int abc_search_hint = 2131558422;
+			// aapt resource value: 0x7f0a000f
+			public const int abc_searchview_description_voice = 2131361807;
 			
-			// aapt resource value: 0x7F0D001C
-			public const int abc_shareactionprovider_share_with = 2131558428;
+			// aapt resource value: 0x7f0a0010
+			public const int abc_shareactionprovider_share_with = 2131361808;
 			
-			// aapt resource value: 0x7F0D001D
-			public const int abc_shareactionprovider_share_with_application = 2131558429;
+			// aapt resource value: 0x7f0a0011
+			public const int abc_shareactionprovider_share_with_application = 2131361809;
 			
-			// aapt resource value: 0x7F0D001E
-			public const int abc_toolbar_collapse_description = 2131558430;
+			// aapt resource value: 0x7f0a0012
+			public const int abc_toolbar_collapse_description = 2131361810;
 			
-			// aapt resource value: 0x7F0D0020
-			public const int appbar_scrolling_view_behavior = 2131558432;
+			// aapt resource value: 0x7f0a003c
+			public const int app_name = 2131361852;
 			
-			// aapt resource value: 0x7F0D001F
-			public const int app_name = 2131558431;
+			// aapt resource value: 0x7f0a0021
+			public const int appbar_scrolling_view_behavior = 2131361825;
 			
-			// aapt resource value: 0x7F0D0021
-			public const int bottom_sheet_behavior = 2131558433;
+			// aapt resource value: 0x7f0a0022
+			public const int bottom_sheet_behavior = 2131361826;
 			
-			// aapt resource value: 0x7F0D0022
-			public const int character_counter_pattern = 2131558434;
+			// aapt resource value: 0x7f0a0023
+			public const int character_counter_pattern = 2131361827;
 			
-			// aapt resource value: 0x7F0D0023
-			public const int gd_activity_title = 2131558435;
+			// aapt resource value: 0x7f0a003d
+			public const int gd_activity_title = 2131361853;
 			
-			// aapt resource value: 0x7F0D0024
-			public const int gd_cancel = 2131558436;
+			// aapt resource value: 0x7f0a003e
+			public const int gd_cancel = 2131361854;
 			
-			// aapt resource value: 0x7F0D0025
-			public const int gd_myhome = 2131558437;
+			// aapt resource value: 0x7f0a003f
+			public const int gd_myhome = 2131361855;
 			
-			// aapt resource value: 0x7F0D0026
-			public const int gd_notifyMsg = 2131558438;
+			// aapt resource value: 0x7f0a0040
+			public const int gd_notifyMsg = 2131361856;
 			
-			// aapt resource value: 0x7F0D0027
-			public const int gd_notifyTitle = 2131558439;
+			// aapt resource value: 0x7f0a0041
+			public const int gd_notifyTitle = 2131361857;
 			
-			// aapt resource value: 0x7F0D0028
-			public const int gd_save = 2131558440;
+			// aapt resource value: 0x7f0a0042
+			public const int gd_save = 2131361858;
 			
-			// aapt resource value: 0x7F0D0029
-			public const int gd_search_tip = 2131558441;
+			// aapt resource value: 0x7f0a0043
+			public const int gd_search_tip = 2131361859;
 			
-			// aapt resource value: 0x7F0D002A
-			public const int gd_select_distance = 2131558442;
+			// aapt resource value: 0x7f0a0044
+			public const int gd_select_distance = 2131361860;
 			
-			// aapt resource value: 0x7F0D002B
-			public const int gd_setting = 2131558443;
+			// aapt resource value: 0x7f0a0045
+			public const int gd_setting = 2131361861;
 			
-			// aapt resource value: 0x7F0D002C
-			public const int hello = 2131558444;
+			// aapt resource value: 0x7f0a004e
+			public const int hello = 2131361870;
 			
-			// aapt resource value: 0x7F0D002D
-			public const int not_recognized_fingerprint_hint = 2131558445;
+			// aapt resource value: 0x7f0a0029
+			public const int not_recognized_fingerprint_hint = 2131361833;
 			
-			// aapt resource value: 0x7F0D002E
-			public const int password_toggle_content_description = 2131558446;
+			// aapt resource value: 0x7f0a0024
+			public const int password_toggle_content_description = 2131361828;
 			
-			// aapt resource value: 0x7F0D002F
-			public const int path_password_eye = 2131558447;
+			// aapt resource value: 0x7f0a0025
+			public const int path_password_eye = 2131361829;
 			
-			// aapt resource value: 0x7F0D0030
-			public const int path_password_eye_mask_strike_through = 2131558448;
+			// aapt resource value: 0x7f0a0026
+			public const int path_password_eye_mask_strike_through = 2131361830;
 			
-			// aapt resource value: 0x7F0D0031
-			public const int path_password_eye_mask_visible = 2131558449;
+			// aapt resource value: 0x7f0a0027
+			public const int path_password_eye_mask_visible = 2131361831;
 			
-			// aapt resource value: 0x7F0D0032
-			public const int path_password_strike_through = 2131558450;
+			// aapt resource value: 0x7f0a0028
+			public const int path_password_strike_through = 2131361832;
 			
-			// aapt resource value: 0x7F0D0033
-			public const int pickerview_cancel = 2131558451;
+			// aapt resource value: 0x7f0a0046
+			public const int pickerview_cancel = 2131361862;
 			
-			// aapt resource value: 0x7F0D0034
-			public const int pickerview_day = 2131558452;
+			// aapt resource value: 0x7f0a0047
+			public const int pickerview_day = 2131361863;
 			
-			// aapt resource value: 0x7F0D0035
-			public const int pickerview_hours = 2131558453;
+			// aapt resource value: 0x7f0a0048
+			public const int pickerview_hours = 2131361864;
 			
-			// aapt resource value: 0x7F0D0036
-			public const int pickerview_minutes = 2131558454;
+			// aapt resource value: 0x7f0a0049
+			public const int pickerview_minutes = 2131361865;
 			
-			// aapt resource value: 0x7F0D0037
-			public const int pickerview_month = 2131558455;
+			// aapt resource value: 0x7f0a004a
+			public const int pickerview_month = 2131361866;
 			
-			// aapt resource value: 0x7F0D0038
-			public const int pickerview_seconds = 2131558456;
+			// aapt resource value: 0x7f0a004b
+			public const int pickerview_seconds = 2131361867;
 			
-			// aapt resource value: 0x7F0D0039
-			public const int pickerview_submit = 2131558457;
+			// aapt resource value: 0x7f0a004c
+			public const int pickerview_submit = 2131361868;
 			
-			// aapt resource value: 0x7F0D003A
-			public const int pickerview_year = 2131558458;
+			// aapt resource value: 0x7f0a004d
+			public const int pickerview_year = 2131361869;
 			
-			// aapt resource value: 0x7F0D003B
-			public const int search_menu_title = 2131558459;
+			// aapt resource value: 0x7f0a0013
+			public const int search_menu_title = 2131361811;
 			
-			// aapt resource value: 0x7F0D003C
-			public const int srl_component_falsify = 2131558460;
+			// aapt resource value: 0x7f0a002b
+			public const int srl_component_falsify = 2131361835;
 			
-			// aapt resource value: 0x7F0D003D
-			public const int srl_content_empty = 2131558461;
+			// aapt resource value: 0x7f0a002c
+			public const int srl_content_empty = 2131361836;
 			
-			// aapt resource value: 0x7F0D003E
-			public const int srl_footer_failed = 2131558462;
+			// aapt resource value: 0x7f0a002d
+			public const int srl_footer_failed = 2131361837;
 			
-			// aapt resource value: 0x7F0D003F
-			public const int srl_footer_finish = 2131558463;
+			// aapt resource value: 0x7f0a002e
+			public const int srl_footer_finish = 2131361838;
 			
-			// aapt resource value: 0x7F0D0040
-			public const int srl_footer_loading = 2131558464;
+			// aapt resource value: 0x7f0a002f
+			public const int srl_footer_loading = 2131361839;
 			
-			// aapt resource value: 0x7F0D0041
-			public const int srl_footer_nothing = 2131558465;
+			// aapt resource value: 0x7f0a0030
+			public const int srl_footer_nothing = 2131361840;
 			
-			// aapt resource value: 0x7F0D0042
-			public const int srl_footer_pulling = 2131558466;
+			// aapt resource value: 0x7f0a0031
+			public const int srl_footer_pulling = 2131361841;
 			
-			// aapt resource value: 0x7F0D0043
-			public const int srl_footer_refreshing = 2131558467;
+			// aapt resource value: 0x7f0a0032
+			public const int srl_footer_refreshing = 2131361842;
 			
-			// aapt resource value: 0x7F0D0044
-			public const int srl_footer_release = 2131558468;
+			// aapt resource value: 0x7f0a0033
+			public const int srl_footer_release = 2131361843;
 			
-			// aapt resource value: 0x7F0D0045
-			public const int srl_header_failed = 2131558469;
+			// aapt resource value: 0x7f0a0034
+			public const int srl_header_failed = 2131361844;
 			
-			// aapt resource value: 0x7F0D0046
-			public const int srl_header_finish = 2131558470;
+			// aapt resource value: 0x7f0a0035
+			public const int srl_header_finish = 2131361845;
 			
-			// aapt resource value: 0x7F0D0047
-			public const int srl_header_loading = 2131558471;
+			// aapt resource value: 0x7f0a0036
+			public const int srl_header_loading = 2131361846;
 			
-			// aapt resource value: 0x7F0D0048
-			public const int srl_header_pulling = 2131558472;
+			// aapt resource value: 0x7f0a0037
+			public const int srl_header_pulling = 2131361847;
 			
-			// aapt resource value: 0x7F0D0049
-			public const int srl_header_refreshing = 2131558473;
+			// aapt resource value: 0x7f0a0038
+			public const int srl_header_refreshing = 2131361848;
 			
-			// aapt resource value: 0x7F0D004A
-			public const int srl_header_release = 2131558474;
+			// aapt resource value: 0x7f0a0039
+			public const int srl_header_release = 2131361849;
 			
-			// aapt resource value: 0x7F0D004B
-			public const int srl_header_secondary = 2131558475;
+			// aapt resource value: 0x7f0a003a
+			public const int srl_header_secondary = 2131361850;
 			
-			// aapt resource value: 0x7F0D004C
-			public const int srl_header_update = 2131558476;
+			// aapt resource value: 0x7f0a003b
+			public const int srl_header_update = 2131361851;
 			
-			// aapt resource value: 0x7F0D004D
-			public const int status_bar_notification_info_overflow = 2131558477;
+			// aapt resource value: 0x7f0a0014
+			public const int status_bar_notification_info_overflow = 2131361812;
 			
-			// aapt resource value: 0x7F0D004E
-			public const int touch_fingerprint_sensor_hint = 2131558478;
+			// aapt resource value: 0x7f0a002a
+			public const int touch_fingerprint_sensor_hint = 2131361834;
 			
 			static String()
 			{
@@ -4208,1205 +4262,1205 @@
 		public partial class Style
 		{
 			
-			// aapt resource value: 0x7F0E0000
-			public const int AlertDialog_AppCompat = 2131623936;
+			// aapt resource value: 0x7f0b009d
+			public const int AlertDialog_AppCompat = 2131427485;
 			
-			// aapt resource value: 0x7F0E0001
-			public const int AlertDialog_AppCompat_Light = 2131623937;
+			// aapt resource value: 0x7f0b009e
+			public const int AlertDialog_AppCompat_Light = 2131427486;
 			
-			// aapt resource value: 0x7F0E0002
-			public const int Animation_AppCompat_Dialog = 2131623938;
+			// aapt resource value: 0x7f0b009f
+			public const int Animation_AppCompat_Dialog = 2131427487;
 			
-			// aapt resource value: 0x7F0E0003
-			public const int Animation_AppCompat_DropDownUp = 2131623939;
+			// aapt resource value: 0x7f0b00a0
+			public const int Animation_AppCompat_DropDownUp = 2131427488;
 			
-			// aapt resource value: 0x7F0E0004
-			public const int Animation_AppCompat_Tooltip = 2131623940;
+			// aapt resource value: 0x7f0b00a1
+			public const int Animation_AppCompat_Tooltip = 2131427489;
 			
-			// aapt resource value: 0x7F0E0005
-			public const int Animation_Design_BottomSheetDialog = 2131623941;
+			// aapt resource value: 0x7f0b0169
+			public const int Animation_Design_BottomSheetDialog = 2131427689;
 			
-			// aapt resource value: 0x7F0E0006
-			public const int Base_AlertDialog_AppCompat = 2131623942;
+			// aapt resource value: 0x7f0b00a2
+			public const int Base_AlertDialog_AppCompat = 2131427490;
 			
-			// aapt resource value: 0x7F0E0007
-			public const int Base_AlertDialog_AppCompat_Light = 2131623943;
+			// aapt resource value: 0x7f0b00a3
+			public const int Base_AlertDialog_AppCompat_Light = 2131427491;
 			
-			// aapt resource value: 0x7F0E0008
-			public const int Base_Animation_AppCompat_Dialog = 2131623944;
+			// aapt resource value: 0x7f0b00a4
+			public const int Base_Animation_AppCompat_Dialog = 2131427492;
 			
-			// aapt resource value: 0x7F0E0009
-			public const int Base_Animation_AppCompat_DropDownUp = 2131623945;
+			// aapt resource value: 0x7f0b00a5
+			public const int Base_Animation_AppCompat_DropDownUp = 2131427493;
 			
-			// aapt resource value: 0x7F0E000A
-			public const int Base_Animation_AppCompat_Tooltip = 2131623946;
+			// aapt resource value: 0x7f0b00a6
+			public const int Base_Animation_AppCompat_Tooltip = 2131427494;
 			
-			// aapt resource value: 0x7F0E000C
-			public const int Base_DialogWindowTitleBackground_AppCompat = 2131623948;
+			// aapt resource value: 0x7f0b00a7
+			public const int Base_DialogWindowTitle_AppCompat = 2131427495;
 			
-			// aapt resource value: 0x7F0E000B
-			public const int Base_DialogWindowTitle_AppCompat = 2131623947;
+			// aapt resource value: 0x7f0b00a8
+			public const int Base_DialogWindowTitleBackground_AppCompat = 2131427496;
 			
-			// aapt resource value: 0x7F0E000D
-			public const int Base_TextAppearance_AppCompat = 2131623949;
+			// aapt resource value: 0x7f0b0039
+			public const int Base_TextAppearance_AppCompat = 2131427385;
 			
-			// aapt resource value: 0x7F0E000E
-			public const int Base_TextAppearance_AppCompat_Body1 = 2131623950;
+			// aapt resource value: 0x7f0b003a
+			public const int Base_TextAppearance_AppCompat_Body1 = 2131427386;
 			
-			// aapt resource value: 0x7F0E000F
-			public const int Base_TextAppearance_AppCompat_Body2 = 2131623951;
+			// aapt resource value: 0x7f0b003b
+			public const int Base_TextAppearance_AppCompat_Body2 = 2131427387;
 			
-			// aapt resource value: 0x7F0E0010
-			public const int Base_TextAppearance_AppCompat_Button = 2131623952;
+			// aapt resource value: 0x7f0b0027
+			public const int Base_TextAppearance_AppCompat_Button = 2131427367;
 			
-			// aapt resource value: 0x7F0E0011
-			public const int Base_TextAppearance_AppCompat_Caption = 2131623953;
+			// aapt resource value: 0x7f0b003c
+			public const int Base_TextAppearance_AppCompat_Caption = 2131427388;
 			
-			// aapt resource value: 0x7F0E0012
-			public const int Base_TextAppearance_AppCompat_Display1 = 2131623954;
+			// aapt resource value: 0x7f0b003d
+			public const int Base_TextAppearance_AppCompat_Display1 = 2131427389;
 			
-			// aapt resource value: 0x7F0E0013
-			public const int Base_TextAppearance_AppCompat_Display2 = 2131623955;
+			// aapt resource value: 0x7f0b003e
+			public const int Base_TextAppearance_AppCompat_Display2 = 2131427390;
 			
-			// aapt resource value: 0x7F0E0014
-			public const int Base_TextAppearance_AppCompat_Display3 = 2131623956;
+			// aapt resource value: 0x7f0b003f
+			public const int Base_TextAppearance_AppCompat_Display3 = 2131427391;
 			
-			// aapt resource value: 0x7F0E0015
-			public const int Base_TextAppearance_AppCompat_Display4 = 2131623957;
+			// aapt resource value: 0x7f0b0040
+			public const int Base_TextAppearance_AppCompat_Display4 = 2131427392;
 			
-			// aapt resource value: 0x7F0E0016
-			public const int Base_TextAppearance_AppCompat_Headline = 2131623958;
+			// aapt resource value: 0x7f0b0041
+			public const int Base_TextAppearance_AppCompat_Headline = 2131427393;
 			
-			// aapt resource value: 0x7F0E0017
-			public const int Base_TextAppearance_AppCompat_Inverse = 2131623959;
+			// aapt resource value: 0x7f0b000b
+			public const int Base_TextAppearance_AppCompat_Inverse = 2131427339;
 			
-			// aapt resource value: 0x7F0E0018
-			public const int Base_TextAppearance_AppCompat_Large = 2131623960;
+			// aapt resource value: 0x7f0b0042
+			public const int Base_TextAppearance_AppCompat_Large = 2131427394;
 			
-			// aapt resource value: 0x7F0E0019
-			public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131623961;
+			// aapt resource value: 0x7f0b000c
+			public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131427340;
 			
-			// aapt resource value: 0x7F0E001A
-			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131623962;
+			// aapt resource value: 0x7f0b0043
+			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427395;
 			
-			// aapt resource value: 0x7F0E001B
-			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131623963;
+			// aapt resource value: 0x7f0b0044
+			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427396;
 			
-			// aapt resource value: 0x7F0E001C
-			public const int Base_TextAppearance_AppCompat_Medium = 2131623964;
+			// aapt resource value: 0x7f0b0045
+			public const int Base_TextAppearance_AppCompat_Medium = 2131427397;
 			
-			// aapt resource value: 0x7F0E001D
-			public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131623965;
+			// aapt resource value: 0x7f0b000d
+			public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131427341;
 			
-			// aapt resource value: 0x7F0E001E
-			public const int Base_TextAppearance_AppCompat_Menu = 2131623966;
+			// aapt resource value: 0x7f0b0046
+			public const int Base_TextAppearance_AppCompat_Menu = 2131427398;
 			
-			// aapt resource value: 0x7F0E001F
-			public const int Base_TextAppearance_AppCompat_SearchResult = 2131623967;
+			// aapt resource value: 0x7f0b00a9
+			public const int Base_TextAppearance_AppCompat_SearchResult = 2131427497;
 			
-			// aapt resource value: 0x7F0E0020
-			public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131623968;
+			// aapt resource value: 0x7f0b0047
+			public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131427399;
 			
-			// aapt resource value: 0x7F0E0021
-			public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131623969;
+			// aapt resource value: 0x7f0b0048
+			public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131427400;
 			
-			// aapt resource value: 0x7F0E0022
-			public const int Base_TextAppearance_AppCompat_Small = 2131623970;
+			// aapt resource value: 0x7f0b0049
+			public const int Base_TextAppearance_AppCompat_Small = 2131427401;
 			
-			// aapt resource value: 0x7F0E0023
-			public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131623971;
+			// aapt resource value: 0x7f0b000e
+			public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131427342;
 			
-			// aapt resource value: 0x7F0E0024
-			public const int Base_TextAppearance_AppCompat_Subhead = 2131623972;
+			// aapt resource value: 0x7f0b004a
+			public const int Base_TextAppearance_AppCompat_Subhead = 2131427402;
 			
-			// aapt resource value: 0x7F0E0025
-			public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131623973;
+			// aapt resource value: 0x7f0b000f
+			public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131427343;
 			
-			// aapt resource value: 0x7F0E0026
-			public const int Base_TextAppearance_AppCompat_Title = 2131623974;
+			// aapt resource value: 0x7f0b004b
+			public const int Base_TextAppearance_AppCompat_Title = 2131427403;
 			
-			// aapt resource value: 0x7F0E0027
-			public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131623975;
+			// aapt resource value: 0x7f0b0010
+			public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131427344;
 			
-			// aapt resource value: 0x7F0E0028
-			public const int Base_TextAppearance_AppCompat_Tooltip = 2131623976;
+			// aapt resource value: 0x7f0b00aa
+			public const int Base_TextAppearance_AppCompat_Tooltip = 2131427498;
 			
-			// aapt resource value: 0x7F0E0029
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131623977;
+			// aapt resource value: 0x7f0b008e
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427470;
 			
-			// aapt resource value: 0x7F0E002A
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131623978;
+			// aapt resource value: 0x7f0b004c
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427404;
 			
-			// aapt resource value: 0x7F0E002B
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131623979;
+			// aapt resource value: 0x7f0b004d
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427405;
 			
-			// aapt resource value: 0x7F0E002C
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131623980;
+			// aapt resource value: 0x7f0b004e
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427406;
 			
-			// aapt resource value: 0x7F0E002D
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131623981;
+			// aapt resource value: 0x7f0b004f
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427407;
 			
-			// aapt resource value: 0x7F0E002E
-			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131623982;
+			// aapt resource value: 0x7f0b0050
+			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427408;
 			
-			// aapt resource value: 0x7F0E002F
-			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131623983;
+			// aapt resource value: 0x7f0b0051
+			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427409;
 			
-			// aapt resource value: 0x7F0E0030
-			public const int Base_TextAppearance_AppCompat_Widget_Button = 2131623984;
+			// aapt resource value: 0x7f0b0052
+			public const int Base_TextAppearance_AppCompat_Widget_Button = 2131427410;
 			
-			// aapt resource value: 0x7F0E0031
-			public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131623985;
+			// aapt resource value: 0x7f0b0095
+			public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427477;
 			
-			// aapt resource value: 0x7F0E0032
-			public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131623986;
+			// aapt resource value: 0x7f0b0096
+			public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131427478;
 			
-			// aapt resource value: 0x7F0E0033
-			public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131623987;
+			// aapt resource value: 0x7f0b008f
+			public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131427471;
 			
-			// aapt resource value: 0x7F0E0034
-			public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131623988;
+			// aapt resource value: 0x7f0b00ab
+			public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131427499;
 			
-			// aapt resource value: 0x7F0E0035
-			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131623989;
+			// aapt resource value: 0x7f0b0053
+			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427411;
 			
-			// aapt resource value: 0x7F0E0036
-			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131623990;
+			// aapt resource value: 0x7f0b0054
+			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427412;
 			
-			// aapt resource value: 0x7F0E0037
-			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131623991;
+			// aapt resource value: 0x7f0b0055
+			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427413;
 			
-			// aapt resource value: 0x7F0E0038
-			public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131623992;
+			// aapt resource value: 0x7f0b0056
+			public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131427414;
 			
-			// aapt resource value: 0x7F0E0039
-			public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131623993;
+			// aapt resource value: 0x7f0b0057
+			public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427415;
 			
-			// aapt resource value: 0x7F0E003A
-			public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131623994;
+			// aapt resource value: 0x7f0b00ac
+			public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427500;
 			
-			// aapt resource value: 0x7F0E003B
-			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131623995;
+			// aapt resource value: 0x7f0b0058
+			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427416;
 			
-			// aapt resource value: 0x7F0E003C
-			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131623996;
+			// aapt resource value: 0x7f0b0059
+			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427417;
 			
-			// aapt resource value: 0x7F0E004B
-			public const int Base_ThemeOverlay_AppCompat = 2131624011;
+			// aapt resource value: 0x7f0b005a
+			public const int Base_Theme_AppCompat = 2131427418;
 			
-			// aapt resource value: 0x7F0E004C
-			public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131624012;
+			// aapt resource value: 0x7f0b00ad
+			public const int Base_Theme_AppCompat_CompactMenu = 2131427501;
 			
-			// aapt resource value: 0x7F0E004D
-			public const int Base_ThemeOverlay_AppCompat_Dark = 2131624013;
+			// aapt resource value: 0x7f0b0011
+			public const int Base_Theme_AppCompat_Dialog = 2131427345;
 			
-			// aapt resource value: 0x7F0E004E
-			public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131624014;
+			// aapt resource value: 0x7f0b0012
+			public const int Base_Theme_AppCompat_Dialog_Alert = 2131427346;
 			
-			// aapt resource value: 0x7F0E004F
-			public const int Base_ThemeOverlay_AppCompat_Dialog = 2131624015;
+			// aapt resource value: 0x7f0b00ae
+			public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131427502;
 			
-			// aapt resource value: 0x7F0E0050
-			public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131624016;
+			// aapt resource value: 0x7f0b0013
+			public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131427347;
 			
-			// aapt resource value: 0x7F0E0051
-			public const int Base_ThemeOverlay_AppCompat_Light = 2131624017;
+			// aapt resource value: 0x7f0b0001
+			public const int Base_Theme_AppCompat_DialogWhenLarge = 2131427329;
 			
-			// aapt resource value: 0x7F0E003D
-			public const int Base_Theme_AppCompat = 2131623997;
+			// aapt resource value: 0x7f0b005b
+			public const int Base_Theme_AppCompat_Light = 2131427419;
 			
-			// aapt resource value: 0x7F0E003E
-			public const int Base_Theme_AppCompat_CompactMenu = 2131623998;
+			// aapt resource value: 0x7f0b00af
+			public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131427503;
 			
-			// aapt resource value: 0x7F0E003F
-			public const int Base_Theme_AppCompat_Dialog = 2131623999;
+			// aapt resource value: 0x7f0b0014
+			public const int Base_Theme_AppCompat_Light_Dialog = 2131427348;
 			
-			// aapt resource value: 0x7F0E0043
-			public const int Base_Theme_AppCompat_DialogWhenLarge = 2131624003;
+			// aapt resource value: 0x7f0b0015
+			public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131427349;
 			
-			// aapt resource value: 0x7F0E0040
-			public const int Base_Theme_AppCompat_Dialog_Alert = 2131624000;
+			// aapt resource value: 0x7f0b00b0
+			public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131427504;
 			
-			// aapt resource value: 0x7F0E0041
-			public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131624001;
+			// aapt resource value: 0x7f0b0016
+			public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131427350;
 			
-			// aapt resource value: 0x7F0E0042
-			public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131624002;
+			// aapt resource value: 0x7f0b0002
+			public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131427330;
 			
-			// aapt resource value: 0x7F0E0044
-			public const int Base_Theme_AppCompat_Light = 2131624004;
+			// aapt resource value: 0x7f0b00b1
+			public const int Base_ThemeOverlay_AppCompat = 2131427505;
 			
-			// aapt resource value: 0x7F0E0045
-			public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131624005;
+			// aapt resource value: 0x7f0b00b2
+			public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131427506;
 			
-			// aapt resource value: 0x7F0E0046
-			public const int Base_Theme_AppCompat_Light_Dialog = 2131624006;
+			// aapt resource value: 0x7f0b00b3
+			public const int Base_ThemeOverlay_AppCompat_Dark = 2131427507;
 			
-			// aapt resource value: 0x7F0E004A
-			public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131624010;
+			// aapt resource value: 0x7f0b00b4
+			public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131427508;
 			
-			// aapt resource value: 0x7F0E0047
-			public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131624007;
+			// aapt resource value: 0x7f0b0017
+			public const int Base_ThemeOverlay_AppCompat_Dialog = 2131427351;
 			
-			// aapt resource value: 0x7F0E0048
-			public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131624008;
+			// aapt resource value: 0x7f0b0018
+			public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131427352;
 			
-			// aapt resource value: 0x7F0E0049
-			public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131624009;
+			// aapt resource value: 0x7f0b00b5
+			public const int Base_ThemeOverlay_AppCompat_Light = 2131427509;
 			
-			// aapt resource value: 0x7F0E0054
-			public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131624020;
+			// aapt resource value: 0x7f0b0019
+			public const int Base_V11_Theme_AppCompat_Dialog = 2131427353;
 			
-			// aapt resource value: 0x7F0E0052
-			public const int Base_V11_Theme_AppCompat_Dialog = 2131624018;
+			// aapt resource value: 0x7f0b001a
+			public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131427354;
 			
-			// aapt resource value: 0x7F0E0053
-			public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131624019;
+			// aapt resource value: 0x7f0b001b
+			public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131427355;
 			
-			// aapt resource value: 0x7F0E0055
-			public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131624021;
+			// aapt resource value: 0x7f0b0023
+			public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131427363;
 			
-			// aapt resource value: 0x7F0E0056
-			public const int Base_V12_Widget_AppCompat_EditText = 2131624022;
+			// aapt resource value: 0x7f0b0024
+			public const int Base_V12_Widget_AppCompat_EditText = 2131427364;
 			
-			// aapt resource value: 0x7F0E0057
-			public const int Base_V14_Widget_Design_AppBarLayout = 2131624023;
+			// aapt resource value: 0x7f0b016a
+			public const int Base_V14_Widget_Design_AppBarLayout = 2131427690;
 			
-			// aapt resource value: 0x7F0E005C
-			public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131624028;
+			// aapt resource value: 0x7f0b005c
+			public const int Base_V21_Theme_AppCompat = 2131427420;
 			
-			// aapt resource value: 0x7F0E0058
-			public const int Base_V21_Theme_AppCompat = 2131624024;
+			// aapt resource value: 0x7f0b005d
+			public const int Base_V21_Theme_AppCompat_Dialog = 2131427421;
 			
-			// aapt resource value: 0x7F0E0059
-			public const int Base_V21_Theme_AppCompat_Dialog = 2131624025;
+			// aapt resource value: 0x7f0b005e
+			public const int Base_V21_Theme_AppCompat_Light = 2131427422;
 			
-			// aapt resource value: 0x7F0E005A
-			public const int Base_V21_Theme_AppCompat_Light = 2131624026;
+			// aapt resource value: 0x7f0b005f
+			public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131427423;
 			
-			// aapt resource value: 0x7F0E005B
-			public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131624027;
+			// aapt resource value: 0x7f0b0060
+			public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131427424;
 			
-			// aapt resource value: 0x7F0E005D
-			public const int Base_V21_Widget_Design_AppBarLayout = 2131624029;
+			// aapt resource value: 0x7f0b0166
+			public const int Base_V21_Widget_Design_AppBarLayout = 2131427686;
 			
-			// aapt resource value: 0x7F0E005E
-			public const int Base_V22_Theme_AppCompat = 2131624030;
+			// aapt resource value: 0x7f0b008c
+			public const int Base_V22_Theme_AppCompat = 2131427468;
 			
-			// aapt resource value: 0x7F0E005F
-			public const int Base_V22_Theme_AppCompat_Light = 2131624031;
+			// aapt resource value: 0x7f0b008d
+			public const int Base_V22_Theme_AppCompat_Light = 2131427469;
 			
-			// aapt resource value: 0x7F0E0060
-			public const int Base_V23_Theme_AppCompat = 2131624032;
+			// aapt resource value: 0x7f0b0090
+			public const int Base_V23_Theme_AppCompat = 2131427472;
 			
-			// aapt resource value: 0x7F0E0061
-			public const int Base_V23_Theme_AppCompat_Light = 2131624033;
+			// aapt resource value: 0x7f0b0091
+			public const int Base_V23_Theme_AppCompat_Light = 2131427473;
 			
-			// aapt resource value: 0x7F0E0062
-			public const int Base_V26_Theme_AppCompat = 2131624034;
+			// aapt resource value: 0x7f0b0099
+			public const int Base_V26_Theme_AppCompat = 2131427481;
 			
-			// aapt resource value: 0x7F0E0063
-			public const int Base_V26_Theme_AppCompat_Light = 2131624035;
+			// aapt resource value: 0x7f0b009a
+			public const int Base_V26_Theme_AppCompat_Light = 2131427482;
 			
-			// aapt resource value: 0x7F0E0064
-			public const int Base_V26_Widget_AppCompat_Toolbar = 2131624036;
+			// aapt resource value: 0x7f0b009b
+			public const int Base_V26_Widget_AppCompat_Toolbar = 2131427483;
 			
-			// aapt resource value: 0x7F0E0065
-			public const int Base_V26_Widget_Design_AppBarLayout = 2131624037;
+			// aapt resource value: 0x7f0b0168
+			public const int Base_V26_Widget_Design_AppBarLayout = 2131427688;
 			
-			// aapt resource value: 0x7F0E006A
-			public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131624042;
+			// aapt resource value: 0x7f0b00b6
+			public const int Base_V7_Theme_AppCompat = 2131427510;
 			
-			// aapt resource value: 0x7F0E0066
-			public const int Base_V7_Theme_AppCompat = 2131624038;
+			// aapt resource value: 0x7f0b00b7
+			public const int Base_V7_Theme_AppCompat_Dialog = 2131427511;
 			
-			// aapt resource value: 0x7F0E0067
-			public const int Base_V7_Theme_AppCompat_Dialog = 2131624039;
+			// aapt resource value: 0x7f0b00b8
+			public const int Base_V7_Theme_AppCompat_Light = 2131427512;
 			
-			// aapt resource value: 0x7F0E0068
-			public const int Base_V7_Theme_AppCompat_Light = 2131624040;
+			// aapt resource value: 0x7f0b00b9
+			public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131427513;
 			
-			// aapt resource value: 0x7F0E0069
-			public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131624041;
+			// aapt resource value: 0x7f0b00ba
+			public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131427514;
 			
-			// aapt resource value: 0x7F0E006B
-			public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131624043;
+			// aapt resource value: 0x7f0b00bb
+			public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131427515;
 			
-			// aapt resource value: 0x7F0E006C
-			public const int Base_V7_Widget_AppCompat_EditText = 2131624044;
+			// aapt resource value: 0x7f0b00bc
+			public const int Base_V7_Widget_AppCompat_EditText = 2131427516;
 			
-			// aapt resource value: 0x7F0E006D
-			public const int Base_V7_Widget_AppCompat_Toolbar = 2131624045;
+			// aapt resource value: 0x7f0b00bd
+			public const int Base_V7_Widget_AppCompat_Toolbar = 2131427517;
 			
-			// aapt resource value: 0x7F0E006E
-			public const int Base_Widget_AppCompat_ActionBar = 2131624046;
+			// aapt resource value: 0x7f0b00be
+			public const int Base_Widget_AppCompat_ActionBar = 2131427518;
 			
-			// aapt resource value: 0x7F0E006F
-			public const int Base_Widget_AppCompat_ActionBar_Solid = 2131624047;
+			// aapt resource value: 0x7f0b00bf
+			public const int Base_Widget_AppCompat_ActionBar_Solid = 2131427519;
 			
-			// aapt resource value: 0x7F0E0070
-			public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131624048;
+			// aapt resource value: 0x7f0b00c0
+			public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131427520;
 			
-			// aapt resource value: 0x7F0E0071
-			public const int Base_Widget_AppCompat_ActionBar_TabText = 2131624049;
+			// aapt resource value: 0x7f0b0061
+			public const int Base_Widget_AppCompat_ActionBar_TabText = 2131427425;
 			
-			// aapt resource value: 0x7F0E0072
-			public const int Base_Widget_AppCompat_ActionBar_TabView = 2131624050;
+			// aapt resource value: 0x7f0b0062
+			public const int Base_Widget_AppCompat_ActionBar_TabView = 2131427426;
 			
-			// aapt resource value: 0x7F0E0073
-			public const int Base_Widget_AppCompat_ActionButton = 2131624051;
+			// aapt resource value: 0x7f0b0063
+			public const int Base_Widget_AppCompat_ActionButton = 2131427427;
 			
-			// aapt resource value: 0x7F0E0074
-			public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131624052;
+			// aapt resource value: 0x7f0b0064
+			public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131427428;
 			
-			// aapt resource value: 0x7F0E0075
-			public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131624053;
+			// aapt resource value: 0x7f0b0065
+			public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131427429;
 			
-			// aapt resource value: 0x7F0E0076
-			public const int Base_Widget_AppCompat_ActionMode = 2131624054;
+			// aapt resource value: 0x7f0b00c1
+			public const int Base_Widget_AppCompat_ActionMode = 2131427521;
 			
-			// aapt resource value: 0x7F0E0077
-			public const int Base_Widget_AppCompat_ActivityChooserView = 2131624055;
+			// aapt resource value: 0x7f0b00c2
+			public const int Base_Widget_AppCompat_ActivityChooserView = 2131427522;
 			
-			// aapt resource value: 0x7F0E0078
-			public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131624056;
+			// aapt resource value: 0x7f0b0025
+			public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131427365;
 			
-			// aapt resource value: 0x7F0E0079
-			public const int Base_Widget_AppCompat_Button = 2131624057;
+			// aapt resource value: 0x7f0b0066
+			public const int Base_Widget_AppCompat_Button = 2131427430;
 			
-			// aapt resource value: 0x7F0E007F
-			public const int Base_Widget_AppCompat_ButtonBar = 2131624063;
+			// aapt resource value: 0x7f0b0067
+			public const int Base_Widget_AppCompat_Button_Borderless = 2131427431;
 			
-			// aapt resource value: 0x7F0E0080
-			public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131624064;
+			// aapt resource value: 0x7f0b0068
+			public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131427432;
 			
-			// aapt resource value: 0x7F0E007A
-			public const int Base_Widget_AppCompat_Button_Borderless = 2131624058;
+			// aapt resource value: 0x7f0b00c3
+			public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427523;
 			
-			// aapt resource value: 0x7F0E007B
-			public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131624059;
+			// aapt resource value: 0x7f0b0092
+			public const int Base_Widget_AppCompat_Button_Colored = 2131427474;
 			
-			// aapt resource value: 0x7F0E007C
-			public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624060;
+			// aapt resource value: 0x7f0b0069
+			public const int Base_Widget_AppCompat_Button_Small = 2131427433;
 			
-			// aapt resource value: 0x7F0E007D
-			public const int Base_Widget_AppCompat_Button_Colored = 2131624061;
+			// aapt resource value: 0x7f0b006a
+			public const int Base_Widget_AppCompat_ButtonBar = 2131427434;
 			
-			// aapt resource value: 0x7F0E007E
-			public const int Base_Widget_AppCompat_Button_Small = 2131624062;
+			// aapt resource value: 0x7f0b00c4
+			public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131427524;
 			
-			// aapt resource value: 0x7F0E0081
-			public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131624065;
+			// aapt resource value: 0x7f0b006b
+			public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131427435;
 			
-			// aapt resource value: 0x7F0E0082
-			public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131624066;
+			// aapt resource value: 0x7f0b006c
+			public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131427436;
 			
-			// aapt resource value: 0x7F0E0083
-			public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131624067;
+			// aapt resource value: 0x7f0b00c5
+			public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131427525;
 			
-			// aapt resource value: 0x7F0E0084
-			public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131624068;
+			// aapt resource value: 0x7f0b0000
+			public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131427328;
 			
-			// aapt resource value: 0x7F0E0085
-			public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131624069;
+			// aapt resource value: 0x7f0b00c6
+			public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131427526;
 			
-			// aapt resource value: 0x7F0E0086
-			public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131624070;
+			// aapt resource value: 0x7f0b006d
+			public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131427437;
 			
-			// aapt resource value: 0x7F0E0087
-			public const int Base_Widget_AppCompat_EditText = 2131624071;
+			// aapt resource value: 0x7f0b0026
+			public const int Base_Widget_AppCompat_EditText = 2131427366;
 			
-			// aapt resource value: 0x7F0E0088
-			public const int Base_Widget_AppCompat_ImageButton = 2131624072;
+			// aapt resource value: 0x7f0b006e
+			public const int Base_Widget_AppCompat_ImageButton = 2131427438;
 			
-			// aapt resource value: 0x7F0E0089
-			public const int Base_Widget_AppCompat_Light_ActionBar = 2131624073;
+			// aapt resource value: 0x7f0b00c7
+			public const int Base_Widget_AppCompat_Light_ActionBar = 2131427527;
 			
-			// aapt resource value: 0x7F0E008A
-			public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131624074;
+			// aapt resource value: 0x7f0b00c8
+			public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131427528;
 			
-			// aapt resource value: 0x7F0E008B
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131624075;
+			// aapt resource value: 0x7f0b00c9
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131427529;
 			
-			// aapt resource value: 0x7F0E008C
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131624076;
+			// aapt resource value: 0x7f0b006f
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131427439;
 			
-			// aapt resource value: 0x7F0E008D
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624077;
+			// aapt resource value: 0x7f0b0070
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427440;
 			
-			// aapt resource value: 0x7F0E008E
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131624078;
+			// aapt resource value: 0x7f0b0071
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131427441;
 			
-			// aapt resource value: 0x7F0E008F
-			public const int Base_Widget_AppCompat_Light_PopupMenu = 2131624079;
+			// aapt resource value: 0x7f0b0072
+			public const int Base_Widget_AppCompat_Light_PopupMenu = 2131427442;
 			
-			// aapt resource value: 0x7F0E0090
-			public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131624080;
+			// aapt resource value: 0x7f0b0073
+			public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131427443;
 			
-			// aapt resource value: 0x7F0E0091
-			public const int Base_Widget_AppCompat_ListMenuView = 2131624081;
+			// aapt resource value: 0x7f0b00ca
+			public const int Base_Widget_AppCompat_ListMenuView = 2131427530;
 			
-			// aapt resource value: 0x7F0E0092
-			public const int Base_Widget_AppCompat_ListPopupWindow = 2131624082;
+			// aapt resource value: 0x7f0b0074
+			public const int Base_Widget_AppCompat_ListPopupWindow = 2131427444;
 			
-			// aapt resource value: 0x7F0E0093
-			public const int Base_Widget_AppCompat_ListView = 2131624083;
+			// aapt resource value: 0x7f0b0075
+			public const int Base_Widget_AppCompat_ListView = 2131427445;
 			
-			// aapt resource value: 0x7F0E0094
-			public const int Base_Widget_AppCompat_ListView_DropDown = 2131624084;
+			// aapt resource value: 0x7f0b0076
+			public const int Base_Widget_AppCompat_ListView_DropDown = 2131427446;
 			
-			// aapt resource value: 0x7F0E0095
-			public const int Base_Widget_AppCompat_ListView_Menu = 2131624085;
+			// aapt resource value: 0x7f0b0077
+			public const int Base_Widget_AppCompat_ListView_Menu = 2131427447;
 			
-			// aapt resource value: 0x7F0E0096
-			public const int Base_Widget_AppCompat_PopupMenu = 2131624086;
+			// aapt resource value: 0x7f0b0078
+			public const int Base_Widget_AppCompat_PopupMenu = 2131427448;
 			
-			// aapt resource value: 0x7F0E0097
-			public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131624087;
+			// aapt resource value: 0x7f0b0079
+			public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131427449;
 			
-			// aapt resource value: 0x7F0E0098
-			public const int Base_Widget_AppCompat_PopupWindow = 2131624088;
+			// aapt resource value: 0x7f0b00cb
+			public const int Base_Widget_AppCompat_PopupWindow = 2131427531;
 			
-			// aapt resource value: 0x7F0E0099
-			public const int Base_Widget_AppCompat_ProgressBar = 2131624089;
+			// aapt resource value: 0x7f0b001c
+			public const int Base_Widget_AppCompat_ProgressBar = 2131427356;
 			
-			// aapt resource value: 0x7F0E009A
-			public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131624090;
+			// aapt resource value: 0x7f0b001d
+			public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131427357;
 			
-			// aapt resource value: 0x7F0E009B
-			public const int Base_Widget_AppCompat_RatingBar = 2131624091;
+			// aapt resource value: 0x7f0b007a
+			public const int Base_Widget_AppCompat_RatingBar = 2131427450;
 			
-			// aapt resource value: 0x7F0E009C
-			public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131624092;
+			// aapt resource value: 0x7f0b0093
+			public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131427475;
 			
-			// aapt resource value: 0x7F0E009D
-			public const int Base_Widget_AppCompat_RatingBar_Small = 2131624093;
+			// aapt resource value: 0x7f0b0094
+			public const int Base_Widget_AppCompat_RatingBar_Small = 2131427476;
 			
-			// aapt resource value: 0x7F0E009E
-			public const int Base_Widget_AppCompat_SearchView = 2131624094;
+			// aapt resource value: 0x7f0b00cc
+			public const int Base_Widget_AppCompat_SearchView = 2131427532;
 			
-			// aapt resource value: 0x7F0E009F
-			public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131624095;
+			// aapt resource value: 0x7f0b00cd
+			public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131427533;
 			
-			// aapt resource value: 0x7F0E00A0
-			public const int Base_Widget_AppCompat_SeekBar = 2131624096;
+			// aapt resource value: 0x7f0b007b
+			public const int Base_Widget_AppCompat_SeekBar = 2131427451;
 			
-			// aapt resource value: 0x7F0E00A1
-			public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131624097;
+			// aapt resource value: 0x7f0b00ce
+			public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131427534;
 			
-			// aapt resource value: 0x7F0E00A2
-			public const int Base_Widget_AppCompat_Spinner = 2131624098;
+			// aapt resource value: 0x7f0b007c
+			public const int Base_Widget_AppCompat_Spinner = 2131427452;
 			
-			// aapt resource value: 0x7F0E00A3
-			public const int Base_Widget_AppCompat_Spinner_Underlined = 2131624099;
+			// aapt resource value: 0x7f0b0003
+			public const int Base_Widget_AppCompat_Spinner_Underlined = 2131427331;
 			
-			// aapt resource value: 0x7F0E00A4
-			public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131624100;
+			// aapt resource value: 0x7f0b007d
+			public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131427453;
 			
-			// aapt resource value: 0x7F0E00A5
-			public const int Base_Widget_AppCompat_Toolbar = 2131624101;
+			// aapt resource value: 0x7f0b009c
+			public const int Base_Widget_AppCompat_Toolbar = 2131427484;
 			
-			// aapt resource value: 0x7F0E00A6
-			public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131624102;
+			// aapt resource value: 0x7f0b007e
+			public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131427454;
 			
-			// aapt resource value: 0x7F0E00A7
-			public const int Base_Widget_Design_AppBarLayout = 2131624103;
+			// aapt resource value: 0x7f0b0167
+			public const int Base_Widget_Design_AppBarLayout = 2131427687;
 			
-			// aapt resource value: 0x7F0E00A8
-			public const int Base_Widget_Design_TabLayout = 2131624104;
+			// aapt resource value: 0x7f0b016b
+			public const int Base_Widget_Design_TabLayout = 2131427691;
 			
-			// aapt resource value: 0x7F0E00A9
-			public const int BottomSheetDialogAnimation = 2131624105;
+			// aapt resource value: 0x7f0b018a
+			public const int BottomSheetDialogAnimation = 2131427722;
 			
-			// aapt resource value: 0x7F0E018D
-			public const int custom_dialog2 = 2131624333;
+			// aapt resource value: 0x7f0b018f
+			public const int MyTheme = 2131427727;
 			
-			// aapt resource value: 0x7F0E00AA
-			public const int MyTheme = 2131624106;
+			// aapt resource value: 0x7f0b001e
+			public const int Platform_AppCompat = 2131427358;
 			
-			// aapt resource value: 0x7F0E018E
-			public const int picker_view_scale_anim = 2131624334;
+			// aapt resource value: 0x7f0b001f
+			public const int Platform_AppCompat_Light = 2131427359;
 			
-			// aapt resource value: 0x7F0E018F
-			public const int picker_view_slide_anim = 2131624335;
+			// aapt resource value: 0x7f0b007f
+			public const int Platform_ThemeOverlay_AppCompat = 2131427455;
 			
-			// aapt resource value: 0x7F0E00AB
-			public const int Platform_AppCompat = 2131624107;
+			// aapt resource value: 0x7f0b0080
+			public const int Platform_ThemeOverlay_AppCompat_Dark = 2131427456;
 			
-			// aapt resource value: 0x7F0E00AC
-			public const int Platform_AppCompat_Light = 2131624108;
+			// aapt resource value: 0x7f0b0081
+			public const int Platform_ThemeOverlay_AppCompat_Light = 2131427457;
 			
-			// aapt resource value: 0x7F0E00AD
-			public const int Platform_ThemeOverlay_AppCompat = 2131624109;
+			// aapt resource value: 0x7f0b0020
+			public const int Platform_V11_AppCompat = 2131427360;
 			
-			// aapt resource value: 0x7F0E00AE
-			public const int Platform_ThemeOverlay_AppCompat_Dark = 2131624110;
+			// aapt resource value: 0x7f0b0021
+			public const int Platform_V11_AppCompat_Light = 2131427361;
 			
-			// aapt resource value: 0x7F0E00AF
-			public const int Platform_ThemeOverlay_AppCompat_Light = 2131624111;
+			// aapt resource value: 0x7f0b0028
+			public const int Platform_V14_AppCompat = 2131427368;
 			
-			// aapt resource value: 0x7F0E00B0
-			public const int Platform_V11_AppCompat = 2131624112;
+			// aapt resource value: 0x7f0b0029
+			public const int Platform_V14_AppCompat_Light = 2131427369;
 			
-			// aapt resource value: 0x7F0E00B1
-			public const int Platform_V11_AppCompat_Light = 2131624113;
+			// aapt resource value: 0x7f0b0082
+			public const int Platform_V21_AppCompat = 2131427458;
 			
-			// aapt resource value: 0x7F0E00B2
-			public const int Platform_V14_AppCompat = 2131624114;
+			// aapt resource value: 0x7f0b0083
+			public const int Platform_V21_AppCompat_Light = 2131427459;
 			
-			// aapt resource value: 0x7F0E00B3
-			public const int Platform_V14_AppCompat_Light = 2131624115;
+			// aapt resource value: 0x7f0b0097
+			public const int Platform_V25_AppCompat = 2131427479;
 			
-			// aapt resource value: 0x7F0E00B4
-			public const int Platform_V21_AppCompat = 2131624116;
+			// aapt resource value: 0x7f0b0098
+			public const int Platform_V25_AppCompat_Light = 2131427480;
 			
-			// aapt resource value: 0x7F0E00B5
-			public const int Platform_V21_AppCompat_Light = 2131624117;
+			// aapt resource value: 0x7f0b0022
+			public const int Platform_Widget_AppCompat_Spinner = 2131427362;
 			
-			// aapt resource value: 0x7F0E00B6
-			public const int Platform_V25_AppCompat = 2131624118;
+			// aapt resource value: 0x7f0b002b
+			public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131427371;
 			
-			// aapt resource value: 0x7F0E00B7
-			public const int Platform_V25_AppCompat_Light = 2131624119;
+			// aapt resource value: 0x7f0b002c
+			public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131427372;
 			
-			// aapt resource value: 0x7F0E00B8
-			public const int Platform_Widget_AppCompat_Spinner = 2131624120;
+			// aapt resource value: 0x7f0b002d
+			public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131427373;
 			
-			// aapt resource value: 0x7F0E00B9
-			public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131624121;
+			// aapt resource value: 0x7f0b002e
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131427374;
 			
-			// aapt resource value: 0x7F0E00BA
-			public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131624122;
+			// aapt resource value: 0x7f0b002f
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131427375;
 			
-			// aapt resource value: 0x7F0E00BB
-			public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131624123;
+			// aapt resource value: 0x7f0b0030
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131427376;
 			
-			// aapt resource value: 0x7F0E00BC
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131624124;
+			// aapt resource value: 0x7f0b0031
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131427377;
 			
-			// aapt resource value: 0x7F0E00BD
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131624125;
+			// aapt resource value: 0x7f0b0032
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131427378;
 			
-			// aapt resource value: 0x7F0E00BE
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131624126;
+			// aapt resource value: 0x7f0b0033
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131427379;
 			
-			// aapt resource value: 0x7F0E00C4
-			public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131624132;
+			// aapt resource value: 0x7f0b0034
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131427380;
 			
-			// aapt resource value: 0x7F0E00BF
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131624127;
+			// aapt resource value: 0x7f0b0035
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131427381;
 			
-			// aapt resource value: 0x7F0E00C0
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131624128;
+			// aapt resource value: 0x7f0b0036
+			public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131427382;
 			
-			// aapt resource value: 0x7F0E00C1
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131624129;
+			// aapt resource value: 0x7f0b0037
+			public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131427383;
 			
-			// aapt resource value: 0x7F0E00C2
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131624130;
+			// aapt resource value: 0x7f0b0038
+			public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131427384;
 			
-			// aapt resource value: 0x7F0E00C3
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131624131;
+			// aapt resource value: 0x7f0b00cf
+			public const int TextAppearance_AppCompat = 2131427535;
 			
-			// aapt resource value: 0x7F0E00C5
-			public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131624133;
+			// aapt resource value: 0x7f0b00d0
+			public const int TextAppearance_AppCompat_Body1 = 2131427536;
 			
-			// aapt resource value: 0x7F0E00C6
-			public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131624134;
+			// aapt resource value: 0x7f0b00d1
+			public const int TextAppearance_AppCompat_Body2 = 2131427537;
 			
-			// aapt resource value: 0x7F0E00C7
-			public const int TextAppearance_AppCompat = 2131624135;
+			// aapt resource value: 0x7f0b00d2
+			public const int TextAppearance_AppCompat_Button = 2131427538;
 			
-			// aapt resource value: 0x7F0E00C8
-			public const int TextAppearance_AppCompat_Body1 = 2131624136;
+			// aapt resource value: 0x7f0b00d3
+			public const int TextAppearance_AppCompat_Caption = 2131427539;
 			
-			// aapt resource value: 0x7F0E00C9
-			public const int TextAppearance_AppCompat_Body2 = 2131624137;
+			// aapt resource value: 0x7f0b00d4
+			public const int TextAppearance_AppCompat_Display1 = 2131427540;
 			
-			// aapt resource value: 0x7F0E00CA
-			public const int TextAppearance_AppCompat_Button = 2131624138;
+			// aapt resource value: 0x7f0b00d5
+			public const int TextAppearance_AppCompat_Display2 = 2131427541;
 			
-			// aapt resource value: 0x7F0E00CB
-			public const int TextAppearance_AppCompat_Caption = 2131624139;
+			// aapt resource value: 0x7f0b00d6
+			public const int TextAppearance_AppCompat_Display3 = 2131427542;
 			
-			// aapt resource value: 0x7F0E00CC
-			public const int TextAppearance_AppCompat_Display1 = 2131624140;
+			// aapt resource value: 0x7f0b00d7
+			public const int TextAppearance_AppCompat_Display4 = 2131427543;
 			
-			// aapt resource value: 0x7F0E00CD
-			public const int TextAppearance_AppCompat_Display2 = 2131624141;
+			// aapt resource value: 0x7f0b00d8
+			public const int TextAppearance_AppCompat_Headline = 2131427544;
 			
-			// aapt resource value: 0x7F0E00CE
-			public const int TextAppearance_AppCompat_Display3 = 2131624142;
+			// aapt resource value: 0x7f0b00d9
+			public const int TextAppearance_AppCompat_Inverse = 2131427545;
 			
-			// aapt resource value: 0x7F0E00CF
-			public const int TextAppearance_AppCompat_Display4 = 2131624143;
+			// aapt resource value: 0x7f0b00da
+			public const int TextAppearance_AppCompat_Large = 2131427546;
 			
-			// aapt resource value: 0x7F0E00D0
-			public const int TextAppearance_AppCompat_Headline = 2131624144;
+			// aapt resource value: 0x7f0b00db
+			public const int TextAppearance_AppCompat_Large_Inverse = 2131427547;
 			
-			// aapt resource value: 0x7F0E00D1
-			public const int TextAppearance_AppCompat_Inverse = 2131624145;
+			// aapt resource value: 0x7f0b00dc
+			public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131427548;
 			
-			// aapt resource value: 0x7F0E00D2
-			public const int TextAppearance_AppCompat_Large = 2131624146;
+			// aapt resource value: 0x7f0b00dd
+			public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131427549;
 			
-			// aapt resource value: 0x7F0E00D3
-			public const int TextAppearance_AppCompat_Large_Inverse = 2131624147;
+			// aapt resource value: 0x7f0b00de
+			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427550;
 			
-			// aapt resource value: 0x7F0E00D4
-			public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131624148;
+			// aapt resource value: 0x7f0b00df
+			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427551;
 			
-			// aapt resource value: 0x7F0E00D5
-			public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131624149;
+			// aapt resource value: 0x7f0b00e0
+			public const int TextAppearance_AppCompat_Medium = 2131427552;
 			
-			// aapt resource value: 0x7F0E00D6
-			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131624150;
+			// aapt resource value: 0x7f0b00e1
+			public const int TextAppearance_AppCompat_Medium_Inverse = 2131427553;
 			
-			// aapt resource value: 0x7F0E00D7
-			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131624151;
+			// aapt resource value: 0x7f0b00e2
+			public const int TextAppearance_AppCompat_Menu = 2131427554;
 			
-			// aapt resource value: 0x7F0E00D8
-			public const int TextAppearance_AppCompat_Medium = 2131624152;
+			// aapt resource value: 0x7f0b0084
+			public const int TextAppearance_AppCompat_Notification = 2131427460;
 			
-			// aapt resource value: 0x7F0E00D9
-			public const int TextAppearance_AppCompat_Medium_Inverse = 2131624153;
+			// aapt resource value: 0x7f0b0085
+			public const int TextAppearance_AppCompat_Notification_Info = 2131427461;
 			
-			// aapt resource value: 0x7F0E00DA
-			public const int TextAppearance_AppCompat_Menu = 2131624154;
+			// aapt resource value: 0x7f0b0086
+			public const int TextAppearance_AppCompat_Notification_Info_Media = 2131427462;
 			
-			// aapt resource value: 0x7F0E00DB
-			public const int TextAppearance_AppCompat_Notification = 2131624155;
+			// aapt resource value: 0x7f0b00e3
+			public const int TextAppearance_AppCompat_Notification_Line2 = 2131427555;
 			
-			// aapt resource value: 0x7F0E00DC
-			public const int TextAppearance_AppCompat_Notification_Info = 2131624156;
+			// aapt resource value: 0x7f0b00e4
+			public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131427556;
 			
-			// aapt resource value: 0x7F0E00DD
-			public const int TextAppearance_AppCompat_Notification_Info_Media = 2131624157;
+			// aapt resource value: 0x7f0b0087
+			public const int TextAppearance_AppCompat_Notification_Media = 2131427463;
 			
-			// aapt resource value: 0x7F0E00DE
-			public const int TextAppearance_AppCompat_Notification_Line2 = 2131624158;
+			// aapt resource value: 0x7f0b0088
+			public const int TextAppearance_AppCompat_Notification_Time = 2131427464;
 			
-			// aapt resource value: 0x7F0E00DF
-			public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131624159;
+			// aapt resource value: 0x7f0b0089
+			public const int TextAppearance_AppCompat_Notification_Time_Media = 2131427465;
 			
-			// aapt resource value: 0x7F0E00E0
-			public const int TextAppearance_AppCompat_Notification_Media = 2131624160;
+			// aapt resource value: 0x7f0b008a
+			public const int TextAppearance_AppCompat_Notification_Title = 2131427466;
 			
-			// aapt resource value: 0x7F0E00E1
-			public const int TextAppearance_AppCompat_Notification_Time = 2131624161;
+			// aapt resource value: 0x7f0b008b
+			public const int TextAppearance_AppCompat_Notification_Title_Media = 2131427467;
 			
-			// aapt resource value: 0x7F0E00E2
-			public const int TextAppearance_AppCompat_Notification_Time_Media = 2131624162;
+			// aapt resource value: 0x7f0b00e5
+			public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131427557;
 			
-			// aapt resource value: 0x7F0E00E3
-			public const int TextAppearance_AppCompat_Notification_Title = 2131624163;
+			// aapt resource value: 0x7f0b00e6
+			public const int TextAppearance_AppCompat_SearchResult_Title = 2131427558;
 			
-			// aapt resource value: 0x7F0E00E4
-			public const int TextAppearance_AppCompat_Notification_Title_Media = 2131624164;
+			// aapt resource value: 0x7f0b00e7
+			public const int TextAppearance_AppCompat_Small = 2131427559;
 			
-			// aapt resource value: 0x7F0E00E5
-			public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131624165;
+			// aapt resource value: 0x7f0b00e8
+			public const int TextAppearance_AppCompat_Small_Inverse = 2131427560;
 			
-			// aapt resource value: 0x7F0E00E6
-			public const int TextAppearance_AppCompat_SearchResult_Title = 2131624166;
+			// aapt resource value: 0x7f0b00e9
+			public const int TextAppearance_AppCompat_Subhead = 2131427561;
 			
-			// aapt resource value: 0x7F0E00E7
-			public const int TextAppearance_AppCompat_Small = 2131624167;
+			// aapt resource value: 0x7f0b00ea
+			public const int TextAppearance_AppCompat_Subhead_Inverse = 2131427562;
 			
-			// aapt resource value: 0x7F0E00E8
-			public const int TextAppearance_AppCompat_Small_Inverse = 2131624168;
+			// aapt resource value: 0x7f0b00eb
+			public const int TextAppearance_AppCompat_Title = 2131427563;
 			
-			// aapt resource value: 0x7F0E00E9
-			public const int TextAppearance_AppCompat_Subhead = 2131624169;
+			// aapt resource value: 0x7f0b00ec
+			public const int TextAppearance_AppCompat_Title_Inverse = 2131427564;
 			
-			// aapt resource value: 0x7F0E00EA
-			public const int TextAppearance_AppCompat_Subhead_Inverse = 2131624170;
+			// aapt resource value: 0x7f0b002a
+			public const int TextAppearance_AppCompat_Tooltip = 2131427370;
 			
-			// aapt resource value: 0x7F0E00EB
-			public const int TextAppearance_AppCompat_Title = 2131624171;
+			// aapt resource value: 0x7f0b00ed
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427565;
 			
-			// aapt resource value: 0x7F0E00EC
-			public const int TextAppearance_AppCompat_Title_Inverse = 2131624172;
+			// aapt resource value: 0x7f0b00ee
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427566;
 			
-			// aapt resource value: 0x7F0E00ED
-			public const int TextAppearance_AppCompat_Tooltip = 2131624173;
+			// aapt resource value: 0x7f0b00ef
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427567;
 			
-			// aapt resource value: 0x7F0E00EE
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131624174;
+			// aapt resource value: 0x7f0b00f0
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427568;
 			
-			// aapt resource value: 0x7F0E00EF
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131624175;
+			// aapt resource value: 0x7f0b00f1
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427569;
 			
-			// aapt resource value: 0x7F0E00F0
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131624176;
+			// aapt resource value: 0x7f0b00f2
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427570;
 			
-			// aapt resource value: 0x7F0E00F1
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131624177;
+			// aapt resource value: 0x7f0b00f3
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131427571;
 			
-			// aapt resource value: 0x7F0E00F2
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131624178;
+			// aapt resource value: 0x7f0b00f4
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427572;
 			
-			// aapt resource value: 0x7F0E00F3
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131624179;
+			// aapt resource value: 0x7f0b00f5
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131427573;
 			
-			// aapt resource value: 0x7F0E00F4
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131624180;
+			// aapt resource value: 0x7f0b00f6
+			public const int TextAppearance_AppCompat_Widget_Button = 2131427574;
 			
-			// aapt resource value: 0x7F0E00F5
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131624181;
+			// aapt resource value: 0x7f0b00f7
+			public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427575;
 			
-			// aapt resource value: 0x7F0E00F6
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131624182;
+			// aapt resource value: 0x7f0b00f8
+			public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131427576;
 			
-			// aapt resource value: 0x7F0E00F7
-			public const int TextAppearance_AppCompat_Widget_Button = 2131624183;
+			// aapt resource value: 0x7f0b00f9
+			public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131427577;
 			
-			// aapt resource value: 0x7F0E00F8
-			public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131624184;
+			// aapt resource value: 0x7f0b00fa
+			public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131427578;
 			
-			// aapt resource value: 0x7F0E00F9
-			public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131624185;
+			// aapt resource value: 0x7f0b00fb
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427579;
 			
-			// aapt resource value: 0x7F0E00FA
-			public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131624186;
+			// aapt resource value: 0x7f0b00fc
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427580;
 			
-			// aapt resource value: 0x7F0E00FB
-			public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131624187;
+			// aapt resource value: 0x7f0b00fd
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427581;
 			
-			// aapt resource value: 0x7F0E00FC
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131624188;
+			// aapt resource value: 0x7f0b00fe
+			public const int TextAppearance_AppCompat_Widget_Switch = 2131427582;
 			
-			// aapt resource value: 0x7F0E00FD
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131624189;
+			// aapt resource value: 0x7f0b00ff
+			public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427583;
 			
-			// aapt resource value: 0x7F0E00FE
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131624190;
+			// aapt resource value: 0x7f0b0183
+			public const int TextAppearance_Compat_Notification = 2131427715;
 			
-			// aapt resource value: 0x7F0E00FF
-			public const int TextAppearance_AppCompat_Widget_Switch = 2131624191;
+			// aapt resource value: 0x7f0b0184
+			public const int TextAppearance_Compat_Notification_Info = 2131427716;
 			
-			// aapt resource value: 0x7F0E0100
-			public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131624192;
+			// aapt resource value: 0x7f0b0160
+			public const int TextAppearance_Compat_Notification_Info_Media = 2131427680;
 			
-			// aapt resource value: 0x7F0E0101
-			public const int TextAppearance_Compat_Notification = 2131624193;
+			// aapt resource value: 0x7f0b0189
+			public const int TextAppearance_Compat_Notification_Line2 = 2131427721;
 			
-			// aapt resource value: 0x7F0E0102
-			public const int TextAppearance_Compat_Notification_Info = 2131624194;
+			// aapt resource value: 0x7f0b0164
+			public const int TextAppearance_Compat_Notification_Line2_Media = 2131427684;
 			
-			// aapt resource value: 0x7F0E0103
-			public const int TextAppearance_Compat_Notification_Info_Media = 2131624195;
+			// aapt resource value: 0x7f0b0161
+			public const int TextAppearance_Compat_Notification_Media = 2131427681;
 			
-			// aapt resource value: 0x7F0E0104
-			public const int TextAppearance_Compat_Notification_Line2 = 2131624196;
+			// aapt resource value: 0x7f0b0185
+			public const int TextAppearance_Compat_Notification_Time = 2131427717;
 			
-			// aapt resource value: 0x7F0E0105
-			public const int TextAppearance_Compat_Notification_Line2_Media = 2131624197;
+			// aapt resource value: 0x7f0b0162
+			public const int TextAppearance_Compat_Notification_Time_Media = 2131427682;
 			
-			// aapt resource value: 0x7F0E0106
-			public const int TextAppearance_Compat_Notification_Media = 2131624198;
+			// aapt resource value: 0x7f0b0186
+			public const int TextAppearance_Compat_Notification_Title = 2131427718;
 			
-			// aapt resource value: 0x7F0E0107
-			public const int TextAppearance_Compat_Notification_Time = 2131624199;
+			// aapt resource value: 0x7f0b0163
+			public const int TextAppearance_Compat_Notification_Title_Media = 2131427683;
 			
-			// aapt resource value: 0x7F0E0108
-			public const int TextAppearance_Compat_Notification_Time_Media = 2131624200;
+			// aapt resource value: 0x7f0b016c
+			public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131427692;
 			
-			// aapt resource value: 0x7F0E0109
-			public const int TextAppearance_Compat_Notification_Title = 2131624201;
+			// aapt resource value: 0x7f0b016d
+			public const int TextAppearance_Design_Counter = 2131427693;
 			
-			// aapt resource value: 0x7F0E010A
-			public const int TextAppearance_Compat_Notification_Title_Media = 2131624202;
+			// aapt resource value: 0x7f0b016e
+			public const int TextAppearance_Design_Counter_Overflow = 2131427694;
 			
-			// aapt resource value: 0x7F0E010B
-			public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131624203;
+			// aapt resource value: 0x7f0b016f
+			public const int TextAppearance_Design_Error = 2131427695;
 			
-			// aapt resource value: 0x7F0E010C
-			public const int TextAppearance_Design_Counter = 2131624204;
+			// aapt resource value: 0x7f0b0170
+			public const int TextAppearance_Design_Hint = 2131427696;
 			
-			// aapt resource value: 0x7F0E010D
-			public const int TextAppearance_Design_Counter_Overflow = 2131624205;
+			// aapt resource value: 0x7f0b0171
+			public const int TextAppearance_Design_Snackbar_Message = 2131427697;
 			
-			// aapt resource value: 0x7F0E010E
-			public const int TextAppearance_Design_Error = 2131624206;
+			// aapt resource value: 0x7f0b0172
+			public const int TextAppearance_Design_Tab = 2131427698;
 			
-			// aapt resource value: 0x7F0E010F
-			public const int TextAppearance_Design_Hint = 2131624207;
+			// aapt resource value: 0x7f0b0100
+			public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427584;
 			
-			// aapt resource value: 0x7F0E0110
-			public const int TextAppearance_Design_Snackbar_Message = 2131624208;
+			// aapt resource value: 0x7f0b0101
+			public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427585;
 			
-			// aapt resource value: 0x7F0E0111
-			public const int TextAppearance_Design_Tab = 2131624209;
+			// aapt resource value: 0x7f0b0102
+			public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427586;
 			
-			// aapt resource value: 0x7F0E0112
-			public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131624210;
+			// aapt resource value: 0x7f0b0103
+			public const int Theme_AppCompat = 2131427587;
 			
-			// aapt resource value: 0x7F0E0113
-			public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131624211;
+			// aapt resource value: 0x7f0b0104
+			public const int Theme_AppCompat_CompactMenu = 2131427588;
 			
-			// aapt resource value: 0x7F0E0114
-			public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131624212;
+			// aapt resource value: 0x7f0b0004
+			public const int Theme_AppCompat_DayNight = 2131427332;
 			
-			// aapt resource value: 0x7F0E0131
-			public const int ThemeOverlay_AppCompat = 2131624241;
+			// aapt resource value: 0x7f0b0005
+			public const int Theme_AppCompat_DayNight_DarkActionBar = 2131427333;
 			
-			// aapt resource value: 0x7F0E0132
-			public const int ThemeOverlay_AppCompat_ActionBar = 2131624242;
+			// aapt resource value: 0x7f0b0006
+			public const int Theme_AppCompat_DayNight_Dialog = 2131427334;
 			
-			// aapt resource value: 0x7F0E0133
-			public const int ThemeOverlay_AppCompat_Dark = 2131624243;
+			// aapt resource value: 0x7f0b0007
+			public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131427335;
 			
-			// aapt resource value: 0x7F0E0134
-			public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131624244;
+			// aapt resource value: 0x7f0b0008
+			public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131427336;
 			
-			// aapt resource value: 0x7F0E0135
-			public const int ThemeOverlay_AppCompat_Dialog = 2131624245;
+			// aapt resource value: 0x7f0b0009
+			public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131427337;
 			
-			// aapt resource value: 0x7F0E0136
-			public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131624246;
+			// aapt resource value: 0x7f0b000a
+			public const int Theme_AppCompat_DayNight_NoActionBar = 2131427338;
 			
-			// aapt resource value: 0x7F0E0137
-			public const int ThemeOverlay_AppCompat_Light = 2131624247;
+			// aapt resource value: 0x7f0b0105
+			public const int Theme_AppCompat_Dialog = 2131427589;
 			
-			// aapt resource value: 0x7F0E0115
-			public const int Theme_AppCompat = 2131624213;
+			// aapt resource value: 0x7f0b0106
+			public const int Theme_AppCompat_Dialog_Alert = 2131427590;
 			
-			// aapt resource value: 0x7F0E0116
-			public const int Theme_AppCompat_CompactMenu = 2131624214;
+			// aapt resource value: 0x7f0b0107
+			public const int Theme_AppCompat_Dialog_MinWidth = 2131427591;
 			
-			// aapt resource value: 0x7F0E0117
-			public const int Theme_AppCompat_DayNight = 2131624215;
+			// aapt resource value: 0x7f0b0108
+			public const int Theme_AppCompat_DialogWhenLarge = 2131427592;
 			
-			// aapt resource value: 0x7F0E0118
-			public const int Theme_AppCompat_DayNight_DarkActionBar = 2131624216;
+			// aapt resource value: 0x7f0b0109
+			public const int Theme_AppCompat_Light = 2131427593;
 			
-			// aapt resource value: 0x7F0E0119
-			public const int Theme_AppCompat_DayNight_Dialog = 2131624217;
+			// aapt resource value: 0x7f0b010a
+			public const int Theme_AppCompat_Light_DarkActionBar = 2131427594;
 			
-			// aapt resource value: 0x7F0E011C
-			public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131624220;
+			// aapt resource value: 0x7f0b010b
+			public const int Theme_AppCompat_Light_Dialog = 2131427595;
 			
-			// aapt resource value: 0x7F0E011A
-			public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131624218;
+			// aapt resource value: 0x7f0b010c
+			public const int Theme_AppCompat_Light_Dialog_Alert = 2131427596;
 			
-			// aapt resource value: 0x7F0E011B
-			public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131624219;
+			// aapt resource value: 0x7f0b010d
+			public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131427597;
 			
-			// aapt resource value: 0x7F0E011D
-			public const int Theme_AppCompat_DayNight_NoActionBar = 2131624221;
+			// aapt resource value: 0x7f0b010e
+			public const int Theme_AppCompat_Light_DialogWhenLarge = 2131427598;
 			
-			// aapt resource value: 0x7F0E011E
-			public const int Theme_AppCompat_Dialog = 2131624222;
+			// aapt resource value: 0x7f0b010f
+			public const int Theme_AppCompat_Light_NoActionBar = 2131427599;
 			
-			// aapt resource value: 0x7F0E0121
-			public const int Theme_AppCompat_DialogWhenLarge = 2131624225;
+			// aapt resource value: 0x7f0b0110
+			public const int Theme_AppCompat_NoActionBar = 2131427600;
 			
-			// aapt resource value: 0x7F0E011F
-			public const int Theme_AppCompat_Dialog_Alert = 2131624223;
+			// aapt resource value: 0x7f0b018b
+			public const int Theme_BiometricPromptDialog = 2131427723;
 			
-			// aapt resource value: 0x7F0E0120
-			public const int Theme_AppCompat_Dialog_MinWidth = 2131624224;
+			// aapt resource value: 0x7f0b0173
+			public const int Theme_Design = 2131427699;
 			
-			// aapt resource value: 0x7F0E0122
-			public const int Theme_AppCompat_Light = 2131624226;
+			// aapt resource value: 0x7f0b0174
+			public const int Theme_Design_BottomSheetDialog = 2131427700;
 			
-			// aapt resource value: 0x7F0E0123
-			public const int Theme_AppCompat_Light_DarkActionBar = 2131624227;
+			// aapt resource value: 0x7f0b0175
+			public const int Theme_Design_Light = 2131427701;
 			
-			// aapt resource value: 0x7F0E0124
-			public const int Theme_AppCompat_Light_Dialog = 2131624228;
+			// aapt resource value: 0x7f0b0176
+			public const int Theme_Design_Light_BottomSheetDialog = 2131427702;
 			
-			// aapt resource value: 0x7F0E0127
-			public const int Theme_AppCompat_Light_DialogWhenLarge = 2131624231;
+			// aapt resource value: 0x7f0b0177
+			public const int Theme_Design_Light_NoActionBar = 2131427703;
 			
-			// aapt resource value: 0x7F0E0125
-			public const int Theme_AppCompat_Light_Dialog_Alert = 2131624229;
+			// aapt resource value: 0x7f0b0178
+			public const int Theme_Design_NoActionBar = 2131427704;
 			
-			// aapt resource value: 0x7F0E0126
-			public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131624230;
+			// aapt resource value: 0x7f0b0111
+			public const int ThemeOverlay_AppCompat = 2131427601;
 			
-			// aapt resource value: 0x7F0E0128
-			public const int Theme_AppCompat_Light_NoActionBar = 2131624232;
+			// aapt resource value: 0x7f0b0112
+			public const int ThemeOverlay_AppCompat_ActionBar = 2131427602;
 			
-			// aapt resource value: 0x7F0E0129
-			public const int Theme_AppCompat_NoActionBar = 2131624233;
+			// aapt resource value: 0x7f0b0113
+			public const int ThemeOverlay_AppCompat_Dark = 2131427603;
 			
-			// aapt resource value: 0x7F0E012A
-			public const int Theme_BiometricPromptDialog = 2131624234;
+			// aapt resource value: 0x7f0b0114
+			public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131427604;
 			
-			// aapt resource value: 0x7F0E012B
-			public const int Theme_Design = 2131624235;
+			// aapt resource value: 0x7f0b0115
+			public const int ThemeOverlay_AppCompat_Dialog = 2131427605;
 			
-			// aapt resource value: 0x7F0E012C
-			public const int Theme_Design_BottomSheetDialog = 2131624236;
+			// aapt resource value: 0x7f0b0116
+			public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131427606;
 			
-			// aapt resource value: 0x7F0E012D
-			public const int Theme_Design_Light = 2131624237;
+			// aapt resource value: 0x7f0b0117
+			public const int ThemeOverlay_AppCompat_Light = 2131427607;
 			
-			// aapt resource value: 0x7F0E012E
-			public const int Theme_Design_Light_BottomSheetDialog = 2131624238;
+			// aapt resource value: 0x7f0b0118
+			public const int Widget_AppCompat_ActionBar = 2131427608;
 			
-			// aapt resource value: 0x7F0E012F
-			public const int Theme_Design_Light_NoActionBar = 2131624239;
+			// aapt resource value: 0x7f0b0119
+			public const int Widget_AppCompat_ActionBar_Solid = 2131427609;
 			
-			// aapt resource value: 0x7F0E0130
-			public const int Theme_Design_NoActionBar = 2131624240;
+			// aapt resource value: 0x7f0b011a
+			public const int Widget_AppCompat_ActionBar_TabBar = 2131427610;
 			
-			// aapt resource value: 0x7F0E0138
-			public const int Widget_AppCompat_ActionBar = 2131624248;
+			// aapt resource value: 0x7f0b011b
+			public const int Widget_AppCompat_ActionBar_TabText = 2131427611;
 			
-			// aapt resource value: 0x7F0E0139
-			public const int Widget_AppCompat_ActionBar_Solid = 2131624249;
+			// aapt resource value: 0x7f0b011c
+			public const int Widget_AppCompat_ActionBar_TabView = 2131427612;
 			
-			// aapt resource value: 0x7F0E013A
-			public const int Widget_AppCompat_ActionBar_TabBar = 2131624250;
+			// aapt resource value: 0x7f0b011d
+			public const int Widget_AppCompat_ActionButton = 2131427613;
 			
-			// aapt resource value: 0x7F0E013B
-			public const int Widget_AppCompat_ActionBar_TabText = 2131624251;
+			// aapt resource value: 0x7f0b011e
+			public const int Widget_AppCompat_ActionButton_CloseMode = 2131427614;
 			
-			// aapt resource value: 0x7F0E013C
-			public const int Widget_AppCompat_ActionBar_TabView = 2131624252;
+			// aapt resource value: 0x7f0b011f
+			public const int Widget_AppCompat_ActionButton_Overflow = 2131427615;
 			
-			// aapt resource value: 0x7F0E013D
-			public const int Widget_AppCompat_ActionButton = 2131624253;
+			// aapt resource value: 0x7f0b0120
+			public const int Widget_AppCompat_ActionMode = 2131427616;
 			
-			// aapt resource value: 0x7F0E013E
-			public const int Widget_AppCompat_ActionButton_CloseMode = 2131624254;
+			// aapt resource value: 0x7f0b0121
+			public const int Widget_AppCompat_ActivityChooserView = 2131427617;
 			
-			// aapt resource value: 0x7F0E013F
-			public const int Widget_AppCompat_ActionButton_Overflow = 2131624255;
+			// aapt resource value: 0x7f0b0122
+			public const int Widget_AppCompat_AutoCompleteTextView = 2131427618;
 			
-			// aapt resource value: 0x7F0E0140
-			public const int Widget_AppCompat_ActionMode = 2131624256;
+			// aapt resource value: 0x7f0b0123
+			public const int Widget_AppCompat_Button = 2131427619;
 			
-			// aapt resource value: 0x7F0E0141
-			public const int Widget_AppCompat_ActivityChooserView = 2131624257;
+			// aapt resource value: 0x7f0b0124
+			public const int Widget_AppCompat_Button_Borderless = 2131427620;
 			
-			// aapt resource value: 0x7F0E0142
-			public const int Widget_AppCompat_AutoCompleteTextView = 2131624258;
+			// aapt resource value: 0x7f0b0125
+			public const int Widget_AppCompat_Button_Borderless_Colored = 2131427621;
 			
-			// aapt resource value: 0x7F0E0143
-			public const int Widget_AppCompat_Button = 2131624259;
+			// aapt resource value: 0x7f0b0126
+			public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427622;
 			
-			// aapt resource value: 0x7F0E0149
-			public const int Widget_AppCompat_ButtonBar = 2131624265;
+			// aapt resource value: 0x7f0b0127
+			public const int Widget_AppCompat_Button_Colored = 2131427623;
 			
-			// aapt resource value: 0x7F0E014A
-			public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131624266;
+			// aapt resource value: 0x7f0b0128
+			public const int Widget_AppCompat_Button_Small = 2131427624;
 			
-			// aapt resource value: 0x7F0E0144
-			public const int Widget_AppCompat_Button_Borderless = 2131624260;
+			// aapt resource value: 0x7f0b0129
+			public const int Widget_AppCompat_ButtonBar = 2131427625;
 			
-			// aapt resource value: 0x7F0E0145
-			public const int Widget_AppCompat_Button_Borderless_Colored = 2131624261;
+			// aapt resource value: 0x7f0b012a
+			public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131427626;
 			
-			// aapt resource value: 0x7F0E0146
-			public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624262;
+			// aapt resource value: 0x7f0b012b
+			public const int Widget_AppCompat_CompoundButton_CheckBox = 2131427627;
 			
-			// aapt resource value: 0x7F0E0147
-			public const int Widget_AppCompat_Button_Colored = 2131624263;
+			// aapt resource value: 0x7f0b012c
+			public const int Widget_AppCompat_CompoundButton_RadioButton = 2131427628;
 			
-			// aapt resource value: 0x7F0E0148
-			public const int Widget_AppCompat_Button_Small = 2131624264;
+			// aapt resource value: 0x7f0b012d
+			public const int Widget_AppCompat_CompoundButton_Switch = 2131427629;
 			
-			// aapt resource value: 0x7F0E014B
-			public const int Widget_AppCompat_CompoundButton_CheckBox = 2131624267;
+			// aapt resource value: 0x7f0b012e
+			public const int Widget_AppCompat_DrawerArrowToggle = 2131427630;
 			
-			// aapt resource value: 0x7F0E014C
-			public const int Widget_AppCompat_CompoundButton_RadioButton = 2131624268;
+			// aapt resource value: 0x7f0b012f
+			public const int Widget_AppCompat_DropDownItem_Spinner = 2131427631;
 			
-			// aapt resource value: 0x7F0E014D
-			public const int Widget_AppCompat_CompoundButton_Switch = 2131624269;
+			// aapt resource value: 0x7f0b0130
+			public const int Widget_AppCompat_EditText = 2131427632;
 			
-			// aapt resource value: 0x7F0E014E
-			public const int Widget_AppCompat_DrawerArrowToggle = 2131624270;
+			// aapt resource value: 0x7f0b0131
+			public const int Widget_AppCompat_ImageButton = 2131427633;
 			
-			// aapt resource value: 0x7F0E014F
-			public const int Widget_AppCompat_DropDownItem_Spinner = 2131624271;
+			// aapt resource value: 0x7f0b0132
+			public const int Widget_AppCompat_Light_ActionBar = 2131427634;
 			
-			// aapt resource value: 0x7F0E0150
-			public const int Widget_AppCompat_EditText = 2131624272;
+			// aapt resource value: 0x7f0b0133
+			public const int Widget_AppCompat_Light_ActionBar_Solid = 2131427635;
 			
-			// aapt resource value: 0x7F0E0151
-			public const int Widget_AppCompat_ImageButton = 2131624273;
+			// aapt resource value: 0x7f0b0134
+			public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131427636;
 			
-			// aapt resource value: 0x7F0E0152
-			public const int Widget_AppCompat_Light_ActionBar = 2131624274;
+			// aapt resource value: 0x7f0b0135
+			public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131427637;
 			
-			// aapt resource value: 0x7F0E0153
-			public const int Widget_AppCompat_Light_ActionBar_Solid = 2131624275;
+			// aapt resource value: 0x7f0b0136
+			public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131427638;
 			
-			// aapt resource value: 0x7F0E0154
-			public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131624276;
+			// aapt resource value: 0x7f0b0137
+			public const int Widget_AppCompat_Light_ActionBar_TabText = 2131427639;
 			
-			// aapt resource value: 0x7F0E0155
-			public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131624277;
+			// aapt resource value: 0x7f0b0138
+			public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427640;
 			
-			// aapt resource value: 0x7F0E0156
-			public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131624278;
+			// aapt resource value: 0x7f0b0139
+			public const int Widget_AppCompat_Light_ActionBar_TabView = 2131427641;
 			
-			// aapt resource value: 0x7F0E0157
-			public const int Widget_AppCompat_Light_ActionBar_TabText = 2131624279;
+			// aapt resource value: 0x7f0b013a
+			public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131427642;
 			
-			// aapt resource value: 0x7F0E0158
-			public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624280;
+			// aapt resource value: 0x7f0b013b
+			public const int Widget_AppCompat_Light_ActionButton = 2131427643;
 			
-			// aapt resource value: 0x7F0E0159
-			public const int Widget_AppCompat_Light_ActionBar_TabView = 2131624281;
+			// aapt resource value: 0x7f0b013c
+			public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131427644;
 			
-			// aapt resource value: 0x7F0E015A
-			public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131624282;
+			// aapt resource value: 0x7f0b013d
+			public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131427645;
 			
-			// aapt resource value: 0x7F0E015B
-			public const int Widget_AppCompat_Light_ActionButton = 2131624283;
+			// aapt resource value: 0x7f0b013e
+			public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131427646;
 			
-			// aapt resource value: 0x7F0E015C
-			public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131624284;
+			// aapt resource value: 0x7f0b013f
+			public const int Widget_AppCompat_Light_ActivityChooserView = 2131427647;
 			
-			// aapt resource value: 0x7F0E015D
-			public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131624285;
+			// aapt resource value: 0x7f0b0140
+			public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131427648;
 			
-			// aapt resource value: 0x7F0E015E
-			public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131624286;
+			// aapt resource value: 0x7f0b0141
+			public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131427649;
 			
-			// aapt resource value: 0x7F0E015F
-			public const int Widget_AppCompat_Light_ActivityChooserView = 2131624287;
+			// aapt resource value: 0x7f0b0142
+			public const int Widget_AppCompat_Light_ListPopupWindow = 2131427650;
 			
-			// aapt resource value: 0x7F0E0160
-			public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131624288;
+			// aapt resource value: 0x7f0b0143
+			public const int Widget_AppCompat_Light_ListView_DropDown = 2131427651;
 			
-			// aapt resource value: 0x7F0E0161
-			public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131624289;
+			// aapt resource value: 0x7f0b0144
+			public const int Widget_AppCompat_Light_PopupMenu = 2131427652;
 			
-			// aapt resource value: 0x7F0E0162
-			public const int Widget_AppCompat_Light_ListPopupWindow = 2131624290;
+			// aapt resource value: 0x7f0b0145
+			public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131427653;
 			
-			// aapt resource value: 0x7F0E0163
-			public const int Widget_AppCompat_Light_ListView_DropDown = 2131624291;
+			// aapt resource value: 0x7f0b0146
+			public const int Widget_AppCompat_Light_SearchView = 2131427654;
 			
-			// aapt resource value: 0x7F0E0164
-			public const int Widget_AppCompat_Light_PopupMenu = 2131624292;
+			// aapt resource value: 0x7f0b0147
+			public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131427655;
 			
-			// aapt resource value: 0x7F0E0165
-			public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131624293;
+			// aapt resource value: 0x7f0b0148
+			public const int Widget_AppCompat_ListMenuView = 2131427656;
 			
-			// aapt resource value: 0x7F0E0166
-			public const int Widget_AppCompat_Light_SearchView = 2131624294;
+			// aapt resource value: 0x7f0b0149
+			public const int Widget_AppCompat_ListPopupWindow = 2131427657;
 			
-			// aapt resource value: 0x7F0E0167
-			public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131624295;
+			// aapt resource value: 0x7f0b014a
+			public const int Widget_AppCompat_ListView = 2131427658;
 			
-			// aapt resource value: 0x7F0E0168
-			public const int Widget_AppCompat_ListMenuView = 2131624296;
+			// aapt resource value: 0x7f0b014b
+			public const int Widget_AppCompat_ListView_DropDown = 2131427659;
 			
-			// aapt resource value: 0x7F0E0169
-			public const int Widget_AppCompat_ListPopupWindow = 2131624297;
+			// aapt resource value: 0x7f0b014c
+			public const int Widget_AppCompat_ListView_Menu = 2131427660;
 			
-			// aapt resource value: 0x7F0E016A
-			public const int Widget_AppCompat_ListView = 2131624298;
+			// aapt resource value: 0x7f0b014d
+			public const int Widget_AppCompat_PopupMenu = 2131427661;
 			
-			// aapt resource value: 0x7F0E016B
-			public const int Widget_AppCompat_ListView_DropDown = 2131624299;
+			// aapt resource value: 0x7f0b014e
+			public const int Widget_AppCompat_PopupMenu_Overflow = 2131427662;
 			
-			// aapt resource value: 0x7F0E016C
-			public const int Widget_AppCompat_ListView_Menu = 2131624300;
+			// aapt resource value: 0x7f0b014f
+			public const int Widget_AppCompat_PopupWindow = 2131427663;
 			
-			// aapt resource value: 0x7F0E016D
-			public const int Widget_AppCompat_PopupMenu = 2131624301;
+			// aapt resource value: 0x7f0b0150
+			public const int Widget_AppCompat_ProgressBar = 2131427664;
 			
-			// aapt resource value: 0x7F0E016E
-			public const int Widget_AppCompat_PopupMenu_Overflow = 2131624302;
+			// aapt resource value: 0x7f0b0151
+			public const int Widget_AppCompat_ProgressBar_Horizontal = 2131427665;
 			
-			// aapt resource value: 0x7F0E016F
-			public const int Widget_AppCompat_PopupWindow = 2131624303;
+			// aapt resource value: 0x7f0b0152
+			public const int Widget_AppCompat_RatingBar = 2131427666;
 			
-			// aapt resource value: 0x7F0E0170
-			public const int Widget_AppCompat_ProgressBar = 2131624304;
+			// aapt resource value: 0x7f0b0153
+			public const int Widget_AppCompat_RatingBar_Indicator = 2131427667;
 			
-			// aapt resource value: 0x7F0E0171
-			public const int Widget_AppCompat_ProgressBar_Horizontal = 2131624305;
+			// aapt resource value: 0x7f0b0154
+			public const int Widget_AppCompat_RatingBar_Small = 2131427668;
 			
-			// aapt resource value: 0x7F0E0172
-			public const int Widget_AppCompat_RatingBar = 2131624306;
+			// aapt resource value: 0x7f0b0155
+			public const int Widget_AppCompat_SearchView = 2131427669;
 			
-			// aapt resource value: 0x7F0E0173
-			public const int Widget_AppCompat_RatingBar_Indicator = 2131624307;
+			// aapt resource value: 0x7f0b0156
+			public const int Widget_AppCompat_SearchView_ActionBar = 2131427670;
 			
-			// aapt resource value: 0x7F0E0174
-			public const int Widget_AppCompat_RatingBar_Small = 2131624308;
+			// aapt resource value: 0x7f0b0157
+			public const int Widget_AppCompat_SeekBar = 2131427671;
 			
-			// aapt resource value: 0x7F0E0175
-			public const int Widget_AppCompat_SearchView = 2131624309;
+			// aapt resource value: 0x7f0b0158
+			public const int Widget_AppCompat_SeekBar_Discrete = 2131427672;
 			
-			// aapt resource value: 0x7F0E0176
-			public const int Widget_AppCompat_SearchView_ActionBar = 2131624310;
+			// aapt resource value: 0x7f0b0159
+			public const int Widget_AppCompat_Spinner = 2131427673;
 			
-			// aapt resource value: 0x7F0E0177
-			public const int Widget_AppCompat_SeekBar = 2131624311;
+			// aapt resource value: 0x7f0b015a
+			public const int Widget_AppCompat_Spinner_DropDown = 2131427674;
 			
-			// aapt resource value: 0x7F0E0178
-			public const int Widget_AppCompat_SeekBar_Discrete = 2131624312;
+			// aapt resource value: 0x7f0b015b
+			public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131427675;
 			
-			// aapt resource value: 0x7F0E0179
-			public const int Widget_AppCompat_Spinner = 2131624313;
+			// aapt resource value: 0x7f0b015c
+			public const int Widget_AppCompat_Spinner_Underlined = 2131427676;
 			
-			// aapt resource value: 0x7F0E017A
-			public const int Widget_AppCompat_Spinner_DropDown = 2131624314;
+			// aapt resource value: 0x7f0b015d
+			public const int Widget_AppCompat_TextView_SpinnerItem = 2131427677;
 			
-			// aapt resource value: 0x7F0E017B
-			public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131624315;
+			// aapt resource value: 0x7f0b015e
+			public const int Widget_AppCompat_Toolbar = 2131427678;
 			
-			// aapt resource value: 0x7F0E017C
-			public const int Widget_AppCompat_Spinner_Underlined = 2131624316;
+			// aapt resource value: 0x7f0b015f
+			public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131427679;
 			
-			// aapt resource value: 0x7F0E017D
-			public const int Widget_AppCompat_TextView_SpinnerItem = 2131624317;
+			// aapt resource value: 0x7f0b0187
+			public const int Widget_Compat_NotificationActionContainer = 2131427719;
 			
-			// aapt resource value: 0x7F0E017E
-			public const int Widget_AppCompat_Toolbar = 2131624318;
+			// aapt resource value: 0x7f0b0188
+			public const int Widget_Compat_NotificationActionText = 2131427720;
 			
-			// aapt resource value: 0x7F0E017F
-			public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131624319;
+			// aapt resource value: 0x7f0b0179
+			public const int Widget_Design_AppBarLayout = 2131427705;
 			
-			// aapt resource value: 0x7F0E0180
-			public const int Widget_Compat_NotificationActionContainer = 2131624320;
+			// aapt resource value: 0x7f0b017a
+			public const int Widget_Design_BottomNavigationView = 2131427706;
 			
-			// aapt resource value: 0x7F0E0181
-			public const int Widget_Compat_NotificationActionText = 2131624321;
+			// aapt resource value: 0x7f0b017b
+			public const int Widget_Design_BottomSheet_Modal = 2131427707;
 			
-			// aapt resource value: 0x7F0E0182
-			public const int Widget_Design_AppBarLayout = 2131624322;
+			// aapt resource value: 0x7f0b017c
+			public const int Widget_Design_CollapsingToolbar = 2131427708;
 			
-			// aapt resource value: 0x7F0E0183
-			public const int Widget_Design_BottomNavigationView = 2131624323;
+			// aapt resource value: 0x7f0b017d
+			public const int Widget_Design_CoordinatorLayout = 2131427709;
 			
-			// aapt resource value: 0x7F0E0184
-			public const int Widget_Design_BottomSheet_Modal = 2131624324;
+			// aapt resource value: 0x7f0b017e
+			public const int Widget_Design_FloatingActionButton = 2131427710;
 			
-			// aapt resource value: 0x7F0E0185
-			public const int Widget_Design_CollapsingToolbar = 2131624325;
+			// aapt resource value: 0x7f0b017f
+			public const int Widget_Design_NavigationView = 2131427711;
 			
-			// aapt resource value: 0x7F0E0186
-			public const int Widget_Design_CoordinatorLayout = 2131624326;
+			// aapt resource value: 0x7f0b0180
+			public const int Widget_Design_ScrimInsetsFrameLayout = 2131427712;
 			
-			// aapt resource value: 0x7F0E0187
-			public const int Widget_Design_FloatingActionButton = 2131624327;
+			// aapt resource value: 0x7f0b0181
+			public const int Widget_Design_Snackbar = 2131427713;
 			
-			// aapt resource value: 0x7F0E0188
-			public const int Widget_Design_NavigationView = 2131624328;
+			// aapt resource value: 0x7f0b0165
+			public const int Widget_Design_TabLayout = 2131427685;
 			
-			// aapt resource value: 0x7F0E0189
-			public const int Widget_Design_ScrimInsetsFrameLayout = 2131624329;
+			// aapt resource value: 0x7f0b0182
+			public const int Widget_Design_TextInputLayout = 2131427714;
 			
-			// aapt resource value: 0x7F0E018A
-			public const int Widget_Design_Snackbar = 2131624330;
+			// aapt resource value: 0x7f0b018c
+			public const int custom_dialog2 = 2131427724;
 			
-			// aapt resource value: 0x7F0E018B
-			public const int Widget_Design_TabLayout = 2131624331;
+			// aapt resource value: 0x7f0b018d
+			public const int picker_view_scale_anim = 2131427725;
 			
-			// aapt resource value: 0x7F0E018C
-			public const int Widget_Design_TextInputLayout = 2131624332;
+			// aapt resource value: 0x7f0b018e
+			public const int picker_view_slide_anim = 2131427726;
 			
 			static Style()
 			{
@@ -5418,193 +5472,204 @@
 			}
 		}
 		
+		public partial class Xml
+		{
+			
+			// aapt resource value: 0x7f070000
+			public const int file_paths = 2131165184;
+			
+			// aapt resource value: 0x7f070001
+			public const int hdl_filepaths = 2131165185;
+			
+			static Xml()
+			{
+				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
+			}
+			
+			private Xml()
+			{
+			}
+		}
+		
 		public partial class Styleable
 		{
 			
-			// aapt resource value: { 0x7F040042,0x7F040043,0x7F040044,0x7F040072,0x7F040073,0x7F040074,0x7F040075,0x7F040076,0x7F040077,0x7F040083,0x7F040087,0x7F040088,0x7F040093,0x7F0400B4,0x7F0400B5,0x7F0400B9,0x7F0400BA,0x7F0400BB,0x7F0400C0,0x7F0400C6,0x7F0400E3,0x7F0400EC,0x7F0400FC,0x7F040100,0x7F040101,0x7F040168,0x7F04016B,0x7F040197,0x7F0401A1 }
 			public static int[] ActionBar = new int[] {
-					2130968642,
-					2130968643,
-					2130968644,
-					2130968690,
-					2130968691,
-					2130968692,
-					2130968693,
-					2130968694,
-					2130968695,
-					2130968707,
-					2130968711,
-					2130968712,
-					2130968723,
-					2130968756,
-					2130968757,
-					2130968761,
-					2130968762,
-					2130968763,
-					2130968768,
-					2130968774,
-					2130968803,
-					2130968812,
-					2130968828,
-					2130968832,
-					2130968833,
-					2130968936,
-					2130968939,
-					2130968983,
-					2130968993};
+					2130771978,
+					2130771980,
+					2130771981,
+					2130771982,
+					2130771983,
+					2130771984,
+					2130771985,
+					2130771986,
+					2130771987,
+					2130771988,
+					2130771989,
+					2130771990,
+					2130771991,
+					2130771992,
+					2130771993,
+					2130771994,
+					2130771995,
+					2130771996,
+					2130771997,
+					2130771998,
+					2130771999,
+					2130772000,
+					2130772001,
+					2130772002,
+					2130772003,
+					2130772004,
+					2130772005,
+					2130772006,
+					2130772076};
 			
-			// aapt resource value: { 0x10100B3 }
+			// aapt resource value: 10
+			public const int ActionBar_background = 10;
+			
+			// aapt resource value: 12
+			public const int ActionBar_backgroundSplit = 12;
+			
+			// aapt resource value: 11
+			public const int ActionBar_backgroundStacked = 11;
+			
+			// aapt resource value: 21
+			public const int ActionBar_contentInsetEnd = 21;
+			
+			// aapt resource value: 25
+			public const int ActionBar_contentInsetEndWithActions = 25;
+			
+			// aapt resource value: 22
+			public const int ActionBar_contentInsetLeft = 22;
+			
+			// aapt resource value: 23
+			public const int ActionBar_contentInsetRight = 23;
+			
+			// aapt resource value: 20
+			public const int ActionBar_contentInsetStart = 20;
+			
+			// aapt resource value: 24
+			public const int ActionBar_contentInsetStartWithNavigation = 24;
+			
+			// aapt resource value: 13
+			public const int ActionBar_customNavigationLayout = 13;
+			
+			// aapt resource value: 3
+			public const int ActionBar_displayOptions = 3;
+			
+			// aapt resource value: 9
+			public const int ActionBar_divider = 9;
+			
+			// aapt resource value: 26
+			public const int ActionBar_elevation = 26;
+			
+			// aapt resource value: 0
+			public const int ActionBar_height = 0;
+			
+			// aapt resource value: 19
+			public const int ActionBar_hideOnContentScroll = 19;
+			
+			// aapt resource value: 28
+			public const int ActionBar_homeAsUpIndicator = 28;
+			
+			// aapt resource value: 14
+			public const int ActionBar_homeLayout = 14;
+			
+			// aapt resource value: 7
+			public const int ActionBar_icon = 7;
+			
+			// aapt resource value: 16
+			public const int ActionBar_indeterminateProgressStyle = 16;
+			
+			// aapt resource value: 18
+			public const int ActionBar_itemPadding = 18;
+			
+			// aapt resource value: 8
+			public const int ActionBar_logo = 8;
+			
+			// aapt resource value: 2
+			public const int ActionBar_navigationMode = 2;
+			
+			// aapt resource value: 27
+			public const int ActionBar_popupTheme = 27;
+			
+			// aapt resource value: 17
+			public const int ActionBar_progressBarPadding = 17;
+			
+			// aapt resource value: 15
+			public const int ActionBar_progressBarStyle = 15;
+			
+			// aapt resource value: 4
+			public const int ActionBar_subtitle = 4;
+			
+			// aapt resource value: 6
+			public const int ActionBar_subtitleTextStyle = 6;
+			
+			// aapt resource value: 1
+			public const int ActionBar_title = 1;
+			
+			// aapt resource value: 5
+			public const int ActionBar_titleTextStyle = 5;
+			
 			public static int[] ActionBarLayout = new int[] {
 					16842931};
 			
 			// aapt resource value: 0
 			public const int ActionBarLayout_android_layout_gravity = 0;
 			
-			// aapt resource value: 0
-			public const int ActionBar_background = 0;
-			
-			// aapt resource value: 1
-			public const int ActionBar_backgroundSplit = 1;
-			
-			// aapt resource value: 2
-			public const int ActionBar_backgroundStacked = 2;
-			
-			// aapt resource value: 3
-			public const int ActionBar_contentInsetEnd = 3;
-			
-			// aapt resource value: 4
-			public const int ActionBar_contentInsetEndWithActions = 4;
-			
-			// aapt resource value: 5
-			public const int ActionBar_contentInsetLeft = 5;
-			
-			// aapt resource value: 6
-			public const int ActionBar_contentInsetRight = 6;
-			
-			// aapt resource value: 7
-			public const int ActionBar_contentInsetStart = 7;
-			
-			// aapt resource value: 8
-			public const int ActionBar_contentInsetStartWithNavigation = 8;
-			
-			// aapt resource value: 9
-			public const int ActionBar_customNavigationLayout = 9;
-			
-			// aapt resource value: 10
-			public const int ActionBar_displayOptions = 10;
-			
-			// aapt resource value: 11
-			public const int ActionBar_divider = 11;
-			
-			// aapt resource value: 12
-			public const int ActionBar_elevation = 12;
-			
-			// aapt resource value: 13
-			public const int ActionBar_height = 13;
-			
-			// aapt resource value: 14
-			public const int ActionBar_hideOnContentScroll = 14;
-			
-			// aapt resource value: 15
-			public const int ActionBar_homeAsUpIndicator = 15;
-			
-			// aapt resource value: 16
-			public const int ActionBar_homeLayout = 16;
-			
-			// aapt resource value: 17
-			public const int ActionBar_icon = 17;
-			
-			// aapt resource value: 18
-			public const int ActionBar_indeterminateProgressStyle = 18;
-			
-			// aapt resource value: 19
-			public const int ActionBar_itemPadding = 19;
-			
-			// aapt resource value: 20
-			public const int ActionBar_logo = 20;
-			
-			// aapt resource value: 21
-			public const int ActionBar_navigationMode = 21;
-			
-			// aapt resource value: 22
-			public const int ActionBar_popupTheme = 22;
-			
-			// aapt resource value: 23
-			public const int ActionBar_progressBarPadding = 23;
-			
-			// aapt resource value: 24
-			public const int ActionBar_progressBarStyle = 24;
-			
-			// aapt resource value: 25
-			public const int ActionBar_subtitle = 25;
-			
-			// aapt resource value: 26
-			public const int ActionBar_subtitleTextStyle = 26;
-			
-			// aapt resource value: 27
-			public const int ActionBar_title = 27;
-			
-			// aapt resource value: 28
-			public const int ActionBar_titleTextStyle = 28;
-			
-			// aapt resource value: { 0x101013F }
 			public static int[] ActionMenuItemView = new int[] {
 					16843071};
 			
 			// aapt resource value: 0
 			public const int ActionMenuItemView_android_minWidth = 0;
 			
-			// aapt resource value: { 0xFFFFFFFF }
-			public static int[] ActionMenuView = new int[] {
-					-1};
+			public static int[] ActionMenuView;
 			
-			// aapt resource value: { 0x7F040042,0x7F040043,0x7F040060,0x7F0400B4,0x7F04016B,0x7F0401A1 }
 			public static int[] ActionMode = new int[] {
-					2130968642,
-					2130968643,
-					2130968672,
-					2130968756,
-					2130968939,
-					2130968993};
-			
-			// aapt resource value: 0
-			public const int ActionMode_background = 0;
-			
-			// aapt resource value: 1
-			public const int ActionMode_backgroundSplit = 1;
-			
-			// aapt resource value: 2
-			public const int ActionMode_closeItemLayout = 2;
+					2130771978,
+					2130771984,
+					2130771985,
+					2130771989,
+					2130771991,
+					2130772007};
 			
 			// aapt resource value: 3
-			public const int ActionMode_height = 3;
+			public const int ActionMode_background = 3;
 			
 			// aapt resource value: 4
-			public const int ActionMode_subtitleTextStyle = 4;
+			public const int ActionMode_backgroundSplit = 4;
 			
 			// aapt resource value: 5
-			public const int ActionMode_titleTextStyle = 5;
-			
-			// aapt resource value: { 0x7F040096,0x7F0400C1 }
-			public static int[] ActivityChooserView = new int[] {
-					2130968726,
-					2130968769};
+			public const int ActionMode_closeItemLayout = 5;
 			
 			// aapt resource value: 0
-			public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 0;
+			public const int ActionMode_height = 0;
+			
+			// aapt resource value: 2
+			public const int ActionMode_subtitleTextStyle = 2;
 			
 			// aapt resource value: 1
-			public const int ActivityChooserView_initialActivityCount = 1;
+			public const int ActionMode_titleTextStyle = 1;
 			
-			// aapt resource value: { 0x10100F2,0x7F040058,0x7F0400DA,0x7F0400DB,0x7F0400E9,0x7F040117,0x7F040118 }
+			public static int[] ActivityChooserView = new int[] {
+					2130772008,
+					2130772009};
+			
+			// aapt resource value: 1
+			public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 1;
+			
+			// aapt resource value: 0
+			public const int ActivityChooserView_initialActivityCount = 0;
+			
 			public static int[] AlertDialog = new int[] {
 					16842994,
-					2130968664,
-					2130968794,
-					2130968795,
-					2130968809,
-					2130968855,
-					2130968856};
+					2130772010,
+					2130772011,
+					2130772012,
+					2130772013,
+					2130772014,
+					2130772015};
 			
 			// aapt resource value: 0
 			public const int AlertDialog_android_layout = 0;
@@ -5612,39 +5677,27 @@
 			// aapt resource value: 1
 			public const int AlertDialog_buttonPanelSideLayout = 1;
 			
+			// aapt resource value: 5
+			public const int AlertDialog_listItemLayout = 5;
+			
 			// aapt resource value: 2
-			public const int AlertDialog_listItemLayout = 2;
+			public const int AlertDialog_listLayout = 2;
 			
 			// aapt resource value: 3
-			public const int AlertDialog_listLayout = 3;
-			
-			// aapt resource value: 4
-			public const int AlertDialog_multiChoiceItemLayout = 4;
-			
-			// aapt resource value: 5
-			public const int AlertDialog_showTitle = 5;
+			public const int AlertDialog_multiChoiceItemLayout = 3;
 			
 			// aapt resource value: 6
-			public const int AlertDialog_singleChoiceItemLayout = 6;
+			public const int AlertDialog_showTitle = 6;
 			
-			// aapt resource value: { 0x10100D4,0x101048F,0x1010540,0x7F040093,0x7F040097 }
+			// aapt resource value: 4
+			public const int AlertDialog_singleChoiceItemLayout = 4;
+			
 			public static int[] AppBarLayout = new int[] {
 					16842964,
 					16843919,
 					16844096,
-					2130968723,
-					2130968727};
-			
-			// aapt resource value: { 0x7F040162,0x7F040163 }
-			public static int[] AppBarLayoutStates = new int[] {
-					2130968930,
-					2130968931};
-			
-			// aapt resource value: 0
-			public const int AppBarLayoutStates_state_collapsed = 0;
-			
-			// aapt resource value: 1
-			public const int AppBarLayoutStates_state_collapsible = 1;
+					2130772005,
+					2130772223};
 			
 			// aapt resource value: 0
 			public const int AppBarLayout_android_background = 0;
@@ -5661,10 +5714,19 @@
 			// aapt resource value: 4
 			public const int AppBarLayout_expanded = 4;
 			
-			// aapt resource value: { 0x7F0400D4,0x7F0400D5 }
+			public static int[] AppBarLayoutStates = new int[] {
+					2130772224,
+					2130772225};
+			
+			// aapt resource value: 0
+			public const int AppBarLayoutStates_state_collapsed = 0;
+			
+			// aapt resource value: 1
+			public const int AppBarLayoutStates_state_collapsible = 1;
+			
 			public static int[] AppBarLayout_Layout = new int[] {
-					2130968788,
-					2130968789};
+					2130772226,
+					2130772227};
 			
 			// aapt resource value: 0
 			public const int AppBarLayout_Layout_layout_scrollFlags = 0;
@@ -5672,12 +5734,11 @@
 			// aapt resource value: 1
 			public const int AppBarLayout_Layout_layout_scrollInterpolator = 1;
 			
-			// aapt resource value: { 0x1010119,0x7F04011E,0x7F040195,0x7F040196 }
 			public static int[] AppCompatImageView = new int[] {
 					16843033,
-					2130968862,
-					2130968981,
-					2130968982};
+					2130772016,
+					2130772017,
+					2130772018};
 			
 			// aapt resource value: 0
 			public const int AppCompatImageView_android_src = 0;
@@ -5691,12 +5752,11 @@
 			// aapt resource value: 3
 			public const int AppCompatImageView_tintMode = 3;
 			
-			// aapt resource value: { 0x1010142,0x7F040192,0x7F040193,0x7F040194 }
 			public static int[] AppCompatSeekBar = new int[] {
 					16843074,
-					2130968978,
-					2130968979,
-					2130968980};
+					2130772019,
+					2130772020,
+					2130772021};
 			
 			// aapt resource value: 0
 			public const int AppCompatSeekBar_android_thumb = 0;
@@ -5710,7 +5770,6 @@
 			// aapt resource value: 3
 			public const int AppCompatSeekBar_tickMarkTintMode = 3;
 			
-			// aapt resource value: { 0x1010034,0x101016D,0x101016E,0x101016F,0x1010170,0x1010392,0x1010393 }
 			public static int[] AppCompatTextHelper = new int[] {
 					16842804,
 					16843117,
@@ -5741,267 +5800,265 @@
 			// aapt resource value: 0
 			public const int AppCompatTextHelper_android_textAppearance = 0;
 			
-			// aapt resource value: { 0x1010034,0x7F04003D,0x7F04003E,0x7F04003F,0x7F040040,0x7F040041,0x7F0400A6,0x7F040181 }
 			public static int[] AppCompatTextView = new int[] {
 					16842804,
-					2130968637,
-					2130968638,
-					2130968639,
-					2130968640,
-					2130968641,
-					2130968742,
-					2130968961};
+					2130772022,
+					2130772023,
+					2130772024,
+					2130772025,
+					2130772026,
+					2130772027,
+					2130772028};
 			
 			// aapt resource value: 0
 			public const int AppCompatTextView_android_textAppearance = 0;
 			
-			// aapt resource value: 1
-			public const int AppCompatTextView_autoSizeMaxTextSize = 1;
-			
-			// aapt resource value: 2
-			public const int AppCompatTextView_autoSizeMinTextSize = 2;
-			
-			// aapt resource value: 3
-			public const int AppCompatTextView_autoSizePresetSizes = 3;
-			
-			// aapt resource value: 4
-			public const int AppCompatTextView_autoSizeStepGranularity = 4;
+			// aapt resource value: 6
+			public const int AppCompatTextView_autoSizeMaxTextSize = 6;
 			
 			// aapt resource value: 5
-			public const int AppCompatTextView_autoSizeTextType = 5;
+			public const int AppCompatTextView_autoSizeMinTextSize = 5;
 			
-			// aapt resource value: 6
-			public const int AppCompatTextView_fontFamily = 6;
+			// aapt resource value: 4
+			public const int AppCompatTextView_autoSizePresetSizes = 4;
+			
+			// aapt resource value: 3
+			public const int AppCompatTextView_autoSizeStepGranularity = 3;
+			
+			// aapt resource value: 2
+			public const int AppCompatTextView_autoSizeTextType = 2;
 			
 			// aapt resource value: 7
-			public const int AppCompatTextView_textAllCaps = 7;
+			public const int AppCompatTextView_fontFamily = 7;
 			
-			// aapt resource value: { 0x1010057,0x10100AE,0x7F040000,0x7F040001,0x7F040002,0x7F040003,0x7F040004,0x7F040005,0x7F040006,0x7F040007,0x7F040008,0x7F040009,0x7F04000A,0x7F04000B,0x7F04000C,0x7F04000E,0x7F04000F,0x7F040010,0x7F040011,0x7F040012,0x7F040013,0x7F040014,0x7F040015,0x7F040016,0x7F040017,0x7F040018,0x7F040019,0x7F04001A,0x7F04001B,0x7F04001C,0x7F04001D,0x7F04001E,0x7F040021,0x7F040022,0x7F040023,0x7F040024,0x7F040025,0x7F04003C,0x7F04004F,0x7F040052,0x7F040053,0x7F040054,0x7F040055,0x7F040056,0x7F040059,0x7F04005A,0x7F04005D,0x7F04005E,0x7F040066,0x7F040067,0x7F040068,0x7F040069,0x7F04006A,0x7F04006B,0x7F04006C,0x7F04006D,0x7F04006E,0x7F04006F,0x7F040079,0x7F040085,0x7F040086,0x7F040089,0x7F04008B,0x7F04008E,0x7F04008F,0x7F040090,0x7F040091,0x7F040092,0x7F0400B9,0x7F0400BF,0x7F0400D8,0x7F0400D9,0x7F0400DC,0x7F0400DD,0x7F0400DE,0x7F0400DF,0x7F0400E0,0x7F0400E1,0x7F0400E2,0x7F0400F3,0x7F0400F4,0x7F0400F5,0x7F0400FB,0x7F0400FD,0x7F040104,0x7F040105,0x7F040106,0x7F040107,0x7F04010E,0x7F040111,0x7F040112,0x7F040113,0x7F04011B,0x7F04011C,0x7F04016F,0x7F040182,0x7F040183,0x7F040184,0x7F040185,0x7F040186,0x7F040187,0x7F040188,0x7F040189,0x7F04018A,0x7F04018C,0x7F0401A3,0x7F0401A4,0x7F0401A5,0x7F0401A6,0x7F0401B8,0x7F0401B9,0x7F0401BA,0x7F0401BB,0x7F0401BC,0x7F0401BD,0x7F0401BE,0x7F0401BF,0x7F0401C0,0x7F0401C1 }
+			// aapt resource value: 1
+			public const int AppCompatTextView_textAllCaps = 1;
+			
 			public static int[] AppCompatTheme = new int[] {
 					16842839,
 					16842926,
-					2130968576,
-					2130968577,
-					2130968578,
-					2130968579,
-					2130968580,
-					2130968581,
-					2130968582,
-					2130968583,
-					2130968584,
-					2130968585,
-					2130968586,
-					2130968587,
-					2130968588,
-					2130968590,
-					2130968591,
-					2130968592,
-					2130968593,
-					2130968594,
-					2130968595,
-					2130968596,
-					2130968597,
-					2130968598,
-					2130968599,
-					2130968600,
-					2130968601,
-					2130968602,
-					2130968603,
-					2130968604,
-					2130968605,
-					2130968606,
-					2130968609,
-					2130968610,
-					2130968611,
-					2130968612,
-					2130968613,
-					2130968636,
-					2130968655,
-					2130968658,
-					2130968659,
-					2130968660,
-					2130968661,
-					2130968662,
-					2130968665,
-					2130968666,
-					2130968669,
-					2130968670,
-					2130968678,
-					2130968679,
-					2130968680,
-					2130968681,
-					2130968682,
-					2130968683,
-					2130968684,
-					2130968685,
-					2130968686,
-					2130968687,
-					2130968697,
-					2130968709,
-					2130968710,
-					2130968713,
-					2130968715,
-					2130968718,
-					2130968719,
-					2130968720,
-					2130968721,
-					2130968722,
-					2130968761,
-					2130968767,
-					2130968792,
-					2130968793,
-					2130968796,
-					2130968797,
-					2130968798,
-					2130968799,
-					2130968800,
-					2130968801,
-					2130968802,
-					2130968819,
-					2130968820,
-					2130968821,
-					2130968827,
-					2130968829,
-					2130968836,
-					2130968837,
-					2130968838,
-					2130968839,
-					2130968846,
-					2130968849,
-					2130968850,
-					2130968851,
-					2130968859,
-					2130968860,
-					2130968943,
-					2130968962,
-					2130968963,
-					2130968964,
-					2130968965,
-					2130968966,
-					2130968967,
-					2130968968,
-					2130968969,
-					2130968970,
-					2130968972,
-					2130968995,
-					2130968996,
-					2130968997,
-					2130968998,
-					2130969016,
-					2130969017,
-					2130969018,
-					2130969019,
-					2130969020,
-					2130969021,
-					2130969022,
-					2130969023,
-					2130969024,
-					2130969025};
-			
-			// aapt resource value: 2
-			public const int AppCompatTheme_actionBarDivider = 2;
-			
-			// aapt resource value: 3
-			public const int AppCompatTheme_actionBarItemBackground = 3;
-			
-			// aapt resource value: 4
-			public const int AppCompatTheme_actionBarPopupTheme = 4;
-			
-			// aapt resource value: 5
-			public const int AppCompatTheme_actionBarSize = 5;
-			
-			// aapt resource value: 6
-			public const int AppCompatTheme_actionBarSplitStyle = 6;
-			
-			// aapt resource value: 7
-			public const int AppCompatTheme_actionBarStyle = 7;
-			
-			// aapt resource value: 8
-			public const int AppCompatTheme_actionBarTabBarStyle = 8;
-			
-			// aapt resource value: 9
-			public const int AppCompatTheme_actionBarTabStyle = 9;
-			
-			// aapt resource value: 10
-			public const int AppCompatTheme_actionBarTabTextStyle = 10;
-			
-			// aapt resource value: 11
-			public const int AppCompatTheme_actionBarTheme = 11;
-			
-			// aapt resource value: 12
-			public const int AppCompatTheme_actionBarWidgetTheme = 12;
-			
-			// aapt resource value: 13
-			public const int AppCompatTheme_actionButtonStyle = 13;
-			
-			// aapt resource value: 14
-			public const int AppCompatTheme_actionDropDownStyle = 14;
-			
-			// aapt resource value: 15
-			public const int AppCompatTheme_actionMenuTextAppearance = 15;
-			
-			// aapt resource value: 16
-			public const int AppCompatTheme_actionMenuTextColor = 16;
-			
-			// aapt resource value: 17
-			public const int AppCompatTheme_actionModeBackground = 17;
-			
-			// aapt resource value: 18
-			public const int AppCompatTheme_actionModeCloseButtonStyle = 18;
-			
-			// aapt resource value: 19
-			public const int AppCompatTheme_actionModeCloseDrawable = 19;
-			
-			// aapt resource value: 20
-			public const int AppCompatTheme_actionModeCopyDrawable = 20;
-			
-			// aapt resource value: 21
-			public const int AppCompatTheme_actionModeCutDrawable = 21;
-			
-			// aapt resource value: 22
-			public const int AppCompatTheme_actionModeFindDrawable = 22;
+					2130772029,
+					2130772030,
+					2130772031,
+					2130772032,
+					2130772033,
+					2130772034,
+					2130772035,
+					2130772036,
+					2130772037,
+					2130772038,
+					2130772039,
+					2130772040,
+					2130772041,
+					2130772042,
+					2130772043,
+					2130772044,
+					2130772045,
+					2130772046,
+					2130772047,
+					2130772048,
+					2130772049,
+					2130772050,
+					2130772051,
+					2130772052,
+					2130772053,
+					2130772054,
+					2130772055,
+					2130772056,
+					2130772057,
+					2130772058,
+					2130772059,
+					2130772060,
+					2130772061,
+					2130772062,
+					2130772063,
+					2130772064,
+					2130772065,
+					2130772066,
+					2130772067,
+					2130772068,
+					2130772069,
+					2130772070,
+					2130772071,
+					2130772072,
+					2130772073,
+					2130772074,
+					2130772075,
+					2130772076,
+					2130772077,
+					2130772078,
+					2130772079,
+					2130772080,
+					2130772081,
+					2130772082,
+					2130772083,
+					2130772084,
+					2130772085,
+					2130772086,
+					2130772087,
+					2130772088,
+					2130772089,
+					2130772090,
+					2130772091,
+					2130772092,
+					2130772093,
+					2130772094,
+					2130772095,
+					2130772096,
+					2130772097,
+					2130772098,
+					2130772099,
+					2130772100,
+					2130772101,
+					2130772102,
+					2130772103,
+					2130772104,
+					2130772105,
+					2130772106,
+					2130772107,
+					2130772108,
+					2130772109,
+					2130772110,
+					2130772111,
+					2130772112,
+					2130772113,
+					2130772114,
+					2130772115,
+					2130772116,
+					2130772117,
+					2130772118,
+					2130772119,
+					2130772120,
+					2130772121,
+					2130772122,
+					2130772123,
+					2130772124,
+					2130772125,
+					2130772126,
+					2130772127,
+					2130772128,
+					2130772129,
+					2130772130,
+					2130772131,
+					2130772132,
+					2130772133,
+					2130772134,
+					2130772135,
+					2130772136,
+					2130772137,
+					2130772138,
+					2130772139,
+					2130772140,
+					2130772141,
+					2130772142,
+					2130772143,
+					2130772144,
+					2130772145};
 			
 			// aapt resource value: 23
-			public const int AppCompatTheme_actionModePasteDrawable = 23;
+			public const int AppCompatTheme_actionBarDivider = 23;
 			
 			// aapt resource value: 24
-			public const int AppCompatTheme_actionModePopupWindowStyle = 24;
+			public const int AppCompatTheme_actionBarItemBackground = 24;
+			
+			// aapt resource value: 17
+			public const int AppCompatTheme_actionBarPopupTheme = 17;
+			
+			// aapt resource value: 22
+			public const int AppCompatTheme_actionBarSize = 22;
+			
+			// aapt resource value: 19
+			public const int AppCompatTheme_actionBarSplitStyle = 19;
+			
+			// aapt resource value: 18
+			public const int AppCompatTheme_actionBarStyle = 18;
+			
+			// aapt resource value: 13
+			public const int AppCompatTheme_actionBarTabBarStyle = 13;
+			
+			// aapt resource value: 12
+			public const int AppCompatTheme_actionBarTabStyle = 12;
+			
+			// aapt resource value: 14
+			public const int AppCompatTheme_actionBarTabTextStyle = 14;
+			
+			// aapt resource value: 20
+			public const int AppCompatTheme_actionBarTheme = 20;
+			
+			// aapt resource value: 21
+			public const int AppCompatTheme_actionBarWidgetTheme = 21;
+			
+			// aapt resource value: 50
+			public const int AppCompatTheme_actionButtonStyle = 50;
+			
+			// aapt resource value: 46
+			public const int AppCompatTheme_actionDropDownStyle = 46;
 			
 			// aapt resource value: 25
-			public const int AppCompatTheme_actionModeSelectAllDrawable = 25;
+			public const int AppCompatTheme_actionMenuTextAppearance = 25;
 			
 			// aapt resource value: 26
-			public const int AppCompatTheme_actionModeShareDrawable = 26;
-			
-			// aapt resource value: 27
-			public const int AppCompatTheme_actionModeSplitBackground = 27;
-			
-			// aapt resource value: 28
-			public const int AppCompatTheme_actionModeStyle = 28;
+			public const int AppCompatTheme_actionMenuTextColor = 26;
 			
 			// aapt resource value: 29
-			public const int AppCompatTheme_actionModeWebSearchDrawable = 29;
+			public const int AppCompatTheme_actionModeBackground = 29;
 			
-			// aapt resource value: 30
-			public const int AppCompatTheme_actionOverflowButtonStyle = 30;
+			// aapt resource value: 28
+			public const int AppCompatTheme_actionModeCloseButtonStyle = 28;
 			
 			// aapt resource value: 31
-			public const int AppCompatTheme_actionOverflowMenuStyle = 31;
-			
-			// aapt resource value: 32
-			public const int AppCompatTheme_activityChooserViewStyle = 32;
+			public const int AppCompatTheme_actionModeCloseDrawable = 31;
 			
 			// aapt resource value: 33
-			public const int AppCompatTheme_alertDialogButtonGroupStyle = 33;
+			public const int AppCompatTheme_actionModeCopyDrawable = 33;
+			
+			// aapt resource value: 32
+			public const int AppCompatTheme_actionModeCutDrawable = 32;
+			
+			// aapt resource value: 37
+			public const int AppCompatTheme_actionModeFindDrawable = 37;
 			
 			// aapt resource value: 34
-			public const int AppCompatTheme_alertDialogCenterButtons = 34;
+			public const int AppCompatTheme_actionModePasteDrawable = 34;
+			
+			// aapt resource value: 39
+			public const int AppCompatTheme_actionModePopupWindowStyle = 39;
 			
 			// aapt resource value: 35
-			public const int AppCompatTheme_alertDialogStyle = 35;
+			public const int AppCompatTheme_actionModeSelectAllDrawable = 35;
 			
 			// aapt resource value: 36
-			public const int AppCompatTheme_alertDialogTheme = 36;
+			public const int AppCompatTheme_actionModeShareDrawable = 36;
+			
+			// aapt resource value: 30
+			public const int AppCompatTheme_actionModeSplitBackground = 30;
+			
+			// aapt resource value: 27
+			public const int AppCompatTheme_actionModeStyle = 27;
+			
+			// aapt resource value: 38
+			public const int AppCompatTheme_actionModeWebSearchDrawable = 38;
+			
+			// aapt resource value: 15
+			public const int AppCompatTheme_actionOverflowButtonStyle = 15;
+			
+			// aapt resource value: 16
+			public const int AppCompatTheme_actionOverflowMenuStyle = 16;
+			
+			// aapt resource value: 58
+			public const int AppCompatTheme_activityChooserViewStyle = 58;
+			
+			// aapt resource value: 95
+			public const int AppCompatTheme_alertDialogButtonGroupStyle = 95;
+			
+			// aapt resource value: 96
+			public const int AppCompatTheme_alertDialogCenterButtons = 96;
+			
+			// aapt resource value: 94
+			public const int AppCompatTheme_alertDialogStyle = 94;
+			
+			// aapt resource value: 97
+			public const int AppCompatTheme_alertDialogTheme = 97;
 			
 			// aapt resource value: 1
 			public const int AppCompatTheme_android_windowAnimationStyle = 1;
@@ -6009,272 +6066,270 @@
 			// aapt resource value: 0
 			public const int AppCompatTheme_android_windowIsFloating = 0;
 			
-			// aapt resource value: 37
-			public const int AppCompatTheme_autoCompleteTextViewStyle = 37;
-			
-			// aapt resource value: 38
-			public const int AppCompatTheme_borderlessButtonStyle = 38;
-			
-			// aapt resource value: 39
-			public const int AppCompatTheme_buttonBarButtonStyle = 39;
-			
-			// aapt resource value: 40
-			public const int AppCompatTheme_buttonBarNegativeButtonStyle = 40;
-			
-			// aapt resource value: 41
-			public const int AppCompatTheme_buttonBarNeutralButtonStyle = 41;
-			
-			// aapt resource value: 42
-			public const int AppCompatTheme_buttonBarPositiveButtonStyle = 42;
-			
-			// aapt resource value: 43
-			public const int AppCompatTheme_buttonBarStyle = 43;
-			
-			// aapt resource value: 44
-			public const int AppCompatTheme_buttonStyle = 44;
-			
-			// aapt resource value: 45
-			public const int AppCompatTheme_buttonStyleSmall = 45;
-			
-			// aapt resource value: 46
-			public const int AppCompatTheme_checkboxStyle = 46;
-			
-			// aapt resource value: 47
-			public const int AppCompatTheme_checkedTextViewStyle = 47;
-			
-			// aapt resource value: 48
-			public const int AppCompatTheme_colorAccent = 48;
-			
-			// aapt resource value: 49
-			public const int AppCompatTheme_colorBackgroundFloating = 49;
-			
-			// aapt resource value: 50
-			public const int AppCompatTheme_colorButtonNormal = 50;
-			
-			// aapt resource value: 51
-			public const int AppCompatTheme_colorControlActivated = 51;
-			
-			// aapt resource value: 52
-			public const int AppCompatTheme_colorControlHighlight = 52;
-			
-			// aapt resource value: 53
-			public const int AppCompatTheme_colorControlNormal = 53;
-			
-			// aapt resource value: 54
-			public const int AppCompatTheme_colorError = 54;
+			// aapt resource value: 102
+			public const int AppCompatTheme_autoCompleteTextViewStyle = 102;
 			
 			// aapt resource value: 55
-			public const int AppCompatTheme_colorPrimary = 55;
+			public const int AppCompatTheme_borderlessButtonStyle = 55;
 			
-			// aapt resource value: 56
-			public const int AppCompatTheme_colorPrimaryDark = 56;
+			// aapt resource value: 52
+			public const int AppCompatTheme_buttonBarButtonStyle = 52;
+			
+			// aapt resource value: 100
+			public const int AppCompatTheme_buttonBarNegativeButtonStyle = 100;
+			
+			// aapt resource value: 101
+			public const int AppCompatTheme_buttonBarNeutralButtonStyle = 101;
+			
+			// aapt resource value: 99
+			public const int AppCompatTheme_buttonBarPositiveButtonStyle = 99;
+			
+			// aapt resource value: 51
+			public const int AppCompatTheme_buttonBarStyle = 51;
+			
+			// aapt resource value: 103
+			public const int AppCompatTheme_buttonStyle = 103;
+			
+			// aapt resource value: 104
+			public const int AppCompatTheme_buttonStyleSmall = 104;
+			
+			// aapt resource value: 105
+			public const int AppCompatTheme_checkboxStyle = 105;
+			
+			// aapt resource value: 106
+			public const int AppCompatTheme_checkedTextViewStyle = 106;
+			
+			// aapt resource value: 86
+			public const int AppCompatTheme_colorAccent = 86;
+			
+			// aapt resource value: 93
+			public const int AppCompatTheme_colorBackgroundFloating = 93;
+			
+			// aapt resource value: 90
+			public const int AppCompatTheme_colorButtonNormal = 90;
+			
+			// aapt resource value: 88
+			public const int AppCompatTheme_colorControlActivated = 88;
+			
+			// aapt resource value: 89
+			public const int AppCompatTheme_colorControlHighlight = 89;
+			
+			// aapt resource value: 87
+			public const int AppCompatTheme_colorControlNormal = 87;
+			
+			// aapt resource value: 118
+			public const int AppCompatTheme_colorError = 118;
+			
+			// aapt resource value: 84
+			public const int AppCompatTheme_colorPrimary = 84;
+			
+			// aapt resource value: 85
+			public const int AppCompatTheme_colorPrimaryDark = 85;
+			
+			// aapt resource value: 91
+			public const int AppCompatTheme_colorSwitchThumbNormal = 91;
+			
+			// aapt resource value: 92
+			public const int AppCompatTheme_controlBackground = 92;
+			
+			// aapt resource value: 44
+			public const int AppCompatTheme_dialogPreferredPadding = 44;
+			
+			// aapt resource value: 43
+			public const int AppCompatTheme_dialogTheme = 43;
 			
 			// aapt resource value: 57
-			public const int AppCompatTheme_colorSwitchThumbNormal = 57;
+			public const int AppCompatTheme_dividerHorizontal = 57;
 			
-			// aapt resource value: 58
-			public const int AppCompatTheme_controlBackground = 58;
-			
-			// aapt resource value: 59
-			public const int AppCompatTheme_dialogPreferredPadding = 59;
-			
-			// aapt resource value: 60
-			public const int AppCompatTheme_dialogTheme = 60;
-			
-			// aapt resource value: 61
-			public const int AppCompatTheme_dividerHorizontal = 61;
-			
-			// aapt resource value: 62
-			public const int AppCompatTheme_dividerVertical = 62;
-			
-			// aapt resource value: 64
-			public const int AppCompatTheme_dropdownListPreferredItemHeight = 64;
-			
-			// aapt resource value: 63
-			public const int AppCompatTheme_dropDownListViewStyle = 63;
-			
-			// aapt resource value: 65
-			public const int AppCompatTheme_editTextBackground = 65;
-			
-			// aapt resource value: 66
-			public const int AppCompatTheme_editTextColor = 66;
-			
-			// aapt resource value: 67
-			public const int AppCompatTheme_editTextStyle = 67;
-			
-			// aapt resource value: 68
-			public const int AppCompatTheme_homeAsUpIndicator = 68;
-			
-			// aapt resource value: 69
-			public const int AppCompatTheme_imageButtonStyle = 69;
-			
-			// aapt resource value: 70
-			public const int AppCompatTheme_listChoiceBackgroundIndicator = 70;
-			
-			// aapt resource value: 71
-			public const int AppCompatTheme_listDividerAlertDialog = 71;
-			
-			// aapt resource value: 72
-			public const int AppCompatTheme_listMenuViewStyle = 72;
-			
-			// aapt resource value: 73
-			public const int AppCompatTheme_listPopupWindowStyle = 73;
-			
-			// aapt resource value: 74
-			public const int AppCompatTheme_listPreferredItemHeight = 74;
+			// aapt resource value: 56
+			public const int AppCompatTheme_dividerVertical = 56;
 			
 			// aapt resource value: 75
-			public const int AppCompatTheme_listPreferredItemHeightLarge = 75;
+			public const int AppCompatTheme_dropDownListViewStyle = 75;
+			
+			// aapt resource value: 47
+			public const int AppCompatTheme_dropdownListPreferredItemHeight = 47;
+			
+			// aapt resource value: 64
+			public const int AppCompatTheme_editTextBackground = 64;
+			
+			// aapt resource value: 63
+			public const int AppCompatTheme_editTextColor = 63;
+			
+			// aapt resource value: 107
+			public const int AppCompatTheme_editTextStyle = 107;
+			
+			// aapt resource value: 49
+			public const int AppCompatTheme_homeAsUpIndicator = 49;
+			
+			// aapt resource value: 65
+			public const int AppCompatTheme_imageButtonStyle = 65;
+			
+			// aapt resource value: 83
+			public const int AppCompatTheme_listChoiceBackgroundIndicator = 83;
+			
+			// aapt resource value: 45
+			public const int AppCompatTheme_listDividerAlertDialog = 45;
+			
+			// aapt resource value: 115
+			public const int AppCompatTheme_listMenuViewStyle = 115;
 			
 			// aapt resource value: 76
-			public const int AppCompatTheme_listPreferredItemHeightSmall = 76;
+			public const int AppCompatTheme_listPopupWindowStyle = 76;
 			
-			// aapt resource value: 77
-			public const int AppCompatTheme_listPreferredItemPaddingLeft = 77;
+			// aapt resource value: 70
+			public const int AppCompatTheme_listPreferredItemHeight = 70;
 			
-			// aapt resource value: 78
-			public const int AppCompatTheme_listPreferredItemPaddingRight = 78;
+			// aapt resource value: 72
+			public const int AppCompatTheme_listPreferredItemHeightLarge = 72;
 			
-			// aapt resource value: 79
-			public const int AppCompatTheme_panelBackground = 79;
+			// aapt resource value: 71
+			public const int AppCompatTheme_listPreferredItemHeightSmall = 71;
+			
+			// aapt resource value: 73
+			public const int AppCompatTheme_listPreferredItemPaddingLeft = 73;
+			
+			// aapt resource value: 74
+			public const int AppCompatTheme_listPreferredItemPaddingRight = 74;
 			
 			// aapt resource value: 80
-			public const int AppCompatTheme_panelMenuListTheme = 80;
+			public const int AppCompatTheme_panelBackground = 80;
+			
+			// aapt resource value: 82
+			public const int AppCompatTheme_panelMenuListTheme = 82;
 			
 			// aapt resource value: 81
 			public const int AppCompatTheme_panelMenuListWidth = 81;
 			
-			// aapt resource value: 82
-			public const int AppCompatTheme_popupMenuStyle = 82;
+			// aapt resource value: 61
+			public const int AppCompatTheme_popupMenuStyle = 61;
 			
-			// aapt resource value: 83
-			public const int AppCompatTheme_popupWindowStyle = 83;
-			
-			// aapt resource value: 84
-			public const int AppCompatTheme_radioButtonStyle = 84;
-			
-			// aapt resource value: 85
-			public const int AppCompatTheme_ratingBarStyle = 85;
-			
-			// aapt resource value: 86
-			public const int AppCompatTheme_ratingBarStyleIndicator = 86;
-			
-			// aapt resource value: 87
-			public const int AppCompatTheme_ratingBarStyleSmall = 87;
-			
-			// aapt resource value: 88
-			public const int AppCompatTheme_searchViewStyle = 88;
-			
-			// aapt resource value: 89
-			public const int AppCompatTheme_seekBarStyle = 89;
-			
-			// aapt resource value: 90
-			public const int AppCompatTheme_selectableItemBackground = 90;
-			
-			// aapt resource value: 91
-			public const int AppCompatTheme_selectableItemBackgroundBorderless = 91;
-			
-			// aapt resource value: 92
-			public const int AppCompatTheme_spinnerDropDownItemStyle = 92;
-			
-			// aapt resource value: 93
-			public const int AppCompatTheme_spinnerStyle = 93;
-			
-			// aapt resource value: 94
-			public const int AppCompatTheme_switchStyle = 94;
-			
-			// aapt resource value: 95
-			public const int AppCompatTheme_textAppearanceLargePopupMenu = 95;
-			
-			// aapt resource value: 96
-			public const int AppCompatTheme_textAppearanceListItem = 96;
-			
-			// aapt resource value: 97
-			public const int AppCompatTheme_textAppearanceListItemSecondary = 97;
-			
-			// aapt resource value: 98
-			public const int AppCompatTheme_textAppearanceListItemSmall = 98;
-			
-			// aapt resource value: 99
-			public const int AppCompatTheme_textAppearancePopupMenuHeader = 99;
-			
-			// aapt resource value: 100
-			public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 100;
-			
-			// aapt resource value: 101
-			public const int AppCompatTheme_textAppearanceSearchResultTitle = 101;
-			
-			// aapt resource value: 102
-			public const int AppCompatTheme_textAppearanceSmallPopupMenu = 102;
-			
-			// aapt resource value: 103
-			public const int AppCompatTheme_textColorAlertDialogListItem = 103;
-			
-			// aapt resource value: 104
-			public const int AppCompatTheme_textColorSearchUrl = 104;
-			
-			// aapt resource value: 105
-			public const int AppCompatTheme_toolbarNavigationButtonStyle = 105;
-			
-			// aapt resource value: 106
-			public const int AppCompatTheme_toolbarStyle = 106;
-			
-			// aapt resource value: 107
-			public const int AppCompatTheme_tooltipForegroundColor = 107;
+			// aapt resource value: 62
+			public const int AppCompatTheme_popupWindowStyle = 62;
 			
 			// aapt resource value: 108
-			public const int AppCompatTheme_tooltipFrameBackground = 108;
+			public const int AppCompatTheme_radioButtonStyle = 108;
 			
 			// aapt resource value: 109
-			public const int AppCompatTheme_windowActionBar = 109;
+			public const int AppCompatTheme_ratingBarStyle = 109;
 			
 			// aapt resource value: 110
-			public const int AppCompatTheme_windowActionBarOverlay = 110;
+			public const int AppCompatTheme_ratingBarStyleIndicator = 110;
 			
 			// aapt resource value: 111
-			public const int AppCompatTheme_windowActionModeOverlay = 111;
+			public const int AppCompatTheme_ratingBarStyleSmall = 111;
+			
+			// aapt resource value: 69
+			public const int AppCompatTheme_searchViewStyle = 69;
 			
 			// aapt resource value: 112
-			public const int AppCompatTheme_windowFixedHeightMajor = 112;
+			public const int AppCompatTheme_seekBarStyle = 112;
+			
+			// aapt resource value: 53
+			public const int AppCompatTheme_selectableItemBackground = 53;
+			
+			// aapt resource value: 54
+			public const int AppCompatTheme_selectableItemBackgroundBorderless = 54;
+			
+			// aapt resource value: 48
+			public const int AppCompatTheme_spinnerDropDownItemStyle = 48;
 			
 			// aapt resource value: 113
-			public const int AppCompatTheme_windowFixedHeightMinor = 113;
+			public const int AppCompatTheme_spinnerStyle = 113;
 			
 			// aapt resource value: 114
-			public const int AppCompatTheme_windowFixedWidthMajor = 114;
+			public const int AppCompatTheme_switchStyle = 114;
 			
-			// aapt resource value: 115
-			public const int AppCompatTheme_windowFixedWidthMinor = 115;
+			// aapt resource value: 40
+			public const int AppCompatTheme_textAppearanceLargePopupMenu = 40;
 			
-			// aapt resource value: 116
-			public const int AppCompatTheme_windowMinWidthMajor = 116;
+			// aapt resource value: 77
+			public const int AppCompatTheme_textAppearanceListItem = 77;
+			
+			// aapt resource value: 78
+			public const int AppCompatTheme_textAppearanceListItemSecondary = 78;
+			
+			// aapt resource value: 79
+			public const int AppCompatTheme_textAppearanceListItemSmall = 79;
+			
+			// aapt resource value: 42
+			public const int AppCompatTheme_textAppearancePopupMenuHeader = 42;
+			
+			// aapt resource value: 67
+			public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 67;
+			
+			// aapt resource value: 66
+			public const int AppCompatTheme_textAppearanceSearchResultTitle = 66;
+			
+			// aapt resource value: 41
+			public const int AppCompatTheme_textAppearanceSmallPopupMenu = 41;
+			
+			// aapt resource value: 98
+			public const int AppCompatTheme_textColorAlertDialogListItem = 98;
+			
+			// aapt resource value: 68
+			public const int AppCompatTheme_textColorSearchUrl = 68;
+			
+			// aapt resource value: 60
+			public const int AppCompatTheme_toolbarNavigationButtonStyle = 60;
+			
+			// aapt resource value: 59
+			public const int AppCompatTheme_toolbarStyle = 59;
 			
 			// aapt resource value: 117
-			public const int AppCompatTheme_windowMinWidthMinor = 117;
+			public const int AppCompatTheme_tooltipForegroundColor = 117;
 			
-			// aapt resource value: 118
-			public const int AppCompatTheme_windowNoTitle = 118;
+			// aapt resource value: 116
+			public const int AppCompatTheme_tooltipFrameBackground = 116;
 			
-			// aapt resource value: { 0x7F040120,0x7F040121,0x7F040150 }
+			// aapt resource value: 2
+			public const int AppCompatTheme_windowActionBar = 2;
+			
+			// aapt resource value: 4
+			public const int AppCompatTheme_windowActionBarOverlay = 4;
+			
+			// aapt resource value: 5
+			public const int AppCompatTheme_windowActionModeOverlay = 5;
+			
+			// aapt resource value: 9
+			public const int AppCompatTheme_windowFixedHeightMajor = 9;
+			
+			// aapt resource value: 7
+			public const int AppCompatTheme_windowFixedHeightMinor = 7;
+			
+			// aapt resource value: 6
+			public const int AppCompatTheme_windowFixedWidthMajor = 6;
+			
+			// aapt resource value: 8
+			public const int AppCompatTheme_windowFixedWidthMinor = 8;
+			
+			// aapt resource value: 10
+			public const int AppCompatTheme_windowMinWidthMajor = 10;
+			
+			// aapt resource value: 11
+			public const int AppCompatTheme_windowMinWidthMinor = 11;
+			
+			// aapt resource value: 3
+			public const int AppCompatTheme_windowNoTitle = 3;
+			
 			public static int[] BallPulseFooter = new int[] {
-					2130968864,
-					2130968865,
-					2130968912};
-			
-			// aapt resource value: 0
-			public const int BallPulseFooter_srlAnimatingColor = 0;
+					2130772317,
+					2130772338,
+					2130772339};
 			
 			// aapt resource value: 1
-			public const int BallPulseFooter_srlClassicsSpinnerStyle = 1;
+			public const int BallPulseFooter_srlAnimatingColor = 1;
+			
+			// aapt resource value: 0
+			public const int BallPulseFooter_srlClassicsSpinnerStyle = 0;
 			
 			// aapt resource value: 2
 			public const int BallPulseFooter_srlNormalColor = 2;
 			
-			// aapt resource value: { 0x7F04011F,0x7F040132,0x7F040151 }
 			public static int[] BezierRadarHeader = new int[] {
-					2130968863,
-					2130968882,
-					2130968913};
+					2130772316,
+					2130772324,
+					2130772326};
 			
 			// aapt resource value: 0
 			public const int BezierRadarHeader_srlAccentColor = 0;
@@ -6285,19 +6340,18 @@
 			// aapt resource value: 2
 			public const int BezierRadarHeader_srlPrimaryColor = 2;
 			
-			// aapt resource value: { 0x7F040093,0x7F0400C4,0x7F0400C5,0x7F0400C8,0x7F0400E8 }
 			public static int[] BottomNavigationView = new int[] {
-					2130968723,
-					2130968772,
-					2130968773,
-					2130968776,
-					2130968808};
+					2130772005,
+					2130772266,
+					2130772267,
+					2130772268,
+					2130772269};
 			
 			// aapt resource value: 0
 			public const int BottomNavigationView_elevation = 0;
 			
-			// aapt resource value: 1
-			public const int BottomNavigationView_itemBackground = 1;
+			// aapt resource value: 4
+			public const int BottomNavigationView_itemBackground = 4;
 			
 			// aapt resource value: 2
 			public const int BottomNavigationView_itemIconTint = 2;
@@ -6305,51 +6359,48 @@
 			// aapt resource value: 3
 			public const int BottomNavigationView_itemTextColor = 3;
 			
-			// aapt resource value: 4
-			public const int BottomNavigationView_menu = 4;
+			// aapt resource value: 1
+			public const int BottomNavigationView_menu = 1;
 			
-			// aapt resource value: { 0x7F040049,0x7F04004B,0x7F04004C }
 			public static int[] BottomSheetBehavior_Layout = new int[] {
-					2130968649,
-					2130968651,
-					2130968652};
-			
-			// aapt resource value: 0
-			public const int BottomSheetBehavior_Layout_behavior_hideable = 0;
+					2130772228,
+					2130772229,
+					2130772230};
 			
 			// aapt resource value: 1
-			public const int BottomSheetBehavior_Layout_behavior_peekHeight = 1;
+			public const int BottomSheetBehavior_Layout_behavior_hideable = 1;
+			
+			// aapt resource value: 0
+			public const int BottomSheetBehavior_Layout_behavior_peekHeight = 0;
 			
 			// aapt resource value: 2
 			public const int BottomSheetBehavior_Layout_behavior_skipCollapsed = 2;
 			
-			// aapt resource value: { 0x7F040026 }
 			public static int[] ButtonBarLayout = new int[] {
-					2130968614};
+					2130772146};
 			
 			// aapt resource value: 0
 			public const int ButtonBarLayout_allowStacking = 0;
 			
-			// aapt resource value: { 0x7F04011F,0x7F040121,0x7F040125,0x7F040126,0x7F040127,0x7F040128,0x7F040129,0x7F04012A,0x7F040140,0x7F040151,0x7F040154,0x7F040155,0x7F040156,0x7F040157,0x7F040158,0x7F040159,0x7F04015A,0x7F04015D }
 			public static int[] ClassicsFooter = new int[] {
-					2130968863,
-					2130968865,
-					2130968869,
-					2130968870,
-					2130968871,
-					2130968872,
-					2130968873,
-					2130968874,
-					2130968896,
-					2130968913,
-					2130968916,
-					2130968917,
-					2130968918,
-					2130968919,
-					2130968920,
-					2130968921,
-					2130968922,
-					2130968925};
+					2130772316,
+					2130772317,
+					2130772318,
+					2130772319,
+					2130772320,
+					2130772321,
+					2130772322,
+					2130772323,
+					2130772325,
+					2130772326,
+					2130772327,
+					2130772328,
+					2130772329,
+					2130772330,
+					2130772331,
+					2130772332,
+					2130772333,
+					2130772336};
 			
 			// aapt resource value: 0
 			public const int ClassicsFooter_srlAccentColor = 0;
@@ -6405,30 +6456,29 @@
 			// aapt resource value: 17
 			public const int ClassicsFooter_srlTextSizeTitle = 17;
 			
-			// aapt resource value: { 0x7F04011F,0x7F040121,0x7F040125,0x7F040126,0x7F040127,0x7F040128,0x7F040129,0x7F04012A,0x7F040133,0x7F040140,0x7F040151,0x7F040154,0x7F040155,0x7F040156,0x7F040158,0x7F040159,0x7F04015A,0x7F04015B,0x7F04015C,0x7F04015D,0x7F04015E,0x7F04015F }
 			public static int[] ClassicsHeader = new int[] {
-					2130968863,
-					2130968865,
-					2130968869,
-					2130968870,
-					2130968871,
-					2130968872,
-					2130968873,
-					2130968874,
-					2130968883,
-					2130968896,
-					2130968913,
-					2130968916,
-					2130968917,
-					2130968918,
-					2130968920,
-					2130968921,
-					2130968922,
-					2130968923,
-					2130968924,
-					2130968925,
-					2130968926,
-					2130968927};
+					2130772316,
+					2130772317,
+					2130772318,
+					2130772319,
+					2130772320,
+					2130772321,
+					2130772322,
+					2130772323,
+					2130772325,
+					2130772326,
+					2130772327,
+					2130772328,
+					2130772329,
+					2130772331,
+					2130772332,
+					2130772333,
+					2130772334,
+					2130772335,
+					2130772336,
+					2130772337,
+					2130772340,
+					2130772341};
 			
 			// aapt resource value: 0
 			public const int ClassicsHeader_srlAccentColor = 0;
@@ -6454,101 +6504,117 @@
 			// aapt resource value: 7
 			public const int ClassicsHeader_srlDrawableSize = 7;
 			
+			// aapt resource value: 21
+			public const int ClassicsHeader_srlEnableLastTime = 21;
+			
 			// aapt resource value: 8
-			public const int ClassicsHeader_srlEnableLastTime = 8;
+			public const int ClassicsHeader_srlFinishDuration = 8;
 			
 			// aapt resource value: 9
-			public const int ClassicsHeader_srlFinishDuration = 9;
+			public const int ClassicsHeader_srlPrimaryColor = 9;
 			
 			// aapt resource value: 10
-			public const int ClassicsHeader_srlPrimaryColor = 10;
+			public const int ClassicsHeader_srlTextFailed = 10;
 			
 			// aapt resource value: 11
-			public const int ClassicsHeader_srlTextFailed = 11;
+			public const int ClassicsHeader_srlTextFinish = 11;
 			
 			// aapt resource value: 12
-			public const int ClassicsHeader_srlTextFinish = 12;
+			public const int ClassicsHeader_srlTextLoading = 12;
 			
 			// aapt resource value: 13
-			public const int ClassicsHeader_srlTextLoading = 13;
+			public const int ClassicsHeader_srlTextPulling = 13;
 			
 			// aapt resource value: 14
-			public const int ClassicsHeader_srlTextPulling = 14;
+			public const int ClassicsHeader_srlTextRefreshing = 14;
 			
 			// aapt resource value: 15
-			public const int ClassicsHeader_srlTextRefreshing = 15;
+			public const int ClassicsHeader_srlTextRelease = 15;
 			
 			// aapt resource value: 16
-			public const int ClassicsHeader_srlTextRelease = 16;
+			public const int ClassicsHeader_srlTextSecondary = 16;
 			
 			// aapt resource value: 17
-			public const int ClassicsHeader_srlTextSecondary = 17;
+			public const int ClassicsHeader_srlTextSizeTime = 17;
 			
 			// aapt resource value: 18
-			public const int ClassicsHeader_srlTextSizeTime = 18;
-			
-			// aapt resource value: 19
-			public const int ClassicsHeader_srlTextSizeTitle = 19;
+			public const int ClassicsHeader_srlTextSizeTitle = 18;
 			
 			// aapt resource value: 20
 			public const int ClassicsHeader_srlTextTimeMarginTop = 20;
 			
-			// aapt resource value: 21
-			public const int ClassicsHeader_srlTextUpdate = 21;
+			// aapt resource value: 19
+			public const int ClassicsHeader_srlTextUpdate = 19;
 			
-			// aapt resource value: { 0x7F040063,0x7F040064,0x7F040078,0x7F040098,0x7F040099,0x7F04009A,0x7F04009B,0x7F04009C,0x7F04009D,0x7F04009E,0x7F04010A,0x7F04010B,0x7F040165,0x7F040197,0x7F040198,0x7F0401A2 }
 			public static int[] CollapsingToolbarLayout = new int[] {
-					2130968675,
-					2130968676,
-					2130968696,
-					2130968728,
-					2130968729,
-					2130968730,
-					2130968731,
-					2130968732,
-					2130968733,
-					2130968734,
-					2130968842,
-					2130968843,
-					2130968933,
-					2130968983,
-					2130968984,
-					2130968994};
+					2130771980,
+					2130772231,
+					2130772232,
+					2130772233,
+					2130772234,
+					2130772235,
+					2130772236,
+					2130772237,
+					2130772238,
+					2130772239,
+					2130772240,
+					2130772241,
+					2130772242,
+					2130772243,
+					2130772244,
+					2130772245};
 			
-			// aapt resource value: 0
-			public const int CollapsingToolbarLayout_collapsedTitleGravity = 0;
+			// aapt resource value: 13
+			public const int CollapsingToolbarLayout_collapsedTitleGravity = 13;
+			
+			// aapt resource value: 7
+			public const int CollapsingToolbarLayout_collapsedTitleTextAppearance = 7;
+			
+			// aapt resource value: 8
+			public const int CollapsingToolbarLayout_contentScrim = 8;
+			
+			// aapt resource value: 14
+			public const int CollapsingToolbarLayout_expandedTitleGravity = 14;
 			
 			// aapt resource value: 1
-			public const int CollapsingToolbarLayout_collapsedTitleTextAppearance = 1;
-			
-			// aapt resource value: 2
-			public const int CollapsingToolbarLayout_contentScrim = 2;
-			
-			// aapt resource value: 3
-			public const int CollapsingToolbarLayout_expandedTitleGravity = 3;
-			
-			// aapt resource value: 4
-			public const int CollapsingToolbarLayout_expandedTitleMargin = 4;
+			public const int CollapsingToolbarLayout_expandedTitleMargin = 1;
 			
 			// aapt resource value: 5
 			public const int CollapsingToolbarLayout_expandedTitleMarginBottom = 5;
 			
+			// aapt resource value: 4
+			public const int CollapsingToolbarLayout_expandedTitleMarginEnd = 4;
+			
+			// aapt resource value: 2
+			public const int CollapsingToolbarLayout_expandedTitleMarginStart = 2;
+			
+			// aapt resource value: 3
+			public const int CollapsingToolbarLayout_expandedTitleMarginTop = 3;
+			
 			// aapt resource value: 6
-			public const int CollapsingToolbarLayout_expandedTitleMarginEnd = 6;
+			public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 6;
 			
-			// aapt resource value: 7
-			public const int CollapsingToolbarLayout_expandedTitleMarginStart = 7;
+			// aapt resource value: 12
+			public const int CollapsingToolbarLayout_scrimAnimationDuration = 12;
 			
-			// aapt resource value: 8
-			public const int CollapsingToolbarLayout_expandedTitleMarginTop = 8;
+			// aapt resource value: 11
+			public const int CollapsingToolbarLayout_scrimVisibleHeightTrigger = 11;
 			
 			// aapt resource value: 9
-			public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 9;
+			public const int CollapsingToolbarLayout_statusBarScrim = 9;
 			
-			// aapt resource value: { 0x7F0400CF,0x7F0400D0 }
+			// aapt resource value: 0
+			public const int CollapsingToolbarLayout_title = 0;
+			
+			// aapt resource value: 15
+			public const int CollapsingToolbarLayout_titleEnabled = 15;
+			
+			// aapt resource value: 10
+			public const int CollapsingToolbarLayout_toolbarId = 10;
+			
 			public static int[] CollapsingToolbarLayout_Layout = new int[] {
-					2130968783,
-					2130968784};
+					2130772246,
+					2130772247};
 			
 			// aapt resource value: 0
 			public const int CollapsingToolbarLayout_Layout_layout_collapseMode = 0;
@@ -6556,29 +6622,10 @@
 			// aapt resource value: 1
 			public const int CollapsingToolbarLayout_Layout_layout_collapseParallaxMultiplier = 1;
 			
-			// aapt resource value: 10
-			public const int CollapsingToolbarLayout_scrimAnimationDuration = 10;
-			
-			// aapt resource value: 11
-			public const int CollapsingToolbarLayout_scrimVisibleHeightTrigger = 11;
-			
-			// aapt resource value: 12
-			public const int CollapsingToolbarLayout_statusBarScrim = 12;
-			
-			// aapt resource value: 13
-			public const int CollapsingToolbarLayout_title = 13;
-			
-			// aapt resource value: 14
-			public const int CollapsingToolbarLayout_titleEnabled = 14;
-			
-			// aapt resource value: 15
-			public const int CollapsingToolbarLayout_toolbarId = 15;
-			
-			// aapt resource value: { 0x10101A5,0x101031F,0x7F040027 }
 			public static int[] ColorStateListItem = new int[] {
 					16843173,
 					16843551,
-					2130968615};
+					2130772147};
 			
 			// aapt resource value: 2
 			public const int ColorStateListItem_alpha = 2;
@@ -6589,11 +6636,10 @@
 			// aapt resource value: 0
 			public const int ColorStateListItem_android_color = 0;
 			
-			// aapt resource value: { 0x1010107,0x7F04005B,0x7F04005C }
 			public static int[] CompoundButton = new int[] {
 					16843015,
-					2130968667,
-					2130968668};
+					2130772148,
+					2130772149};
 			
 			// aapt resource value: 0
 			public const int CompoundButton_android_button = 0;
@@ -6604,53 +6650,50 @@
 			// aapt resource value: 2
 			public const int CompoundButton_buttonTintMode = 2;
 			
-			// aapt resource value: { 0x7F0400C9,0x7F040164 }
 			public static int[] CoordinatorLayout = new int[] {
-					2130968777,
-					2130968932};
+					2130772248,
+					2130772249};
 			
 			// aapt resource value: 0
 			public const int CoordinatorLayout_keylines = 0;
 			
-			// aapt resource value: { 0x10100B3,0x7F0400CC,0x7F0400CD,0x7F0400CE,0x7F0400D1,0x7F0400D2,0x7F0400D3 }
+			// aapt resource value: 1
+			public const int CoordinatorLayout_statusBarBackground = 1;
+			
 			public static int[] CoordinatorLayout_Layout = new int[] {
 					16842931,
-					2130968780,
-					2130968781,
-					2130968782,
-					2130968785,
-					2130968786,
-					2130968787};
+					2130772250,
+					2130772251,
+					2130772252,
+					2130772253,
+					2130772254,
+					2130772255};
 			
 			// aapt resource value: 0
 			public const int CoordinatorLayout_Layout_android_layout_gravity = 0;
 			
-			// aapt resource value: 1
-			public const int CoordinatorLayout_Layout_layout_anchor = 1;
-			
 			// aapt resource value: 2
-			public const int CoordinatorLayout_Layout_layout_anchorGravity = 2;
-			
-			// aapt resource value: 3
-			public const int CoordinatorLayout_Layout_layout_behavior = 3;
+			public const int CoordinatorLayout_Layout_layout_anchor = 2;
 			
 			// aapt resource value: 4
-			public const int CoordinatorLayout_Layout_layout_dodgeInsetEdges = 4;
+			public const int CoordinatorLayout_Layout_layout_anchorGravity = 4;
+			
+			// aapt resource value: 1
+			public const int CoordinatorLayout_Layout_layout_behavior = 1;
+			
+			// aapt resource value: 6
+			public const int CoordinatorLayout_Layout_layout_dodgeInsetEdges = 6;
 			
 			// aapt resource value: 5
 			public const int CoordinatorLayout_Layout_layout_insetEdge = 5;
 			
-			// aapt resource value: 6
-			public const int CoordinatorLayout_Layout_layout_keyline = 6;
+			// aapt resource value: 3
+			public const int CoordinatorLayout_Layout_layout_keyline = 3;
 			
-			// aapt resource value: 1
-			public const int CoordinatorLayout_statusBarBackground = 1;
-			
-			// aapt resource value: { 0x7F040050,0x7F040051,0x7F04018B }
 			public static int[] DesignTheme = new int[] {
-					2130968656,
-					2130968657,
-					2130968971};
+					2130772256,
+					2130772257,
+					2130772258};
 			
 			// aapt resource value: 0
 			public const int DesignTheme_bottomSheetDialogTheme = 0;
@@ -6661,70 +6704,61 @@
 			// aapt resource value: 2
 			public const int DesignTheme_textColorError = 2;
 			
-			// aapt resource value: { 0x7F04003A,0x7F04003B,0x7F040047,0x7F040065,0x7F04008C,0x7F0400B0,0x7F04011A,0x7F04018E }
 			public static int[] DrawerArrowToggle = new int[] {
-					2130968634,
-					2130968635,
-					2130968647,
-					2130968677,
-					2130968716,
-					2130968752,
-					2130968858,
-					2130968974};
-			
-			// aapt resource value: 0
-			public const int DrawerArrowToggle_arrowHeadLength = 0;
-			
-			// aapt resource value: 1
-			public const int DrawerArrowToggle_arrowShaftLength = 1;
-			
-			// aapt resource value: 2
-			public const int DrawerArrowToggle_barLength = 2;
-			
-			// aapt resource value: 3
-			public const int DrawerArrowToggle_color = 3;
+					2130772150,
+					2130772151,
+					2130772152,
+					2130772153,
+					2130772154,
+					2130772155,
+					2130772156,
+					2130772157};
 			
 			// aapt resource value: 4
-			public const int DrawerArrowToggle_drawableSize = 4;
+			public const int DrawerArrowToggle_arrowHeadLength = 4;
 			
 			// aapt resource value: 5
-			public const int DrawerArrowToggle_gapBetweenBars = 5;
+			public const int DrawerArrowToggle_arrowShaftLength = 5;
 			
 			// aapt resource value: 6
-			public const int DrawerArrowToggle_spinBars = 6;
+			public const int DrawerArrowToggle_barLength = 6;
+			
+			// aapt resource value: 0
+			public const int DrawerArrowToggle_color = 0;
+			
+			// aapt resource value: 2
+			public const int DrawerArrowToggle_drawableSize = 2;
+			
+			// aapt resource value: 3
+			public const int DrawerArrowToggle_gapBetweenBars = 3;
+			
+			// aapt resource value: 1
+			public const int DrawerArrowToggle_spinBars = 1;
 			
 			// aapt resource value: 7
 			public const int DrawerArrowToggle_thickness = 7;
 			
-			// aapt resource value: { 0x7F040045,0x7F040046,0x7F04004E,0x7F040093,0x7F04009F,0x7F0400FF,0x7F040109,0x7F0401AB }
 			public static int[] FloatingActionButton = new int[] {
-					2130968645,
-					2130968646,
-					2130968654,
-					2130968723,
-					2130968735,
-					2130968831,
-					2130968841,
-					2130969003};
-			
-			// aapt resource value: 0
-			public const int FloatingActionButton_backgroundTint = 0;
+					2130772005,
+					2130772221,
+					2130772222,
+					2130772259,
+					2130772260,
+					2130772261,
+					2130772262,
+					2130772263};
 			
 			// aapt resource value: 1
-			public const int FloatingActionButton_backgroundTintMode = 1;
-			
-			// aapt resource value: { 0x7F040048 }
-			public static int[] FloatingActionButton_Behavior_Layout = new int[] {
-					2130968648};
-			
-			// aapt resource value: 0
-			public const int FloatingActionButton_Behavior_Layout_behavior_autoHide = 0;
+			public const int FloatingActionButton_backgroundTint = 1;
 			
 			// aapt resource value: 2
-			public const int FloatingActionButton_borderWidth = 2;
+			public const int FloatingActionButton_backgroundTintMode = 2;
 			
-			// aapt resource value: 3
-			public const int FloatingActionButton_elevation = 3;
+			// aapt resource value: 6
+			public const int FloatingActionButton_borderWidth = 6;
+			
+			// aapt resource value: 0
+			public const int FloatingActionButton_elevation = 0;
 			
 			// aapt resource value: 4
 			public const int FloatingActionButton_fabSize = 4;
@@ -6732,59 +6766,62 @@
 			// aapt resource value: 5
 			public const int FloatingActionButton_pressedTranslationZ = 5;
 			
-			// aapt resource value: 6
-			public const int FloatingActionButton_rippleColor = 6;
+			// aapt resource value: 3
+			public const int FloatingActionButton_rippleColor = 3;
 			
 			// aapt resource value: 7
 			public const int FloatingActionButton_useCompatPadding = 7;
 			
-			// aapt resource value: { 0x7F0400A7,0x7F0400A8,0x7F0400A9,0x7F0400AA,0x7F0400AB,0x7F0400AC }
-			public static int[] FontFamily = new int[] {
-					2130968743,
-					2130968744,
-					2130968745,
-					2130968746,
-					2130968747,
-					2130968748};
-			
-			// aapt resource value: { 0x7F0400A5,0x7F0400AD,0x7F0400AE }
-			public static int[] FontFamilyFont = new int[] {
-					2130968741,
-					2130968749,
-					2130968750};
+			public static int[] FloatingActionButton_Behavior_Layout = new int[] {
+					2130772264};
 			
 			// aapt resource value: 0
-			public const int FontFamilyFont_font = 0;
+			public const int FloatingActionButton_Behavior_Layout_behavior_autoHide = 0;
 			
-			// aapt resource value: 1
-			public const int FontFamilyFont_fontStyle = 1;
-			
-			// aapt resource value: 2
-			public const int FontFamilyFont_fontWeight = 2;
+			public static int[] FontFamily = new int[] {
+					2130772305,
+					2130772306,
+					2130772307,
+					2130772308,
+					2130772309,
+					2130772310};
 			
 			// aapt resource value: 0
 			public const int FontFamily_fontProviderAuthority = 0;
 			
-			// aapt resource value: 1
-			public const int FontFamily_fontProviderCerts = 1;
-			
-			// aapt resource value: 2
-			public const int FontFamily_fontProviderFetchStrategy = 2;
-			
 			// aapt resource value: 3
-			public const int FontFamily_fontProviderFetchTimeout = 3;
+			public const int FontFamily_fontProviderCerts = 3;
 			
 			// aapt resource value: 4
-			public const int FontFamily_fontProviderPackage = 4;
+			public const int FontFamily_fontProviderFetchStrategy = 4;
 			
 			// aapt resource value: 5
-			public const int FontFamily_fontProviderQuery = 5;
+			public const int FontFamily_fontProviderFetchTimeout = 5;
 			
-			// aapt resource value: { 0x1010109,0x1010200,0x7F0400AF }
+			// aapt resource value: 1
+			public const int FontFamily_fontProviderPackage = 1;
+			
+			// aapt resource value: 2
+			public const int FontFamily_fontProviderQuery = 2;
+			
+			public static int[] FontFamilyFont = new int[] {
+					2130772311,
+					2130772312,
+					2130772313};
+			
+			// aapt resource value: 1
+			public const int FontFamilyFont_font = 1;
+			
+			// aapt resource value: 0
+			public const int FontFamilyFont_fontStyle = 0;
+			
+			// aapt resource value: 2
+			public const int FontFamilyFont_fontWeight = 2;
+			
 			public static int[] ForegroundLinearLayout = new int[] {
 					16843017,
 					16843264,
-					2130968751};
+					2130772265};
 			
 			// aapt resource value: 0
 			public const int ForegroundLinearLayout_android_foreground = 0;
@@ -6795,146 +6832,142 @@
 			// aapt resource value: 2
 			public const int ForegroundLinearLayout_foregroundInsidePadding = 2;
 			
-			// aapt resource value: { 0x7F040029,0x7F04002A,0x7F04002B,0x7F04002C,0x7F04002D,0x7F04002E,0x7F04002F,0x7F040030,0x7F040031,0x7F040032,0x7F040033,0x7F040034,0x7F040035,0x7F040036,0x7F040037,0x7F040038,0x7F040039,0x7F0400B2 }
 			public static int[] HDLArcSeekBar = new int[] {
-					2130968617,
-					2130968618,
-					2130968619,
-					2130968620,
-					2130968621,
-					2130968622,
-					2130968623,
-					2130968624,
-					2130968625,
-					2130968626,
-					2130968627,
-					2130968628,
-					2130968629,
-					2130968630,
-					2130968631,
-					2130968632,
-					2130968633,
-					2130968754};
-			
-			// aapt resource value: 0
-			public const int HDLArcSeekBar_arc_border_color = 0;
-			
-			// aapt resource value: 1
-			public const int HDLArcSeekBar_arc_border_width = 1;
-			
-			// aapt resource value: 2
-			public const int HDLArcSeekBar_arc_colors = 2;
-			
-			// aapt resource value: 3
-			public const int HDLArcSeekBar_arc_max = 3;
-			
-			// aapt resource value: 4
-			public const int HDLArcSeekBar_arc_min = 4;
+					2130772382,
+					2130772383,
+					2130772384,
+					2130772385,
+					2130772386,
+					2130772387,
+					2130772388,
+					2130772389,
+					2130772390,
+					2130772391,
+					2130772392,
+					2130772393,
+					2130772394,
+					2130772395,
+					2130772396,
+					2130772397,
+					2130772398,
+					2130772399};
 			
 			// aapt resource value: 5
-			public const int HDLArcSeekBar_arc_open_angle = 5;
+			public const int HDLArcSeekBar_arc_border_color = 5;
+			
+			// aapt resource value: 4
+			public const int HDLArcSeekBar_arc_border_width = 4;
+			
+			// aapt resource value: 3
+			public const int HDLArcSeekBar_arc_colors = 3;
 			
 			// aapt resource value: 6
-			public const int HDLArcSeekBar_arc_progress = 6;
+			public const int HDLArcSeekBar_arc_max = 6;
 			
 			// aapt resource value: 7
-			public const int HDLArcSeekBar_arc_progress_bar_color = 7;
+			public const int HDLArcSeekBar_arc_min = 7;
+			
+			// aapt resource value: 1
+			public const int HDLArcSeekBar_arc_open_angle = 1;
 			
 			// aapt resource value: 8
-			public const int HDLArcSeekBar_arc_progress_bar_text_unit = 8;
+			public const int HDLArcSeekBar_arc_progress = 8;
 			
-			// aapt resource value: 9
-			public const int HDLArcSeekBar_arc_rotate_angle = 9;
+			// aapt resource value: 16
+			public const int HDLArcSeekBar_arc_progress_bar_color = 16;
+			
+			// aapt resource value: 17
+			public const int HDLArcSeekBar_arc_progress_bar_text_unit = 17;
+			
+			// aapt resource value: 2
+			public const int HDLArcSeekBar_arc_rotate_angle = 2;
+			
+			// aapt resource value: 15
+			public const int HDLArcSeekBar_arc_shadow_radius = 15;
 			
 			// aapt resource value: 10
-			public const int HDLArcSeekBar_arc_shadow_radius = 10;
+			public const int HDLArcSeekBar_arc_thumb_color = 10;
 			
 			// aapt resource value: 11
-			public const int HDLArcSeekBar_arc_thumb_color = 11;
-			
-			// aapt resource value: 12
-			public const int HDLArcSeekBar_arc_thumb_radius = 12;
+			public const int HDLArcSeekBar_arc_thumb_radius = 11;
 			
 			// aapt resource value: 13
 			public const int HDLArcSeekBar_arc_thumb_shadow_color = 13;
 			
-			// aapt resource value: 14
-			public const int HDLArcSeekBar_arc_thumb_shadow_radius = 14;
+			// aapt resource value: 12
+			public const int HDLArcSeekBar_arc_thumb_shadow_radius = 12;
 			
-			// aapt resource value: 15
-			public const int HDLArcSeekBar_arc_thumb_width = 15;
-			
-			// aapt resource value: 16
-			public const int HDLArcSeekBar_arc_width = 16;
-			
-			// aapt resource value: 17
-			public const int HDLArcSeekBar_hdl_arc_thumb_mode = 17;
-			
-			// aapt resource value: { 0x7F04007E,0x7F04007F,0x7F040080,0x7F040081,0x7F040082,0x7F04010F }
-			public static int[] HDLCurtainSeekBar = new int[] {
-					2130968702,
-					2130968703,
-					2130968704,
-					2130968705,
-					2130968706,
-					2130968847};
+			// aapt resource value: 9
+			public const int HDLArcSeekBar_arc_thumb_width = 9;
 			
 			// aapt resource value: 0
-			public const int HDLCurtainSeekBar_curtain_bar_bg_color = 0;
+			public const int HDLArcSeekBar_arc_width = 0;
 			
-			// aapt resource value: 1
-			public const int HDLCurtainSeekBar_curtain_bar_border_color = 1;
+			// aapt resource value: 14
+			public const int HDLArcSeekBar_hdl_arc_thumb_mode = 14;
+			
+			public static int[] HDLCurtainSeekBar = new int[] {
+					2130772400,
+					2130772401,
+					2130772402,
+					2130772403,
+					2130772404,
+					2130772405};
 			
 			// aapt resource value: 2
-			public const int HDLCurtainSeekBar_curtain_bar_color = 2;
+			public const int HDLCurtainSeekBar_curtain_bar_bg_color = 2;
 			
 			// aapt resource value: 3
-			public const int HDLCurtainSeekBar_curtain_bar_height = 3;
+			public const int HDLCurtainSeekBar_curtain_bar_border_color = 3;
+			
+			// aapt resource value: 0
+			public const int HDLCurtainSeekBar_curtain_bar_color = 0;
+			
+			// aapt resource value: 5
+			public const int HDLCurtainSeekBar_curtain_bar_height = 5;
 			
 			// aapt resource value: 4
 			public const int HDLCurtainSeekBar_curtain_bar_width = 4;
 			
-			// aapt resource value: 5
-			public const int HDLCurtainSeekBar_second_curtain_bar_color = 5;
+			// aapt resource value: 1
+			public const int HDLCurtainSeekBar_second_curtain_bar_color = 1;
 			
-			// aapt resource value: { 0x7F040110,0x7F0401AD,0x7F0401AE,0x7F0401AF,0x7F0401B0,0x7F0401B1 }
 			public static int[] HDLWaveSeekBar = new int[] {
-					2130968848,
-					2130969005,
-					2130969006,
-					2130969007,
-					2130969008,
-					2130969009};
-			
-			// aapt resource value: 0
-			public const int HDLWaveSeekBar_second_wave_color = 0;
+					2130772406,
+					2130772407,
+					2130772408,
+					2130772409,
+					2130772410,
+					2130772411};
 			
 			// aapt resource value: 1
-			public const int HDLWaveSeekBar_wave_bg_color = 1;
+			public const int HDLWaveSeekBar_second_wave_color = 1;
 			
 			// aapt resource value: 2
-			public const int HDLWaveSeekBar_wave_border_color = 2;
+			public const int HDLWaveSeekBar_wave_bg_color = 2;
 			
 			// aapt resource value: 3
-			public const int HDLWaveSeekBar_wave_color = 3;
+			public const int HDLWaveSeekBar_wave_border_color = 3;
 			
-			// aapt resource value: 4
-			public const int HDLWaveSeekBar_wave_height = 4;
+			// aapt resource value: 0
+			public const int HDLWaveSeekBar_wave_color = 0;
 			
 			// aapt resource value: 5
-			public const int HDLWaveSeekBar_wave_width = 5;
+			public const int HDLWaveSeekBar_wave_height = 5;
 			
-			// aapt resource value: { 0x10100AF,0x10100C4,0x1010126,0x1010127,0x1010128,0x7F040088,0x7F04008A,0x7F0400E7,0x7F040115 }
+			// aapt resource value: 4
+			public const int HDLWaveSeekBar_wave_width = 4;
+			
 			public static int[] LinearLayoutCompat = new int[] {
 					16842927,
 					16842948,
 					16843046,
 					16843047,
 					16843048,
-					2130968712,
-					2130968714,
-					2130968807,
-					2130968853};
+					2130771988,
+					2130772158,
+					2130772159,
+					2130772160};
 			
 			// aapt resource value: 2
 			public const int LinearLayoutCompat_android_baselineAligned = 2;
@@ -6954,10 +6987,15 @@
 			// aapt resource value: 5
 			public const int LinearLayoutCompat_divider = 5;
 			
-			// aapt resource value: 6
-			public const int LinearLayoutCompat_dividerPadding = 6;
+			// aapt resource value: 8
+			public const int LinearLayoutCompat_dividerPadding = 8;
 			
-			// aapt resource value: { 0x10100B3,0x10100F4,0x10100F5,0x1010181 }
+			// aapt resource value: 6
+			public const int LinearLayoutCompat_measureWithLargestChild = 6;
+			
+			// aapt resource value: 7
+			public const int LinearLayoutCompat_showDividers = 7;
+			
 			public static int[] LinearLayoutCompat_Layout = new int[] {
 					16842931,
 					16842996,
@@ -6976,13 +7014,6 @@
 			// aapt resource value: 1
 			public const int LinearLayoutCompat_Layout_android_layout_width = 1;
 			
-			// aapt resource value: 7
-			public const int LinearLayoutCompat_measureWithLargestChild = 7;
-			
-			// aapt resource value: 8
-			public const int LinearLayoutCompat_showDividers = 8;
-			
-			// aapt resource value: { 0x10102AC,0x10102AD }
 			public static int[] ListPopupWindow = new int[] {
 					16843436,
 					16843437};
@@ -6993,7 +7024,6 @@
 			// aapt resource value: 1
 			public const int ListPopupWindow_android_dropDownVerticalOffset = 1;
 			
-			// aapt resource value: { 0x101000E,0x10100D0,0x1010194,0x10101DE,0x10101DF,0x10101E0 }
 			public static int[] MenuGroup = new int[] {
 					16842766,
 					16842960,
@@ -7020,7 +7050,6 @@
 			// 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,0x7F04000D,0x7F04001F,0x7F040020,0x7F040028,0x7F040071,0x7F0400BC,0x7F0400BD,0x7F0400ED,0x7F040114,0x7F0401A7 }
 			public static int[] MenuItem = new int[] {
 					16842754,
 					16842766,
@@ -7035,28 +7064,28 @@
 					16843236,
 					16843237,
 					16843375,
-					2130968589,
-					2130968607,
-					2130968608,
-					2130968616,
-					2130968689,
-					2130968764,
-					2130968765,
-					2130968813,
-					2130968852,
-					2130968999};
-			
-			// aapt resource value: 13
-			public const int MenuItem_actionLayout = 13;
-			
-			// aapt resource value: 14
-			public const int MenuItem_actionProviderClass = 14;
-			
-			// aapt resource value: 15
-			public const int MenuItem_actionViewClass = 15;
+					2130772161,
+					2130772162,
+					2130772163,
+					2130772164,
+					2130772165,
+					2130772166,
+					2130772167,
+					2130772168,
+					2130772169,
+					2130772170};
 			
 			// aapt resource value: 16
-			public const int MenuItem_alphabeticModifiers = 16;
+			public const int MenuItem_actionLayout = 16;
+			
+			// aapt resource value: 18
+			public const int MenuItem_actionProviderClass = 18;
+			
+			// aapt resource value: 17
+			public const int MenuItem_actionViewClass = 17;
+			
+			// aapt resource value: 13
+			public const int MenuItem_alphabeticModifiers = 13;
 			
 			// aapt resource value: 9
 			public const int MenuItem_android_alphabeticShortcut = 9;
@@ -7097,25 +7126,24 @@
 			// aapt resource value: 4
 			public const int MenuItem_android_visible = 4;
 			
-			// aapt resource value: 17
-			public const int MenuItem_contentDescription = 17;
-			
-			// aapt resource value: 18
-			public const int MenuItem_iconTint = 18;
-			
 			// aapt resource value: 19
-			public const int MenuItem_iconTintMode = 19;
-			
-			// aapt resource value: 20
-			public const int MenuItem_numericModifiers = 20;
+			public const int MenuItem_contentDescription = 19;
 			
 			// aapt resource value: 21
-			public const int MenuItem_showAsAction = 21;
+			public const int MenuItem_iconTint = 21;
 			
 			// aapt resource value: 22
-			public const int MenuItem_tooltipText = 22;
+			public const int MenuItem_iconTintMode = 22;
 			
-			// aapt resource value: { 0x10100AE,0x101012C,0x101012D,0x101012E,0x101012F,0x1010130,0x1010131,0x7F0400FE,0x7F040166 }
+			// aapt resource value: 14
+			public const int MenuItem_numericModifiers = 14;
+			
+			// aapt resource value: 15
+			public const int MenuItem_showAsAction = 15;
+			
+			// aapt resource value: 20
+			public const int MenuItem_tooltipText = 20;
+			
 			public static int[] MenuView = new int[] {
 					16842926,
 					16843052,
@@ -7124,8 +7152,8 @@
 					16843055,
 					16843056,
 					16843057,
-					2130968830,
-					2130968934};
+					2130772171,
+					2130772172};
 			
 			// aapt resource value: 4
 			public const int MenuView_android_headerBackground = 4;
@@ -7154,18 +7182,17 @@
 			// aapt resource value: 8
 			public const int MenuView_subMenuArrow = 8;
 			
-			// aapt resource value: { 0x10100D4,0x10100DD,0x101011F,0x7F040093,0x7F0400B3,0x7F0400C4,0x7F0400C5,0x7F0400C7,0x7F0400C8,0x7F0400E8 }
 			public static int[] NavigationView = new int[] {
 					16842964,
 					16842973,
 					16843039,
-					2130968723,
-					2130968755,
-					2130968772,
-					2130968773,
-					2130968775,
-					2130968776,
-					2130968808};
+					2130772005,
+					2130772266,
+					2130772267,
+					2130772268,
+					2130772269,
+					2130772270,
+					2130772271};
 			
 			// aapt resource value: 0
 			public const int NavigationView_android_background = 0;
@@ -7179,63 +7206,28 @@
 			// aapt resource value: 3
 			public const int NavigationView_elevation = 3;
 			
-			// aapt resource value: 4
-			public const int NavigationView_headerLayout = 4;
-			
-			// aapt resource value: 5
-			public const int NavigationView_itemBackground = 5;
-			
-			// aapt resource value: 6
-			public const int NavigationView_itemIconTint = 6;
+			// aapt resource value: 9
+			public const int NavigationView_headerLayout = 9;
 			
 			// aapt resource value: 7
-			public const int NavigationView_itemTextAppearance = 7;
-			
-			// aapt resource value: 8
-			public const int NavigationView_itemTextColor = 8;
-			
-			// aapt resource value: 9
-			public const int NavigationView_menu = 9;
-			
-			// aapt resource value: { 0x7F0401B2,0x7F0401B3,0x7F0401B4,0x7F0401B5,0x7F0401B6,0x7F0401B7 }
-			public static int[] pickerview = new int[] {
-					2130969010,
-					2130969011,
-					2130969012,
-					2130969013,
-					2130969014,
-					2130969015};
-			
-			// aapt resource value: 0
-			public const int pickerview_wheelview_dividerColor = 0;
-			
-			// aapt resource value: 1
-			public const int pickerview_wheelview_gravity = 1;
-			
-			// aapt resource value: 2
-			public const int pickerview_wheelview_lineSpacingMultiplier = 2;
-			
-			// aapt resource value: 3
-			public const int pickerview_wheelview_textColorCenter = 3;
-			
-			// aapt resource value: 4
-			public const int pickerview_wheelview_textColorOut = 4;
+			public const int NavigationView_itemBackground = 7;
 			
 			// aapt resource value: 5
-			public const int pickerview_wheelview_textSize = 5;
+			public const int NavigationView_itemIconTint = 5;
 			
-			// aapt resource value: { 0x1010176,0x10102C9,0x7F0400EE }
+			// aapt resource value: 8
+			public const int NavigationView_itemTextAppearance = 8;
+			
+			// aapt resource value: 6
+			public const int NavigationView_itemTextColor = 6;
+			
+			// aapt resource value: 4
+			public const int NavigationView_menu = 4;
+			
 			public static int[] PopupWindow = new int[] {
 					16843126,
 					16843465,
-					2130968814};
-			
-			// aapt resource value: { 0x7F040161 }
-			public static int[] PopupWindowBackgroundState = new int[] {
-					2130968929};
-			
-			// aapt resource value: 0
-			public const int PopupWindowBackgroundState_state_above_anchor = 0;
+					2130772173};
 			
 			// aapt resource value: 1
 			public const int PopupWindow_android_popupAnimationStyle = 1;
@@ -7246,10 +7238,15 @@
 			// aapt resource value: 2
 			public const int PopupWindow_overlapAnchor = 2;
 			
-			// aapt resource value: { 0x7F0400EF,0x7F0400F2 }
+			public static int[] PopupWindowBackgroundState = new int[] {
+					2130772174};
+			
+			// aapt resource value: 0
+			public const int PopupWindowBackgroundState_state_above_anchor = 0;
+			
 			public static int[] RecycleListView = new int[] {
-					2130968815,
-					2130968818};
+					2130772175,
+					2130772176};
 			
 			// aapt resource value: 0
 			public const int RecycleListView_paddingBottomNoButtons = 0;
@@ -7257,19 +7254,18 @@
 			// aapt resource value: 1
 			public const int RecycleListView_paddingTopNoTitle = 1;
 			
-			// aapt resource value: { 0x10100C4,0x10100F1,0x7F0400A0,0x7F0400A1,0x7F0400A2,0x7F0400A3,0x7F0400A4,0x7F0400CB,0x7F040108,0x7F040119,0x7F040160 }
 			public static int[] RecyclerView = new int[] {
 					16842948,
 					16842993,
-					2130968736,
-					2130968737,
-					2130968738,
-					2130968739,
-					2130968740,
-					2130968779,
-					2130968840,
-					2130968857,
-					2130968928};
+					2130771968,
+					2130771969,
+					2130771970,
+					2130771971,
+					2130771972,
+					2130771973,
+					2130771974,
+					2130771975,
+					2130771976};
 			
 			// aapt resource value: 1
 			public const int RecyclerView_android_descendantFocusability = 1;
@@ -7277,66 +7273,63 @@
 			// aapt resource value: 0
 			public const int RecyclerView_android_orientation = 0;
 			
-			// aapt resource value: 2
-			public const int RecyclerView_fastScrollEnabled = 2;
-			
-			// aapt resource value: 3
-			public const int RecyclerView_fastScrollHorizontalThumbDrawable = 3;
-			
-			// aapt resource value: 4
-			public const int RecyclerView_fastScrollHorizontalTrackDrawable = 4;
-			
-			// aapt resource value: 5
-			public const int RecyclerView_fastScrollVerticalThumbDrawable = 5;
-			
 			// aapt resource value: 6
-			public const int RecyclerView_fastScrollVerticalTrackDrawable = 6;
-			
-			// aapt resource value: 7
-			public const int RecyclerView_layoutManager = 7;
-			
-			// aapt resource value: 8
-			public const int RecyclerView_reverseLayout = 8;
+			public const int RecyclerView_fastScrollEnabled = 6;
 			
 			// aapt resource value: 9
-			public const int RecyclerView_spanCount = 9;
+			public const int RecyclerView_fastScrollHorizontalThumbDrawable = 9;
 			
 			// aapt resource value: 10
-			public const int RecyclerView_stackFromEnd = 10;
+			public const int RecyclerView_fastScrollHorizontalTrackDrawable = 10;
 			
-			// aapt resource value: { 0x7F0400C2 }
+			// aapt resource value: 7
+			public const int RecyclerView_fastScrollVerticalThumbDrawable = 7;
+			
+			// aapt resource value: 8
+			public const int RecyclerView_fastScrollVerticalTrackDrawable = 8;
+			
+			// aapt resource value: 2
+			public const int RecyclerView_layoutManager = 2;
+			
+			// aapt resource value: 4
+			public const int RecyclerView_reverseLayout = 4;
+			
+			// aapt resource value: 3
+			public const int RecyclerView_spanCount = 3;
+			
+			// aapt resource value: 5
+			public const int RecyclerView_stackFromEnd = 5;
+			
 			public static int[] ScrimInsetsFrameLayout = new int[] {
-					2130968770};
+					2130772272};
 			
 			// aapt resource value: 0
 			public const int ScrimInsetsFrameLayout_insetForeground = 0;
 			
-			// aapt resource value: { 0x7F04004A }
 			public static int[] ScrollingViewBehavior_Layout = new int[] {
-					2130968650};
+					2130772273};
 			
 			// aapt resource value: 0
 			public const int ScrollingViewBehavior_Layout_behavior_overlapTop = 0;
 			
-			// aapt resource value: { 0x10100DA,0x101011F,0x1010220,0x1010264,0x7F04005F,0x7F040070,0x7F040084,0x7F0400B1,0x7F0400BE,0x7F0400CA,0x7F040102,0x7F040103,0x7F04010C,0x7F04010D,0x7F040167,0x7F04016C,0x7F0401AC }
 			public static int[] SearchView = new int[] {
 					16842970,
 					16843039,
 					16843296,
 					16843364,
-					2130968671,
-					2130968688,
-					2130968708,
-					2130968753,
-					2130968766,
-					2130968778,
-					2130968834,
-					2130968835,
-					2130968844,
-					2130968845,
-					2130968935,
-					2130968940,
-					2130969004};
+					2130772177,
+					2130772178,
+					2130772179,
+					2130772180,
+					2130772181,
+					2130772182,
+					2130772183,
+					2130772184,
+					2130772185,
+					2130772186,
+					2130772187,
+					2130772188,
+					2130772189};
 			
 			// aapt resource value: 0
 			public const int SearchView_android_focusable = 0;
@@ -7350,84 +7343,83 @@
 			// aapt resource value: 1
 			public const int SearchView_android_maxWidth = 1;
 			
-			// aapt resource value: 4
-			public const int SearchView_closeIcon = 4;
-			
-			// aapt resource value: 5
-			public const int SearchView_commitIcon = 5;
-			
-			// aapt resource value: 6
-			public const int SearchView_defaultQueryHint = 6;
-			
-			// aapt resource value: 7
-			public const int SearchView_goIcon = 7;
-			
 			// aapt resource value: 8
-			public const int SearchView_iconifiedByDefault = 8;
-			
-			// aapt resource value: 9
-			public const int SearchView_layout = 9;
-			
-			// aapt resource value: 10
-			public const int SearchView_queryBackground = 10;
-			
-			// aapt resource value: 11
-			public const int SearchView_queryHint = 11;
-			
-			// aapt resource value: 12
-			public const int SearchView_searchHintIcon = 12;
+			public const int SearchView_closeIcon = 8;
 			
 			// aapt resource value: 13
-			public const int SearchView_searchIcon = 13;
+			public const int SearchView_commitIcon = 13;
 			
-			// aapt resource value: 14
-			public const int SearchView_submitBackground = 14;
+			// aapt resource value: 7
+			public const int SearchView_defaultQueryHint = 7;
+			
+			// aapt resource value: 9
+			public const int SearchView_goIcon = 9;
+			
+			// aapt resource value: 5
+			public const int SearchView_iconifiedByDefault = 5;
+			
+			// aapt resource value: 4
+			public const int SearchView_layout = 4;
 			
 			// aapt resource value: 15
-			public const int SearchView_suggestionRowLayout = 15;
+			public const int SearchView_queryBackground = 15;
+			
+			// aapt resource value: 6
+			public const int SearchView_queryHint = 6;
+			
+			// aapt resource value: 11
+			public const int SearchView_searchHintIcon = 11;
+			
+			// aapt resource value: 10
+			public const int SearchView_searchIcon = 10;
 			
 			// aapt resource value: 16
-			public const int SearchView_voiceIcon = 16;
+			public const int SearchView_submitBackground = 16;
 			
-			// aapt resource value: { 0x10100EA,0x10100EB,0x7F04011F,0x7F040122,0x7F040123,0x7F040124,0x7F04012B,0x7F04012C,0x7F04012D,0x7F04012E,0x7F04012F,0x7F040130,0x7F040131,0x7F040134,0x7F040135,0x7F040136,0x7F040137,0x7F040138,0x7F040139,0x7F04013B,0x7F04013C,0x7F04013D,0x7F04013E,0x7F040141,0x7F040142,0x7F040145,0x7F040146,0x7F040147,0x7F040148,0x7F040149,0x7F04014A,0x7F04014B,0x7F04014C,0x7F04014D,0x7F04014E,0x7F040151,0x7F040152 }
+			// aapt resource value: 14
+			public const int SearchView_suggestionRowLayout = 14;
+			
+			// aapt resource value: 12
+			public const int SearchView_voiceIcon = 12;
+			
 			public static int[] SmartRefreshLayout = new int[] {
 					16842986,
 					16842987,
-					2130968863,
-					2130968866,
-					2130968867,
-					2130968868,
-					2130968875,
-					2130968876,
-					2130968877,
-					2130968878,
-					2130968879,
-					2130968880,
-					2130968881,
-					2130968884,
-					2130968885,
-					2130968886,
-					2130968887,
-					2130968888,
-					2130968889,
-					2130968891,
-					2130968892,
-					2130968893,
-					2130968894,
-					2130968897,
-					2130968898,
-					2130968901,
-					2130968902,
-					2130968903,
-					2130968904,
-					2130968905,
-					2130968906,
-					2130968907,
-					2130968908,
-					2130968909,
-					2130968910,
-					2130968913,
-					2130968914};
+					2130772316,
+					2130772326,
+					2130772342,
+					2130772343,
+					2130772344,
+					2130772345,
+					2130772346,
+					2130772347,
+					2130772348,
+					2130772349,
+					2130772350,
+					2130772351,
+					2130772352,
+					2130772353,
+					2130772354,
+					2130772355,
+					2130772356,
+					2130772357,
+					2130772358,
+					2130772359,
+					2130772360,
+					2130772361,
+					2130772362,
+					2130772363,
+					2130772364,
+					2130772365,
+					2130772366,
+					2130772367,
+					2130772368,
+					2130772369,
+					2130772370,
+					2130772371,
+					2130772372,
+					2130772373,
+					2130772374};
 			
 			// aapt resource value: 0
 			public const int SmartRefreshLayout_android_clipChildren = 0;
@@ -7435,127 +7427,125 @@
 			// aapt resource value: 1
 			public const int SmartRefreshLayout_android_clipToPadding = 1;
 			
-			// aapt resource value: { 0x7F0400D6,0x7F0400D7 }
-			public static int[] SmartRefreshLayout_Layout = new int[] {
-					2130968790,
-					2130968791};
-			
-			// aapt resource value: 0
-			public const int SmartRefreshLayout_Layout_layout_srlBackgroundColor = 0;
-			
-			// aapt resource value: 1
-			public const int SmartRefreshLayout_Layout_layout_srlSpinnerStyle = 1;
-			
 			// aapt resource value: 2
 			public const int SmartRefreshLayout_srlAccentColor = 2;
 			
-			// aapt resource value: 3
-			public const int SmartRefreshLayout_srlDisableContentWhenLoading = 3;
-			
-			// aapt resource value: 4
-			public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 4;
-			
-			// aapt resource value: 5
-			public const int SmartRefreshLayout_srlDragRate = 5;
-			
-			// aapt resource value: 6
-			public const int SmartRefreshLayout_srlEnableAutoLoadMore = 6;
-			
-			// aapt resource value: 7
-			public const int SmartRefreshLayout_srlEnableClipFooterWhenFixedBehind = 7;
-			
-			// aapt resource value: 8
-			public const int SmartRefreshLayout_srlEnableClipHeaderWhenFixedBehind = 8;
-			
-			// aapt resource value: 9
-			public const int SmartRefreshLayout_srlEnableFooterFollowWhenLoadFinished = 9;
-			
-			// aapt resource value: 10
-			public const int SmartRefreshLayout_srlEnableFooterFollowWhenNoMoreData = 10;
-			
-			// aapt resource value: 11
-			public const int SmartRefreshLayout_srlEnableFooterTranslationContent = 11;
-			
-			// aapt resource value: 12
-			public const int SmartRefreshLayout_srlEnableHeaderTranslationContent = 12;
-			
-			// aapt resource value: 13
-			public const int SmartRefreshLayout_srlEnableLoadMore = 13;
-			
-			// aapt resource value: 14
-			public const int SmartRefreshLayout_srlEnableLoadMoreWhenContentNotFull = 14;
-			
-			// aapt resource value: 15
-			public const int SmartRefreshLayout_srlEnableNestedScrolling = 15;
-			
-			// aapt resource value: 16
-			public const int SmartRefreshLayout_srlEnableOverScrollBounce = 16;
-			
-			// aapt resource value: 17
-			public const int SmartRefreshLayout_srlEnableOverScrollDrag = 17;
-			
-			// aapt resource value: 18
-			public const int SmartRefreshLayout_srlEnablePreviewInEditMode = 18;
-			
-			// aapt resource value: 19
-			public const int SmartRefreshLayout_srlEnablePureScrollMode = 19;
-			
-			// aapt resource value: 20
-			public const int SmartRefreshLayout_srlEnableRefresh = 20;
-			
-			// aapt resource value: 21
-			public const int SmartRefreshLayout_srlEnableScrollContentWhenLoaded = 21;
-			
-			// aapt resource value: 22
-			public const int SmartRefreshLayout_srlEnableScrollContentWhenRefreshed = 22;
-			
-			// aapt resource value: 23
-			public const int SmartRefreshLayout_srlFixedFooterViewId = 23;
-			
-			// aapt resource value: 24
-			public const int SmartRefreshLayout_srlFixedHeaderViewId = 24;
-			
-			// aapt resource value: 25
-			public const int SmartRefreshLayout_srlFooterHeight = 25;
-			
-			// aapt resource value: 26
-			public const int SmartRefreshLayout_srlFooterInsetStart = 26;
-			
-			// aapt resource value: 27
-			public const int SmartRefreshLayout_srlFooterMaxDragRate = 27;
-			
-			// aapt resource value: 28
-			public const int SmartRefreshLayout_srlFooterTranslationViewId = 28;
-			
-			// aapt resource value: 29
-			public const int SmartRefreshLayout_srlFooterTriggerRate = 29;
-			
-			// aapt resource value: 30
-			public const int SmartRefreshLayout_srlHeaderHeight = 30;
-			
-			// aapt resource value: 31
-			public const int SmartRefreshLayout_srlHeaderInsetStart = 31;
-			
-			// aapt resource value: 32
-			public const int SmartRefreshLayout_srlHeaderMaxDragRate = 32;
+			// aapt resource value: 34
+			public const int SmartRefreshLayout_srlDisableContentWhenLoading = 34;
 			
 			// aapt resource value: 33
-			public const int SmartRefreshLayout_srlHeaderTranslationViewId = 33;
+			public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 33;
 			
-			// aapt resource value: 34
-			public const int SmartRefreshLayout_srlHeaderTriggerRate = 34;
+			// aapt resource value: 9
+			public const int SmartRefreshLayout_srlDragRate = 9;
 			
-			// aapt resource value: 35
-			public const int SmartRefreshLayout_srlPrimaryColor = 35;
+			// aapt resource value: 21
+			public const int SmartRefreshLayout_srlEnableAutoLoadMore = 21;
+			
+			// aapt resource value: 31
+			public const int SmartRefreshLayout_srlEnableClipFooterWhenFixedBehind = 31;
+			
+			// aapt resource value: 30
+			public const int SmartRefreshLayout_srlEnableClipHeaderWhenFixedBehind = 30;
+			
+			// aapt resource value: 28
+			public const int SmartRefreshLayout_srlEnableFooterFollowWhenLoadFinished = 28;
+			
+			// aapt resource value: 29
+			public const int SmartRefreshLayout_srlEnableFooterFollowWhenNoMoreData = 29;
+			
+			// aapt resource value: 17
+			public const int SmartRefreshLayout_srlEnableFooterTranslationContent = 17;
+			
+			// aapt resource value: 16
+			public const int SmartRefreshLayout_srlEnableHeaderTranslationContent = 16;
+			
+			// aapt resource value: 15
+			public const int SmartRefreshLayout_srlEnableLoadMore = 15;
+			
+			// aapt resource value: 27
+			public const int SmartRefreshLayout_srlEnableLoadMoreWhenContentNotFull = 27;
+			
+			// aapt resource value: 24
+			public const int SmartRefreshLayout_srlEnableNestedScrolling = 24;
+			
+			// aapt resource value: 22
+			public const int SmartRefreshLayout_srlEnableOverScrollBounce = 22;
+			
+			// aapt resource value: 32
+			public const int SmartRefreshLayout_srlEnableOverScrollDrag = 32;
+			
+			// aapt resource value: 20
+			public const int SmartRefreshLayout_srlEnablePreviewInEditMode = 20;
+			
+			// aapt resource value: 23
+			public const int SmartRefreshLayout_srlEnablePureScrollMode = 23;
+			
+			// aapt resource value: 14
+			public const int SmartRefreshLayout_srlEnableRefresh = 14;
+			
+			// aapt resource value: 25
+			public const int SmartRefreshLayout_srlEnableScrollContentWhenLoaded = 25;
+			
+			// aapt resource value: 26
+			public const int SmartRefreshLayout_srlEnableScrollContentWhenRefreshed = 26;
 			
 			// aapt resource value: 36
-			public const int SmartRefreshLayout_srlReboundDuration = 36;
+			public const int SmartRefreshLayout_srlFixedFooterViewId = 36;
 			
-			// aapt resource value: { 0x101011F,0x7F040093,0x7F0400E5 }
+			// aapt resource value: 35
+			public const int SmartRefreshLayout_srlFixedHeaderViewId = 35;
+			
+			// aapt resource value: 6
+			public const int SmartRefreshLayout_srlFooterHeight = 6;
+			
+			// aapt resource value: 8
+			public const int SmartRefreshLayout_srlFooterInsetStart = 8;
+			
+			// aapt resource value: 11
+			public const int SmartRefreshLayout_srlFooterMaxDragRate = 11;
+			
+			// aapt resource value: 19
+			public const int SmartRefreshLayout_srlFooterTranslationViewId = 19;
+			
+			// aapt resource value: 13
+			public const int SmartRefreshLayout_srlFooterTriggerRate = 13;
+			
+			// aapt resource value: 5
+			public const int SmartRefreshLayout_srlHeaderHeight = 5;
+			
+			// aapt resource value: 7
+			public const int SmartRefreshLayout_srlHeaderInsetStart = 7;
+			
+			// aapt resource value: 10
+			public const int SmartRefreshLayout_srlHeaderMaxDragRate = 10;
+			
+			// aapt resource value: 18
+			public const int SmartRefreshLayout_srlHeaderTranslationViewId = 18;
+			
+			// aapt resource value: 12
+			public const int SmartRefreshLayout_srlHeaderTriggerRate = 12;
+			
+			// aapt resource value: 3
+			public const int SmartRefreshLayout_srlPrimaryColor = 3;
+			
+			// aapt resource value: 4
+			public const int SmartRefreshLayout_srlReboundDuration = 4;
+			
+			public static int[] SmartRefreshLayout_Layout = new int[] {
+					2130772315,
+					2130772375};
+			
+			// aapt resource value: 1
+			public const int SmartRefreshLayout_Layout_layout_srlBackgroundColor = 1;
+			
+			// aapt resource value: 0
+			public const int SmartRefreshLayout_Layout_layout_srlSpinnerStyle = 0;
+			
 			public static int[] SnackbarLayout = new int[] {
 					16843039,
-					2130968723,
-					2130968805};
+					2130772005,
+					2130772274};
 			
 			// aapt resource value: 0
 			public const int SnackbarLayout_android_maxWidth = 0;
@@ -7566,13 +7556,12 @@
 			// aapt resource value: 2
 			public const int SnackbarLayout_maxActionInlineWidth = 2;
 			
-			// aapt resource value: { 0x10100B2,0x1010176,0x101017B,0x1010262,0x7F0400FC }
 			public static int[] Spinner = new int[] {
 					16842930,
 					16843126,
 					16843131,
 					16843362,
-					2130968828};
+					2130772006};
 			
 			// aapt resource value: 3
 			public const int Spinner_android_dropDownWidth = 3;
@@ -7589,22 +7578,21 @@
 			// aapt resource value: 4
 			public const int Spinner_popupTheme = 4;
 			
-			// aapt resource value: { 0x1010124,0x1010125,0x1010142,0x7F040116,0x7F04011D,0x7F04016D,0x7F04016E,0x7F040170,0x7F04018F,0x7F040190,0x7F040191,0x7F0401A8,0x7F0401A9,0x7F0401AA }
 			public static int[] SwitchCompat = new int[] {
 					16843044,
 					16843045,
 					16843074,
-					2130968854,
-					2130968861,
-					2130968941,
-					2130968942,
-					2130968944,
-					2130968975,
-					2130968976,
-					2130968977,
-					2130969000,
-					2130969001,
-					2130969002};
+					2130772190,
+					2130772191,
+					2130772192,
+					2130772193,
+					2130772194,
+					2130772195,
+					2130772196,
+					2130772197,
+					2130772198,
+					2130772199,
+					2130772200};
 			
 			// aapt resource value: 1
 			public const int SwitchCompat_android_textOff = 1;
@@ -7615,40 +7603,39 @@
 			// aapt resource value: 2
 			public const int SwitchCompat_android_thumb = 2;
 			
-			// aapt resource value: 3
-			public const int SwitchCompat_showText = 3;
+			// aapt resource value: 13
+			public const int SwitchCompat_showText = 13;
 			
-			// aapt resource value: 4
-			public const int SwitchCompat_splitTrack = 4;
+			// aapt resource value: 12
+			public const int SwitchCompat_splitTrack = 12;
 			
-			// aapt resource value: 5
-			public const int SwitchCompat_switchMinWidth = 5;
+			// aapt resource value: 10
+			public const int SwitchCompat_switchMinWidth = 10;
 			
-			// aapt resource value: 6
-			public const int SwitchCompat_switchPadding = 6;
+			// aapt resource value: 11
+			public const int SwitchCompat_switchPadding = 11;
 			
-			// aapt resource value: 7
-			public const int SwitchCompat_switchTextAppearance = 7;
+			// aapt resource value: 9
+			public const int SwitchCompat_switchTextAppearance = 9;
 			
 			// aapt resource value: 8
 			public const int SwitchCompat_thumbTextPadding = 8;
 			
-			// aapt resource value: 9
-			public const int SwitchCompat_thumbTint = 9;
+			// aapt resource value: 3
+			public const int SwitchCompat_thumbTint = 3;
 			
-			// aapt resource value: 10
-			public const int SwitchCompat_thumbTintMode = 10;
+			// aapt resource value: 4
+			public const int SwitchCompat_thumbTintMode = 4;
 			
-			// aapt resource value: 11
-			public const int SwitchCompat_track = 11;
+			// aapt resource value: 5
+			public const int SwitchCompat_track = 5;
 			
-			// aapt resource value: 12
-			public const int SwitchCompat_trackTint = 12;
+			// aapt resource value: 6
+			public const int SwitchCompat_trackTint = 6;
 			
-			// aapt resource value: 13
-			public const int SwitchCompat_trackTintMode = 13;
+			// aapt resource value: 7
+			public const int SwitchCompat_trackTintMode = 7;
 			
-			// aapt resource value: { 0x1010002,0x10100F2,0x101014F }
 			public static int[] TabItem = new int[] {
 					16842754,
 					16842994,
@@ -7663,57 +7650,56 @@
 			// aapt resource value: 2
 			public const int TabItem_android_text = 2;
 			
-			// aapt resource value: { 0x7F040171,0x7F040172,0x7F040173,0x7F040174,0x7F040175,0x7F040176,0x7F040177,0x7F040178,0x7F040179,0x7F04017A,0x7F04017B,0x7F04017C,0x7F04017D,0x7F04017E,0x7F04017F,0x7F040180 }
 			public static int[] TabLayout = new int[] {
-					2130968945,
-					2130968946,
-					2130968947,
-					2130968948,
-					2130968949,
-					2130968950,
-					2130968951,
-					2130968952,
-					2130968953,
-					2130968954,
-					2130968955,
-					2130968956,
-					2130968957,
-					2130968958,
-					2130968959,
-					2130968960};
-			
-			// aapt resource value: 0
-			public const int TabLayout_tabBackground = 0;
-			
-			// aapt resource value: 1
-			public const int TabLayout_tabContentStart = 1;
-			
-			// aapt resource value: 2
-			public const int TabLayout_tabGravity = 2;
+					2130772275,
+					2130772276,
+					2130772277,
+					2130772278,
+					2130772279,
+					2130772280,
+					2130772281,
+					2130772282,
+					2130772283,
+					2130772284,
+					2130772285,
+					2130772286,
+					2130772287,
+					2130772288,
+					2130772289,
+					2130772290};
 			
 			// aapt resource value: 3
-			public const int TabLayout_tabIndicatorColor = 3;
+			public const int TabLayout_tabBackground = 3;
 			
-			// aapt resource value: 4
-			public const int TabLayout_tabIndicatorHeight = 4;
+			// aapt resource value: 2
+			public const int TabLayout_tabContentStart = 2;
 			
 			// aapt resource value: 5
-			public const int TabLayout_tabMaxWidth = 5;
+			public const int TabLayout_tabGravity = 5;
+			
+			// aapt resource value: 0
+			public const int TabLayout_tabIndicatorColor = 0;
+			
+			// aapt resource value: 1
+			public const int TabLayout_tabIndicatorHeight = 1;
+			
+			// aapt resource value: 7
+			public const int TabLayout_tabMaxWidth = 7;
 			
 			// aapt resource value: 6
 			public const int TabLayout_tabMinWidth = 6;
 			
-			// aapt resource value: 7
-			public const int TabLayout_tabMode = 7;
+			// aapt resource value: 4
+			public const int TabLayout_tabMode = 4;
 			
-			// aapt resource value: 8
-			public const int TabLayout_tabPadding = 8;
+			// aapt resource value: 15
+			public const int TabLayout_tabPadding = 15;
 			
-			// aapt resource value: 9
-			public const int TabLayout_tabPaddingBottom = 9;
+			// aapt resource value: 14
+			public const int TabLayout_tabPaddingBottom = 14;
 			
-			// aapt resource value: 10
-			public const int TabLayout_tabPaddingEnd = 10;
+			// aapt resource value: 13
+			public const int TabLayout_tabPaddingEnd = 13;
 			
 			// aapt resource value: 11
 			public const int TabLayout_tabPaddingStart = 11;
@@ -7721,16 +7707,15 @@
 			// aapt resource value: 12
 			public const int TabLayout_tabPaddingTop = 12;
 			
-			// aapt resource value: 13
-			public const int TabLayout_tabSelectedTextColor = 13;
+			// aapt resource value: 10
+			public const int TabLayout_tabSelectedTextColor = 10;
 			
-			// aapt resource value: 14
-			public const int TabLayout_tabTextAppearance = 14;
+			// aapt resource value: 8
+			public const int TabLayout_tabTextAppearance = 8;
 			
-			// aapt resource value: 15
-			public const int TabLayout_tabTextColor = 15;
+			// aapt resource value: 9
+			public const int TabLayout_tabTextColor = 9;
 			
-			// aapt resource value: { 0x1010095,0x1010096,0x1010097,0x1010098,0x101009A,0x101009B,0x1010161,0x1010162,0x1010163,0x1010164,0x10103AC,0x7F0400A6,0x7F040181 }
 			public static int[] TextAppearance = new int[] {
 					16842901,
 					16842902,
@@ -7743,8 +7728,8 @@
 					16843107,
 					16843108,
 					16843692,
-					2130968742,
-					2130968961};
+					2130772022,
+					2130772028};
 			
 			// aapt resource value: 10
 			public const int TextAppearance_android_fontFamily = 10;
@@ -7779,30 +7764,29 @@
 			// aapt resource value: 1
 			public const int TextAppearance_android_typeface = 1;
 			
-			// aapt resource value: 11
-			public const int TextAppearance_fontFamily = 11;
-			
 			// aapt resource value: 12
-			public const int TextAppearance_textAllCaps = 12;
+			public const int TextAppearance_fontFamily = 12;
 			
-			// aapt resource value: { 0x101009A,0x1010150,0x7F04007A,0x7F04007B,0x7F04007C,0x7F04007D,0x7F040094,0x7F040095,0x7F0400B6,0x7F0400B7,0x7F0400B8,0x7F0400F6,0x7F0400F7,0x7F0400F8,0x7F0400F9,0x7F0400FA }
+			// aapt resource value: 11
+			public const int TextAppearance_textAllCaps = 11;
+			
 			public static int[] TextInputLayout = new int[] {
 					16842906,
 					16843088,
-					2130968698,
-					2130968699,
-					2130968700,
-					2130968701,
-					2130968724,
-					2130968725,
-					2130968758,
-					2130968759,
-					2130968760,
-					2130968822,
-					2130968823,
-					2130968824,
-					2130968825,
-					2130968826};
+					2130772291,
+					2130772292,
+					2130772293,
+					2130772294,
+					2130772295,
+					2130772296,
+					2130772297,
+					2130772298,
+					2130772299,
+					2130772300,
+					2130772301,
+					2130772302,
+					2130772303,
+					2130772304};
 			
 			// aapt resource value: 1
 			public const int TextInputLayout_android_hint = 1;
@@ -7810,41 +7794,41 @@
 			// aapt resource value: 0
 			public const int TextInputLayout_android_textColorHint = 0;
 			
-			// aapt resource value: 2
-			public const int TextInputLayout_counterEnabled = 2;
-			
-			// aapt resource value: 3
-			public const int TextInputLayout_counterMaxLength = 3;
-			
-			// aapt resource value: 4
-			public const int TextInputLayout_counterOverflowTextAppearance = 4;
-			
-			// aapt resource value: 5
-			public const int TextInputLayout_counterTextAppearance = 5;
-			
 			// aapt resource value: 6
-			public const int TextInputLayout_errorEnabled = 6;
+			public const int TextInputLayout_counterEnabled = 6;
 			
 			// aapt resource value: 7
-			public const int TextInputLayout_errorTextAppearance = 7;
-			
-			// aapt resource value: 8
-			public const int TextInputLayout_hintAnimationEnabled = 8;
+			public const int TextInputLayout_counterMaxLength = 7;
 			
 			// aapt resource value: 9
-			public const int TextInputLayout_hintEnabled = 9;
+			public const int TextInputLayout_counterOverflowTextAppearance = 9;
+			
+			// aapt resource value: 8
+			public const int TextInputLayout_counterTextAppearance = 8;
+			
+			// aapt resource value: 4
+			public const int TextInputLayout_errorEnabled = 4;
+			
+			// aapt resource value: 5
+			public const int TextInputLayout_errorTextAppearance = 5;
 			
 			// aapt resource value: 10
-			public const int TextInputLayout_hintTextAppearance = 10;
+			public const int TextInputLayout_hintAnimationEnabled = 10;
 			
-			// aapt resource value: 11
-			public const int TextInputLayout_passwordToggleContentDescription = 11;
+			// aapt resource value: 3
+			public const int TextInputLayout_hintEnabled = 3;
+			
+			// aapt resource value: 2
+			public const int TextInputLayout_hintTextAppearance = 2;
+			
+			// aapt resource value: 13
+			public const int TextInputLayout_passwordToggleContentDescription = 13;
 			
 			// aapt resource value: 12
 			public const int TextInputLayout_passwordToggleDrawable = 12;
 			
-			// aapt resource value: 13
-			public const int TextInputLayout_passwordToggleEnabled = 13;
+			// aapt resource value: 11
+			public const int TextInputLayout_passwordToggleEnabled = 11;
 			
 			// aapt resource value: 14
 			public const int TextInputLayout_passwordToggleTint = 14;
@@ -7852,37 +7836,36 @@
 			// aapt resource value: 15
 			public const int TextInputLayout_passwordToggleTintMode = 15;
 			
-			// aapt resource value: { 0x10100AF,0x1010140,0x7F040057,0x7F040061,0x7F040062,0x7F040072,0x7F040073,0x7F040074,0x7F040075,0x7F040076,0x7F040077,0x7F0400E3,0x7F0400E4,0x7F0400E6,0x7F0400EA,0x7F0400EB,0x7F0400FC,0x7F040168,0x7F040169,0x7F04016A,0x7F040197,0x7F040199,0x7F04019A,0x7F04019B,0x7F04019C,0x7F04019D,0x7F04019E,0x7F04019F,0x7F0401A0 }
 			public static int[] Toolbar = new int[] {
 					16842927,
 					16843072,
-					2130968663,
-					2130968673,
-					2130968674,
-					2130968690,
-					2130968691,
-					2130968692,
-					2130968693,
-					2130968694,
-					2130968695,
-					2130968803,
-					2130968804,
-					2130968806,
-					2130968810,
-					2130968811,
-					2130968828,
-					2130968936,
-					2130968937,
-					2130968938,
-					2130968983,
-					2130968985,
-					2130968986,
-					2130968987,
-					2130968988,
-					2130968989,
-					2130968990,
-					2130968991,
-					2130968992};
+					2130771980,
+					2130771983,
+					2130771987,
+					2130771999,
+					2130772000,
+					2130772001,
+					2130772002,
+					2130772003,
+					2130772004,
+					2130772006,
+					2130772201,
+					2130772202,
+					2130772203,
+					2130772204,
+					2130772205,
+					2130772206,
+					2130772207,
+					2130772208,
+					2130772209,
+					2130772210,
+					2130772211,
+					2130772212,
+					2130772213,
+					2130772214,
+					2130772215,
+					2130772216,
+					2130772217};
 			
 			// aapt resource value: 0
 			public const int Toolbar_android_gravity = 0;
@@ -7890,20 +7873,20 @@
 			// aapt resource value: 1
 			public const int Toolbar_android_minHeight = 1;
 			
-			// aapt resource value: 2
-			public const int Toolbar_buttonGravity = 2;
+			// aapt resource value: 21
+			public const int Toolbar_buttonGravity = 21;
 			
-			// aapt resource value: 3
-			public const int Toolbar_collapseContentDescription = 3;
+			// aapt resource value: 23
+			public const int Toolbar_collapseContentDescription = 23;
 			
-			// aapt resource value: 4
-			public const int Toolbar_collapseIcon = 4;
-			
-			// aapt resource value: 5
-			public const int Toolbar_contentInsetEnd = 5;
+			// aapt resource value: 22
+			public const int Toolbar_collapseIcon = 22;
 			
 			// aapt resource value: 6
-			public const int Toolbar_contentInsetEndWithActions = 6;
+			public const int Toolbar_contentInsetEnd = 6;
+			
+			// aapt resource value: 10
+			public const int Toolbar_contentInsetEndWithActions = 10;
 			
 			// aapt resource value: 7
 			public const int Toolbar_contentInsetLeft = 7;
@@ -7911,106 +7894,118 @@
 			// aapt resource value: 8
 			public const int Toolbar_contentInsetRight = 8;
 			
+			// aapt resource value: 5
+			public const int Toolbar_contentInsetStart = 5;
+			
 			// aapt resource value: 9
-			public const int Toolbar_contentInsetStart = 9;
-			
-			// aapt resource value: 10
-			public const int Toolbar_contentInsetStartWithNavigation = 10;
-			
-			// aapt resource value: 11
-			public const int Toolbar_logo = 11;
-			
-			// aapt resource value: 12
-			public const int Toolbar_logoDescription = 12;
-			
-			// aapt resource value: 13
-			public const int Toolbar_maxButtonHeight = 13;
-			
-			// aapt resource value: 14
-			public const int Toolbar_navigationContentDescription = 14;
-			
-			// aapt resource value: 15
-			public const int Toolbar_navigationIcon = 15;
-			
-			// aapt resource value: 16
-			public const int Toolbar_popupTheme = 16;
-			
-			// aapt resource value: 17
-			public const int Toolbar_subtitle = 17;
-			
-			// aapt resource value: 18
-			public const int Toolbar_subtitleTextAppearance = 18;
-			
-			// aapt resource value: 19
-			public const int Toolbar_subtitleTextColor = 19;
-			
-			// aapt resource value: 20
-			public const int Toolbar_title = 20;
-			
-			// aapt resource value: 21
-			public const int Toolbar_titleMargin = 21;
-			
-			// aapt resource value: 22
-			public const int Toolbar_titleMarginBottom = 22;
-			
-			// aapt resource value: 23
-			public const int Toolbar_titleMarginEnd = 23;
-			
-			// aapt resource value: 26
-			public const int Toolbar_titleMargins = 26;
-			
-			// aapt resource value: 24
-			public const int Toolbar_titleMarginStart = 24;
-			
-			// aapt resource value: 25
-			public const int Toolbar_titleMarginTop = 25;
-			
-			// aapt resource value: 27
-			public const int Toolbar_titleTextAppearance = 27;
-			
-			// aapt resource value: 28
-			public const int Toolbar_titleTextColor = 28;
-			
-			// aapt resource value: { 0x7F04013A,0x7F04013F,0x7F040143,0x7F040144,0x7F04014F,0x7F040153 }
-			public static int[] TwoLevelHeader = new int[] {
-					2130968890,
-					2130968895,
-					2130968899,
-					2130968900,
-					2130968911,
-					2130968915};
-			
-			// aapt resource value: 0
-			public const int TwoLevelHeader_srlEnablePullToCloseTwoLevel = 0;
-			
-			// aapt resource value: 1
-			public const int TwoLevelHeader_srlEnableTwoLevel = 1;
-			
-			// aapt resource value: 2
-			public const int TwoLevelHeader_srlFloorDuration = 2;
-			
-			// aapt resource value: 3
-			public const int TwoLevelHeader_srlFloorRage = 3;
+			public const int Toolbar_contentInsetStartWithNavigation = 9;
 			
 			// aapt resource value: 4
-			public const int TwoLevelHeader_srlMaxRage = 4;
+			public const int Toolbar_logo = 4;
+			
+			// aapt resource value: 26
+			public const int Toolbar_logoDescription = 26;
+			
+			// aapt resource value: 20
+			public const int Toolbar_maxButtonHeight = 20;
+			
+			// aapt resource value: 25
+			public const int Toolbar_navigationContentDescription = 25;
+			
+			// aapt resource value: 24
+			public const int Toolbar_navigationIcon = 24;
+			
+			// aapt resource value: 11
+			public const int Toolbar_popupTheme = 11;
+			
+			// aapt resource value: 3
+			public const int Toolbar_subtitle = 3;
+			
+			// aapt resource value: 13
+			public const int Toolbar_subtitleTextAppearance = 13;
+			
+			// aapt resource value: 28
+			public const int Toolbar_subtitleTextColor = 28;
+			
+			// aapt resource value: 2
+			public const int Toolbar_title = 2;
+			
+			// aapt resource value: 14
+			public const int Toolbar_titleMargin = 14;
+			
+			// aapt resource value: 18
+			public const int Toolbar_titleMarginBottom = 18;
+			
+			// aapt resource value: 16
+			public const int Toolbar_titleMarginEnd = 16;
+			
+			// aapt resource value: 15
+			public const int Toolbar_titleMarginStart = 15;
+			
+			// aapt resource value: 17
+			public const int Toolbar_titleMarginTop = 17;
+			
+			// aapt resource value: 19
+			public const int Toolbar_titleMargins = 19;
+			
+			// aapt resource value: 12
+			public const int Toolbar_titleTextAppearance = 12;
+			
+			// aapt resource value: 27
+			public const int Toolbar_titleTextColor = 27;
+			
+			public static int[] TwoLevelHeader = new int[] {
+					2130772376,
+					2130772377,
+					2130772378,
+					2130772379,
+					2130772380,
+					2130772381};
 			
 			// aapt resource value: 5
-			public const int TwoLevelHeader_srlRefreshRage = 5;
+			public const int TwoLevelHeader_srlEnablePullToCloseTwoLevel = 5;
 			
-			// aapt resource value: { 0x1010000,0x10100DA,0x7F0400F0,0x7F0400F1,0x7F04018D }
+			// aapt resource value: 4
+			public const int TwoLevelHeader_srlEnableTwoLevel = 4;
+			
+			// aapt resource value: 3
+			public const int TwoLevelHeader_srlFloorDuration = 3;
+			
+			// aapt resource value: 1
+			public const int TwoLevelHeader_srlFloorRage = 1;
+			
+			// aapt resource value: 0
+			public const int TwoLevelHeader_srlMaxRage = 0;
+			
+			// aapt resource value: 2
+			public const int TwoLevelHeader_srlRefreshRage = 2;
+			
 			public static int[] View = new int[] {
 					16842752,
 					16842970,
-					2130968816,
-					2130968817,
-					2130968973};
+					2130772218,
+					2130772219,
+					2130772220};
 			
-			// aapt resource value: { 0x10100D4,0x7F040045,0x7F040046 }
+			// aapt resource value: 1
+			public const int View_android_focusable = 1;
+			
+			// aapt resource value: 0
+			public const int View_android_theme = 0;
+			
+			// aapt resource value: 3
+			public const int View_paddingEnd = 3;
+			
+			// aapt resource value: 2
+			public const int View_paddingStart = 2;
+			
+			// aapt resource value: 4
+			public const int View_theme = 4;
+			
 			public static int[] ViewBackgroundHelper = new int[] {
 					16842964,
-					2130968645,
-					2130968646};
+					2130772221,
+					2130772222};
 			
 			// aapt resource value: 0
 			public const int ViewBackgroundHelper_android_background = 0;
@@ -8021,7 +8016,6 @@
 			// aapt resource value: 2
 			public const int ViewBackgroundHelper_backgroundTintMode = 2;
 			
-			// aapt resource value: { 0x10100D0,0x10100F2,0x10100F3 }
 			public static int[] ViewStubCompat = new int[] {
 					16842960,
 					16842994,
@@ -8036,20 +8030,31 @@
 			// aapt resource value: 1
 			public const int ViewStubCompat_android_layout = 1;
 			
-			// aapt resource value: 1
-			public const int View_android_focusable = 1;
-			
-			// aapt resource value: 0
-			public const int View_android_theme = 0;
-			
-			// aapt resource value: 2
-			public const int View_paddingEnd = 2;
-			
-			// aapt resource value: 3
-			public const int View_paddingStart = 3;
+			public static int[] pickerview = new int[] {
+					2130772412,
+					2130772413,
+					2130772414,
+					2130772415,
+					2130772416,
+					2130772417};
 			
 			// aapt resource value: 4
-			public const int View_theme = 4;
+			public const int pickerview_wheelview_dividerColor = 4;
+			
+			// aapt resource value: 0
+			public const int pickerview_wheelview_gravity = 0;
+			
+			// aapt resource value: 5
+			public const int pickerview_wheelview_lineSpacingMultiplier = 5;
+			
+			// aapt resource value: 3
+			public const int pickerview_wheelview_textColorCenter = 3;
+			
+			// aapt resource value: 2
+			public const int pickerview_wheelview_textColorOut = 2;
+			
+			// aapt resource value: 1
+			public const int pickerview_wheelview_textSize = 1;
 			
 			static Styleable()
 			{
@@ -8057,25 +8062,6 @@
 			}
 			
 			private Styleable()
-			{
-			}
-		}
-		
-		public partial class Xml
-		{
-			
-			// aapt resource value: 0x7F100000
-			public const int file_paths = 2131755008;
-			
-			// aapt resource value: 0x7F100001
-			public const int hdl_filepaths = 2131755009;
-			
-			static Xml()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Xml()
 			{
 			}
 		}
diff --git a/ZigbeeApp/Home.Ios/Entitlements.plist b/ZigbeeApp/Home.Ios/Entitlements.plist
index 0704a76..c6c22a4 100755
--- a/ZigbeeApp/Home.Ios/Entitlements.plist
+++ b/ZigbeeApp/Home.Ios/Entitlements.plist
@@ -8,5 +8,7 @@
 	<array>
 		<string>applinks:hdlcontrol.com</string>
 	</array>
+	<key>com.apple.developer.networking.wifi-info</key>
+	<true/>
 </dict>
 </plist>
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index a018d8a..f91c085 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -403,12 +403,17 @@
       <BundleResource Include="Resources\Phone\SceneIcon\3.png" />
       <BundleResource Include="Resources\Phone\SceneIcon\1.png" />
       <BundleResource Include="Resources\Phone\SceneIcon\0.png" />
+      <BundleResource Include="Resources\Phone\BindPic\EmptyTargets.png" />
       <BundleResource Include="Resources\Phone\BindPic\BindEmptyPic.png" />
+      <BundleResource Include="Resources\Phone\BindPic\Curtain.png" />
       <BundleResource Include="Resources\Phone\BindPic\BindLeft.png" />
       <BundleResource Include="Resources\Phone\BindPic\FreshAirIcon.png" />
+      <BundleResource Include="Resources\Phone\BindPic\Roller.png" />
       <BundleResource Include="Resources\Phone\BindPic\BindAdd.png" />
       <BundleResource Include="Resources\Phone\BindPic\BindDown.png" />
+      <BundleResource Include="Resources\Phone\BindPic\EmptyTargetsSelected.png" />
       <BundleResource Include="Resources\Phone\BindPic\BindRoomColor.png" />
+      <BundleResource Include="Resources\Phone\BindPic\Switch.png" />
       <BundleResource Include="Resources\Phone\BindPic\BindRight.png" />
       <BundleResource Include="Resources\Phone\BindPic\BindRoomColorOn.png" />
       <BundleResource Include="Resources\Phone\DoorLock\DistributeUnlockIcon.png" />
@@ -634,6 +639,7 @@
       <BundleResource Include="Resources\Phone\ZigeeLogic\withdrawal.png" />
       <BundleResource Include="Resources\Phone\ZigeeLogic\logicaddcolor.png" />
       <BundleResource Include="Resources\Phone\ZigeeLogic\sensor13.png" />
+      <BundleResource Include="Resources\Phone\ZigeeLogic\nightLight.png" />
       <BundleResource Include="Resources\Phone\ZigeeLogic\logicclose.png" />
       <BundleResource Include="Resources\Phone\ZigeeLogic\function.png" />
       <BundleResource Include="Resources\Phone\ZigeeLogic\Ddmmablelight.png" />
@@ -643,6 +649,8 @@
       <BundleResource Include="Resources\Phone\ZigeeLogic\progressbtn_2.png" />
       <BundleResource Include="Resources\Phone\ZigeeLogic\temperature.png" />
       <BundleResource Include="Resources\Phone\ZigeeLogic\AddSelected.png" />
+      <BundleResource Include="Resources\Phone\ZigeeLogic\nightLightSelected.png" />
+      <BundleResource Include="Resources\Phone\ZigeeLogic\seek.png" />
       <BundleResource Include="Resources\Phone\ZigeeLogic\light_1.png" />
       <BundleResource Include="Resources\Phone\ZigeeLogic\sign.png" />
       <BundleResource Include="Resources\Phone\ZigeeLogic\selected.png" />
@@ -654,6 +662,7 @@
       <BundleResource Include="Resources\Phone\ZigeeLogic\timeparagraph.png" />
       <BundleResource Include="Resources\Phone\ZigeeLogic\light.png" />
       <BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor44.png" />
+      <BundleResource Include="Resources\Phone\ZigeeLogic\back1.png" />
       <BundleResource Include="Resources\Phone\ZigeeLogic\selectedpanel.png" />
       <BundleResource Include="Resources\Phone\ZigeeLogic\nofunction.png" />
       <BundleResource Include="Resources\Phone\ZigeeLogic\panel.png" />
diff --git a/ZigbeeApp/Home.Ios/Info.plist b/ZigbeeApp/Home.Ios/Info.plist
index b18409b..f0aa3e9 100755
--- a/ZigbeeApp/Home.Ios/Info.plist
+++ b/ZigbeeApp/Home.Ios/Info.plist
@@ -61,6 +61,10 @@
 	<array>
 		<dict>
 			<key>CFBundleURLName</key>
+			<string>xiaoduapp</string>
+		</dict>
+		<dict>
+			<key>CFBundleURLName</key>
 			<string>weixin</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
@@ -70,6 +74,7 @@
 	</array>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
+		<string>xiaoduapp</string>
 		<string>weixin</string>
 		<string>weixinULAPI</string>
 	</array>
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index c2b864a..ee5fcfd 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -329,6 +329,14 @@
 325=鎵撳紑闈㈡澘涓昏彍鍗曪紝鍙充笂瑙掔偣鍑粄0}璁剧疆鎸夐挳锛岀偣鍑诲叆缃�
 326=闀挎寜鈥滃紑鍏斥�濇寜閿�5绉掞紝鎵�鏈夌伅姣忚繘琛寋0}2娆′寒鏆楀垏鎹紝鍗冲叆缃戞垚鍔�
 327=闀挎寜鈥滃紑鍏斥�濇寜閿�5绉�
+328=鏈�澶氬彲娣诲姞{0}涓�
+329=缁戝畾
+330=璇ヨ澶囨槸缁х數鍣紝褰撳墠鍙敮鎸佸甫鏈夎皟鍏夌殑鐏厜
+331=璇ヨ澶囨槸璋冨厜鐏紝褰撳墠鍙敮鎸佷笉甯︽湁璋冨厜鐨勭伅鍏�
+332=绌鸿皟鐩爣
+333=涓嶇粦瀹氫换浣曠洰鏍�
+334= 鐫$湢鏃堕棿
+335=璀﹀憡锛佹暟鎹嚭閿欙紝蹇呴』鍒锋柊鍒楄〃锛屽惁鍒欐帶鍒剁幇璞¢敊涔�
 
 5097=鍙栨秷
 5098=纭畾
@@ -602,7 +610,6 @@
 5396=鎴�
 5397=鏃堕棿涓虹┖
 5398=鍙敮鎸佹暟瀛楄緭鍏�
-
 5399=鍏抽棴澶辫触
 5400=寮�鍚父寮�妯″紡澶辫触
 5401=娣诲姞鏃舵晥鎬у父寮�璁剧疆澶辫触
@@ -610,6 +617,10 @@
 5403=鍒嗗叧闂�
 5404=鏃�
 5405=绫�
+5406=澶滅伅寮�鍏�
+5407=鑹叉俯
+5408=铚傞福鍣�
+
 
 10000=HDL Home
 10001=甯哥敤
@@ -1847,6 +1858,7 @@
 16131=蹇界暐
 16132=铚傞福鍣ㄥ紑鍏�
 16133=灏忓鐏紑鍏�
+16134=璁剧疆璁惧鍔熻兘绫诲瀷澶辫触
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
 18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/BindPic/Curtain.png b/ZigbeeApp/Home.Ios/Resources/Phone/BindPic/Curtain.png
new file mode 100755
index 0000000..ff844b8
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/BindPic/Curtain.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/BindPic/EmptyTargets.png b/ZigbeeApp/Home.Ios/Resources/Phone/BindPic/EmptyTargets.png
new file mode 100755
index 0000000..a467884
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/BindPic/EmptyTargets.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/BindPic/EmptyTargetsSelected.png b/ZigbeeApp/Home.Ios/Resources/Phone/BindPic/EmptyTargetsSelected.png
new file mode 100755
index 0000000..6a7220b
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/BindPic/EmptyTargetsSelected.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/BindPic/Roller.png b/ZigbeeApp/Home.Ios/Resources/Phone/BindPic/Roller.png
new file mode 100755
index 0000000..c345d33
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/BindPic/Roller.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/BindPic/Switch.png b/ZigbeeApp/Home.Ios/Resources/Phone/BindPic/Switch.png
new file mode 100755
index 0000000..2da4dcc
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/BindPic/Switch.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/back1.png b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/back1.png
new file mode 100755
index 0000000..df52c60
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/back1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/nightLight.png b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/nightLight.png
new file mode 100755
index 0000000..714762c
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/nightLight.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/nightLightSelected.png b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/nightLightSelected.png
new file mode 100755
index 0000000..8eca161
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/nightLightSelected.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/seek.png b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/seek.png
new file mode 100755
index 0000000..610b1ef
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/seek.png
Binary files differ
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index 572bdba..b1c65d1 100755
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -50,7 +50,7 @@
         /// <summary>
         /// 鐗堟湰鍙�
         /// </summary>
-        public static string CodeIDString = "1.1.0120061701";
+        public static string CodeIDString = "1.1.0120062401";
         /// <summary>
         /// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
         /// </summary>
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index bada159..cd8dc6a 100755
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -249,6 +249,7 @@
             }
 
             //娣诲姞璁惧鐨勭紦瀛�
+            var listDriveDevice = new List<CommonDevice>();
             for (int i = 0; i < listDevice.Count; i++)
             {
                 var device = listDevice[i];
@@ -267,24 +268,27 @@
                 }
                 //鑾峰彇璁惧鐨勫浐瀹氬睘鎬�
                 HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device);
-            }
-
-            for (int i = 0; i < listDevice.Count; i++)
-            {
-                var device = listDevice[i];
                 //瀵规湭鍛藉悕鐨勮櫄鎷熻澶囬噸鏂板懡鍚�
                 if (device.DriveCode > 0 && this.GetSimpleEpointName(device) == string.Empty)
                 {
-                    //鏍规嵁璁惧绫诲瀷鑾峰彇鍚嶇О
-                    var dName = this.GetDeviceObjectText(new List<CommonDevice>() { device }, false);
-                    //鍦ㄧ鐐瑰悕瀛楃殑鍚庨潰闄勫姞銆愬洖璺�戝瓧鏍�
-                    dName += "(" + device.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
-
-                    HdlThreadLogic.Current.RunThread(() =>
-                    {
-                        this.ReName(device, dName, ShowErrorMode.NO);
-                    });
+                    listDriveDevice.Add(device);
                 }
+            }
+            if (listDriveDevice.Count > 0)
+            {
+                //濡傛灉铏氭嫙璁惧杩樻病鏈夊悕瀛楃殑璇�
+                HdlThreadLogic.Current.RunThread(() =>
+                {
+                    //濡傛灉涓嶈繖鏍锋斁鍦ㄤ竴涓嚎绋嬮噷,鏈夊彲鑳藉Dictionary浜х敓褰卞搷
+                    foreach (var myDevice in listDriveDevice)
+                    {
+                        //鏍规嵁璁惧绫诲瀷鑾峰彇鍚嶇О
+                        var dName = this.GetDeviceObjectText(new List<CommonDevice>() { myDevice }, false);
+                        //鍦ㄧ鐐瑰悕瀛楃殑鍚庨潰闄勫姞銆愬洖璺�戝瓧鏍�
+                        dName += "(" + myDevice.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
+                        this.ReName(myDevice, dName, ShowErrorMode.NO);
+                    }
+                });
             }
 
             //鍙湁瀹屽叏鑾峰彇鐨勬椂鍊�,鎵嶄細鍘诲鐞嗗垹闄ょ殑闂
@@ -978,13 +982,20 @@
         public List<CommonDevice> GetMutilfunctionPanelByMac(List<CommonDevice> listDevice, bool sort = true)
         {
             //鍜屽姜鍝ャ�佽澶囧拰浜у搧閮ㄥ悓浜嬬‘璁わ細
-            //绠�绾﹀鍔熻兘闈㈡澘[涓嶆樉绀哄浣欑殑鍥炶矾锛屽彧鏄剧ず鎼哄甫鐨�2涓户鐢靛櫒鍜�1涓俯婀垮害浼犳劅鍣�
+            //绠�绾﹀鍔熻兘闈㈡澘[涓嶆樉绀哄浣欑殑鍥炶矾锛屽彧鏄剧ず鎼哄甫鐨�2涓户鐢靛櫒锛�1涓俯搴︿紶鎰熷櫒锛�1涓箍搴︿紶鎰熷櫒
             var list = new List<CommonDevice>();
             foreach (var dev in listDevice)
             {
                 if (dev.Type == DeviceType.TemperatureSensor)
                 {
                     if (dev.DeviceEpoint == 64)
+                    {
+                        list.Add(dev);
+                    }
+                }
+                else if (dev.Type == DeviceType.FreshAirHumiditySensor)
+                {
+                    if (dev.DeviceEpoint == 65)
                     {
                         list.Add(dev);
                     }
@@ -1008,6 +1019,40 @@
                 return -1;
             });
 
+            return list;
+        }
+
+        /// <summary>
+        /// 鏍规嵁MAC鍦板潃,鑾峰彇鏂伴銆佺畝绾︾幆澧冮潰鏉垮叏閮ㄥ洖璺殑璁惧瀵硅薄
+        /// </summary>
+        /// <param name="listDevice"></param>
+        /// <returns></returns>
+        public List<CommonDevice> GetPanelMatchEpointByMac(List<CommonDevice> listDevice, bool sort = true)
+        { 
+            var list = new List<CommonDevice>();
+            foreach (var dev in listDevice)
+            {
+                if (dev.Type == DeviceType.TemperatureSensor)
+                {
+                    list.Add(dev);
+                }
+                else if (dev.Type == DeviceType.FreshAirHumiditySensor)
+                {
+                    list.Add(dev);
+                }  
+            }
+            if (sort == false)
+            {
+                return list;
+            } 
+            list.Sort((obj1, obj2) => {
+
+                if (obj1.DeviceEpoint > obj2.DeviceEpoint)
+                {
+                    return 1;
+                }
+                return -1;
+            }); 
             return list;
         }
 
@@ -1126,6 +1171,56 @@
 
         #endregion
 
+        #region 鈻� 鑾峰彇璁惧淇℃伅_______________________
+
+        /// <summary>
+        /// 璇诲彇鍗曚釜绔偣鍥炶矾璁惧淇℃伅
+        /// </summary>
+        /// <param name="device">璁惧瀵硅薄</param>
+        /// <returns></returns>
+        public CommonDevice.DeviceInfoData ReadDeviceEpointDeviceInfo(CommonDevice device)
+        {
+            var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", device.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 80 } };
+            var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "GetStatusRecord", jObject.ToString(), "GetStatusRecord_Respon");
+            if (result.ErrorMsg != null || result.ErrorMsgDiv == 0)
+            {
+                return null;
+            }
+            var info = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DeviceInfoData>(result.ReceiptData);
+            return info;
+        }
+
+        #endregion
+
+        #region 鈻� 璁剧疆璁惧鍔熻兘绫诲瀷___________________
+
+        /// <summary>
+        /// 璁剧疆璁惧鍔熻兘绫诲瀷鍒扮綉鍏�
+        /// </summary>
+        /// <param name="device">璁惧鍥炶矾</param>
+        /// <param name="functionType">鍔熻兘绫诲瀷</param>
+        /// <returns></returns>
+        public bool SendDeviceFunctionTypeToGateway(CommonDevice device, DeviceFunctionType functionType)
+        {
+            var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", device.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 110 } };
+            var data = new Newtonsoft.Json.Linq.JObject { { "FunctionType", (int)functionType } };
+            jObject.Add("Data", data);
+            var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway(device, "Device/SetEPDeviceFunctionType", jObject.ToString(), "Device/SetEPDeviceFunctionTypeRespon");
+            if (result.ErrorMsg != null || result.ErrorMsgDiv == 0)
+            {
+                return false;
+            }
+            var resultData = Newtonsoft.Json.Linq.JObject.Parse(result.ReceiptData);
+            if (resultData.Property("Result") != null)
+            {
+                //0:淇敼鎴愬姛 1:淇敼澶辫触
+                return resultData["Result"].ToString() == "0";
+            }
+            return false;
+        }
+
+        #endregion
+
         #region 鈻� 鑾峰彇璁惧鍚嶇О_______________________
 
         /// <summary>
@@ -1181,17 +1276,7 @@
             {
                 //绌鸿皟閮藉彨瀹ゅ唴鏈�
                 return Language.StringByID(R.MyInternationalizationString.uIndoorUnit) + epointNo;
-            }
-            else if (device.Type == DeviceType.FreshAir)
-            {
-                //鏂伴闈㈡澘涓殑鎸夐敭鍙柊椋�
-                return Language.StringByID(R.MyInternationalizationString.FreshAir);
-            }
-            else if (device.Type == DeviceType.FreshAirHumiditySensor)
-            {
-                //鏂伴闈㈡澘婀垮害浼犳劅鍣�
-                return Language.StringByID(R.MyInternationalizationString.HumiditySensor);
-            }
+            }  
 
             //鑾峰彇璁惧绫诲瀷
             var deviceInfoType = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
@@ -1208,12 +1293,19 @@
                     return Language.StringByID(R.MyInternationalizationString.uDeviceBelongId16) + epointNo;
                 }
             }
+            else if (device.Type == DeviceType.FreshAirHumiditySensor)
+            {
+                //鏂伴闈㈡澘/绠�绾﹀鍔熻兘/绠�绾︾幆澧冮潰鏉挎箍搴︿紶鎰熷櫒
+                return Language.StringByID(deviceInfoType.DefultNameId) + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
+            }
             else if (device.Type == DeviceType.TemperatureSensor)
             {
-                if (deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+                if (deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir
+                    || deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment
+                    || deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
                 {
-                    //鏂伴闈㈡澘涓殑Thermostat涓烘俯搴︿紶鎰熷櫒
-                    return Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
+                    //鏂伴闈㈡澘/绠�绾﹀鍔熻兘/绠�绾︾幆澧冮潰鏉� 娓╁害浼犳劅鍣�
+                    return Language.StringByID(deviceInfoType.DefultNameId) + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
                 }
                 else if (deviceInfoType.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘)
                 {
@@ -2863,10 +2955,13 @@
             //鏍规嵁璁惧绫诲瀷鍒涘缓璁惧瀵硅薄鐨勫疄渚�
             if (deviceType == DeviceType.ColorDimmableLight) { device = new ColorDimmableLight(); }
             else if (deviceType == DeviceType.DimmableLight) { device = new DimmableLight(); }
+            else if (deviceType == DeviceType.ColorDimmerSwitch) { device = new ColorDimmerSwitch(); }
+            else if (deviceType == DeviceType.LevelControlSwitch) { device = new LevelControlSwitch(); }
             else if (deviceType == DeviceType.OnOffSwitch) { device = new Panel(); }
             else if (deviceType == DeviceType.OnOffOutput) { device = new ToggleLight(); }
             else if (deviceType == DeviceType.AirSwitch) { device = new AirSwitch(); }
             else if (deviceType == DeviceType.WindowCoveringDevice) { device = new Rollershade(); }
+            else if (deviceType == DeviceType.WindowCoveringController) { device = new WindowCoveringController(); }
             else if (deviceType == DeviceType.IASZone) { device = new IASZone(); }
             else if (deviceType == DeviceType.Repeater) { device = new Repeater(); }
             else if (deviceType == DeviceType.Thermostat) { device = new AC(); }
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
index af11f1d..b1faab1 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
index 8275ecd..0a412cd 100755
--- a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.xml b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.xml
new file mode 100755
index 0000000..a325f31
--- /dev/null
+++ b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.xml
@@ -0,0 +1,4106 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Shared.Droid</name>
+    </assembly>
+    <members>
+        <member name="M:Shared.IO.FileUtils.WriteFileByBytes(System.String,System.Byte[])">
+            <summary>
+            Writes the file by bytes.
+            </summary>
+            <returns><c>true</c>, if file by bytes was writed, <c>false</c> otherwise.</returns>
+            <param name="fileName">File name.</param>
+            <param name="bytes">Bytes.</param>
+        </member>
+        <member name="M:Shared.IO.FileUtils.WriteFileByInputStream(System.String,System.IO.Stream)">
+            <summary>
+            Writes the file by input stream.
+            </summary>
+            <returns><c>true</c>, if file by input stream was writed, <c>false</c> otherwise.</returns>
+            <param name="fileName">File name.</param>
+            <param name="inputStream">Input stream.</param>
+            <param name="isNeedRootPath">If set to <c>true</c> is need root path.</param>
+        </member>
+        <member name="M:Shared.IO.FileUtils.GetImageFilePath(System.String)">
+            <summary>
+            璇诲彇鍥剧墖鏂囦欢璺緞
+            </summary>
+            <returns>The file.</returns>
+            <param name="fileName">File name.</param>
+        </member>
+        <member name="M:Shared.IO.FileUtils.ReadImage11111(System.String)">
+            <summary>
+            read file
+            </summary>
+            <returns>The file.</returns>
+            <param name="fileName">File name.</param>
+        </member>
+        <member name="M:Shared.Net.NetWiFi.GetWIFISSID(System.Action{System.String})">
+            <summary>
+            9.0系统锟斤拷锟斤拷锟斤拷要锟斤拷权锟斤拷 android.permission.ACCESS_FINE_LOCATION锟斤拷android.permission.ACCESS_COARSE_LOCATION锟斤拷android.permission.CHANGE_WIFI_STATE
+            8.1系统锟斤拷要锟斤拷权锟斤拷 android.permission.CHANGE_NETWORK_STATE android.permission.CHANGE_WIFI_STATE
+            锟斤拷锟斤拷系统锟芥本锟斤拷锟斤拷要锟斤拷 android.permission.ACCESS_NETWORK_STATE锟斤拷android.permission.ACCESS_WIFI_STATE
+            </summary>
+            <param name="action"></param>
+        </member>
+        <member name="P:Shared.Net.NetWiFi.IpAddress">
+            <summary>
+            锟斤拷前IP锟斤拷址
+            </summary>
+        </member>
+        <member name="P:Shared.Net.NetWiFi.BroadcastIpAddress">
+            <summary>
+            锟姐播锟斤拷址
+            </summary>
+        </member>
+        <member name="M:Shared.DensityUtil.Dip2Px(System.Single)">
+            <summary>
+            鏍规嵁鎵嬫満鐨勫垎杈ㄧ巼浠� dp 鐨勫崟浣� 杞垚涓� px(鍍忕礌) 
+            </summary>
+            <returns>The px.</returns>
+            <param name="dpValue">Dp value.</param>
+        </member>
+        <member name="M:Shared.DensityUtil.Px2Dip(System.Single)">
+            <summary>
+            鏍规嵁鎵嬫満鐨勫垎杈ㄧ巼浠� px(鍍忕礌) 鐨勫崟浣� 杞垚涓� dp 
+            </summary>
+            <returns>The dip.</returns>
+            <param name="pxValue">Px value.</param>
+        </member>
+        <member name="T:Shared.Alert">
+            <summary>
+            瀵硅瘽妗� 
+            </summary>
+            2019--18 淇敼
+        </member>
+        <member name="F:Shared.Alert.builder">
+            <summary>
+            褰撳墠淇℃伅妗嗗璞�
+            </summary>
+        </member>
+        <member name="M:Shared.Alert.#ctor(System.String,System.String,System.String,System.String)">
+            <summary>
+            瀵硅瘽绐�
+            </summary>
+            <param name="title">鏍囬</param>
+            <param name="message">淇℃伅</param>
+            <param name="cancelButtonText">鍙栨秷鎸夐敭澶囨敞锛屽�糿ull琛ㄧず涓嶆樉绀哄彇娑堟寜閿�</param>
+            <param name="okButtonText">纭鎸夐敭澶囨敞</param>
+        </member>
+        <member name="M:Shared.Alert.#ctor(System.String,System.String,System.String)">
+            <summary>
+            瀵硅瘽绐�
+            </summary>
+            <param name="title">鏍囬</param>
+            <param name="message">淇℃伅</param>
+            <param name="okButtonText">纭鎸夐敭澶囨敞</param>
+        </member>
+        <member name="F:Shared.Alert.ResultEventHandler">
+            <summary>
+            缁撴灉閫氱煡浜嬩欢锛宼rue琛ㄧず閫変腑鎸夐敭锛宖alse琛ㄧず鍙栨秷浜嬩欢
+            </summary>
+        </member>
+        <member name="M:Shared.Alert.Show">
+            <summary>
+            鏄剧ず褰撳墠鐨勭晫闈� 
+            </summary>
+        </member>
+        <member name="M:Shared.Alert.Dismiss">
+            <summary>
+            鍏抽棴褰撳墠鐨勭晫闈�
+            </summary>
+        </member>
+        <member name="T:Shared.Application">
+            <summary>
+            UI澶勭悊绫�
+            </summary>
+        </member>
+        <member name="M:Shared.Application.GetRealHeight(System.Int32)">
+            <summary>
+            鑾峰彇瀹為檯鐨勯珮搴�
+            </summary>
+            <returns>The real height.</returns>
+            <param name="height">Height.</param>
+        </member>
+        <member name="F:Shared.Application.FontSize">
+            <summary>
+            榛樿鐨勫瓧浣撳ぇ灏�
+            </summary>
+        </member>
+        <member name="F:Shared.Application.DeviceType">
+            <summary>
+            褰撳墠璁惧绫诲瀷
+            </summary>
+        </member>
+        <member name="M:Shared.Application.GetRealWidth(System.Int32)">
+            <summary>
+            鑾峰彇瀹為檯鐨勫搴�
+            </summary>
+            <returns>The real width.</returns>
+            <param name="width">Width.</param>
+        </member>
+        <member name="M:Shared.Application.GetMinReal(System.Int32)">
+            <summary>
+            鑾峰彇鏈�灏忔瘮渚嬬殑瀹為檯鍊�
+            </summary>
+            <returns>The minimum real.</returns>
+            <param name="widthOrHeight">Width or height.</param>
+        </member>
+        <member name="M:Shared.Application.GetMinRealAverage(System.Int32)">
+            <summary>
+            鑾峰彇骞冲潎瀹為檯鍊�
+            </summary>
+            <returns>The minimum real average.</returns>
+            <param name="widthOrHeight">Width or height.</param>
+        </member>
+        <member name="P:Shared.Application.CurrentWidth">
+            <summary>
+            褰撳墠璁惧鐨勫搴�
+            </summary>
+        </member>
+        <member name="P:Shared.Application.CurrentHeight">
+            <summary>
+            褰撳墠璁惧鐨勯珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.Application.WidthScale">
+            <summary>
+            瀹藉害姣斾緥
+            </summary>
+            <value>The width scale.</value>
+        </member>
+        <member name="P:Shared.Application.HeightScale">
+            <summary>
+            楂樺害姣斾緥
+            </summary>
+            <value>The height scale.</value>
+        </member>
+        <member name="P:Shared.Application.MinScale">
+            <summary>
+            鏈�灏忔瘮渚�
+            </summary>
+            <value>The minimum scale.</value>
+        </member>
+        <member name="P:Shared.Application.AverageScale">
+            <summary>
+            骞冲潎姣斾緥
+            </summary>
+            <value>The average scale.</value>
+        </member>
+        <member name="F:Shared.Application.DesignWidth">
+            <summary>
+             璁捐瀹藉害 
+            </summary>
+        </member>
+        <member name="F:Shared.Application.DesignHeight">
+            <summary>
+            璁捐楂樺害
+            </summary>
+        </member>
+        <member name="P:Shared.Application.Activity">
+            <summary>
+            褰撳墠鐨凙ctivity
+            </summary>
+        </member>
+        <member name="P:Shared.Application.MainPage">
+            <summary>
+            褰撳墠涓婚〉
+            </summary>
+            <value>The main page.</value>
+        </member>
+        <member name="P:Shared.Application.RootFrameLayout">
+            <summary>
+            鏍瑰鍣ㄨ鍥�
+            </summary>
+            <value>The root frame layout.</value>
+        </member>
+        <member name="F:Shared.Application.RootPath">
+            <summary>
+            鏁版嵁鏂囦欢鏍圭洰褰�
+            </summary>
+            <value>The root path.</value>
+        </member>
+        <member name="P:Shared.Application.IsPad">
+            <summary>
+            鏄惁鏄痯ad
+            </summary>
+        </member>
+        <member name="F:Shared.Application.Skin">
+            <summary>
+            鐨偆锛宯ull鏃惰〃绀虹敤榛樿鐨�
+            </summary>
+        </member>
+        <member name="F:Shared.Application.LocationAction">
+            <summary>
+            GPS浣嶇疆鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="M:Shared.Application.StartGPSLocationService">
+            <summary>
+            寮�鍚畾浣嶆湇鍔�
+            </summary>
+        </member>
+        <member name="M:Shared.Application.StopGPSLocationService">
+            <summary>
+            鍏抽棴瀹氫綅鏈嶅姟
+            </summary>
+        </member>
+        <member name="T:Shared.Button">
+            <summary>
+            Button 鎸夐敭
+            </summary>
+        </member>
+        <member name="P:Shared.Button.currentButton">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The android button.</value>
+        </member>
+        <member name="M:Shared.Button.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.Button.TextSize">
+            <summary>
+            鏂囧瓧澶у皬
+            </summary>
+            <value>The size of the text.</value>
+        </member>
+        <member name="P:Shared.Button.TextID">
+            <summary>
+            鏍规嵁ID鑾峰彇瀵瑰簲鐨勫娉�
+            </summary>
+            <value>The text I.</value>
+        </member>
+        <member name="P:Shared.Button.Text">
+            <summary>
+            鏂囨湰
+            </summary>
+            <value>The text.</value>
+        </member>
+        <member name="P:Shared.Button.FontName">
+            <summary>
+            瀛椾綋鍚嶇О
+            </summary>
+            <value>The name of the font.</value>
+        </member>
+        <member name="F:Shared.Button.isBold">
+            <summary>
+            鏄惁鏄剧ず绮椾綋
+            </summary>
+        </member>
+        <member name="M:Shared.Button.GetTextWidth">
+            <summary>
+            鑾峰彇瀛椾綋闀垮害
+            </summary>
+        </member>
+        <member name="M:Shared.Button.Refresh">
+            <summary>
+            鍒锋柊
+            </summary>
+        </member>
+        <member name="P:Shared.Button.TextColor">
+            <summary>
+            鏂囧瓧棰滆壊
+            </summary>
+            <value>The color of the text.</value>
+        </member>
+        <member name="P:Shared.Button.SelectedTextColor">
+            <summary>
+            鏂囧瓧棰滆壊
+            </summary>
+            <value>The color of the text.</value>
+        </member>
+        <member name="P:Shared.Button.IsSelected">
+            <summary>
+            閫変腑鐘舵��
+            </summary>
+            <value><c>true</c> if this instance is selected; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.Button.TextAlignment">
+            <summary>
+            鏂囧瓧瀵归綈鏂瑰紡
+            </summary>
+            <param name="horizontalAlignment">妯悜</param>
+            <param name="verticalAlignment">绾靛悜</param>
+        </member>
+        <member name="P:Shared.Button.Padding">
+            <summary>
+            鍐呰竟璺�
+            </summary>
+            <value>The padding.</value>
+        </member>
+        <member name="P:Shared.Button.SelectedImagePath">
+            <summary>
+            閫夋嫨鏃惰儗鏅浘璺緞
+            </summary>
+            <value>The selected image path.</value>
+        </member>
+        <member name="P:Shared.Button.UnSelectedImagePath">
+            <summary>
+            闈為�変腑鐘舵�佺殑鑳屾櫙鍥捐矾寰�
+            </summary>
+            <value>The un selected image path.</value>
+        </member>
+        <member name="P:Shared.Button.SelectedBackgroundColor">
+            <summary>
+            閫夋嫨鏃惰儗鏅鑹�
+            </summary>
+            <value>The color of the text.</value>
+        </member>
+        <member name="T:Shared.DateView">
+            <summary>
+            鏃ユ湡瑙嗗浘
+            </summary>
+        </member>
+        <member name="P:Shared.DateView.currentAndroidDatePicker">
+            <summary>
+            褰撳墠瑙嗗浘
+            </summary>
+            <value>The android text.</value>
+        </member>
+        <member name="P:Shared.DateView.Year">
+            <summary>
+            骞�
+            </summary>
+        </member>
+        <member name="P:Shared.DateView.Month">
+            <summary>
+            鏈�
+            </summary>
+        </member>
+        <member name="P:Shared.DateView.Day">
+            <summary>
+            澶�
+            </summary>
+        </member>
+        <member name="M:Shared.DateView.#ctor">
+            <summary>
+            瀹炰緥
+            </summary>
+        </member>
+        <member name="T:Shared.DateView.AndroidDatePicker">
+            <summary>
+            Android 鍘熺敓 AndroidDatePicker
+            </summary>
+        </member>
+        <member name="T:Shared.TimeView">
+            <summary>
+            时锟斤拷锟斤拷图
+            </summary>
+        </member>
+        <member name="P:Shared.TimeView.currentAndroidTimePicker">
+            <summary>
+            锟斤拷前锟斤拷图
+            </summary>
+            <value>The android text.</value>
+        </member>
+        <member name="P:Shared.TimeView.Hour">
+            <summary>
+            时
+            </summary>
+        </member>
+        <member name="P:Shared.TimeView.Minute">
+            <summary>
+            锟斤拷
+            </summary>
+        </member>
+        <member name="M:Shared.TimeView.#ctor">
+            <summary>
+            锟斤拷图
+            </summary>
+        </member>
+        <member name="F:Shared.TimeView.AndroidTimePicker.MouseUPEventHandler">
+            <summary>
+            锟斤拷锟斤拷锟斤拷锟斤拷录锟�
+            </summary>
+        </member>
+        <member name="F:Shared.TimeView.AndroidTimePicker.MouseDownEventHandler">
+            <summary>
+            锟斤拷锟斤拷锟斤拷锟斤拷录锟�
+            </summary>
+        </member>
+        <member name="M:Shared.TimeView.AndroidTimePicker.OnTouchEvent(Android.Views.MotionEvent)">
+            <summary>
+            锟斤拷锟斤拷录锟�
+            </summary>
+            <returns>The touch event.</returns>
+            <param name="e">E.</param>
+        </member>
+        <member name="F:Shared.TimeView.AndroidTimePicker.SizeChangeEventHandler">
+            <summary>
+            锟斤拷小锟戒化锟铰硷拷
+            </summary>
+        </member>
+        <member name="P:Shared.TimeView.AndroidTimePicker.LayoutParameters">
+            <summary>
+            位锟矫诧拷锟斤拷
+            </summary>
+        </member>
+        <member name="T:Shared.Dialog">
+            <summary>
+            寮圭獥瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.Dialog.#ctor">
+            <summary>
+            寮圭獥瑙嗗浘鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.Dialog.BackgroundColor">
+            <summary>
+            鑳屾櫙棰滆壊
+            </summary>
+            <value>The color of the background.</value>
+        </member>
+        <member name="P:Shared.Dialog.Radius">
+            <summary>
+            鍦嗚澶у皬
+            </summary>
+            <value>The corner.</value>
+        </member>
+        <member name="P:Shared.Dialog.BorderWidth">
+            <summary>
+            杈规绾垮ぇ灏�
+            </summary>
+            <value>The width of the border.</value>
+        </member>
+        <member name="M:Shared.Dialog.AddChidren(Shared.View)">
+            <summary>
+            澧炲姞瀛愭帶浠�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="P:Shared.Dialog.BackgroundImagePath">
+            <summary>
+            鑳屾櫙鍥剧墖璺緞
+            </summary>
+            <value>The background image path.</value>
+        </member>
+        <member name="P:Shared.Dialog.Width">
+            <summary>
+            瀹藉害
+            </summary>
+            <value>The width.</value>
+        </member>
+        <member name="P:Shared.Dialog.Height">
+            <summary>
+            楂樺
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="P:Shared.Dialog.X">
+            <summary>
+            X
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="P:Shared.Dialog.Y">
+            <summary>
+            Y
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="M:Shared.Dialog.Show">
+            <summary>
+            鏄剧ず褰撳墠鐨勭晫闈�
+            </summary>
+        </member>
+        <member name="M:Shared.Dialog.Close">
+            <summary>
+            鍏抽棴褰撳墠鐨勭晫闈紝閲婃斁璧勬簮
+            </summary>
+        </member>
+        <member name="T:Shared.EditText">
+            <summary>
+            EditText
+            </summary>
+        </member>
+        <member name="P:Shared.EditText.currentAndroidEditText">
+            <summary>
+            褰撳墠瑙嗗浘
+            </summary>
+            <value>The android text.</value>
+        </member>
+        <member name="P:Shared.EditText.TextSize">
+            <summary>
+            鏂囧瓧澶у皬
+            </summary>
+            <value>The size of the text.</value>
+        </member>
+        <member name="P:Shared.EditText.Text">
+            <summary>
+            鏂囨湰
+            </summary>
+            <value>The text.</value>
+        </member>
+        <member name="P:Shared.EditText.TextID">
+            <summary>
+            鏍规嵁ID鑾峰彇瀵瑰簲鐨勫娉�
+            </summary>
+            <value>The text I.</value>
+        </member>
+        <member name="P:Shared.EditText.Enable">
+            <summary>
+            鏄惁浣胯兘
+            </summary>
+            <value>true</value>
+            <c>false</c>
+        </member>
+        <member name="P:Shared.EditText.PlaceholderText">
+            <summary>
+            鏄剧ず鎻愮ず淇℃伅
+            </summary>
+            <value>The placeholder.</value>
+        </member>
+        <member name="P:Shared.EditText.PlaceholderTextColor">
+            <summary>
+            Gets or sets the color of the placeholder text.
+            </summary>
+            <value>The color of the placeholder text.</value>
+        </member>
+        <member name="P:Shared.EditText.IsNumberKeyboardType">
+            <summary>
+            璁剧疆閿洏绫诲瀷 鏄惁涓烘暟瀛楃被鍨嬮敭鐩橈紝娉ㄦ剰浼氫笌*鍙烽殣钘忓瓧绗﹀啿绐�
+            </summary>
+        </member>
+        <member name="P:Shared.EditText.SecureTextEntry">
+            <summary>
+            鏄惁鐢�*鍙烽殣钘忓瓧绗�
+            </summary>
+            <value>The secure text entry.</value>
+        </member>
+        <member name="P:Shared.EditText.IsSelected">
+            <summary>
+            Gets or sets a value indicating whether this instance is selected.
+            </summary>
+            <value><c>true</c> if this instance is selected; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.EditText.SelectedBackgroundColor">
+            <summary>
+            閫夋嫨鏃惰儗鏅鑹�
+            </summary>
+            <value>The color of the text.</value>
+        </member>
+        <member name="M:Shared.EditText.Refresh">
+            <summary>
+            鍒锋柊澶у皬
+            </summary>
+        </member>
+        <member name="P:Shared.EditText.TextColor">
+            <summary>
+            鏂囧瓧棰滆壊
+            </summary>
+            <value>The color of the text.</value>
+        </member>
+        <member name="P:Shared.EditText.TextAlignment">
+            <summary>
+            Texts the alignment.
+            </summary>
+            <param name="horizontalAlignment">Horizontal alignment.</param>
+            <param name="verticalAlignment">Vertical alignment.</param>
+        </member>
+        <member name="P:Shared.EditText.SelectedImagePath">
+            <summary>
+            閫夋嫨鏃惰儗鏅浘璺緞
+            </summary>
+            <value>The selected image path.</value>
+        </member>
+        <member name="P:Shared.EditText.UnSelectedImagePath">
+            <summary>
+            闈為�変腑鐘舵�佺殑鑳屾櫙鍥捐矾寰�
+            </summary>
+            <value>The un selected image path.</value>
+        </member>
+        <member name="F:Shared.EditText.TextChangeEventHandler">
+            <summary>
+            杈撳叆鏂囧瓧鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="F:Shared.FocusEventArgs.Focus">
+            <summary>
+            true 涓鸿幏鍙栧埌鐒︾偣
+            false 鐒︾偣娑堝け
+            </summary>
+        </member>
+        <member name="T:Shared.HorizontalScrolViewLayout">
+            <summary>
+            浣嶇疆甯冨眬
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalScrolViewLayout.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.HorizontalScrolViewLayout.Width">
+            <summary>
+            瑙嗗浘瀹藉害
+            </summary>
+            <value>The width.</value>
+        </member>
+        <member name="P:Shared.HorizontalScrolViewLayout.Height">
+            <summary>
+            瑙嗗浘楂樺害
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="P:Shared.HorizontalScrolViewLayout.ScrollEnabled">
+            <summary>
+            鏄惁鍏佽婊戝姩
+            </summary>
+            <value><c>true</c> if scroll enabled; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.HorizontalScrolViewLayout.Decelerating">
+            <summary>
+            鏄惁姝e湪婊戝姩
+            </summary>
+            <value><c>true</c> if decelerating; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.HorizontalScrolViewLayout.HorizontalScrollBarEnabled">
+            <summary>鈥�        /// 鏄惁鏄剧ず婊氬姩鏉♀��        /// </summary>
+        </member>
+        <member name="M:Shared.HorizontalScrolViewLayout.ScrollToViewIndex(System.Int32)">
+            <summary>
+            婊戝姩鍒版寚瀹歏iew
+            </summary>
+            <param name="viewIndex"> 鎸囧畾view鐨勭储寮曞��</param>
+        </member>
+        <member name="M:Shared.HorizontalScrolViewLayout.ScrollToX(System.Int32)">
+            <summary>
+            婊戝姩鍒版寚瀹氫綅缃� X
+            </summary>
+            <param name="viewX"></param>
+        </member>
+        <member name="T:Shared.AndroidHorizontalScrollView">
+            <summary>
+            Android 鍘熺敓 AndroidHorizontalScrollView
+            </summary>
+        </member>
+        <member name="M:Shared.AndroidHorizontalScrollView.#ctor(Android.Content.Context,Shared.View)">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+            <param name="context">Context.</param>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.AndroidHorizontalScrollView.OnTouchEvent(Android.Views.MotionEvent)">
+            <summary>
+            閲嶅啓鐐瑰嚮浜嬩欢
+            </summary>
+            <returns><c>true</c>浜嬩欢宸茬粡澶勭悊<c>false</c>浜嬩欢娌℃湁澶勭悊</returns>
+            <param name="e">E.</param>
+        </member>
+        <member name="T:Shared.HorizontalSeekBar">
+            <summary>
+            浣嶇疆甯冨眬
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalSeekBar.#ctor">
+            <summary>
+            褰撳墠瀹炰緥
+            </summary>
+        </member>
+        <member name="P:Shared.HorizontalSeekBar.ProgressColor">
+            <summary>
+            杩涘害棰滆壊
+            </summary>
+            <value>The color of the progress.</value>
+        </member>
+        <member name="P:Shared.HorizontalSeekBar.BackgroundColor">
+            <summary>
+            搴曢儴棰滆壊
+            </summary>
+            <value>The color of the background.</value>
+        </member>
+        <member name="F:Shared.HorizontalSeekBar.ProgressChanged">
+            <summary>
+             杩涘害鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="P:Shared.HorizontalSeekBar.Max">
+            <summary>
+            鏈�澶у��
+            </summary>
+            <value>The max.</value>
+        </member>
+        <member name="P:Shared.HorizontalSeekBar.IsCanScrolled">
+            <summary>
+            鏄惁鍏佽婊戝姩婊戝潡
+            </summary>
+            <value><c>true</c> if is can scrolled; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.HorizontalSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害
+            </summary>
+            <value>The progress.</value>
+        </member>
+        <member name="P:Shared.HorizontalSeekBar.ThumbColor">
+            <summary>
+            婊戝潡棰滆壊
+            </summary>
+            <value>The color of the background.</value>
+        </member>
+        <member name="F:Shared.HorizontalSeekBar.IsCanMove">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+        </member>
+        <member name="T:Shared.HorizontalSeekBar.AndroidHorizontalSeekBar">
+            <summary>
+            闇�瑕侀噸鍐欑殑瑙嗗浘
+            </summary>
+        </member>
+        <member name="F:Shared.HorizontalSeekBar.AndroidHorizontalSeekBar.isHorizontalActioned">
+            <summary>
+            濡傛灉宸茬粡鏄í鍚戞粦鍔紝鐖舵帶浠朵笉鍏佽鍐嶈姹備腑鏂�
+            </summary>
+        </member>
+        <member name="F:Shared.HorizontalSeekBar.AndroidHorizontalSeekBar.mLastMotionX">
+            <summary>
+            璁板綍鏈�鍚庣偣鍑荤殑X杞村潗鏍�
+            </summary>
+        </member>
+        <member name="F:Shared.HorizontalSeekBar.AndroidHorizontalSeekBar.mLastMotionY">
+            <summary>
+            鐐瑰嚮Y杞寸殑鍧愭爣
+            </summary>
+        </member>
+        <member name="M:Shared.Language.UpdateLanguage">
+            <summary>
+            閲嶆柊鏇存柊璇█搴撴暟鎹�
+            </summary>
+        </member>
+        <member name="F:Shared.Language.CurrentLanguage">
+            <summary>
+            褰撳墠璁剧疆鐨勮瑷�
+            </summary>
+        </member>
+        <member name="M:Shared.Language.StringByID(System.Int32)">
+            <summary>
+            鏍规嵁ID鑾峰彇瀵瑰簲鐨勫娉�
+            </summary>
+            <returns>The by I.</returns>
+            <param name="id">Identifier.</param>
+        </member>
+        <member name="M:Shared.Loading.Refresh">
+            <summary>
+            Refresh this instance.
+            </summary>
+        </member>
+        <member name="M:Shared.Loading.Hide">
+            <summary>
+            Hide this instance.
+            </summary>
+        </member>
+        <member name="M:Shared.Loading.Start">
+            <summary>
+            Start this instance.
+            </summary>
+        </member>
+        <member name="M:Shared.Loading.Start(System.String)">
+            <summary>
+            Start this instance.
+            </summary>
+        </member>
+        <member name="P:Shared.Loading.TextSize">
+            <summary>
+            鏂囧瓧澶у皬
+            </summary>
+            <value>The size of the text.</value>
+        </member>
+        <member name="P:Shared.MyLoading.LodingBackgroundColor">
+            <summary>
+            鑳屾櫙棰滆壊
+            </summary>
+            <value>The color of the background.</value>
+        </member>
+        <member name="M:Shared.MyLoading.OnTouchEvent(Android.Views.MotionEvent)">
+            <summary>
+            鐐瑰嚮浜嬩欢
+            </summary>
+            <returns>The touch event.</returns>
+            <param name="e">E.</param>
+        </member>
+        <member name="T:Shared.PageLayout">
+            <summary>
+            浣嶇疆甯冨眬
+            </summary>
+        </member>
+        <member name="P:Shared.PageLayout.Height">
+            <summary>
+            瑙嗗浘楂樺害
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="P:Shared.PageLayout.Width">
+            <summary>
+            瑙嗗浘瀹藉害
+            </summary>
+            <value>The width.</value>
+        </member>
+        <member name="F:Shared.PageLayout.PageChange">
+            <summary>
+            椤甸潰鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="M:Shared.PageLayout.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.PageLayout.IsShowPoint">
+            <summary>
+             鏄惁鏄剧ず涓嬮潰涓�鎺掔殑鐐�
+            </summary>
+            <value><c>true</c> if is show point; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.PageLayout.ScrollEnabled">
+            <summary>
+            鏄惁鍏佽婊戝姩
+            </summary>
+            <value><c>true</c> if scroll enabled; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.PageLayout.PageIndex">
+            <summary>
+            璁剧疆鎴栬�呰幏鍙栧綋鍓嶇殑鐣岄潰绱㈠紩
+            </summary>
+            <value>The index of the page.</value>
+        </member>
+        <member name="M:Shared.PageLayout.AddChidren(Shared.View)">
+            <summary>
+            澧炲姞瀛愭帶浠�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.PageLayout.Remove(Shared.View)">
+            <summary>
+            绉婚櫎褰撳墠鎺т欢
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.PageLayout.RemoveAll">
+            <summary>
+            绉婚櫎鎵�鏈夌殑鎺т欢
+            </summary>
+        </member>
+        <member name="M:Shared.PageLayout.RemoveAt(System.Int32)">
+            <summary>
+            鏍规嵁绱㈠紩绉婚櫎鎺т欢
+            </summary>
+            <param name="index">Index.</param>
+        </member>
+        <member name="T:Shared.RowLayout">
+            <summary>
+            鍦ㄦ粦鍔ㄤ簨浠朵笅锛屽彲鏄剧ず闅愯棌浜涜嚜瀹氫箟瑙嗗浘
+            </summary>
+        </member>
+        <member name="P:Shared.RowLayout.LineColor">
+            <summary>
+            鑳屾櫙棰滆壊
+            </summary>
+            <value>The color of the background.</value>
+        </member>
+        <member name="P:Shared.RowLayout.Width">
+            <summary>
+            瀹藉害璁剧疆鎴栬鍙�
+            </summary>
+            <value>The width.</value>
+        </member>
+        <member name="P:Shared.RowLayout.Height">
+            <summary>
+            瑙嗗浘楂樺害
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="M:Shared.RowLayout.#ctor">
+            <summary>
+            鍦ㄦ粦鍔ㄤ簨浠朵笅锛屽彲鏄剧ず闅愯棌浜涜嚜瀹氫箟瑙嗗浘
+            </summary>
+        </member>
+        <member name="F:Shared.RowLayout.IsShowLeft">
+            <summary>
+            鏄惁姝f墦寮�
+            </summary>
+        </member>
+        <member name="M:Shared.RowLayout.HideOtherRowLayout">
+            <summary>
+            鍏抽棴鍏朵粬RowLayout 鏄剧ず鐨刅iew
+            </summary>
+        </member>
+        <member name="M:Shared.RowLayout.HideMenu">
+            <summary>
+            鍏抽棴鏄剧ず鐨刅iew
+            </summary>
+        </member>
+        <member name="F:Shared.RowLayout.isUseSameSubViewWidth">
+            <summary>
+            鏄惁浣跨敤鍚屾牱鐨凷ubViewWidth瀹� 
+            </summary>
+        </member>
+        <member name="M:Shared.RowLayout.GetAllLeftViewWidth">
+            <summary>
+            鑾峰彇褰撳墠leftView鐨勬�诲
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Shared.RowLayout.GetAllRightViewWidth">
+            <summary>
+            鑾峰彇褰撳墠rigthView鐨勬�诲
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="F:Shared.RowLayout.subViewWidth">
+            <summary>
+            瀛愯鍥剧殑瀹藉害
+            </summary>
+        </member>
+        <member name="M:Shared.RowLayout.AddLeftView(Shared.View)">
+            <summary>
+            澧炲姞宸﹁竟瑙嗗浘
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.RowLayout.AddRightView(Shared.View)">
+            <summary>
+            澧炲姞鍙宠竟瑙嗗浘
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.RowLayout.AndroidRowLayout.DispatchTouchEvent(Android.Views.MotionEvent)">
+            <summary>
+            鎵цOnInterceptTouchEvent鍜孫nTouchEvent
+            </summary>
+            <returns><c>true</c>浜嬩欢宸茬粡澶勭悊<c>false</c>浜嬩欢娌℃湁澶勭悊</returns>
+            <param name="e">E.</param>
+        </member>
+        <member name="M:Shared.RowLayout.AndroidRowLayout.OnTouchEvent(Android.Views.MotionEvent)">
+            <summary>
+            閲嶅啓鐐瑰嚮浜嬩欢
+            </summary>
+            <returns><c>true</c>, if touch event was oned, <c>false</c> otherwise.</returns>
+            <param name="e">E.</param>
+        </member>
+        <member name="T:Shared.Spinner">
+            <summary>
+            褰撳墠瑙嗗浘
+            </summary>
+        </member>
+        <member name="P:Shared.Spinner.CurrentRow">
+            <summary>
+            褰撳墠琛�
+            </summary>
+            <value>褰撳墠琛岋紝浠�0寮�濮�</value>
+        </member>
+        <member name="P:Shared.Spinner.AdapterStr">
+            <summary>
+            娣诲姞涓嬫媺鍒楄〃鐨勬暟鎹�
+            </summary>
+            <param name="Str">String.</param>
+        </member>
+        <member name="F:Shared.Spinner.SelectedItemChanged">
+            <summary>
+            閫夋嫨鍒楄〃鍙樺寲鐨勪簨浠�
+            </summary>
+        </member>
+        <member name="M:Shared.Spinner.Refresh">
+            <summary>
+            鍒锋柊褰撳墠瑙嗗浘
+            </summary>
+        </member>
+        <member name="T:Shared.VerticalScrolViewLayout">
+            <summary>鈥�    /// 浣嶇疆甯冨眬鈥�    /// </summary>鈥�
+        </member>
+        <member name="M:Shared.VerticalScrolViewLayout.#ctor">
+            <summary>鈥�        /// 鏋勯�犲嚱鏁扳��        /// </summary>鈥�
+        </member>
+        <member name="P:Shared.VerticalScrolViewLayout.Width">
+            <summary>鈥�        /// 瑙嗗浘瀹藉害鈥�        /// </summary>鈥�        /// <value>The width.</value>鈥�
+        </member>
+        <member name="P:Shared.VerticalScrolViewLayout.Height">
+            <summary>鈥�        /// 瑙嗗浘楂樺害鈥�        /// </summary>鈥�        /// <value>The height.</value>鈥�
+        </member>
+        <member name="P:Shared.VerticalScrolViewLayout.ScrollEnabled">
+            <summary>鈥�        /// 鏄惁鍏佽婊戝姩鈥�        /// </summary>鈥�        /// <value><c>true</c> if scroll enabled; otherwise, <c>false</c>.</value>鈥�
+        </member>
+        <member name="P:Shared.VerticalScrolViewLayout.Decelerating">
+            <summary>鈥�        /// 鏄惁姝e湪婊戝姩鈥�        /// </summary>鈥�        /// <value><c>true</c> if decelerating; otherwise, <c>false</c>.</value>鈥�
+        </member>
+        <member name="P:Shared.VerticalScrolViewLayout.VerticalScrollBarEnabled">
+            <summary>鈥�        /// 鏄惁鏄剧ず婊氬姩鏉♀��        /// </summary>
+        </member>
+        <member name="T:Shared.AndroidScrolView">
+            <summary>鈥�    /// 绔栫洿鏂瑰悜婊戝姩鎺т欢鈥�    /// </summary>鈥�
+        </member>
+        <member name="F:Shared.AndroidScrolView.ScrollEnable">
+            <summary>鈥�        /// 鏄惁鍏佽婊戝姩鈥�        /// </summary>鈥�
+        </member>
+        <member name="M:Shared.AndroidScrolView.#ctor(Android.Content.Context,Shared.View)">
+            <summary>鈥�        /// 鏋勯�犲嚱鏁扳��        /// </summary>鈥�        /// <param name="context">Context.</param>鈥�        /// <param name="view">View.</param>鈥�
+        </member>
+        <member name="M:Shared.AndroidScrolView.OnTouchEvent(Android.Views.MotionEvent)">
+            <summary>鈥�        /// 閲嶅啓鐐瑰嚮浜嬩欢鈥�        /// </summary>鈥�        /// <returns><c>true</c>, if touch event was oned, <c>false</c> otherwise.</returns>鈥�        /// <param name="e">E.</param>鈥�
+        </member>
+        <member name="T:Shared.VerticalSeekBar">
+            <summary>
+            浣嶇疆甯冨眬
+            </summary>
+        </member>
+        <member name="P:Shared.VerticalSeekBar.verticalSeekBarAndroidFrameLayout">
+            <summary>
+            褰撳墠瑙嗗浘
+            </summary>
+            <value>The android horizonetal seek bar.</value>
+        </member>
+        <member name="F:Shared.VerticalSeekBar.btnProgressColor">
+            <summary>
+            鏄剧ず杩涘害鎺т欢
+            </summary>
+        </member>
+        <member name="F:Shared.VerticalSeekBar.btnThum">
+            <summary>
+            婊戝潡
+            </summary>
+        </member>
+        <member name="M:Shared.VerticalSeekBar.#ctor">
+            <summary>
+            褰撳墠瀹炰緥
+            </summary>
+        </member>
+        <member name="P:Shared.VerticalSeekBar.Height">
+            <summary>
+            褰撳墠瑙嗗浘鐨勯珮搴�
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="F:Shared.VerticalSeekBar.ProgressChanged">
+            <summary>
+             杩涘害鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="P:Shared.VerticalSeekBar.Max">
+            <summary>
+            鏈�澶у��
+            </summary>
+            <value>The max.</value>
+        </member>
+        <member name="P:Shared.VerticalSeekBar.IsCanScrolled">
+            <summary>
+            鏄惁鍏佽婊戝姩婊戝潡
+            </summary>
+            <value><c>true</c> if is can scrolled; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.VerticalSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害
+            </summary>
+            <value>The progress.</value>
+        </member>
+        <member name="M:Shared.VerticalSeekBar.Refresh">
+            <summary>
+            鍒锋柊褰撳墠瀵硅薄
+            </summary>
+        </member>
+        <member name="F:Shared.VerticalSeekBar.SleepTime">
+            <summary>
+            婊戝姩浼戠湢鏃堕棿
+            </summary>
+        </member>
+        <member name="P:Shared.VerticalSeekBar.ProgressColor">
+            <summary>
+            杩涘害瑙嗗浘棰滆壊
+            </summary>
+            <value>The color of the progress.</value>
+        </member>
+        <member name="P:Shared.VerticalSeekBar.BackgroundColor">
+            <summary>
+            杩涘害瑙嗗浘棰滆壊
+            </summary>
+            <value>The color of the progress.</value>
+        </member>
+        <member name="P:Shared.VerticalSeekBar.ThumbColor">
+            <summary>
+            婊戝潡棰滆壊
+            </summary>
+            <value>The color of the background.</value>
+        </member>
+        <member name="T:Shared.VerticalSeekBar.VerticalSeekBarAndroidFrameLayout">
+            <summary>
+            闇�瑕侀噸鍐欑殑瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.VerticalSeekBar.VerticalSeekBarAndroidFrameLayout.OnInterceptTouchEvent(Android.Views.MotionEvent)">
+            <summary>
+            鎵�鏈変簨浠舵湰瑙嗗浘鍏ㄩ儴娑堝寲锛屼笉閫氱煡缁欏瓙瑙嗗浘
+            </summary>
+            <returns><c>true</c>浜嬩欢宸茬粡澶勭悊<c>false</c>闇�瑕佺埗瑙嗗浘澶勭悊</returns>
+            <param name="ev">Ev.</param>
+        </member>
+        <member name="M:Shared.VerticalSeekBar.VerticalSeekBarAndroidFrameLayout.DispatchTouchEvent(Android.Views.MotionEvent)">
+            <summary>
+            鎵цOnInterceptTouchEvent鍜孫nTouchEvent
+            </summary>
+            <returns><c>true</c>浜嬩欢宸茬粡澶勭悊<c>false</c>浜嬩欢娌℃湁澶勭悊</returns>
+            <param name="e">E.</param>
+        </member>
+        <member name="M:Shared.VerticalSeekBar.VerticalSeekBarAndroidFrameLayout.requestParentDisallowInterceptTouchEvent(System.Boolean)">
+            <summary>
+            璁剧疆鎵�鏈夌埗瑙嗗浘绂佹鎷︽埅浜嬩欢
+            </summary>
+            <param name="b">濡傛灉璁剧疆True琛ㄧず涓嶈鎷︽埅锛屽鏋滆缃负False琛ㄧず鍙互鎷︽埅</param>
+        </member>
+        <member name="T:Shared.Video">
+            <summary>
+            Button 鎸夐敭
+            </summary>
+        </member>
+        <member name="M:Shared.Video.#ctor">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The android button.</value>
+        </member>
+        <member name="T:Shared.RootView">
+            <summary>
+            鏍硅鍥�
+            </summary>
+        </member>
+        <member name="T:Shared.View">
+            <summary>
+            鎵�鏈夌被鐨勫熀绫�
+            </summary>
+        </member>
+        <member name="P:Shared.View.IsCanRefresh">
+            <summary>
+            鏄惁闇�瑕佹洿鏂版帶浠�
+            </summary>
+            <value>The is need refresh.</value>
+        </member>
+        <member name="P:Shared.View.AndroidView">
+            <summary>
+            褰撳墠瀵瑰簲鐨凙ndroidView鎺т欢
+            </summary>
+        </member>
+        <member name="P:Shared.View.Enable">
+            <summary>
+            鏄惁浣胯兘
+            </summary>
+            <value>The enable.</value>
+        </member>
+        <member name="P:Shared.View.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="P:Shared.View.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+            <value>The width.</value>
+        </member>
+        <member name="M:Shared.View.Refresh">
+            <summary>
+            鍒锋柊鐣岄潰
+            </summary>
+        </member>
+        <member name="P:Shared.View.Name">
+            <summary>
+            鍚嶇О
+            </summary>
+            <value>The name.</value>
+        </member>
+        <member name="P:Shared.View.X">
+            <summary>
+            X杞村潗鏍�
+            </summary>
+            <value>The x.</value>
+        </member>
+        <member name="P:Shared.View.Y">
+            <summary>
+            Y杞村潗鏍�
+            </summary>
+            <value>The y.</value>
+        </member>
+        <member name="P:Shared.View.Gravity">
+            <summary>
+            鎺т欢鐩稿浜庣埗鎺т欢鐨勫榻愭柟寮�
+            </summary>
+            <value>The gravity.</value>
+        </member>
+        <member name="P:Shared.View.Bottom">
+            <summary>
+            宸﹁竟绾夸綅缃�
+            </summary>
+            <value>The bottom.</value>
+        </member>
+        <member name="P:Shared.View.Right">
+            <summary>
+             鍙宠竟绾夸綅缃�
+            </summary>
+            <value>The right.</value>
+        </member>
+        <member name="P:Shared.View.Size">
+            <summary>
+            褰撳墠绐楀彛澶у皬鍙婁綅缃�
+            </summary>
+            <value>The frame.</value>
+        </member>
+        <member name="P:Shared.View.Parent">
+            <summary>
+            鐖跺鍣�
+            </summary>
+            <value>The parent.</value>
+        </member>
+        <member name="M:Shared.View.TouchEvent(Android.Views.MotionEvent)">
+            <summary>
+            澶勭悊鐐瑰嚮浠g悊
+            </summary>
+            <param name="sender">Sender.</param>
+            <param name="e">E.</param>
+        </member>
+        <member name="F:Shared.View.MouseDownEventHandler">
+            <summary>
+            鐐瑰嚮鎸変笅浜嬩欢
+            </summary>
+        </member>
+        <member name="F:Shared.View.MouseMoveEventHandler">
+            <summary>
+            鎺т欢涓婄Щ鍔ㄤ簨浠�
+            </summary>
+        </member>
+        <member name="F:Shared.View.MouseUpEventHandler">
+            <summary>
+            鐐瑰嚮寮硅捣浜嬩欢
+            </summary>
+        </member>
+        <member name="F:Shared.View.MouseLongEventHandler">
+            <summary>
+            闀挎寜鐐瑰嚮浜嬩欢
+            </summary>
+        </member>
+        <member name="F:Shared.View.SizeChangeEventHandler">
+            <summary>
+            澶у皬鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="M:Shared.View.BringToFront">
+            <summary>
+            灏嗘帶鍒剁Щ鍒版渶鍓�
+            </summary>
+        </member>
+        <member name="F:Shared.View.AnimateSpeed">
+            <summary>
+            鍔ㄧ敾鏁堟灉 閫熷害
+            2020-06-15
+            </summary>
+        </member>
+        <member name="P:Shared.View.Animate">
+            <summary>
+            鍔ㄧ敾鏂瑰紡
+            </summary>
+            <value>The animate.</value>
+        </member>
+        <member name="M:Shared.View.Background(System.String)">
+            <summary>
+            璁惧鎺т欢鑳屾櫙鍥�
+            </summary>
+            <param name="filePath"></param>
+        </member>
+        <member name="P:Shared.View.Padding">
+            <summary>
+            鍐呰竟璺�
+            </summary>
+            <value>The padding.</value>
+        </member>
+        <member name="F:Shared.View.Tag">
+            <summary>
+            鏂逛究寮�鍙戣�呭紑鍙�
+            </summary>
+        </member>
+        <member name="M:Shared.View.AddTag(System.String,System.Object)">
+            <summary>
+            澧炲姞閿�煎
+            </summary>
+            <param name="key">Key.</param>
+            <param name="value">Value.</param>
+        </member>
+        <member name="M:Shared.View.RemoveTag(System.String)">
+            <summary>
+            鍒犻櫎鎸囧畾閿�煎
+            </summary>
+            <param name="key">Key.</param>
+        </member>
+        <member name="M:Shared.View.GetTagByKey(System.String)">
+            <summary>
+            鏍规嵁閿幏鍙栧��
+            </summary>
+            <returns>The tag by key.</returns>
+            <param name="key">Key.</param>
+        </member>
+        <member name="M:Shared.View.ClearTag">
+            <summary>
+            鍏ㄩ儴鍒犻櫎Tag
+            </summary>
+            <returns>The tag.</returns>
+        </member>
+        <member name="P:Shared.View.Visible">
+            <summary>
+            鏄惁鏄剧ず
+            </summary>
+            <value><c>true</c> if visible; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="M:Shared.View.RemoveFromParent">
+            <summary>
+            浠庣埗瑙嗗浘涓Щ闄�
+            </summary>
+        </member>
+        <member name="P:Shared.View.Alpha">
+            <summary>
+             閫忔槑搴﹁缃�
+            </summary>
+            <value>The alpha.</value>
+        </member>
+        <member name="P:Shared.View.BackgroundColor">
+            <summary>
+            鑳屾櫙棰滆壊
+            </summary>
+            <value>The color of the background.</value>
+        </member>
+        <member name="M:Shared.View.GetCornerRadii">
+            <summary>
+            鑾峰彇鎸囧畾鍦嗚灞炴��
+            </summary>
+            <value>The corner.</value>
+        </member>
+        <member name="M:Shared.View.SetCornerWithSameRadius(System.Single,System.Int32)">
+            <summary>
+            鎸囧畾浣嶇疆 璁剧疆鐩稿悓鐨勫渾瑙�
+            </summary>
+        </member>
+        <member name="P:Shared.View.Radius">
+            <summary>
+            鍦嗚澶у皬
+            </summary>
+            <value>The corner.</value>
+        </member>
+        <member name="P:Shared.View.BorderWidth">
+            <summary>
+            杈规绾垮ぇ灏�
+            </summary>
+            <value>The width of the border.</value>
+        </member>
+        <member name="P:Shared.View.BorderColor">
+            <summary>
+            杈规棰滆壊
+            </summary>
+            <value>The color of the border.</value>
+        </member>
+        <member name="M:Shared.View.SetRotation(System.Single)">
+            <summary>
+            鏃嬭浆View
+            </summary>
+            <value>鏃嬭浆瑙掑害</value>
+        </member>
+        <member name="M:Shared.View.SetViewShadow(System.Boolean,System.Single)">
+            <summary>
+            璁剧疆闃村奖鏁堟灉
+            </summary>
+            <value>鏄惁鏄剧ず闃村奖</value>
+        </member>
+        <member name="M:Shared.Size.#ctor(System.Int32,System.Int32)">
+            <summary>
+            Initializes a new instance of the <see cref="!:Shared.Frame"/> class.
+            </summary>
+            <param name="x">X杞�</param>
+            <param name="y">Y杞�</param>
+            <param name="width">瀹藉害</param>
+            <param name="height">楂樺害</param>
+        </member>
+        <member name="P:Shared.Size.Width">
+            <summary>
+            瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.Size.Height">
+            <summary>
+            楂樺害
+            </summary>
+        </member>
+        <member name="T:Shared.Padding">
+            <summary>
+            鍐呰竟璺�
+            </summary>
+        </member>
+        <member name="P:Shared.Padding.Top">
+            <summary>
+            椤堕儴
+            </summary>
+        </member>
+        <member name="P:Shared.Padding.Left">
+            <summary>
+            宸﹁竟
+            </summary>
+        </member>
+        <member name="P:Shared.Padding.Bottom">
+            <summary>
+            搴曢儴
+            </summary>
+        </member>
+        <member name="P:Shared.Padding.Right">
+            <summary>
+            鍙宠竟
+            </summary>
+        </member>
+        <member name="F:Shared.AndroidDrawableUtiles.Drawable">
+            <summary>
+            鍥剧墖瀵硅薄
+            </summary>
+        </member>
+        <member name="F:Shared.AndroidDrawableUtiles.Height">
+            <summary>
+            鍥剧墖鐨勯珮搴�
+            </summary>
+        </member>
+        <member name="F:Shared.AndroidDrawableUtiles.Width">
+            <summary>
+            鍥剧墖鐨勫搴�
+            </summary>
+        </member>
+        <member name="M:Shared.AndroidDrawableUtiles.#ctor(Android.Graphics.Drawables.Drawable,System.Int32,System.Int32)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Shared.AndroidDrawableUtiles"/> class.
+            </summary>
+            <param name="bitmapDrawable">Bitmap drawable.</param>
+            <param name="height">Height.</param>
+            <param name="width">Width.</param>
+        </member>
+        <member name="T:Shared.MouseEventArgs">
+            <summary>
+            鐐瑰嚮鏃跺熀鏈弬鏁�
+            </summary>
+        </member>
+        <member name="F:Shared.MouseEventArgs.X">
+            <summary>
+            X鍧愭爣
+            </summary>
+        </member>
+        <member name="F:Shared.MouseEventArgs.Y">
+            <summary>
+            Y鍧愭爣
+            </summary>
+        </member>
+        <member name="M:Shared.Tip.Show(Shared.View)">
+            <summary>
+            鐐瑰嚮鍝釜View鏃舵樉璧彁绀�
+            </summary>
+        </member>
+        <member name="T:Shared.FrameLayout">
+            <summary>
+            缁濆甯冨眬
+            </summary>
+        </member>
+        <member name="M:Shared.FrameLayout.#ctor">
+            <summary>
+            褰撳墠瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.FrameLayout.#ctor(Android.Widget.FrameLayout)">
+            <summary>
+            浠ヤ紶杩涙潵鐨勫璞′负褰撳墠瀵硅薄
+            </summary>
+            <param name="frameLayout">Frame layout.</param>
+        </member>
+        <member name="T:Shared.AndroidFrameLayout">
+            <summary>
+            Android鍘熺敓缁濆甯冨眬瑙嗗浘 FrameLayout
+            </summary>
+        </member>
+        <member name="T:Shared.AndroidLinearLayout">
+            <summary>
+             宸茬粡鍏ㄩ潰妫�鏌ヤ唬鐮�
+            </summary>
+        </member>
+        <member name="T:Shared.ViewGroup">
+            <summary>
+            Button 鎸夐敭
+            </summary>
+        </member>
+        <member name="F:Shared.ViewGroup.realViewGroup">
+            <summary>
+            鐪熸鐨勫鍣�
+            </summary>
+        </member>
+        <member name="P:Shared.ViewGroup.viewGroup">
+            <summary>
+            褰撳墠鎺т欢
+            </summary>
+            <value>The android frame layout.</value>
+        </member>
+        <member name="M:Shared.ViewGroup.AddChidren(Shared.View)">
+            <summary>
+            澧炲姞瀛愭帶浠�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="P:Shared.ViewGroup.ChildrenCount">
+            <summary>
+            鎺т欢鏁伴噺
+            </summary>
+            <value>The children count.</value>
+        </member>
+        <member name="F:Shared.ViewGroup.viewList">
+            <summary>
+            鎺т欢鍒楄〃
+            </summary>
+        </member>
+        <member name="P:Shared.ViewGroup.BackgroundImagePath">
+            <summary>
+            鑳屾櫙鍥剧墖
+            </summary>
+            <value>The background image path.</value>
+        </member>
+        <member name="M:Shared.ViewGroup.Refresh">
+            <summary>
+            鍒锋柊鐣岄潰
+            </summary>
+        </member>
+        <member name="M:Shared.ViewGroup.Remove(Shared.View)">
+            <summary>
+            绉婚櫎鎺т欢
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.ViewGroup.RemoveAll">
+            <summary>
+            娓呯┖鎵�鏈夌殑鎺т欢
+            </summary>
+        </member>
+        <member name="M:Shared.ViewGroup.RemoveAt(System.Int32)">
+            <summary>
+            绉婚櫎鎸囧畾绱㈠紩瀵硅薄
+            </summary>
+            <param name="index">Index.</param>
+        </member>
+        <member name="M:Shared.ViewGroup.GetChildren(System.Int32)">
+            <summary>
+            鑾峰彇鎸囧畾绱㈠紩瀵硅薄
+            </summary>
+            <returns>The children.</returns>
+            <param name="index">Index.</param>
+        </member>
+        <member name="M:Shared.ViewGroup.RemoveViewByType(System.Type)">
+            <summary>
+            鏍规嵁绫诲瀷绉婚櫎鎺т欢
+            </summary>
+            <param name="type">Type.</param>
+        </member>
+        <member name="M:Shared.ViewGroup.RemoveViewByTag(System.Object)">
+            <summary>
+            鏍规嵁Tag绉婚櫎鎺т欢
+            </summary>
+            <param name="type">Type.</param>
+        </member>
+        <member name="M:Shared.CameraActivity.OnActivityResult(System.Int32,Android.App.Result,Android.Content.Intent)">
+            <summary>
+            澶勭悊閫夋嫨鎴栬�呮媿鐓х殑鍥剧墖
+            </summary>
+            <param name="requestCode">Request code.</param>
+            <param name="resultCode">Result code.</param>
+            <param name="data">Data.</param>
+        </member>
+        <member name="T:Shared.Camera">
+            <summary>
+            鎷嶇収鎴栬�呴�夋嫨鍥剧墖
+            </summary>
+        </member>
+        <member name="F:Shared.Camera._callback">
+            <summary>
+            鎷嶇収鎴栬�呰鍙栧浘鐗囧畬鎴愭椂璋冪敤鐨勫姩浣�,string==null琛ㄧず鐢ㄦ埛鍙栨秷浜嗘媿鐓ф垨鑰呭彇娑堥�夋嫨鍥剧墖,string!=null,琛ㄧず鍥剧墖鐨勮矾寰�
+            </summary>
+        </member>
+        <member name="F:Shared.Camera._fileName">
+            <summary>
+            鏂囦欢鍚�
+            </summary>
+        </member>
+        <member name="F:Shared.Camera.TypeCamera">
+            <summary>
+            閫夋嫨绫诲瀷鏄媿鐓�
+            </summary>
+        </member>
+        <member name="F:Shared.Camera.TypePicture">
+            <summary>
+            閫夋嫨鍥剧墖
+            </summary>
+        </member>
+        <member name="M:Shared.Camera.TakePicture(System.Action{System.String},System.String,System.Boolean)">
+            <summary>
+            鎷嶇収
+            </summary>
+            <param name="callback">鍥炶皟鍑芥暟</param>
+            <param name="fileName">鏂囦欢鍚�</param>
+        </member>
+        <member name="M:Shared.Camera.SelectPicture(System.Action{System.String},System.String,System.Boolean)">
+            <summary>
+            閫夋嫨鍥剧墖
+            </summary>
+            <param name="callback">鍥炶皟鍑芥暟</param>
+            <param name="fileName">鏂囦欢鍚�</param>
+        </member>
+        <member name="T:Shared.TextView">
+            <summary>
+            TextView
+            </summary>
+        </member>
+        <member name="P:Shared.TextView.currentAndroidTextView">
+            <summary>
+            褰撳墠瑙嗗浘
+            </summary>
+            <value>The android text.</value>
+        </member>
+        <member name="P:Shared.TextView.TextSize">
+            <summary>
+            鏂囧瓧澶у皬
+            </summary>
+            <value>The size of the text.</value>
+        </member>
+        <member name="P:Shared.TextView.Text">
+            <summary>
+            鏂囨湰
+            </summary>
+            <value>The text.</value>
+        </member>
+        <member name="P:Shared.TextView.TextID">
+            <summary>
+            鏍规嵁ID鑾峰彇瀵瑰簲鐨勫娉�
+            </summary>
+            <value>The text I.</value>
+        </member>
+        <member name="P:Shared.TextView.IsSelected">
+            <summary>
+            Gets or sets a value indicating whether this instance is selected.
+            </summary>
+            <value><c>true</c> if this instance is selected; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="M:Shared.TextView.Refresh">
+            <summary>
+            鍒锋柊澶у皬
+            </summary>
+        </member>
+        <member name="P:Shared.TextView.TextColor">
+            <summary>
+            鏂囧瓧棰滆壊
+            </summary>
+            <value>The color of the text.</value>
+        </member>
+        <member name="P:Shared.TextView.SelectedImagePath">
+            <summary>
+            閫夋嫨鏃惰儗鏅浘璺緞
+            </summary>
+            <value>The selected image path.</value>
+        </member>
+        <member name="P:Shared.TextView.UnSelectedImagePath">
+            <summary>
+            闈為�変腑鐘舵�佺殑鑳屾櫙鍥捐矾寰�
+            </summary>
+            <value>The un selected image path.</value>
+        </member>
+        <member name="M:Shared.TextView.AndroidTextView.OnTouchEvent(Android.Views.MotionEvent)">
+            <summary>
+            閲嶅啓鐐瑰嚮浜嬩欢
+            </summary>
+            <returns><c>true</c>, if touch event was oned, <c>false</c> otherwise.</returns>
+            <param name="e">E.</param>
+        </member>
+        <member name="T:Shared.ColorPicker">
+            <summary>
+            鑹叉澘
+            </summary>
+        </member>
+        <member name="M:Shared.ColorPicker.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Shared.Button"/> class.
+            </summary>
+        </member>
+        <member name="P:Shared.ColorPicker.ColorImagePath">
+            <summary>
+            鑹叉澘鍥�
+            </summary>
+            <value>The color image path.</value>
+        </member>
+        <member name="F:Shared.ColorPicker.ColorChaged">
+            <summary>
+            棰滆壊鍙樺寲
+            </summary>
+        </member>
+        <member name="M:Shared.ColorPicker.MyColorPickerView.OnTouchEvent(Android.Views.MotionEvent)">
+            <summary>
+            閲嶅啓鐐瑰嚮浜嬩欢
+            </summary>
+            <returns><c>true</c>, if touch event was oned, <c>false</c> otherwise.</returns>
+            <param name="e">E.</param>
+        </member>
+        <member name="F:Shared.UrlMonitor.UserName">
+            <summary>
+            鐢ㄦ埛鍚�
+            </summary>
+        </member>
+        <member name="F:Shared.UrlMonitor.Password">
+            <summary>
+            瀵嗙爜
+            </summary>
+        </member>
+        <member name="F:Shared.UrlMonitor.URL">
+            <summary>
+            鎽勫儚澶寸殑鍥剧墖鍦板潃
+            </summary>
+        </member>
+        <member name="M:Shared.UrlMonitor.Start">
+            <summary>
+            鍚姩
+            </summary>
+        </member>
+        <member name="M:Shared.UrlMonitor.Stop">
+            <summary>
+            鍋滄鎾斁
+            </summary>
+        </member>
+        <member name="T:Shared.MusicVerticalScrolViewLayout">
+            <summary>
+            闊充箰婊戝姩瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.AddChidren(Shared.View)">
+            <summary>
+            娣诲姞瀛愭帶浠�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.inRangeOfView(Android.Views.View,Android.Graphics.Point)">
+            <summary>
+             鏍规嵁缁濆鍧愭爣鏉ョ‘瀹氬綋鍓嶉�夋嫨浜嗗摢涓帶浠�
+            </summary>
+            <returns><c>true</c>, if range of view was ined, <c>false</c> otherwise.</returns>
+            <param name="view">View.</param>
+            <param name="point">Point.</param>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.replaceViewOfPoint(Android.Views.View,Android.Graphics.Point)">
+            <summary>
+            鏍规嵁鐐瑰嚮浣嶇疆鎵惧嚭鐐瑰嚮鍒扮殑瑙嗗浘
+            </summary>
+            <returns>The view of point.</returns>
+            <param name="point">Point.</param>
+            <param name="view">Uiview.</param>
+        </member>
+        <member name="F:Shared.MusicVerticalScrolViewLayout.ReplaceChanged">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="F:Shared.MusicVerticalScrolViewLayout.LongPressAction">
+            <summary>
+            闀挎寜浜嬩欢
+            </summary>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.selectedViewByPoint(Android.Graphics.Point)">
+            <summary>
+            鏍规嵁鐐瑰嚮浣嶇疆鎵惧嚭鐐瑰嚮鍒扮殑瑙嗗浘
+            </summary>
+            <returns>杩斿洖鐐瑰嚮鍒扮殑瑙嗗浘</returns>
+            <param name="point">褰撳墠鐐瑰嚮浣嶇疆</param>
+        </member>
+        <member name="F:Shared.MusicVerticalScrolViewLayout.originPressPoint">
+            <summary>
+            褰撳墠閫変腑鎸夐敭鐨勫垵濮嬬偣
+            </summary>
+        </member>
+        <member name="F:Shared.MusicVerticalScrolViewLayout.selectedViewPoint">
+            <summary>
+            褰撳墠閫変腑鐨勮鍥捐捣鐐�
+            </summary>
+        </member>
+        <member name="F:Shared.MusicVerticalScrolViewLayout.selectedAndroidView">
+            <summary>
+            褰撳墠閫変腑鐨勮鍥�
+            </summary>
+        </member>
+        <member name="F:Shared.MusicVerticalScrolViewLayout.replaceAndroidView">
+            <summary>
+            鍑嗗浜ゆ崲浣嶇疆鐨勮鍥�
+            </summary>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.centerPoint(Android.Views.View)">
+            <summary>
+            鑾峰彇褰撳墠View鐨勪腑蹇冪偣
+            </summary>
+            <returns>The point.</returns>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.TouchEventDown(Android.Views.MotionEvent)">
+            <summary>
+            鐐瑰嚮寮�濮嬬殑浜嬩欢
+            </summary>
+            <param name="e">E.</param>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.TouchEventMove(Android.Views.MotionEvent)">
+            <summary>
+            鐐瑰嚮浜嬩欢绉诲姩
+            </summary>
+            <param name="e">E.</param>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.TouchEventUp(Android.Views.MotionEvent)">
+            <summary>
+            鐐瑰嚮浜嬩欢寮硅捣
+            </summary>
+            <param name="e">E.</param>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.scaleSelectedAndroidView">
+            <summary>
+            缁欏綋鍓嶉�夋嫨涓殑鎺т欢涓姩鐢荤缉灏忕殑鏁堟灉
+            </summary>
+        </member>
+        <member name="F:Shared.MusicVerticalScrolViewLayout.isFirst">
+            <summary>
+             鏄惁绗竴娆″姞杞�
+            </summary>
+        </member>
+        <member name="T:Shared.MusicVerticalScrolViewLayout.AndroidScrolView11">
+            <summary>
+            绔栫洿鏂瑰悜婊戝姩鎺т欢
+            </summary>
+        </member>
+        <member name="F:Shared.MusicVerticalScrolViewLayout.AndroidScrolView11.isLongPress">
+            <summary>
+            鏄惁闀挎寜
+            </summary>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.AndroidScrolView11.#ctor(Android.Content.Context,Shared.MusicVerticalScrolViewLayout)">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+            <param name="context">Context.</param>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.AndroidScrolView11.OnTouchEvent(Android.Views.MotionEvent)">
+            <summary>
+            閲嶅啓鐐瑰嚮浜嬩欢
+            </summary>
+            <returns><c>true</c>, if touch event was oned, <c>false</c> otherwise.</returns>
+            <param name="e">E.</param>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.AndroidScrolView11.requestParentDisallowInterceptTouchEvent(System.Boolean)">
+            <summary>
+            璁剧疆鎵�鏈夌埗瑙嗗浘绂佹鎷︽埅浜嬩欢
+            </summary>
+            <param name="b">濡傛灉璁剧疆True琛ㄧず涓嶈鎷︽埅锛屽鏋滆缃负False琛ㄧず鍙互鎷︽埅</param>
+        </member>
+        <member name="P:Shared.SwipeLayout.LineColor">
+            <summary>
+            鑳屾櫙棰滆壊
+            </summary>
+            <value>The color of the background.</value>
+        </member>
+        <member name="P:Shared.SwipeLayout.Width">
+            <summary>
+            瀹藉害璁剧疆鎴栬鍙�
+            </summary>
+            <value>The width.</value>
+        </member>
+        <member name="P:Shared.SwipeLayout.Height">
+            <summary>
+            瑙嗗浘楂樺害
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="M:Shared.SwipeLayout.#ctor">
+            <summary>
+            鍦ㄦ粦鍔ㄤ簨浠朵笅锛屽彲鏄剧ず闅愯棌浜涜嚜瀹氫箟瑙嗗浘
+            </summary>
+        </member>
+        <member name="F:Shared.SwipeLayout.subViewWidth">
+            <summary>
+            瀛愯鍥剧殑瀹藉害
+            </summary>
+        </member>
+        <member name="M:Shared.SwipeLayout.AddLeftView(Shared.View)">
+            <summary>
+            澧炲姞宸﹁竟瑙嗗浘
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.SwipeLayout.AddRightView(Shared.View)">
+            <summary>
+            澧炲姞鍙宠竟瑙嗗浘
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="F:Shared.SwipeLayout.AndroidSwipeLayout.distance">
+            <summary>
+            宸﹀彸婊戝姩鐨勬渶鐭窛绂�
+            </summary>
+        </member>
+        <member name="F:Shared.SwipeLayout.AndroidSwipeLayout.velocity">
+            <summary>
+            宸﹀彸婊戝姩鐨勬渶灏忛�熷害
+            </summary>
+        </member>
+        <member name="F:Shared.SwipeLayout.AndroidSwipeLayout.mGesture">
+            <summary>
+            鎵嬪娍瀵硅薄
+            </summary>
+        </member>
+        <member name="M:Shared.SwipeLayout.AndroidSwipeLayout.requestParentDisallowInterceptTouchEvent(System.Boolean)">
+            <summary>
+            璁剧疆鎵�鏈夌埗瑙嗗浘绂佹鎷︽埅浜嬩欢
+            </summary>
+            <param name="b">濡傛灉璁剧疆True琛ㄧず涓嶈鎷︽埅锛屽鏋滆缃负False琛ㄧず鍙互鎷︽埅</param>
+        </member>
+        <member name="T:Shared.ImageView">
+            <summary>
+            Button 鎸夐敭
+            </summary>
+        </member>
+        <member name="P:Shared.ImageView.currentButton">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The android button.</value>
+        </member>
+        <member name="M:Shared.ImageView.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.ImageView.ImagePath">
+            <summary>
+            闈為�変腑鐘舵�佺殑鑳屾櫙鍥捐矾寰�
+            </summary>
+            <value>The un selected image path.</value>
+        </member>
+        <member name="F:Shared.AndroidImageView.type">
+            鍥剧墖鐨勭被鍨嬶紝鍦嗗舰or鍦嗚
+        </member>
+        <member name="F:Shared.AndroidImageView.BODER_RADIUS_DEFAULT">
+            鍦嗚澶у皬鐨勯粯璁ゅ��
+        </member>
+        <member name="F:Shared.AndroidImageView.mBitmapPaint">
+            缁樺浘鐨凱aint
+        </member>
+        <member name="F:Shared.AndroidImageView.mRadius">
+            鍦嗚鐨勫崐寰�
+        </member>
+        <member name="F:Shared.AndroidImageView.mMatrix">
+            3x3 鐭╅樀锛屼富瑕佺敤浜庣缉灏忔斁澶�
+        </member>
+        <member name="F:Shared.AndroidImageView.mBitmapShader">
+            娓叉煋鍥惧儚锛屼娇鐢ㄥ浘鍍忎负缁樺埗鍥惧舰鐫�鑹�
+        </member>
+        <member name="F:Shared.AndroidImageView.mWidth">
+            view鐨勫搴�
+        </member>
+        <member name="M:Shared.AndroidImageView.setUpShader">
+            鍒濆鍖朆itmapShader
+        </member>
+        <member name="M:Shared.AndroidImageView.drawableToBitamp(Android.Graphics.Drawables.Drawable)">
+            drawable杞琤itmap
+            
+            @param drawable
+            @return
+        </member>
+        <member name="P:Shared.WiimuUPnP.SSID">
+            <summary>
+            鑾峰彇褰撳墠WIFI鐨勫悕绉�
+            </summary>
+            <value>The ssid.</value>
+        </member>
+        <member name="M:Shared.WiimuUPnP.getWIFISSID(Android.App.Activity)">
+            鑾峰彇SSID
+            @param activity 涓婁笅鏂�
+            @return  WIFI 鐨凷SID
+        </member>
+        <member name="M:Shared.WiimuUPnP.Start(System.String,System.Action{System.String})">
+            <summary>
+            鍚姩閰嶇疆鏃犵嚎涓婄綉
+            </summary>
+            <returns>The start.</returns>
+            <param name="password">瀵嗙爜</param>
+            <param name="a">閰嶇疆瀹屾垚鍚庡弽棣堢殑缁撴灉</param>
+        </member>
+        <member name="F:Shared.WiimuUPnP.dateTime">
+            <summary>
+            璁板綍寮�濮嬫椂闂�
+            </summary>
+        </member>
+        <member name="M:Shared.WiimuUPnP.Stop">
+            <summary>
+            鍋滄閰嶇疆鏃犵嚎涓婄綉
+            </summary>
+        </member>
+        <member name="F:Shared.BaseActivity.NetworkStateChanged">
+            <summary>
+            缃戠粶鐘舵�佸彉鍖�
+            </summary>
+        </member>
+        <member name="F:Shared.BaseActivity.OnDestroyAction">
+            <summary>
+            Activity 閿�鎺夋椂浜嬩欢
+            </summary>
+        </member>
+        <member name="F:Shared.BaseActivity.TopMargin">
+            <summary>
+            Y杞村潗鏍�
+            </summary>
+        </member>
+        <member name="M:Shared.BaseActivity.SetImagePermission(System.Action{System.Boolean})">
+            <summary>
+            
+            </summary>
+            <param name="action">Action.</param>
+        </member>
+        <member name="M:Shared.BaseActivity.SetCamera(System.Action{System.Boolean})">
+            <summary>
+            
+            </summary>
+            <param name="action">Action.</param>
+        </member>
+        <member name="M:Shared.BaseActivity.SetPhoneState(System.Action{System.Boolean})">
+            <summary>
+            钀ょ煶鎽勫儚澶撮偅鍧椾唬鐮佹瘮杈冪壒娈婏紝寰楀湪璋冪敤杩欎釜鍚姩浠栭渶瑕佺殑鏉冮檺
+            </summary>
+            <param name="action">Action.</param>
+        </member>
+        <member name="M:Shared.BaseActivity.SetPermission(System.Action{System.Boolean},System.String)">
+            <summary>
+            
+            </summary>
+            <param name="action">Action.</param>
+        </member>
+        <member name="M:Shared.BaseActivity.SetGPSLocationPermission(System.Action{System.Boolean})">
+            <summary>
+            
+            </summary>
+            <param name="action">Action.</param>
+        </member>
+        <member name="M:Shared.BaseActivity.SetContactsPermission(System.Action{System.Boolean})">
+            <summary>
+            
+            </summary>
+            <param name="action">Action.</param>
+        </member>
+        <member name="F:Shared.BaseActivity.VerifyDateTime">
+            <summary>
+             瀹℃牳鏈�鍚庢椂闂�
+            </summary>
+        </member>
+        <member name="T:Shared.SettingsContentObserver">
+            <summary>
+            鐩戝惉闊抽噺鐨勫彉鍖�
+            </summary>
+        </member>
+        <member name="M:Shared.SystemHelper.AppIsExist(Android.Content.Context,System.String)">
+             鍒ゆ柇鏈湴鏄惁宸茬粡瀹夎濂戒簡鎸囧畾鐨勫簲鐢ㄧ▼搴忓寘
+            
+             @param packageNameTarget 锛氬緟鍒ゆ柇鐨� App 鍖呭悕锛屽 寰崥 com.sina.weibo
+             @return 宸插畨瑁呮椂杩斿洖 true,涓嶅瓨鍦ㄦ椂杩斿洖 false
+        </member>
+        <member name="M:Shared.SystemHelper.SetTopApp(Android.Content.Context)">
+             灏嗘湰搴旂敤缃《鍒版渶鍓嶇
+             褰撴湰搴旂敤浣嶄簬鍚庡彴鏃讹紝鍒欏皢瀹冨垏鎹㈠埌鏈�鍓嶇
+            
+             @param context
+        </member>
+        <member name="M:Shared.SystemHelper.isRunningForeground(Android.Content.Context)">
+             鍒ゆ柇鏈簲鐢ㄦ槸鍚﹀凡缁忎綅浜庢渶鍓嶇
+            
+             @param context
+             @return 鏈簲鐢ㄥ凡缁忎綅浜庢渶鍓嶇鏃讹紝杩斿洖 true锛涘惁鍒欒繑鍥� false
+        </member>
+        <member name="F:Shared.Other.MusicService.server">
+            <summary>
+            鏈湴闊充箰鐨勭洃鍚湇鍔�
+            </summary>
+        </member>
+        <member name="F:Shared.Other.MusicService.isRunning">
+            <summary>
+            鏄惁姝e湪杩愯
+            </summary>
+        </member>
+        <member name="P:Shared.Other.MusicService.documentRoot">
+            <summary>
+            WebServer 鏈湴璺緞
+            </summary>
+            <value>The get document root.</value>
+        </member>
+        <member name="M:Shared.Other.MusicService.initDocumentRoot">
+            <summary>
+            鍒濆鍖朩ebServer鐨勮矾寰�
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.Title">
+            <summary>
+            姝屾洸鍚嶇О
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.Artist">
+            <summary>
+            姝屾洸鐨勬瓕鎵嬪悕 
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.Album">
+            <summary>
+            姝屾洸鐨勪笓杈戝悕     
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.AlbumId">
+            <summary>
+            姝屾洸涓撹緫ID
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.Data">
+            <summary>
+            姝屾洸鏂囦欢鐨勮矾寰�
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.Size">
+            <summary>
+            姝屾洸鐨勬�绘挱鏀炬椂闀�
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.Duration">
+            <summary>
+            姝屾洸鐨勬�绘挱鏀炬椂闀�
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.ID">
+            <summary>
+            闊充箰ID
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.URL">
+            <summary>
+            缃戠粶鍦板潃
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.filename">
+            <summary>
+              鏂囦欢鍚�
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.dlnalistName">
+            <summary>
+            DLNA鍒楄〃鍚�
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.Image">
+            <summary>
+            鍥剧墖
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.Cntype">
+            <summary>
+            鐢靛彴绫诲瀷
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.Cnkey">
+            <summary>
+            鐢靛彴绫诲瀷
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.IsDirectory">
+            <summary>
+            鏄惁鏄洰褰�
+            </summary>
+        </member>
+        <member name="P:Shared.MusicInfo.MusicInfoList">
+            <summary>
+            鑾峰彇鎵�鏈夌殑
+            </summary>
+        </member>
+        <member name="M:Shared.CommonClass.OpenApp(System.String)">
+            <summary>
+            鎵撳紑搴旂敤
+            </summary>
+            <param name="packetName">鍖呭悕</param>
+            <param name="activityName"></param>
+        </member>
+        <member name="M:Shared.CommonClass.isAvilible(Android.Content.Context,System.String)">
+            妫�鏌ユ墜鏈轰笂鏄惁瀹夎浜嗘寚瀹氱殑杞欢
+            @param context
+            @param packageName
+            @return
+        </member>
+        <member name="M:Shared.CommonClass.OpenAction(System.String)">
+            <summary>
+            鎵撳紑鐣岄潰
+            </summary>
+            <param name="action">Action.</param>
+        </member>
+        <member name="F:Shared.MyBroadcastReceive.ActioRinging">
+            <summary>
+            鍝嶉搩浜嬩欢
+            </summary>
+        </member>
+        <member name="F:Shared.MyBroadcastReceive.ActionIdle">
+            <summary>
+            鐢佃瘽鎸傛柇浜嬩欢
+            </summary>
+        </member>
+        <member name="F:Shared.MyBroadcastReceive.IsCalling">
+            <summary>
+            鏄惁鍦ㄩ�氳瘽涓�
+            </summary>
+        </member>
+        <member name="T:Shared.MyEchartsView">
+            <summary>
+            Button 鎸夐敭
+            </summary>
+        </member>
+        <member name="M:Shared.MyEchartsView.refresh(System.String)">
+            <summary>
+            鍒涙柊鐣岄潰
+            </summary>
+        </member>
+        <member name="P:Shared.MyEchartsView.JsonData.Title">
+            <summary>
+            鏍囬鍐呭
+            </summary>
+            <value>The title.</value>
+        </member>
+        <member name="P:Shared.MyEchartsView.JsonData.XArray">
+            <summary>
+            X杞村潗鏍囩偣
+            </summary>
+            <value>The XA rray.</value>
+        </member>
+        <member name="P:Shared.MyEchartsView.JsonData.YArray">
+            <summary>
+            Y杞村潗鏍囩偣
+            </summary>
+            <value>The YA rray.</value>
+        </member>
+        <member name="M:Shared.PickerView.Show(System.Collections.Generic.List{System.String},System.Action{System.Int32},System.Int32,System.String,System.String,System.String)">
+            <summary>
+            涓�绾ф暟缁勫脊绐� 鏀寔璁剧疆榛樿閫変腑绱㈠紩锛岃嚜瀹氫箟鏍囬锛岀‘璁ゆ寜閽紝鍙栨秷鎸夐挳瀛楃
+            </summary>
+        </member>
+        <member name="M:Shared.PickerView.ShowSecondary(System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.Collections.Generic.List{System.String}},System.Action{System.Int32,System.Int32},System.Int32,System.Int32,System.String,System.String,System.String)">
+            <summary>
+            浜岀骇鑱斿姩寮圭獥 鏀寔璁剧疆榛樿閫変腑绱㈠紩锛岃嚜瀹氫箟鏍囬锛岀‘璁ゆ寜閽紝鍙栨秷鎸夐挳瀛楃
+            </summary>
+        </member>
+        <member name="M:Shared.PickerView.ShowNormal(System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String},System.Action{System.Int32,System.Int32,System.Int32},System.Int32,System.Int32,System.Int32,System.String,System.String,System.String)">
+            <summary>
+            涓嶈仈鍔ㄦ敮鎸佽嚜瀹氫箟鏍囬锛岀‘璁ゆ寜閽紝鍙栨秷鎸夐挳鏂囧瓧
+            </summary>
+        </member>
+        <member name="T:Shared.PickerView.OnOptionsSelectListenerCallBack">
+            <summary>
+            涓�绾у洖璋冧簨浠�
+            </summary>
+        </member>
+        <member name="T:Shared.PickerView.OnSecondaryOptionsSelectListenerCallBack">
+            <summary>
+            浜岀骇鑱斿姩鍥炶皟浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.PickerView.OnOptionsSelectListenerCallBack3">
+            <summary>
+            涓夌骇鍥炶皟浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.ArcSeekBar">
+            <summary>
+            HDLArcSeekBar 鍦嗗姬婊戝姩鎺т欢
+            </summary>
+        </member>
+        <member name="P:Shared.ArcSeekBar.mHDLArcSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLArcSeekBar.</value>
+        </member>
+        <member name="M:Shared.ArcSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ArcWidthWithDefaultStyle">
+            <summary>
+            鍚屾椂璁剧疆鍦嗗姬鍜屾嫋鍔ㄥ渾褰㈢殑瀹�
+            </summary>
+            <value>瀹�</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ArcColor">
+            <summary>
+            鍦嗗姬榛樿鑳屾櫙棰滆壊
+            </summary>
+            <value>鑳屾櫙棰滆壊</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ProgressBarColor">
+            <summary>
+            杩涘害鏉¢鑹� 鍗曚竴棰滆壊涓嶆笎鍙�
+            </summary>
+            <value>鍗曚竴杩涘害鏉¢鑹�</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ThumbColor">
+            <summary>
+            鎷栧姩鎸夐挳鍦嗗舰棰滆壊
+            </summary>
+            <value>鎷栧姩鎸夐挳棰滆壊</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ThumbModeFill">
+            <summary>
+            鎷栧姩鎸夐挳榛樿褰㈢姸 濉弧瀹炲績鎴栬�呯┖蹇�
+            </summary>
+            <value>鏄惁濉弧</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ThumbRadius">
+            <summary>
+            鎷栧姩鎸夐挳鍦嗗舰鍗婂緞
+            </summary>
+            <value>鍗婂緞</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ArcWidth">
+            <summary>
+            鍦嗗姬瀹�
+            </summary>
+            <value>瀹�</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="M:Shared.ArcSeekBar.SetProgressBarColors(System.UInt32,System.UInt32)">
+            <summary>
+            璁剧疆杩涘害鏉� 娓愬彉棰滆壊鐨勫紑濮嬮鑹插拰缁撴潫棰滆壊
+            </summary>
+            <value>寮�濮嬮鑹层�佺粨鏉熼鑹�</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.OpenAngle">
+            <summary>
+            寮�鍙h搴�
+            </summary>
+        </member>
+        <member name="F:Shared.ArcSeekBar.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="F:Shared.ArcSeekBar.mOnProgressChangeListener">
+            <summary>
+            OnProgressChangeListener 缁ф壙鍝嶅簲浜嬩欢
+            </summary>
+        </member>
+        <member name="M:Shared.TouchIDUtils.showTouchIDWithDescribe(System.String,System.String)">
+            <summary>
+            寮圭獥鎸囩汗楠岃瘉 descTitle锛氳緭鍏ュ瘑鐮侀獙璇佹寜閽爣棰�   mLocalizedReason锛歍ouch鏄剧ず鐨勬弿杩�
+            </summary>
+            <value>descTitle锛氳緭鍏ュ瘑鐮侀獙璇佹寜閽爣棰�   mLocalizedReason锛歍ouch鏄剧ず鐨勬弿杩�</value>
+        </member>
+        <member name="F:Shared.TouchIDUtils.mOnIAuthenticationCallback">
+            <summary>
+            OnProgressChangeListener 缁ф壙鍝嶅簲浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.WaveSeekBar">
+            <summary>
+            HDLWaveSeekBar 娉㈡氮婊戝姩鎺т欢
+            </summary>
+        </member>
+        <member name="P:Shared.WaveSeekBar.mHDLWaveSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLWaveSeekBar.</value>
+        </member>
+        <member name="M:Shared.WaveSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.WaveSeekBar.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.IsProgressTextShow">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.WaveBorderWidth">
+            <summary>
+            鑳屾櫙杈规瀹藉害
+            </summary>
+            <value>鍗婂緞</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.CornerRadius">
+            <summary>
+            鍦嗚
+            </summary>
+            <value>鍦嗚</value>
+        </member>
+        <member name="M:Shared.WaveSeekBar.SetProgressBarColors(System.UInt32,System.UInt32)">
+            <summary>
+            璁剧疆杩涘害鏉� 娓愬彉棰滆壊鐨勫紑濮嬮鑹插拰缁撴潫棰滆壊
+            </summary>
+            <value>寮�濮嬮鑹层�佺粨鏉熼鑹�</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.WaveBorderColor">
+            <summary>
+            鑳屾櫙杈规棰滆壊
+            </summary>
+            <value>鑳屾櫙杈规棰滆壊</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.WavePadding">
+            <summary>
+            杩涘害鏉′笌杈规杈硅窛
+            </summary>
+            <value>鍗婂緞</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.NowProgressY">
+            <summary>
+            褰撳墠杩涘害鍊� Y鍧愭爣
+            </summary>
+            <value>Y鍧愭爣</value>
+        </member>
+        <member name="F:Shared.WaveSeekBar.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="F:Shared.WaveSeekBar.mOnProgressChangeListener">
+            <summary>
+            OnProgressChangeListener 缁ф壙鍝嶅簲浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.GDMapKit.OnGeofenceCallback">
+            <summary>
+            OnGeofenceCallback
+            </summary>
+        </member>
+        <member name="F:Shared.HDLUtils.m_Current">
+            <summary>
+            鎺ュ彛绫荤殑杩斿洖淇℃伅
+            </summary>
+        </member>
+        <member name="P:Shared.HDLUtils.Current">
+            <summary>
+            鎺ュ彛绫荤殑杩斿洖淇℃伅
+            </summary>
+        </member>
+        <member name="M:Shared.HDLUtils.WriteLine(System.Object)">
+            <summary>
+            鍏ㄥ眬鎵撳嵃
+            </summary>
+        </member>
+        <member name="M:Shared.HDLUtils.RestartApp">
+            <summary>
+            閲嶅惎APP
+            </summary>
+        </member>
+        <member name="M:Shared.HDLUtils.SetAuthoritiesName(System.String)">
+            <summary>
+            璁剧疆鍘熺敓鎺т欢搴� authorities鐨勫��
+            </summary>
+        </member>
+        <member name="M:Shared.HDLUtils.OpenUrl(System.String)">
+            <summary>
+            璺宠浆娴忚鍣ㄦ墦寮�鍦板潃
+            </summary>
+            <param name="mUrl"></param>
+        </member>
+        <member name="M:Shared.HDLUtils.OpenAppWithPackageName(System.String)">
+            <summary>
+            鎵撳紑鍏朵粬app
+            </summary>
+            <param name="packageName"></param>
+            <returns></returns>
+        </member>
+        <member name="T:Shared.UIPickerView">
+            <summary>
+            UIPickerView
+            </summary>
+        </member>
+        <member name="P:Shared.UIPickerView.mPickerViewNT">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The UIPickerView.</value>
+        </member>
+        <member name="M:Shared.UIPickerView.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.UIPickerView.setCurrentItems(System.Int32,System.Int32,System.Int32)">
+            <summary>
+            璁剧疆PickerView 榛樿閫変腑椤�
+            </summary>
+        </member>
+        <member name="F:Shared.UIPickerView.SPLIT_FLAG">
+            <summary>
+            璁剧疆PickerView鏁版嵁
+            </summary>
+        </member>
+        <member name="M:Shared.UIPickerView.setPicker(System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.Collections.Generic.List{System.String}})">
+            <summary>
+            璁剧疆PickerView鏁版嵁 鑱斿姩鏁堟灉
+            </summary>
+        </member>
+        <member name="M:Shared.UIPickerView.setNPicker(System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String})">
+            <summary>
+            璁剧疆PickerView鏁版嵁 涓嶈仈鍔�
+            </summary>
+        </member>
+        <member name="M:Shared.UIPickerView.setTextColorCenter(System.UInt32,System.Int32)">
+            <summary>
+            璁剧疆PickerView 閫変腑鏂囧瓧鐨勯鑹�
+            </summary>
+        </member>
+        <member name="F:Shared.UIPickerView.mOnSelectChangeListener">
+            <summary>
+            OnProgressChangeListener 缁ф壙鍝嶅簲浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.UICoverFlowView">
+            <summary>
+            UICoverFlowView 宸插簾寮冿紝鏆傜敤HorizontalPages浠f浛瀹炵幇
+            </summary>
+        </member>
+        <member name="P:Shared.UICoverFlowView.mHDLCoverFlowViewPager">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The UICoverFlowView.</value>
+        </member>
+        <member name="P:Shared.UICoverFlowView.Parents">
+            <summary>
+            鐖跺鍣�
+            </summary>
+            <value>The parent.</value>
+        </member>
+        <member name="M:Shared.UICoverFlowView.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.UICoverFlowView.PageIndex">
+            <summary>
+            璁剧疆鎴栬�呰幏鍙栧綋鍓嶇殑鐣岄潰绱㈠紩
+            </summary>
+            <value>The index of the page.</value>
+        </member>
+        <member name="M:Shared.UICoverFlowView.AddChidren(Shared.View)">
+            <summary>
+            澧炲姞瀛愭帶浠�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.UICoverFlowView.RemoveAll">
+            <summary>
+            娓呯┖鎵�鏈夌殑鎺т欢
+            </summary>
+        </member>
+        <member name="M:Shared.UICoverFlowView.RemoveAt(System.Int32)">
+            <summary>
+            绉婚櫎鎸囧畾绱㈠紩瀵硅薄
+            </summary>
+            <param name="index">Index.</param>
+        </member>
+        <member name="M:Shared.UICoverFlowView.GetChildren(System.Int32)">
+            <summary>
+            鑾峰彇鎸囧畾绱㈠紩瀵硅薄
+            </summary>
+            <returns>The children.</returns>
+            <param name="index">Index.</param>
+        </member>
+        <member name="F:Shared.UICoverFlowView.mOnSelectChangeListener">
+            <summary>
+            OnProgressChangeListener 缁ф壙鍝嶅簲浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.CropImage">
+            <summary>
+            鎷嶇収鎴栬�呴�夋嫨鍥剧墖
+            </summary>
+        </member>
+        <!-- Badly formed XML comment ignored for member "F:Shared.CropImage.TypeCamera" -->
+        <member name="F:Shared.CropImage.TypePicture">
+            <summary>
+            閫夋嫨鍥剧墖
+            </summary>
+        </member>
+        <!-- Badly formed XML comment ignored for member "M:Shared.CropImage.TakePicture(System.Action{System.String},System.String,System.Int32,System.Int32,System.Int32)" -->
+        <!-- Badly formed XML comment ignored for member "M:Shared.CropImage.SelectPicture(System.Action{System.String},System.String,System.Int32,System.Int32,System.Int32)" -->
+        <member name="T:Shared.CropImage.OnCropImageeCallback">
+            <summary>
+            OnCropImageeCallback
+            </summary>
+        </member>
+        <member name="T:Shared.UIDrawerLayout">
+            <summary>
+            鍙虫粦鎶藉眽View
+            </summary>
+        </member>
+        <member name="P:Shared.UIDrawerLayout.Width">
+            <summary>
+            瀹藉害璁剧疆鎴栬鍙�
+            </summary>
+            <value>The width.</value>
+        </member>
+        <member name="P:Shared.UIDrawerLayout.Height">
+            <summary>
+            瑙嗗浘楂樺害
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.#ctor">
+            <summary>
+            鍦ㄦ粦鍔ㄤ簨浠朵笅锛屽彲鏄剧ず闅愯棌浜涜嚜瀹氫箟瑙嗗浘
+            </summary>
+        </member>
+        <member name="F:Shared.UIDrawerLayout._IsDrawerLockMode">
+            <summary>
+            鏄惁閿佸畾鍙虫粦鍔熻兘锛� 閿佸畾鍚庡彸婊戝脊鍑鸿彍鍗曞け鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.OpenLeftMenu">
+            <summary>
+            鎵撳紑鎶藉眽view
+            </summary>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.CloseLeftMenu">
+            <summary>
+            鍏抽棴鎶藉眽view
+            </summary>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.AddLeftView(Shared.View)">
+            <summary>
+            澧炲姞宸﹁竟瑙嗗浘
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.LeftViewRemoveAllViews">
+            <summary>
+            RemoveLeftView
+            </summary>
+        </member>
+        <member name="T:Shared.GPSLocationService">
+            <summary>
+            GPS 鍚庡彴瀹氫綅
+            </summary>
+        </member>
+        <member name="M:Shared.GPSLocationService.initLocation">
+            <summary>
+            鍒濆鍖栧畾浣嶆湇鍔�
+            </summary>  
+        </member>
+        <member name="T:Shared.GestureLockView">
+            <summary>
+            GestureLockView
+            </summary>
+        </member>
+        <member name="P:Shared.GestureLockView.mHDLGestureLockView">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The GestureLockView.</value>
+        </member>
+        <member name="M:Shared.GestureLockView.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.GestureLockView.LockViewCorrectColor">
+            <summary>
+            璁剧疆姝g‘鍜屾櫘閫氭椂鐨勯鑹�
+            </summary>
+            <value>绾块鑹�</value>
+        </member>
+        <member name="P:Shared.GestureLockView.LockViewErrorColor">
+            <summary>
+            璁剧疆閿欒鏃剁殑棰滆壊
+            </summary>
+            <value>绾块鑹�</value>
+        </member>
+        <member name="P:Shared.GestureLockView.LockViewNormalColor">
+            <summary>
+            榛樿鍦嗙偣鑳屾櫙棰滆壊
+            </summary>
+            <value>绾块鑹�</value>
+        </member>
+        <member name="M:Shared.GestureLockView.showCorrectStatus(System.Boolean)">
+            <summary>
+            鏄剧ず鎵嬪娍瑙i攣view 鏄惁鏄剧ず姝g‘
+            </summary>
+        </member>
+        <member name="M:Shared.GestureLockView.SetSolidType(System.Boolean)">
+            <summary>
+            2020-06-18 鏂板
+            璁剧疆鏄惁涓哄疄蹇冨渾褰㈣В閿佹牱寮�
+            </summary>
+        </member>
+        <member name="F:Shared.GestureLockView.OnLockVerifyEvent">
+            <summary>
+            Action
+            </summary>
+        </member>
+        <member name="F:Shared.GestureLockView.mOnLockVerifyListener">
+            <summary>
+            OnProgressChangeListener 缁ф壙鍝嶅簲浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.VerticalRefreshLayout">
+            <summary>鈥�    /// 浣嶇疆甯冨眬鈥�    /// </summary>鈥�
+        </member>
+        <member name="M:Shared.VerticalRefreshLayout.#ctor">
+            <summary>鈥�        /// 鏋勯�犲嚱鏁扳��        /// </summary>鈥�
+        </member>
+        <member name="P:Shared.VerticalRefreshLayout.Width">
+            <summary>鈥�        /// 瑙嗗浘瀹藉害鈥�        /// </summary>鈥�        /// <value>The width.</value>鈥�
+        </member>
+        <member name="P:Shared.VerticalRefreshLayout.Height">
+            <summary>鈥�        /// 瑙嗗浘楂樺害鈥�        /// </summary>鈥�        /// <value>The height.</value>鈥�
+        </member>
+        <member name="F:Shared.VerticalRefreshLayout._isCanHeaderRefresh">
+            <summary>鈥�        /// 鏄惁鏀寔涓嬫媺鍒锋柊鈥�        /// </summary>
+        </member>
+        <member name="M:Shared.VerticalRefreshLayout.BeginHeaderRefreshing">
+            <summary>鈥�        /// 澶村紑濮嬪埛鏂扳��        /// </summary>
+        </member>
+        <member name="M:Shared.VerticalRefreshLayout.EndHeaderRefreshing">
+            <summary>鈥�        /// 澶寸粨鏉熷埛鏂扳��        /// </summary>
+        </member>
+        <member name="P:Shared.VerticalRefreshLayout.VerticalScrollBarEnabled">
+            <summary>鈥�        /// 鏄惁鏄剧ず婊氬姩鏉♀��        /// </summary>
+        </member>
+        <member name="T:Shared.CurtainSeekBar">
+            <summary>
+            CurtainSeekBar 寮�鍚堝笜婊戝姩鎺т欢
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.mHDLOACCurtainSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLOACCurtainSeekBar.</value>
+        </member>
+        <member name="M:Shared.CurtainSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.IsProgressTextShow">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.CurtainPaddingLeftRight">
+            <summary>
+            杩涘害鏉′笌宸﹀彸杈规杈硅窛
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.CurtainPaddingTop">
+            <summary>
+            椤堕儴padding
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.IsOffline">
+            <summary>
+            鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.NowProgressX">
+            <summary>
+            褰撳墠杩涘害鍊� X鍧愭爣
+            </summary>
+            <value>X鍧愭爣</value>
+        </member>
+        <member name="F:Shared.CurtainSeekBar.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="F:Shared.CurtainSeekBar.mOnProgressChangeListener">
+            <summary>
+            OnProgressChangeListener 缁ф壙鍝嶅簲浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.CurtainRollSeekBar">
+            <summary>
+            CurtainRollSeekBar 鍗峰笜婊戝姩鎺т欢
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.mHDLRollCurtainSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLRollCurtainSeekBar.</value>
+        </member>
+        <member name="M:Shared.CurtainRollSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.IsProgressTextShow">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.CurtainPaddingLeftRight">
+            <summary>
+            杩涘害鏉′笌宸﹀彸杈规杈硅窛
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.CurtainPaddingTop">
+            <summary>
+            椤堕儴padding
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.IsOffline">
+            <summary>
+            鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.NowProgressY">
+            <summary>
+            褰撳墠杩涘害鍊� Y鍧愭爣
+            </summary>
+            <value>Y鍧愭爣</value>
+        </member>
+        <member name="F:Shared.CurtainRollSeekBar.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="F:Shared.CurtainRollSeekBar.mOnProgressChangeListener">
+            <summary>
+            OnProgressChangeListener 缁ф壙鍝嶅簲浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.ArcScaleSeekBar">
+            <summary>
+            ArcScaleSeekBar 绌鸿皟 鍒诲害鍦嗗姬鎺т欢
+            </summary>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.mHDLArcScaleSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLArcScaleSeekBar.</value>
+        </member>
+        <member name="M:Shared.ArcScaleSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.IsProgressTextShow">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="M:Shared.ArcScaleSeekBar.SetProgressBarColors(System.UInt32,System.UInt32)">
+            <summary>
+            璁剧疆杩涘害鏉� 娓愬彉棰滆壊鐨勫紑濮嬮鑹插拰缁撴潫棰滆壊
+            </summary>
+            <value>寮�濮嬮鑹层�佺粨鏉熼鑹�</value>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.IsOffline">
+            <summary>
+            鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="F:Shared.ArcScaleSeekBar.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="F:Shared.ArcScaleSeekBar.mOnProgressChangeListener">
+            <summary>
+            OnProgressChangeListener 缁ф壙鍝嶅簲浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.EditTextView">
+            <summary>
+            EditTextView 鏂囨湰杈撳叆妗�
+            鏀寔鎹㈣
+            </summary>
+        </member>
+        <member name="P:Shared.EditTextView.currentAndroidEditText">
+            <summary>
+            褰撳墠瑙嗗浘
+            </summary>
+            <value>The android text.</value>
+        </member>
+        <member name="P:Shared.EditTextView.TextSize">
+            <summary>
+            鏂囧瓧澶у皬
+            </summary>
+            <value>The size of the text.</value>
+        </member>
+        <member name="P:Shared.EditTextView.Text">
+            <summary>
+            鏂囨湰
+            </summary>
+            <value>The text.</value>
+        </member>
+        <member name="P:Shared.EditTextView.TextID">
+            <summary>
+            鏍规嵁ID鑾峰彇瀵瑰簲鐨勫娉�
+            </summary>
+            <value>The text I.</value>
+        </member>
+        <member name="P:Shared.EditTextView.Enable">
+            <summary>
+            鏄惁浣胯兘
+            </summary>
+            <value>true</value>
+            <c>false</c>
+        </member>
+        <member name="P:Shared.EditTextView.PlaceholderText">
+            <summary>
+            鏄剧ず鎻愮ず淇℃伅
+            </summary>
+            <value>The placeholder.</value>
+        </member>
+        <member name="P:Shared.EditTextView.PlaceholderTextColor">
+            <summary>
+            Gets or sets the color of the placeholder text.
+            </summary>
+            <value>The color of the placeholder text.</value>
+        </member>
+        <member name="P:Shared.EditTextView.SecureTextEntry">
+            <summary>
+            鏄惁鐢�*鍙烽殣钘忓瓧绗�
+            </summary>
+            <value>The secure text entry.</value>
+        </member>
+        <member name="P:Shared.EditTextView.IsSelected">
+            <summary>
+            Gets or sets a value indicating whether this instance is selected.
+            </summary>
+            <value><c>true</c> if this instance is selected; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.EditTextView.SelectedBackgroundColor">
+            <summary>
+            閫夋嫨鏃惰儗鏅鑹�
+            </summary>
+            <value>The color of the text.</value>
+        </member>
+        <member name="M:Shared.EditTextView.Refresh">
+            <summary>
+            鍒锋柊澶у皬
+            </summary>
+        </member>
+        <member name="P:Shared.EditTextView.TextColor">
+            <summary>
+            鏂囧瓧棰滆壊
+            </summary>
+            <value>The color of the text.</value>
+        </member>
+        <member name="P:Shared.EditTextView.TextAlignment">
+            <summary>
+            Texts the alignment.
+            </summary>
+            <param name="horizontalAlignment">Horizontal alignment.</param>
+            <param name="verticalAlignment">Vertical alignment.</param>
+        </member>
+        <member name="P:Shared.EditTextView.SelectedImagePath">
+            <summary>
+            閫夋嫨鏃惰儗鏅浘璺緞
+            </summary>
+            <value>The selected image path.</value>
+        </member>
+        <member name="P:Shared.EditTextView.UnSelectedImagePath">
+            <summary>
+            闈為�変腑鐘舵�佺殑鑳屾櫙鍥捐矾寰�
+            </summary>
+            <value>The un selected image path.</value>
+        </member>
+        <member name="F:Shared.EditTextView.TextChangeEventHandler">
+            <summary>
+            杈撳叆鏂囧瓧鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="M:Shared.EditTextView.InitIosPlaceholderUILabelWithHeight(System.Int32)">
+            <summary>
+            鍒锋柊placeholderUILabel甯冨眬
+            </summary>
+        </member>
+        <member name="T:Shared.HorizontalPages">
+            <summary>
+            棣栭〉杞挱鍥�
+            </summary>
+        </member>
+        <member name="P:Shared.HorizontalPages.Height">
+            <summary>
+            瑙嗗浘楂樺害
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="P:Shared.HorizontalPages.Width">
+            <summary>
+            瑙嗗浘瀹藉害
+            </summary>
+            <value>The width.</value>
+        </member>
+        <member name="F:Shared.HorizontalPages.PageChange">
+            <summary>
+            椤甸潰鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="F:Shared.HorizontalPages.StartScrollAction">
+            <summary>
+            寮�濮嬫粦鍔ㄤ簨浠�
+            </summary>
+        </member>
+        <member name="F:Shared.HorizontalPages.EndScrollAction">
+            <summary>
+            缁撴潫婊戝姩浜嬩欢
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalPages.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="F:Shared.HorizontalPages.IsSetLeftAndRightImageView">
+            <summary>
+            鏄惁璁剧疆浜嗚櫄鍋囪儗鏅疺iew 璁剧疆浜嗘墠鏄剧ず
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalPages.SetLeftAndRightImageView(Shared.ImageView,Shared.ImageView)">
+            <summary>
+             璁剧疆鎺у埗鏈�宸﹀拰鏈�鍙�2杈癸紝濉厖鐨勫亣鑳屾櫙View锛屼笉璁剧疆涓嶆樉绀猴紝闇�瑕佸湪AddChidren 鍓嶈皟鐢ㄨ鏂规硶
+            </summary>
+            <param name="mLeftImageView"></param>
+            <param name="mRightImageView"></param>
+        </member>
+        <member name="P:Shared.HorizontalPages.PageIndex">
+            <summary>
+            璁剧疆鎴栬�呰幏鍙栧綋鍓嶇殑鐣岄潰绱㈠紩
+            </summary>
+            <value>The index of the page.</value>
+        </member>
+        <member name="P:Shared.HorizontalPages.ScrollEnabled">
+            <summary>
+            鏄惁鍏佽婊戝姩
+            </summary>
+            <value><c>true</c> if scroll enabled; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="M:Shared.HorizontalPages.AddChidren(Shared.View)">
+            <summary>
+            澧炲姞瀛愭帶浠�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.HorizontalPages.Remove(Shared.View)">
+            <summary>
+            绉婚櫎褰撳墠鎺т欢
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.HorizontalPages.RemoveAll">
+            <summary>
+            绉婚櫎鎵�鏈夌殑鎺т欢
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalPages.RemoveAt(System.Int32)">
+            <summary>
+            鏍规嵁绱㈠紩绉婚櫎鎺т欢
+            </summary>
+            <param name="index">Index.</param>
+        </member>
+        <member name="P:Shared.HorizontalPages.JMBJ">
+            <summary>
+            鐣岄潰涔嬮棿鐨勮竟璺�
+            </summary>
+        </member>
+        <member name="P:Shared.HorizontalPages.TCBJ">
+            <summary>
+            绐佸嚭瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.HorizontalPages.ISScrolling">
+            <summary>
+            鏄惁姝e湪婊戝姩
+            </summary>
+        </member>
+        <member name="P:Shared.HorizontalPages.Decelerating">
+            <summary>
+            鏄惁姝e湪婊戝姩
+            </summary>
+            <value><c>true</c> if decelerating; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="F:Shared.InnerHorizontalPages.JMBJ">
+            <summary>
+            鐣岄潰涔嬮棿鐨勮竟璺�
+            </summary>
+        </member>
+        <member name="M:Shared.InnerHorizontalPages.AddView(Android.Views.View)">
+            <summary>
+            閲嶅啓杩欎釜鏄负浜嗘柟渚块儴灞�锛屽湪姣忎釜鐣岄潰涔嬮棿閮藉鍔犱簡涓�涓帶浠跺寘浣�
+            </summary>
+            <param name="child"></param>
+        </member>
+        <member name="M:Shared.InnerHorizontalPages.ReLocation">
+            <summary>
+            閲嶆柊鎺掍綅缃強璁惧鍐呭澶у皬
+            </summary>
+        </member>
+        <member name="M:Shared.InnerHorizontalPages.CheckIfStartOrEnd">
+            <summary>
+            
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Shared.InnerHorizontalPages.SendEndScrollAction">
+            <summary>
+            鍒ゆ柇鏄惁闇�瑕佸彂閫佺粨鏉熸粦鍔ㄤ簨浠�
+            </summary>
+        </member>
+        <member name="M:Shared.InnerHorizontalPages.RefreshPageView">
+            <summary>
+            鑷姩璁$畻鍒锋柊鎵�鏈塚iew鐨勯珮搴︼紝瀹炵幇缂╂斁鏁堟灉
+            </summary>
+        </member>
+        <member name="F:Shared.InnerHorizontalPages.MaxDistance">
+            <summary>
+            鍒锋柊鏈�澶ц窛绂诲��
+            </summary>
+        </member>
+        <member name="M:Shared.InnerHorizontalPages.RefreshViewWithChangeHeight">
+            <summary>
+            璁$畻婊戝姩缂╂斁楂樺害鐨勬柟娉�
+            </summary>
+        </member>
+        <member name="M:Shared.InnerHorizontalPages.RefreshSubviewHeight(Shared.View,System.Single)">
+            <summary>
+            鍚屾椂鍒锋柊瀛恦iew 鍜孖mageView鐨勯珮搴︼紝鏆傛椂瑙e喅搴曢儴鍦嗚澶辨晥闂
+            </summary>
+            <param name="mView"></param>
+            <param name="height"></param>
+        </member>
+        <member name="M:Shared.InnerHorizontalPages.snapToDestination(System.Boolean)">
+            <summary>
+            婊戝姩鍒版寚瀹氱殑鐣岄潰
+            </summary>
+        </member>
+        <member name="M:Shared.InnerHorizontalPages.snapToScreen(System.Int32,System.Boolean)">
+            <summary>
+            婊戝姩鍒版寚瀹氱晫闈�
+            </summary>
+            <param name="whichScreen">Which screen.</param>
+        </member>
+        <member name="M:Shared.InnerHorizontalPages.SendIfPageChange(System.Int32)">
+            <summary>
+            鍒ゆ柇鏄惁瑕佸彂閫佹敼鍙樹簨浠�
+            </summary>
+        </member>
+        <member name="T:Shared.DiyImageSeekBar">
+            <summary>
+            DiyImageSeekBar 鑷畾涔夋嫋鍔ㄦ寜閽浘鐗囩殑婊戝姩SeekBar
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.mHDLDiyImageSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLDiyImageSeekBar.</value>
+        </member>
+        <member name="M:Shared.DiyImageSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.IsProgressTextShow">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.ProgressBarColor">
+            <summary>
+            褰撳墠杩涘害鏉¢鑹�
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.SeekBarBackgroundColor">
+            <summary>
+            褰撳墠杩涘害鏉¤儗鏅殑棰滆壊
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.SeekBarPadding">
+            <summary>
+            杩涘害鏉′笌宸﹀彸杈规杈硅窛
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.SeekBarViewHeight">
+            <summary>
+            杩涘害鏉¢珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.ThumbImageHeight">
+            <summary>
+            鎷栧姩鎸夐挳鍥剧墖楂樺害
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.ThumbImagePath">
+            <summary>
+            鎷栧姩鎸夐挳鍥剧墖
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.IsOffline">
+            <summary>
+            鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="F:Shared.DiyImageSeekBar.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="F:Shared.DiyImageSeekBar.mOnProgressChangeListener">
+            <summary>
+            OnProgressChangeListener 缁ф壙鍝嶅簲浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.BaseSeekBar">
+            <summary>
+            BaseSeekBar 瀹炵幇ProgressChange 鏄惁灞忚斀鍒ゆ柇
+            </summary>
+        </member>
+        <member name="P:Shared.BaseSeekBar.ProgressChangeDelayTime">
+            <summary>
+            灞忚斀鏃堕棿闂撮殧 鍗曚綅ms
+            </summary>
+        </member>
+        <member name="M:Shared.BaseSeekBar.IsProgressChangeDelay">
+            <summary>
+            鍒ゆ柇鏄惁灞忚斀
+            </summary>
+        </member>
+        <member name="T:Shared.ProgressLoading">
+            <summary>
+            ProgressLoading
+            </summary>
+        </member>
+        <member name="P:Shared.ProgressLoading.mProgressLoadingView">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The android ProgressLoadingView.</value>
+        </member>
+        <member name="M:Shared.ProgressLoading.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.ProgressLoading.StartLoading(System.Int32)">
+            <summary>
+            寮�濮婰oading绾跨▼
+            </summary>
+            <param name="mTime">鏈�灏�500ms</param>
+        </member>
+        <member name="M:Shared.ProgressLoading.EndLoading">
+            <summary>
+            缁撴潫Loading
+            </summary>
+        </member>
+        <member name="M:Shared.ProgressLoading.HideLoading">
+            <summary>
+            缁撴潫Loading
+            </summary>
+        </member>
+        <member name="P:Shared.ProgressLoading.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.ProgressLoading.ProgressWidth">
+            <summary>
+            褰撳墠杩涘害瀹�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.ProgressLoading.ProgressRadius">
+            <summary>
+            褰撳墠杩涘害鍗婂緞
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.ProgressLoading.ProgressBarColor">
+            <summary>
+            杩涘害鏉¢鑹� 
+            </summary>
+            <value>鍗曚竴杩涘害鏉¢鑹�</value>
+        </member>
+        <member name="P:Shared.ProgressLoading.LoadingBackgroundColor">
+            <summary>
+            LoadingBackgroundColor 
+            </summary>
+            <value>鑳屾櫙棰滆壊</value>
+        </member>
+        <member name="F:Shared.ProgressLoading.ProgressLoadingView.mArcProgressBarPaint">
+            <summary>
+            缁樺浘鐨凱aint
+            </summary>
+        </member>
+        <member name="T:Shared.GradientMaskView">
+            <summary>
+            GradientMaskView
+            </summary>
+        </member>
+        <member name="P:Shared.GradientMaskView.mGradientButton">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The android GradientMaskView.</value>
+        </member>
+        <member name="M:Shared.GradientMaskView.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="F:Shared.GradientMaskView.mGradientColors">
+            <summary>
+            0%锛�25%锛�50%锛�80%
+            </summary>
+        </member>
+        <member name="F:Shared.GradientMaskView.GradientButton.mPaint">
+            <summary>
+            缁樺浘鐨凱aint
+            </summary>
+        </member>
+        <member name="M:Shared.GradientMaskView.GradientButton.DrawWithGradient(Android.Graphics.Canvas)">
+            <summary>
+            缁樺埗娓愬彉鏁堟灉
+            </summary>
+            <param name="canvas"></param>
+        </member>
+        <member name="T:Shared.DiyImageVerticalSeekBar">
+            <summary>
+            DiyImageVerticalSeekBar 鑷畾涔夋嫋鍔ㄦ寜閽浘鐗囩殑婊戝姩鍨傜洿鏂瑰悜SeekBar
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.mHDLDiyImageVerticalSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLDiyImageVerticalSeekBar.</value>
+        </member>
+        <member name="M:Shared.DiyImageVerticalSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.IsProgressTextShow">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.ProgressBarColor">
+            <summary>
+            褰撳墠杩涘害鏉¢鑹�
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.SeekBarBackgroundColor">
+            <summary>
+            褰撳墠杩涘害鏉¤儗鏅殑棰滆壊
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.SeekBarPadding">
+            <summary>
+            杩涘害鏉′笌宸﹀彸杈规杈硅窛
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.SeekBarViewHeight">
+            <summary>
+            杩涘害鏉¢珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.ThumbImageHeight">
+            <summary>
+            鎷栧姩鎸夐挳鍥剧墖楂樺害
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.ThumbImagePath">
+            <summary>
+            鎷栧姩鎸夐挳鍥剧墖
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.IsOffline">
+            <summary>
+            鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="F:Shared.DiyImageVerticalSeekBar.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="F:Shared.DiyImageVerticalSeekBar.mOnProgressChangeListener">
+            <summary>
+            OnProgressChangeListener 缁ф壙鍝嶅簲浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.CurtainSeekBarOn">
+            <summary>
+            CurtainSeekBarOn 寮�鍚堝笜鎺т欢
+            HDL ON+ 寮�鍚堝笜鎺т欢
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.mHDLOnOACCurtainSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLOnOACCurtainSeekBar.</value>
+        </member>
+        <member name="M:Shared.CurtainSeekBarOn.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.IsProgressTextShow">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.IsOffline">
+            <summary>
+            鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.NowProgressX">
+            <summary>
+            褰撳墠杩涘害鍊� X鍧愭爣
+            </summary>
+            <value>X鍧愭爣</value>
+        </member>
+        <member name="F:Shared.CurtainSeekBarOn.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="F:Shared.CurtainSeekBarOn.mOnProgressChangeListener">
+            <summary>
+            OnProgressChangeListener 缁ф壙鍝嶅簲浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.CurtainRollSeekBarOn">
+            <summary>
+            CurtainRollSeekBarOn
+            2020-06-18 HDL ON+ 鍗峰笜鍜岀櫨鍙剁獥鎺т欢
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.mHDLOnRollCurtainSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLOnRollCurtainSeekBar.</value>
+        </member>
+        <member name="M:Shared.CurtainRollSeekBarOn.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.IsProgressTextShow">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.IsOffline">
+            <summary>
+            鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.NowProgressY">
+            <summary>
+            褰撳墠杩涘害鍊� Y鍧愭爣
+            </summary>
+            <value>Y鍧愭爣</value>
+        </member>
+        <member name="M:Shared.CurtainRollSeekBarOn.SetBlindsType(System.Boolean)">
+            <summary>
+            璁剧疆鏄惁涓虹櫨鍙剁獥鏍峰紡
+            </summary>
+        </member>
+        <member name="F:Shared.CurtainRollSeekBarOn.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="F:Shared.CurtainRollSeekBarOn.mOnProgressChangeListener">
+            <summary>
+            OnProgressChangeListener 缁ф壙鍝嶅簲浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.DiyArcSeekBar">
+            <summary>
+            HDLDiyArcSeekBar 鎺т欢
+            鑷畾涔夊紑鍙h搴﹀渾寮ф帶浠讹紝鏀寔璁剧疆鑷畾涔夋嫋鍔ㄥ浘鐗囷紝鏇寸伒娲绘墿灞曪紝鐢ㄤ簬绌鸿皟椤甸潰鍜岄煶涔愮瓑椤甸潰
+            </summary>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.mHDLDiyArcSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLDiyArcSeekBar.</value>
+        </member>
+        <member name="M:Shared.DiyArcSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.ArcColor">
+            <summary>
+            鍦嗗姬榛樿鑳屾櫙棰滆壊
+            </summary>
+            <value>鑳屾櫙棰滆壊</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.ProgressBarColor">
+            <summary>
+            杩涘害鏉¢鑹� 鍗曚竴棰滆壊涓嶆笎鍙�
+            </summary>
+            <value>鍗曚竴杩涘害鏉¢鑹�</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.ArcWidth">
+            <summary>
+            鍦嗗姬瀹�
+            </summary>
+            <value>瀹�</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="M:Shared.DiyArcSeekBar.SetProgressBarColors(System.UInt32,System.UInt32)">
+            <summary>
+            璁剧疆杩涘害鏉� 娓愬彉棰滆壊鐨勫紑濮嬮鑹插拰缁撴潫棰滆壊
+            </summary>
+            <value>寮�濮嬮鑹层�佺粨鏉熼鑹�</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.OpenAngle">
+            <summary>
+            寮�鍙h搴�
+            </summary>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.SeekBarPadding">
+            <summary>
+            杩涘害鏉′笌宸﹀彸杈规杈硅窛
+            </summary>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.ThumbImageHeight">
+            <summary>
+            鎷栧姩鎸夐挳鍥剧墖楂樺害
+            </summary>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.ThumbImagePath">
+            <summary>
+            鎷栧姩鎸夐挳鍥剧墖
+            </summary>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.IsOffline">
+            <summary>
+            鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.OfflineProgressBarColor">
+            <summary>
+            绂荤嚎鏁堟灉鏃� 杩涘害鏉¢鑹� 鍗曚竴棰滆壊涓嶆笎鍙�
+            </summary>
+            <value>鍗曚竴杩涘害鏉¢鑹�</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.IsThumbImgBtnShow">
+            <summary>
+            鏄惁鏄剧ず鎷栧姩鎸夐挳鍥剧墖
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="F:Shared.DiyArcSeekBar.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="F:Shared.DiyArcSeekBar.mOnProgressChangeListener">
+            <summary>
+            OnProgressChangeListener 缁ф壙鍝嶅簲浜嬩欢
+            </summary>
+        </member>
+        <member name="T:ViewFlow.ViewSwitchListener">
+            Receives call backs when a new {@link View} has been scrolled to.
+        </member>
+        <member name="M:ViewFlow.ViewSwitchListener.onSwitched(Android.Views.View,System.Int32)">
+            This method is called when a new View has been scrolled to.
+            
+            @param view
+                       the {@link View} currently in focus.
+            @param position
+                       The position in the adapter of the {@link View} currently in focus.
+        </member>
+        <member name="P:ViewFlow.screenWidth">
+            <summary>
+            瀛愭帶浠剁殑瀹藉害
+            </summary>
+            <value>The width of the child.</value>
+        </member>
+        <member name="M:ViewFlow.snapToDestination(System.Boolean)">
+            <summary>
+            婊戝姩鍒版寚瀹氱殑鐣岄潰
+            </summary>
+        </member>
+        <member name="M:ViewFlow.snapToScreen(System.Int32,System.Boolean)">
+            <summary>
+            婊戝姩鍒版寚瀹氱晫闈�
+            </summary>
+            <param name="whichScreen">Which screen.</param>
+        </member>
+        <member name="M:ViewFlow.setVisibleView(System.Int32,System.Boolean)">
+            Scroll to the {@link View} in the view buffer specified by the index.
+            
+            @param indexInBuffer
+                       Index of the view in the view buffer.
+        </member>
+        <member name="M:ViewFlow.setOnViewSwitchListener(ViewFlow.ViewSwitchListener)">
+            Set the listener that will receive notifications every time the {code
+            ViewFlow} scrolls.
+            
+            @param l
+                       the scroll listener
+        </member>
+        <member name="F:com.hdl.on.Volume.VolumeChange">
+            <summary>
+            闊抽噺鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="F:com.hdl.on.Volume.isNeedUpdate">
+            <summary>
+            鏄惁闇�瑕佹洿鏂板綋鍓嶉煶閲�
+            </summary>
+        </member>
+        <member name="P:com.hdl.on.Volume.MusicVolume">
+            <summary>
+            璁剧疆褰撳墠闊抽噺
+            </summary>
+            <param name="volume">Volume.</param>
+        </member>
+        <member name="M:com.hdl.on.Volume.Init">
+            <summary>
+            鍒濆鍖栧綋鍓嶉煶閲忔挱鏀剧被鍨嬫槸濯掍綋
+            </summary>
+        </member>
+    </members>
+</doc>
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
index 083b92e..4c39958 100755
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.TBL.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
index 4cd2543..4fb86e4 100755
--- a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.dll
Binary files differ
diff --git a/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.xml b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.xml
new file mode 100755
index 0000000..5aa77c7
--- /dev/null
+++ b/ZigbeeApp/Shared/DLL/IOS/Shared.IOS.xml
@@ -0,0 +1,4963 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Shared.IOS</name>
+    </assembly>
+    <members>
+        <member name="T:Shared.IO.FileUtils">
+            <summary>
+            鏂囦欢绫�
+            </summary>
+        </member>
+        <member name="M:Shared.IO.FileUtils.DeleteFile(System.String)">
+            <summary>
+            鍒犻櫎鏂囦欢
+            </summary>
+            <param name="path">Path.</param>
+        </member>
+        <member name="M:Shared.IO.FileUtils.GetStreamFromResource(System.String)">
+            <summary>
+            浠庤祫婧愭枃浠堕噷鑾峰彇鏂囦欢
+            </summary>
+            <returns>The stream from resource.</returns>
+            <param name="path">Path.</param>
+        </member>
+        <member name="F:Shared.IO.FileUtils.RootPath">
+            <summary>
+            鏍圭洰褰曡矾寰�
+            </summary>
+        </member>
+        <member name="M:Shared.IO.FileUtils.WriteFileByBytes(System.String,System.Byte[])">
+            <summary>
+            Writes the file by bytes.
+            </summary>
+            <returns><c>true</c>, if file by bytes was writed, <c>false</c> otherwise.</returns>
+            <param name="fileName">File name.</param>
+            <param name="bytes">Bytes.</param>
+        </member>
+        <member name="M:Shared.IO.FileUtils.WriteFileByInputStream(System.String,System.IO.Stream)">
+            <summary>
+            Writes the file by input stream.
+            </summary>
+            <returns><c>true</c>, if file by input stream was writed, <c>false</c> otherwise.</returns>
+            <param name="fileName">File name.</param>
+            <param name="inputStream">Input stream.</param>
+        </member>
+        <member name="M:Shared.IO.FileUtils.ReadImage1(System.String)">
+            <summary>
+            璇诲彇鍥剧墖鏂囦欢
+            </summary>
+            <returns>The file.</returns>
+            <param name="fileName">File name.</param>
+        </member>
+        <member name="M:Shared.IO.FileUtils.GetImageFilePath(System.String)">
+            <summary>
+            璇诲彇鍥剧墖鏂囦欢璺緞
+            </summary>
+            <returns>The file.</returns>
+            <param name="fileName">File name.</param>
+        </member>
+        <member name="M:Shared.IO.FileUtils.ReadStringList(System.String,System.Text.Encoding)">
+            <summary>
+            Reads the string list.
+            </summary>
+            <returns>The string list.</returns>
+            <param name="fileName">File name.</param>
+            <param name="encoding">Encoding.</param>
+        </member>
+        <member name="M:Shared.IO.FileUtils.ReadFile(System.String)">
+            <summary>
+            Reads the file.
+            </summary>
+            <returns>The file.</returns>
+            <param name="fileName">File name.</param>
+        </member>
+        <member name="P:Shared.Net.NetWiFi.IpAddress">
+            <summary>
+            锟斤拷取锟斤拷前锟借备锟斤拷IP
+            </summary>
+        </member>
+        <member name="P:Shared.Net.NetWiFi.BroadcastIpAddress">
+            <summary>
+            锟斤拷取锟姐播IPAddress
+            </summary>
+        </member>
+        <member name="T:Shared.Alert">
+            <summary>
+            瀵硅瘽妗�
+            </summary>
+        </member>
+        <member name="F:Shared.Alert.myUIAlertView">
+            <summary>
+            褰撳墠瀵硅瘽妗�
+            </summary>
+        </member>
+        <member name="M:Shared.Alert.#ctor(System.String,System.String,System.String,System.String)">
+            <summary>
+            瀵硅瘽绐�
+            </summary>
+            <param name="title">鏍囬</param>
+            <param name="message">淇℃伅</param>
+            <param name="cancelButtonText">鍙栨秷鎸夐敭澶囨敞锛屽�糿ull琛ㄧず涓嶆樉绀哄彇娑堟寜閿�</param>
+            <param name="okButtonText">纭鎸夐敭澶囨敞</param>
+        </member>
+        <member name="M:Shared.Alert.#ctor(System.String,System.String,System.String)">
+            <summary>
+            瀵硅瘽绐�
+            </summary>
+            <param name="title">鏍囬</param>
+            <param name="message">淇℃伅</param>
+            <param name="okButtonText">纭鎸夐敭澶囨敞</param>
+        </member>
+        <member name="F:Shared.Alert.ResultEventHandler">
+            <summary>
+            缁撴灉閫氱煡浜嬩欢锛宼rue琛ㄧず閫変腑鎸夐敭锛宖alse琛ㄧず鍙栨秷浜嬩欢
+            </summary>
+        </member>
+        <member name="M:Shared.Alert.Show">
+            <summary>
+            鏄剧ず褰撳墠鐨勭晫闈�
+            </summary>
+        </member>
+        <member name="M:Shared.Alert.Dismiss">
+            <summary>
+            鍏抽棴褰撳墠鐨勭晫闈�
+            </summary>
+        </member>
+        <member name="T:Shared.Application">
+            <summary>
+            UI澶勭悊绫�
+            </summary>
+        </member>
+        <member name="P:Shared.Application.IsFullScreen">
+            <summary>
+            2020-06-23
+            鏄惁鍏ㄥ睆骞曟墜鏈�
+            </summary>
+        </member>
+        <member name="M:Shared.Application.GetRealHeight(System.Int32)">
+            <summary>
+            鑾峰彇瀹為檯鐨勯珮搴�
+            </summary>
+            <returns>The real height.</returns>
+            <param name="height">Height.</param>
+        </member>
+        <member name="F:Shared.Application.FontSize">
+            <summary>
+            榛樿鐨勫瓧浣撳ぇ灏�
+            </summary>
+        </member>
+        <member name="M:Shared.Application.GetRealWidth(System.Int32)">
+            <summary>
+            鑾峰彇瀹為檯鐨勫搴�
+            </summary>
+            <returns>The real width.</returns>
+            <param name="width">Width.</param>
+        </member>
+        <member name="M:Shared.Application.HideSoftInput">
+            <summary>
+            闅愯棌杞敭鐩�
+            </summary>
+        </member>
+        <member name="F:Shared.Application.DeviceType">
+            <summary>
+            褰撳墠璁惧绫诲瀷
+            </summary>
+        </member>
+        <member name="M:Shared.Application.GetMinReal(System.Int32)">
+            <summary>
+            鑾峰彇鏈�灏忔瘮渚嬬殑瀹為檯鍊�
+            </summary>
+            <returns>The minimum real.</returns>
+            <param name="widthOrHeight">Width or height.</param>
+        </member>
+        <member name="M:Shared.Application.GetMinRealAverage(System.Int32)">
+            <summary>
+            鑾峰彇骞冲潎瀹為檯鍊�
+            </summary>
+            <returns>The minimum real average.</returns>
+            <param name="widthOrHeight">Width or height.</param>
+        </member>
+        <member name="M:Shared.Application.RunOnMainThread(System.Action)">
+            <summary>
+            涓荤嚎绋嬫墽琛屾寚瀹氫簨浠�
+            </summary>
+            <param name="action">Action.</param>
+        </member>
+        <member name="F:Shared.Application.CurrentWidth">
+            <summary>
+            褰撳墠璁惧鐨勫搴�
+            </summary>
+        </member>
+        <member name="F:Shared.Application.CurrentHeight">
+            <summary>
+            褰撳墠璁惧鐨勯珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.Application.WidthScale">
+            <summary>
+            瀹藉害姣斾緥
+            </summary>
+            <value>The width scale.</value>
+        </member>
+        <member name="P:Shared.Application.HeightScale">
+            <summary>
+            楂樺害姣斾緥
+            </summary>
+            <value>The height scale.</value>
+        </member>
+        <member name="P:Shared.Application.MinScale">
+            <summary>
+            鏈�灏忔瘮渚�
+            </summary>
+            <value>The minimum scale.</value>
+        </member>
+        <member name="P:Shared.Application.AverageScale">
+            <summary>
+            骞冲潎姣斾緥
+            </summary>
+            <value>The average scale.</value>
+        </member>
+        <member name="F:Shared.Application.DesignWidth">
+            <summary>
+             璁捐瀹藉害 
+            </summary>
+        </member>
+        <member name="F:Shared.Application.DesignHeight">
+            <summary>
+            璁捐楂樺害
+            </summary>
+        </member>
+        <member name="P:Shared.Application.MainPage">
+            <summary>
+            褰撳墠涓婚〉
+            </summary>
+            <value>The main page.</value>
+        </member>
+        <member name="P:Shared.Application.RootFrameLayout">
+            <summary>
+            鏍瑰鍣ㄨ鍥�
+            </summary>
+            <value>The root frame layout.</value>
+        </member>
+        <member name="F:Shared.Application.RootPath">
+            <summary>
+            鏁版嵁鏂囦欢鏍圭洰褰�
+            </summary>
+            <value>The root path.</value>
+        </member>
+        <member name="P:Shared.Application.RootPathImage">
+            <summary>
+             鍥剧墖鐨勬牴鐩綍
+            </summary>
+            <value>The root path image.</value>
+        </member>
+        <member name="P:Shared.Application.IsPad">
+            <summary>
+            鏄惁鏄痯ad
+            </summary>
+        </member>
+        <member name="F:Shared.Application.Skin">
+            <summary>
+            鐨偆锛宯ull鏃惰〃绀虹敤榛樿鐨�
+            </summary>
+        </member>
+        <member name="F:Shared.Application.LocationAction">
+            <summary>
+            GPS浣嶇疆鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.Button">
+            <summary>
+            Button 鎸夐敭
+            </summary>
+        </member>
+        <member name="F:Shared.Button.FontNameNormal">
+            <summary>
+            鏅�氬瓧浣�
+            </summary>
+        </member>
+        <member name="F:Shared.Button.FontNameBold">
+            <summary>
+            绮椾綋
+            </summary>
+        </member>
+        <member name="M:Shared.Button.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Shared.Button"/> class.
+            </summary>
+        </member>
+        <member name="P:Shared.Button.TextID">
+            <summary>
+            鏍规嵁ID鑾峰彇瀵瑰簲鐨勫娉�
+            </summary>
+            <value>The text I.</value>
+        </member>
+        <member name="P:Shared.Button.Text">
+            <summary>
+            鏂囨湰
+            </summary>
+            <value>The text.</value>
+        </member>
+        <member name="P:Shared.Button.FontName">
+            <summary>
+            瀛椾綋鍚嶇О
+            </summary>
+            <value>The name of the font.</value>
+        </member>
+        <member name="F:Shared.Button.isBold">
+            <summary>
+            鏄惁鏄剧ず绮椾綋
+            </summary>
+        </member>
+        <member name="M:Shared.Button.GetTextWidth">
+            <summary>
+            鑾峰彇瀛椾綋闀垮害
+            </summary>
+        </member>
+        <member name="M:Shared.Button.Refresh">
+            <summary>
+            鍒涙柊闇�瑕佸垱鏂扮殑淇℃伅
+            </summary>
+        </member>
+        <member name="P:Shared.Button.TextSize">
+            <summary>
+            鏂囧瓧澶у皬,榛樿12
+            </summary>
+            <value>The size of the text.</value>
+        </member>
+        <member name="P:Shared.Button.TextColor">
+            <summary>
+            鏂囧瓧棰滆壊
+            </summary>
+            <value>The color of the text.</value>
+        </member>
+        <member name="P:Shared.Button.SelectedTextColor">
+            <summary>
+            鏂囧瓧棰滆壊
+            </summary>
+            <value>The color of the text.</value>
+        </member>
+        <member name="P:Shared.Button.IsSelected">
+            <summary>
+            閫変腑鐘舵��
+            </summary>
+            <value><c>true</c> if this instance is selected; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.Button.TextAlignment">
+            <summary>
+             鏂囧瓧瀵归綈鏂瑰紡
+            </summary>
+            <param name="horizontalAlignment">Horizontal alignment.</param>
+            <param name="verticalAlignment">Vertical alignment.</param>
+        </member>
+        <member name="P:Shared.Button.SelectedImagePath">
+            <summary>
+            閫夋嫨鏃惰儗鏅浘璺緞
+            </summary>
+            <value>The selected image path.</value>
+        </member>
+        <member name="P:Shared.Button.UnSelectedImagePath">
+            <summary>
+            闈為�変腑鐘舵�佺殑鑳屾櫙鍥捐矾寰�
+            </summary>
+            <value>The un selected image path.</value>
+        </member>
+        <member name="P:Shared.Button.Padding">
+            <summary>
+            鍐呰竟璺�
+            </summary>
+            <value>The padding.</value>
+        </member>
+        <member name="P:Shared.Button.Enable">
+            <summary>
+            鏄惁浣跨敤鐐瑰嚮
+            </summary>
+            <value><c>true</c> if enable; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.Button.SelectedBackgroundColor">
+            <summary>
+            閫夋嫨鏃惰儗鏅鑹�
+            </summary>
+            <value>The color of the text.</value>
+        </member>
+        <member name="M:Shared.Button.MyButton.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.Button.MyButton.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.Button.MyButton.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="T:Shared.Dialog">
+            <summary>
+            寮圭獥
+            </summary>
+        </member>
+        <member name="M:Shared.Dialog.#ctor">
+            <summary>
+            寮圭獥鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.Dialog.BackgroundColor">
+            <summary>
+            鑳屾櫙棰滆壊
+            </summary>
+            <value>The color of the background.</value>
+        </member>
+        <member name="P:Shared.Dialog.Radius">
+            <summary>
+            鍦嗚澶у皬
+            </summary>
+            <value>The corner.</value>
+        </member>
+        <member name="P:Shared.Dialog.BorderWidth">
+            <summary>
+            杈规绾垮ぇ灏�
+            </summary>
+            <value>The width of the border.</value>
+        </member>
+        <member name="M:Shared.Dialog.AddChidren(Shared.View)">
+            <summary>
+            澧炲姞瀛愭帶浠�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="P:Shared.Dialog.BackgroundImagePath">
+            <summary>
+            鑳屾櫙鍥剧墖璺緞
+            </summary>
+            <value>The background image path.</value>
+        </member>
+        <member name="P:Shared.Dialog.Width">
+            <summary>
+            瀹藉害
+            </summary>
+            <value>The width.</value>
+        </member>
+        <member name="P:Shared.Dialog.Height">
+            <summary>
+            楂樺
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="P:Shared.Dialog.X">
+            <summary>
+            X
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="P:Shared.Dialog.Y">
+            <summary>
+            Y
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="M:Shared.Dialog.Show">
+            <summary>
+            鏄剧ず褰撳墠鐨勭晫闈�
+            </summary>
+        </member>
+        <member name="M:Shared.Dialog.Close">
+            <summary>
+            鍏抽棴褰撳墠鐨勭晫闈紝閲婃斁璧勬簮
+            </summary>
+        </member>
+        <member name="T:Shared.EditText">
+            <summary>
+            鏂囨湰杈撳叆妗�
+            </summary>
+        </member>
+        <member name="P:Shared.EditText.iosUITextView">
+            <summary>
+            褰撳墠瑙嗗浘
+            </summary>
+            <value>The ios user interface text view.</value>
+        </member>
+        <member name="P:Shared.EditText.TextSize">
+            <summary>
+            鏂囧瓧澶у皬
+            </summary>
+            <value>The size of the text.</value>
+        </member>
+        <member name="P:Shared.EditText.IsFirstResponder">
+            <summary>
+            鏄惁璁剧疆涓哄姞杞芥椂鏄剧ず杈撳叆閿洏
+            </summary>
+            <value><c>true</c> if is first responder; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.EditText.TextID">
+            <summary>
+            鏍规嵁ID鑾峰彇瀵瑰簲鐨勫娉�
+            </summary>
+            <value>The text I.</value>
+        </member>
+        <member name="P:Shared.EditText.Enable">
+            <summary>
+            鏄惁浣胯兘
+            </summary>
+            <value>鏄惁浣胯兘</value>
+        </member>
+        <member name="P:Shared.EditText.PlaceholderText">
+            <summary>
+            鏄剧ず鎻愮ず淇℃伅
+            </summary>
+            <value>The placeholder.</value>
+        </member>
+        <member name="P:Shared.EditText.PlaceholderTextColor">
+            <summary>
+            Gets or sets the color of the placeholder text.
+            </summary>
+            <value>The color of the placeholder text.</value>
+        </member>
+        <member name="M:Shared.EditText.setPlaceholderTextAndColor">
+            <summary>
+            閫氳繃attributedPlaceholder灞炴�т慨鏀筆laceholder棰滆壊
+            </summary>
+        </member>
+        <member name="P:Shared.EditText.SecureTextEntry">
+            <summary>
+            鏄惁鐢�*鍙烽殣钘忓瓧绗�
+            </summary>
+            <value>The secure text entry.</value>
+        </member>
+        <member name="M:Shared.EditText.ResetTextContentType">
+            <summary>
+            鏆傛椂瑙e喅iOS13 浠ヤ笂榛樿鎻愮ず鑷姩鐢熸垚寮哄瘑鐮侊紝涓嶆槸鏈�浼樻柟妗�
+            </summary>
+        </member>
+        <member name="M:Shared.EditText.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.EditText.Refresh">
+            <summary>
+            鍒涙柊闇�瑕佸垱鏂扮殑淇℃伅
+            </summary>
+        </member>
+        <member name="P:Shared.EditText.Text">
+            <summary>
+            鏂囨湰
+            </summary>
+            <value>The text.</value>
+        </member>
+        <member name="P:Shared.EditText.TextColor">
+            <summary>
+            鏂囧瓧棰滆壊
+            </summary>
+            <value>The color of the text.</value>
+        </member>
+        <member name="P:Shared.EditText.IsSelected">
+            <summary>
+            Gets or sets a value indicating whether this instance is selected.
+            </summary>
+            <value><c>true</c> if this instance is selected; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.EditText.SelectedBackgroundColor">
+            <summary>
+            閫夋嫨鏃惰儗鏅鑹�
+            </summary>
+            <value>The color of the text.</value>
+        </member>
+        <member name="P:Shared.EditText.TextAlignment">
+            <summary>
+            Texts the alignment.
+            </summary>
+        </member>
+        <member name="P:Shared.EditText.SelectedImagePath">
+            <summary>
+            閫夋嫨鏃惰儗鏅浘璺緞
+            </summary>
+            <value>The selected image path.</value>
+        </member>
+        <member name="P:Shared.EditText.UnSelectedImagePath">
+            <summary>
+            闈為�変腑鐘舵�佺殑鑳屾櫙鍥捐矾寰�
+            </summary>
+            <value>The un selected image path.</value>
+        </member>
+        <member name="F:Shared.EditText.TextChangeEventHandler">
+            <summary>
+            杈撳叆鏂囧瓧鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="F:Shared.EditText.EditorEnterAction">
+            <summary>
+            鎸変簡杩斿洖鎸夐敭浜嬩欢
+            </summary>
+        </member>
+        <member name="P:Shared.EditText.Foucs">
+            <summary>
+            璁剧疆鐒︾偣
+            </summary>
+        </member>
+        <member name="M:Shared.EditText.MyEditText.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.EditText.MyEditText.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.EditText.MyEditText.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="F:Shared.FocusEventArgs.Focus">
+            <summary>
+            true 涓鸿幏鍙栧埌鐒︾偣
+            false 鐒︾偣娑堝け
+            </summary>
+        </member>
+        <member name="T:Shared.Orientation">
+            <summary>
+            閮ㄥ眬鏂瑰悜
+            </summary>
+        </member>
+        <member name="T:Shared.TextAlignment">
+            <summary>
+            Vertical alignment.
+            </summary>
+        </member>
+        <member name="T:Shared.FrameLayout">
+            <summary>
+            缁濆浣嶇疆甯冨眬锛屽凡缁忓叏闈㈡鏌�
+            </summary>
+        </member>
+        <member name="M:Shared.FrameLayout.#ctor">
+            <summary>
+            缁濆甯冨眬
+            </summary>
+        </member>
+        <member name="M:Shared.MyFrameLayout.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.MyFrameLayout.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.MyFrameLayout.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.MyFrameLayout.AddSubview(UIKit.UIView)">
+            <summary>
+            鍥犱负杩欎釜瑙嗗浘寰堝鎬紝浼氳嚜鍔ㄥ姞浜嗕袱涓猆IImageView锛屾墍浠ヨ繖涓壒娈婂鐞嗕竴涓�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="T:Shared.HorizontalScrolViewLayout">
+            <summary>
+            浣嶇疆甯冨眬
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalScrolViewLayout.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="T:Shared.HorizontalScrolViewLayout.MyHorizontalScrolViewLayout">
+            <summary>
+            鍨傜洿鏂瑰悜婊氬姩瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalScrolViewLayout.MyHorizontalScrolViewLayout.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.HorizontalScrolViewLayout.MyHorizontalScrolViewLayout.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.HorizontalScrolViewLayout.MyHorizontalScrolViewLayout.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.HorizontalScrolViewLayout.MyHorizontalScrolViewLayout.AddSubview(UIKit.UIView)">
+            <summary>
+            妗嗘灦榛樿鍔犱簡涓や釜UIImageView 锛岃繖鏍峰彲浠ュ幓鎺夐粯璁ゆ坊鍔�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.HorizontalScrolViewLayout.AddChidren(Shared.View)">
+            <summary>
+            澧炲姞瀛愯鍥�
+            </summary>
+            <returns>The chidren.</returns>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.HorizontalScrolViewLayout.ReLocation">
+            <summary>
+            閲嶆柊鎺掍綅缃強璁惧鍐呭澶у皬
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalScrolViewLayout.RemoveAll">
+            <summary>
+            绉婚櫎鎵�鏈夌殑瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalScrolViewLayout.Remove(Shared.View)">
+            <summary>
+            绉婚櫎鎺т欢
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.HorizontalScrolViewLayout.RemoveAt(System.Int32)">
+            <summary>
+             绉婚櫎鎸囧畾绱㈠紩瀵硅薄
+            </summary>
+            <param name="index">Index.</param>
+        </member>
+        <member name="P:Shared.HorizontalScrolViewLayout.ScrollEnabled">
+            <summary>
+            鏄惁鍏佽婊戝姩
+            </summary>
+            <value><c>true</c> if scroll enabled; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.HorizontalScrolViewLayout.Decelerating">
+            <summary>
+            鏄惁姝e湪婊戝姩
+            </summary>
+            <value><c>true</c> if decelerating; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.HorizontalScrolViewLayout.HorizontalScrollBarEnabled">
+            <summary>鈥�        /// 鏄惁鏄剧ず姘村钩婊氬姩鏉♀��        /// </summary>
+        </member>
+        <member name="M:Shared.HorizontalScrolViewLayout.ScrollToX(System.Int32)">
+            <summary>
+            婊戝姩鍒版寚瀹氫綅缃�
+            </summary>
+            <param name="viewX"></param>
+        </member>
+        <member name="M:Shared.HorizontalScrolViewLayout.ScrollToViewIndex(System.Int32)">
+            <summary>
+            婊戝姩鍒版寚瀹歏IEW
+            </summary>
+            <param name="viewIndex"></param>
+        </member>
+        <member name="T:Shared.HorizontalSeekBar">
+            <summary>
+            浣嶇疆甯冨眬
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="F:Shared.HorizontalSeekBar.ProgressChanged">
+            <summary>
+             杩涘害鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="P:Shared.HorizontalSeekBar.Max">
+            <summary>
+            鏈�澶у��
+            </summary>
+            <value>The max.</value>
+        </member>
+        <member name="P:Shared.HorizontalSeekBar.IsCanScrolled">
+            <summary>
+            鏄惁鍏佽婊戝姩婊戝潡
+            </summary>
+            <value><c>true</c> if is can scrolled; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.HorizontalSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害
+            </summary>
+            <value>The progress.</value>
+        </member>
+        <member name="P:Shared.HorizontalSeekBar.ProgressColor">
+            <summary>
+            杩涘害棰滆壊
+            </summary>
+            <value>The color of the progress.</value>
+        </member>
+        <member name="P:Shared.HorizontalSeekBar.BackgroundColor">
+            <summary>
+            搴曢儴棰滆壊
+            </summary>
+            <value>The color of the background.</value>
+        </member>
+        <member name="P:Shared.HorizontalSeekBar.ThumbColor">
+            <summary>
+            婊戝潡棰滆壊
+            </summary>
+            <value>The color of the background.</value>
+        </member>
+        <member name="F:Shared.HorizontalSeekBar.IsCanMove">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalSeekBar.Refresh">
+            <summary>
+            鍒锋柊褰撳墠瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalSeekBar.MySlide.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.HorizontalSeekBar.MySlide.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.HorizontalSeekBar.MySlide.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.Language.UpdateLanguage">
+            <summary>
+            閲嶆柊鏇存柊璇█搴撴暟鎹�
+            </summary>
+        </member>
+        <member name="F:Shared.Language.CurrentLanguage">
+            <summary>
+            褰撳墠璁剧疆鐨勮瑷�
+            </summary>
+        </member>
+        <member name="M:Shared.Language.StringByID(System.Int32)">
+            <summary>
+            鏍规嵁ID鑾峰彇瀵瑰簲鐨勫娉�
+            </summary>
+            <returns>The by I.</returns>
+            <param name="id">Identifier.</param>
+        </member>
+        <member name="T:Shared.Loading">
+            <summary>
+            Loading UI
+            </summary>
+        </member>
+        <member name="M:Shared.Loading.#ctor">
+            <summary>
+            Loading UI
+            </summary>
+        </member>
+        <member name="M:Shared.Loading.Start">
+            <summary>
+            寮�濮嬪綋鍓嶈鍥�
+            </summary>
+        </member>
+        <member name="M:Shared.Loading.Start(System.String)">
+            <summary>
+            寮�濮嬪綋鍓嶈鍥�
+            </summary>
+        </member>
+        <member name="M:Shared.Loading.Hide">
+            <summary>
+            闅愯棌褰撳墠瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.Loading.SetUIActivityIndicatorViewStyle(System.Int32)">
+            <summary>
+            
+            </summary>
+            <param name="mViewStyle">1 涓虹伆鑹�</param>
+        </member>
+        <member name="P:Shared.Loading.TextSize">
+            <summary>
+            鏂囧瓧澶у皬
+            </summary>
+            <value>The size of the text.</value>
+        </member>
+        <member name="M:Shared.IosLoading.Hide">
+            <summary>
+            Fades out the control and then removes it from the super view
+            </summary>
+        </member>
+        <member name="P:Shared.IosLoading.LodingBackgroundColor">
+            <summary>
+            鑳屾櫙棰滆壊
+            </summary>
+            <value>The color of the background.</value>
+        </member>
+        <member name="M:Shared.IosLoading.GetTextWidth">
+            <summary>
+            鑾峰彇瀛椾綋闀垮害
+            </summary>
+        </member>
+        <member name="T:Shared.PageLayout">
+            <summary>
+            浣嶇疆甯冨眬
+            </summary>
+        </member>
+        <member name="F:Shared.PageLayout.PageChange">
+            <summary>
+            椤甸潰鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.PageLayout.MyPageLayout">
+            <summary>
+            鍨傜洿鏂瑰悜婊氬姩瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.PageLayout.MyPageLayout.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.PageLayout.MyPageLayout.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.PageLayout.MyPageLayout.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.PageLayout.MyPageLayout.AddSubview(UIKit.UIView)">
+            <summary>
+            妗嗘灦榛樿鍔犱簡涓や釜UIImageView 锛岃繖鏍峰彲浠ュ幓鎺夐粯璁ゆ坊鍔�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.PageLayout.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.PageLayout.IsShowPoint">
+            <summary>
+             鏄惁鏄剧ず涓嬮潰涓�鎺掔殑鐐�
+            </summary>
+            <value><c>true</c> if is show point; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.PageLayout.ScrollEnabled">
+            <summary>
+            鏄惁鍏佽婊戝姩
+            </summary>
+            <value><c>true</c> if scroll enabled; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.PageLayout.PageIndex">
+            <summary>
+            璁剧疆鎴栬�呰幏鍙栧綋鍓嶇殑鐣岄潰绱㈠紩
+            </summary>
+            <value>The index of the page.</value>
+        </member>
+        <member name="M:Shared.PageLayout.AddChidren(Shared.View)">
+            <summary>
+            澧炲姞瀛愭帶浠�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.PageLayout.ReLocation">
+            <summary>
+            閲嶆柊鎺掍綅缃強璁惧鍐呭澶у皬
+            </summary>
+        </member>
+        <member name="P:Shared.PageLayout.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+            <value>The width.</value>
+        </member>
+        <member name="P:Shared.PageLayout.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="M:Shared.PageLayout.Remove(Shared.View)">
+            <summary>
+            绉婚櫎褰撳墠鎺т欢
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.PageLayout.RemoveAll">
+            <summary>
+            绉婚櫎鎵�鏈夌殑鎺т欢
+            </summary>
+        </member>
+        <member name="M:Shared.PageLayout.RemoveAt(System.Int32)">
+            <summary>
+            鏍规嵁绱㈠紩绉婚櫎鎺т欢
+            </summary>
+            <param name="index">Index.</param>
+        </member>
+        <member name="T:Shared.Spinner">
+            <summary>
+            褰撳墠瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.Spinner.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.Spinner.Refresh">
+            <summary>
+            鍒锋柊褰撳墠瑙嗗浘
+            </summary>
+        </member>
+        <member name="P:Shared.Spinner.CurrentRow">
+            <summary>
+            
+            </summary>
+            <value>The current row.</value>
+        </member>
+        <member name="P:Shared.Spinner.AdapterStr">
+            <summary>
+            娣诲姞涓嬫媺鍒楄〃鐨勬暟鎹�
+            </summary>
+            <param name="Str">String.</param>
+        </member>
+        <member name="F:Shared.Spinner.SelectedItemChanged">
+            <summary>
+            閫夋嫨鍒楄〃鍙樺寲鐨勪簨浠�
+            </summary>
+        </member>
+        <member name="T:Shared.VerticalScrolViewLayout">
+            <summary>
+            浣嶇疆甯冨眬锛屽凡缁忓叏闈㈡鏌�
+            </summary>
+        </member>
+        <member name="M:Shared.VerticalScrolViewLayout.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="T:Shared.VerticalScrolViewLayout.MyVerticalScrolViewLayout">
+            <summary>
+            鍨傜洿鏂瑰悜婊氬姩瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.VerticalScrolViewLayout.MyVerticalScrolViewLayout.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.VerticalScrolViewLayout.MyVerticalScrolViewLayout.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.VerticalScrolViewLayout.MyVerticalScrolViewLayout.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.VerticalScrolViewLayout.MyVerticalScrolViewLayout.AddSubview(UIKit.UIView)">
+            <summary>
+            妗嗘灦榛樿鍔犱簡涓や釜UIImageView 锛岃繖鏍峰彲浠ュ幓鎺夐粯璁ゆ坊鍔�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.VerticalScrolViewLayout.AddChidren(Shared.View)">
+            <summary>
+            澧炲姞鎺т欢
+            </summary>
+            <param name="view">瀛愭帶浠�</param>
+        </member>
+        <member name="M:Shared.VerticalScrolViewLayout.ReLocation">
+            <summary>
+            閲嶆柊鎺掍綅缃強璁惧鍐呭澶у皬
+            </summary>
+        </member>
+        <member name="M:Shared.VerticalScrolViewLayout.RemoveAll">
+            <summary>
+            绉婚櫎鎵�鏈夌殑瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.VerticalScrolViewLayout.Remove(Shared.View)">
+            <summary>
+            绉婚櫎褰撳墠瑙嗗浘
+            </summary>
+            <param name="view">褰撳墠瑙嗗浘</param>
+        </member>
+        <member name="M:Shared.VerticalScrolViewLayout.RemoveAt(System.Int32)">
+            <summary>
+            绉婚櫎鎸囧畾绱㈠紩
+            </summary>
+            <param name="index">绱㈠紩</param>
+        </member>
+        <member name="P:Shared.VerticalScrolViewLayout.ScrollEnabled">
+            <summary>
+            鏄惁鍏佽婊戝姩
+            </summary>
+            <value><c>true</c> if scroll enabled; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.VerticalScrolViewLayout.Decelerating">
+            <summary>
+            鏄惁姝e湪婊戝姩
+            </summary>
+            <value><c>true</c> if decelerating; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="F:Shared.VerticalScrolViewLayout.ScrolledEventHandler">
+            <summary>
+            婊戝姩浜嬩欢
+            </summary>
+        </member>
+        <member name="P:Shared.VerticalScrolViewLayout.VerticalScrollBarEnabled">
+            <summary>鈥�        /// 鏄惁鏄剧ず鍨傜洿婊氬姩鏉♀��        /// </summary>
+        </member>
+        <member name="T:Shared.VerticalSeekBar">
+            <summary>
+            浣嶇疆甯冨眬
+            </summary>
+        </member>
+        <member name="F:Shared.VerticalSeekBar.btnThum">
+            <summary>
+            婊戝潡
+            </summary>
+        </member>
+        <member name="F:Shared.VerticalSeekBar.btnProgressColor">
+            <summary>
+            杩涘害鏉¢鑹�
+            </summary>
+        </member>
+        <member name="F:Shared.VerticalSeekBar.btnBackgroundColor">
+            <summary>
+            鑳屾櫙杩涘害鏉¢鑹�
+            </summary>
+        </member>
+        <member name="M:Shared.VerticalSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.VerticalSeekBar.createImageWithColor(UIKit.UIColor)">
+            <summary>
+            鐢熸垚鍦嗗舰鐨勬粦鍔�
+            </summary>
+            <returns>The image with color.</returns>
+            <param name="color">Color.</param>
+        </member>
+        <member name="P:Shared.VerticalSeekBar.Height">
+            <summary>
+            褰撳墠瑙嗗浘鐨勯珮搴�
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="P:Shared.VerticalSeekBar.Width">
+            <summary>
+            褰撳墠瑙嗗浘鐨勫搴�
+            </summary>
+            <value>The width.</value>
+        </member>
+        <member name="F:Shared.VerticalSeekBar.ProgressChanged">
+            <summary>
+             杩涘害鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="P:Shared.VerticalSeekBar.Max">
+            <summary>
+            鏈�澶у��
+            </summary>
+            <value>The max.</value>
+        </member>
+        <member name="P:Shared.VerticalSeekBar.IsCanScrolled">
+            <summary>
+            鏄惁鍏佽婊戝姩婊戝潡
+            </summary>
+            <value><c>true</c> if is can scrolled; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.VerticalSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害
+            </summary>
+            <value>The progress.</value>
+        </member>
+        <member name="F:Shared.VerticalSeekBar.SleepTime">
+            <summary>
+            婊戝姩浼戠湢鏃堕棿
+            </summary>
+        </member>
+        <member name="P:Shared.VerticalSeekBar.ProgressColor">
+            <summary>
+            杩涘害棰滆壊
+            </summary>
+            <value>The color of the progress.</value>
+        </member>
+        <member name="P:Shared.VerticalSeekBar.BackgroundColor">
+            <summary>
+            搴曢儴棰滆壊
+            </summary>
+            <value>The color of the background.</value>
+        </member>
+        <member name="P:Shared.VerticalSeekBar.ThumbColor">
+            <summary>
+            婊戝潡棰滆壊
+            </summary>
+            <value>The color of the background.</value>
+        </member>
+        <member name="M:Shared.VerticalSeekBar.MyVerticalSeekBar.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.VerticalSeekBar.MyVerticalSeekBar.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.VerticalSeekBar.MyVerticalSeekBar.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.VerticalSeekBar.MyVerticalSeekBar.parentScrolled(System.Boolean)">
+            <summary>
+            璁剧疆鐖惰鍥炬槸鍚﹀彲浠ユ粦鍔�
+            </summary>
+            <param name="b">If set to <c>true</c> b.</param>
+        </member>
+        <member name="T:Shared.Video">
+            <summary>
+            Button 鎸夐敭
+            </summary>
+        </member>
+        <member name="P:Shared.Video.playUIView">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The android button.</value>
+        </member>
+        <member name="T:Shared.RootView">
+            <summary>
+            鏍硅鍥撅紝鎵�鏈夎鍥剧殑鐖惰鍥�
+            </summary>
+        </member>
+        <member name="T:Shared.View">
+            <summary>
+            鎵�鏈夌被鐨勫熀绫伙紝宸茬粡鍏ㄩ潰妫�鏌�
+            </summary>
+        </member>
+        <member name="P:Shared.View.IsCanRefresh">
+            <summary>
+            鏄惁闇�瑕佹洿鏂版帶浠�
+            </summary>
+            <value>The is need refresh.</value>
+        </member>
+        <member name="F:Shared.View.uiView">
+            <summary>
+            褰撳墠瀵瑰簲鐨処OS鎺т欢
+            </summary>
+        </member>
+        <member name="P:Shared.View.Padding">
+            <summary>
+            鍐呰竟璺�
+            </summary>
+            <value>The padding.</value>
+        </member>
+        <member name="P:Shared.View.Enable">
+            <summary>
+            鏄惁浣胯兘
+            </summary>
+            <value><c>true</c> if enable; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.View.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="P:Shared.View.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+            <value>The width.</value>
+        </member>
+        <member name="P:Shared.View.Gravity">
+            <summary>
+            褰撳墠瑙嗗浘瀵归綈鏂瑰紡
+            </summary>
+            <value>The gravity.</value>
+        </member>
+        <member name="M:Shared.View.Refresh">
+            <summary>
+            鍒涙柊闇�瑕佸垱鏂扮殑淇℃伅
+            </summary>
+        </member>
+        <member name="P:Shared.View.Bottom">
+            <summary>
+            宸﹁竟绾夸綅缃�
+            </summary>
+            <value>The bottom.</value>
+        </member>
+        <member name="P:Shared.View.Right">
+            <summary>
+             鍙宠竟绾夸綅缃�
+            </summary>
+            <value>The right.</value>
+        </member>
+        <member name="P:Shared.View.Name">
+            <summary>
+            鍚嶇О
+            </summary>
+            <value>The name.</value>
+        </member>
+        <member name="P:Shared.View.X">
+            <summary>
+            X杞村潗鏍�
+            </summary>
+            <value>The x.</value>
+        </member>
+        <member name="P:Shared.View.Y">
+            <summary>
+            Y杞村潗鏍�
+            </summary>
+            <value>The y.</value>
+        </member>
+        <member name="P:Shared.View.Size">
+            <summary>
+            褰撳墠绐楀彛澶у皬鍙婁綅缃�
+            </summary>
+            <value>The frame.</value>
+        </member>
+        <member name="F:Shared.View.Parent">
+            <summary>
+            鐖跺鍣�
+            </summary>
+            <value>The parent.</value>
+        </member>
+        <member name="M:Shared.View.TouchEvent(Shared.EventActions,CoreGraphics.CGPoint)">
+            <summary>
+            鐐瑰嚮浜嬩欢
+            </summary>
+            <returns>鍙嶉褰撳墠浜嬩欢鏄惁宸茬粡澶勭悊</returns>
+            <param name="e">浜嬩欢</param>
+            <param name="point">褰撳墠鐐瑰嚮浣嶇疆</param>
+        </member>
+        <member name="F:Shared.View.MouseDownEventHandler">
+            <summary>
+            鐐瑰嚮鎸変笅浜嬩欢
+            </summary>
+        </member>
+        <member name="F:Shared.View.MouseMoveEventHandler">
+            <summary>
+            鎺т欢涓婄Щ鍔ㄤ簨浠�
+            </summary>
+        </member>
+        <member name="F:Shared.View.MouseUpEventHandler">
+            <summary>
+            鐐瑰嚮寮硅捣浜嬩欢
+            </summary>
+        </member>
+        <member name="F:Shared.View.SizeChangeEventHandler">
+            <summary>
+            澶у皬鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="P:Shared.View.BackgroundColor">
+            <summary>
+            鑳屾櫙棰滆壊
+            </summary>
+            <value>The color of the background.</value>
+        </member>
+        <member name="P:Shared.View.RealView">
+            <summary>
+             鑾峰彇鐪熷疄鐨勬帶浠�
+            </summary>
+            <value>The real view.</value>
+        </member>
+        <member name="M:Shared.View.BringToFront">
+            <summary>
+            灏嗘帶鍒剁Щ鍒版渶鍓�
+            </summary>
+        </member>
+        <member name="M:Shared.View.SendToBack">
+            <summary>
+            灏嗘帶浠剁Щ鍒版渶鍚�
+            </summary>
+        </member>
+        <member name="M:Shared.View.AddTag(System.String,System.Object)">
+            <summary>
+            閿�煎锛屾柟渚垮紑鍙戠敤
+            </summary>
+            <param name="key">Key.</param>
+            <param name="value">Value.</param>
+        </member>
+        <member name="M:Shared.View.RemoveTag(System.String)">
+            <summary>
+            鍒犻櫎鎸囧畾閿�煎
+            </summary>
+            <param name="key">Key.</param>
+        </member>
+        <member name="M:Shared.View.GetTagByKey(System.String)">
+            <summary>
+            鏍规嵁閿幏鍙栧��
+            </summary>
+            <returns>The tag by key.</returns>
+            <param name="key">Key.</param>
+        </member>
+        <member name="M:Shared.View.ClearTag">
+            <summary>
+            鍏ㄩ儴鍒犻櫎Tag
+            </summary>
+            <returns>The tag.</returns>
+        </member>
+        <member name="F:Shared.View.Tag">
+            <summary>
+            鏂逛究寮�鍙戣�呭紑鍙戠敤
+            </summary>
+        </member>
+        <member name="P:Shared.View.Visible">
+            <summary>
+            鏄惁鏄剧ず
+            </summary>
+            <value><c>true</c> if visible; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="M:Shared.View.RemoveFromParent">
+            <summary>
+            浠庣埗瑙嗗浘閲岄潰绉婚櫎鎺�
+            </summary>
+        </member>
+        <member name="F:Shared.View.AnimateSpeed">
+            <summary>
+            鍔ㄧ敾鏁堟灉 閫熷害
+            2020-06-15
+            </summary>
+        </member>
+        <member name="P:Shared.View.Animate">
+            <summary>
+            鍔ㄧ敾鏂瑰紡
+            </summary>
+            <value>The animate.</value>
+        </member>
+        <member name="P:Shared.View.Alpha">
+            <summary>
+             閫忔槑搴﹁缃�
+            </summary>
+            <value>The alpha.</value>
+        </member>
+        <member name="F:Shared.View.IsSetAloneRadius">
+            鏈疄鐜帮紝浠e畬鍠�
+        </member>
+        <member name="M:Shared.View.SetCornerWithSameRadius(System.Single,System.Int32)">
+            <summary>
+            鎸囧畾浣嶇疆 璁剧疆鐩稿悓鐨勫渾瑙�
+            </summary>
+        </member>
+        <member name="M:Shared.View.RefreshAloneCorner">
+            <summary>
+            鏇存柊鍦嗚
+            </summary>
+            <returns>The corner.</returns>
+        </member>
+        <member name="P:Shared.View.Radius">
+            <summary>
+            鍦嗚澶у皬
+            </summary>
+            <value>The corner.</value>
+        </member>
+        <member name="M:Shared.View.refreshCorner">
+            <summary>
+            鏇存柊鍦嗚
+            </summary>
+            <returns>The corner.</returns>
+        </member>
+        <member name="P:Shared.View.BorderWidth">
+            <summary>
+            杈规绾垮ぇ灏�
+            </summary>
+            <value>The width of the border.</value>
+        </member>
+        <member name="P:Shared.View.BorderColor">
+            <summary>
+            杈规绾块鑹�
+            </summary>
+        </member>
+        <member name="M:Shared.View.SetRotation(System.Single)">
+            <summary>
+            鏃嬭浆View
+            </summary>
+            <value>鏃嬭浆瑙掑害</value>
+        </member>
+        <member name="M:Shared.View.SetViewShadow(System.Boolean,System.Single)">
+            <summary>
+            璁剧疆闃村奖鏁堟灉
+            </summary>
+            <value>鏄惁鏄剧ず闃村奖</value>
+        </member>
+        <member name="T:Shared.Size">
+            <summary>
+            瑙嗗浘澶у皬
+            </summary>
+        </member>
+        <member name="M:Shared.Size.#ctor(System.Int32,System.Int32)">
+            <summary>
+            瑙嗗浘澶у皬
+            </summary>
+            <param name="width">Width.</param>
+            <param name="height">Height.</param>
+        </member>
+        <member name="P:Shared.Size.Width">
+            <summary>
+            瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.Size.Height">
+            <summary>
+            楂樺害
+            </summary>
+        </member>
+        <member name="T:Shared.Padding">
+            <summary>
+            鍐呰竟璺�
+            </summary>
+        </member>
+        <member name="M:Shared.Padding.#ctor(System.Int32,System.Int32,System.Int32,System.Int32)">
+            <summary>
+            鍐呰竟璺�
+            </summary>
+            <param name="top">Top.</param>
+            <param name="left">Left.</param>
+            <param name="bottom">Bottom.</param>
+            <param name="right">Right.</param>
+        </member>
+        <member name="P:Shared.Padding.Top">
+            <summary>
+            椤堕儴
+            </summary>
+        </member>
+        <member name="P:Shared.Padding.Left">
+            <summary>
+            宸﹁竟
+            </summary>
+        </member>
+        <member name="P:Shared.Padding.Bottom">
+            <summary>
+            搴曢儴
+            </summary>
+        </member>
+        <member name="P:Shared.Padding.Right">
+            <summary>
+            鍙宠竟
+            </summary>
+        </member>
+        <member name="T:Shared.MouseEventArgs">
+            <summary>
+            鐐瑰嚮鏃跺熀鏈弬鏁�
+            </summary>
+        </member>
+        <member name="F:Shared.MouseEventArgs.X">
+            <summary>
+            X鍧愭爣
+            </summary>
+        </member>
+        <member name="F:Shared.MouseEventArgs.Y">
+            <summary>
+            Y鍧愭爣
+            </summary>
+        </member>
+        <member name="T:Shared.EventActions">
+            <summary>
+            鐐瑰嚮浜嬩欢
+            </summary>
+        </member>
+        <member name="F:Shared.EventActions.Down">
+            <summary>
+            Down
+            </summary>
+        </member>
+        <member name="F:Shared.EventActions.Move">
+            <summary>
+            Move
+            </summary>
+        </member>
+        <member name="F:Shared.EventActions.Up">
+            <summary>
+            UP
+            </summary>
+        </member>
+        <member name="F:Shared.EventActions.Cancel">
+            <summary>
+            Cancel
+            </summary>
+        </member>
+        <member name="T:Shared.Tip">
+            <summary>
+            淇℃伅鎻愮ず
+            </summary>
+        </member>
+        <member name="M:Shared.Tip.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.Tip.CloseTime">
+            <summary>
+            鍏抽棴鏃堕棿
+            </summary>
+            <value>The close time.</value>
+        </member>
+        <member name="P:Shared.Tip.Text">
+            <summary>
+            鎻愮ず鍐呭
+            </summary>
+            <value>The text.</value>
+        </member>
+        <member name="P:Shared.Tip.Direction">
+            <summary>
+            鏂囧瓧鎻愮ず鏂瑰悜
+            </summary>
+            <value>The direction.</value>
+        </member>
+        <member name="P:Shared.Tip.MaxWidth">
+            <summary>
+            鏈�澶у搴�
+            </summary>
+            <value>The width of the max.</value>
+        </member>
+        <member name="P:Shared.Tip.BackgroundColor">
+            <summary>
+             鑳屾櫙棰滆壊
+            </summary>
+            <value>The color of the background.</value>
+        </member>
+        <member name="M:Shared.Tip.Show(Shared.View)">
+            <summary>
+            鐐瑰嚮鍝釜View鏃舵樉璧彁绀�
+            </summary>
+        </member>
+        <member name="T:Shared.RowLayout">
+            <summary>
+            鍦ㄦ粦鍔ㄤ簨浠朵笅锛屽彲鏄剧ず闅愯棌浜涜嚜瀹氫箟瑙嗗浘
+            </summary>
+        </member>
+        <member name="F:Shared.RowLayout.OpenMenuAction">
+            <summary>
+            OpenMenuAction
+            </summary>
+        </member>
+        <member name="F:Shared.RowLayout.leftView">
+            <summary>
+            鍙宠竟鐨勮鍥惧垪琛�
+            </summary>
+        </member>
+        <member name="F:Shared.RowLayout.rigthView">
+            <summary>
+            鍙宠竟鐨勮鍥惧垪琛�
+            </summary>
+        </member>
+        <member name="F:Shared.RowLayout.lineUIView">
+            <summary>
+            涓嬮潰閭h竟寮�
+            </summary>
+        </member>
+        <member name="M:Shared.RowLayout.Refresh">
+            <summary>
+            閲嶆柊鍒锋柊鎺т欢
+            </summary>
+        </member>
+        <member name="P:Shared.RowLayout.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+        </member>
+        <member name="F:Shared.RowLayout.SubViewWidth">
+            <summary>
+            瀛愯鍥剧殑瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.RowLayout.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="P:Shared.RowLayout.LineColor">
+            <summary>
+            鑳屾櫙棰滆壊
+            </summary>
+            <value>The color of the background.</value>
+        </member>
+        <member name="F:Shared.RowLayout.IsShowLeft">
+            <summary>
+            鏄惁姝f墦寮�
+            </summary>
+        </member>
+        <member name="M:Shared.RowLayout.HideOtherRowLayout">
+            <summary>
+            鍏抽棴鍏朵粬RowLayout 鏄剧ず鐨刅iew
+            </summary>
+        </member>
+        <member name="M:Shared.RowLayout.HideMenu">
+            <summary>
+            鍏抽棴鏄剧ず鐨刅iew
+            </summary>
+        </member>
+        <member name="F:Shared.RowLayout.isUseSameSubViewWidth">
+            <summary>
+            鏄惁浣跨敤鍚屾牱鐨凷ubViewWidth瀹� 
+            </summary>
+        </member>
+        <member name="M:Shared.RowLayout.GetAllLeftViewWidth">
+            <summary>
+            鑾峰彇褰撳墠leftView鐨勬�诲
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Shared.RowLayout.GetAllRightViewWidth">
+            <summary>
+            鑾峰彇褰撳墠rigthView鐨勬�诲
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Shared.RowLayout.AddLeftView(Shared.Button)">
+            <summary>
+            澧炲姞宸﹁竟瑙嗗浘
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.RowLayout.AddRightView(Shared.Button)">
+            <summary>
+            澧炲姞鍙宠竟瑙嗗浘
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.RowLayout.#ctor">
+            <summary>
+            鍦ㄦ粦鍔ㄤ簨浠朵笅锛屽彲鏄剧ず闅愯棌浜涜嚜瀹氫箟瑙嗗浘
+            </summary>
+        </member>
+        <member name="T:Shared.RowLayout.MyRowLayout">
+            <summary>
+            鍨傜洿鏂瑰悜婊氬姩瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.RowLayout.MyRowLayout.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.RowLayout.MyRowLayout.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.RowLayout.MyRowLayout.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.RowLayout.MyRowLayout.AddSubview(UIKit.UIView)">
+            <summary>
+            妗嗘灦榛樿鍔犱簡涓や釜UIImageView 锛岃繖鏍峰彲浠ュ幓鎺夐粯璁ゆ坊鍔�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="T:Shared.ViewGroup">
+            <summary>
+            ViewGroup 鎸夐敭
+            </summary>
+        </member>
+        <member name="F:Shared.ViewGroup.realViewGroup">
+            <summary>
+            褰撳墠鐪熷疄鐨勬帶浠�
+            </summary>
+        </member>
+        <member name="P:Shared.ViewGroup.viewGroup">
+            <summary>
+            褰撳墠鎺т欢
+            </summary>
+            <value>The view group.</value>
+        </member>
+        <member name="F:Shared.ViewGroup.backgroundImage">
+            <summary>
+            褰撳墠鑳屾櫙鍥�
+            </summary>
+        </member>
+        <member name="P:Shared.ViewGroup.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.ViewGroup.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="M:Shared.ViewGroup.AddChidren(Shared.View)">
+            <summary>
+            澧炲姞瀛愭帶浠�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="P:Shared.ViewGroup.ChildrenCount">
+            <summary>
+            鎺т欢鏁伴噺
+            </summary>
+            <value>The children count.</value>
+        </member>
+        <member name="F:Shared.ViewGroup.viewList">
+            <summary>
+            鎺т欢鍒楄〃
+            </summary>
+        </member>
+        <member name="P:Shared.ViewGroup.BackgroundImagePath">
+            <summary>
+            鑳屾櫙鍥剧墖
+            </summary>
+            <value>The background image path.</value>
+        </member>
+        <member name="M:Shared.ViewGroup.Refresh">
+            <summary>
+            鍒锋柊鐣岄潰
+            </summary>
+        </member>
+        <member name="M:Shared.ViewGroup.Remove(Shared.View)">
+            <summary>
+            绉婚櫎鎺т欢
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.ViewGroup.RemoveAll">
+            <summary>
+            娓呯┖鎵�鏈夌殑鎺т欢
+            </summary>
+        </member>
+        <member name="M:Shared.ViewGroup.RemoveAt(System.Int32)">
+            <summary>
+            绉婚櫎鎸囧畾绱㈠紩瀵硅薄
+            </summary>
+            <param name="index">Index.</param>
+        </member>
+        <member name="M:Shared.ViewGroup.GetChildren(System.Int32)">
+            <summary>
+            鑾峰彇鎸囧畾绱㈠紩瀵硅薄
+            </summary>
+            <returns>The children.</returns>
+            <param name="index">Index.</param>
+        </member>
+        <member name="M:Shared.ViewGroup.RemoveViewByType(System.Type)">
+            <summary>
+            鏍规嵁绫诲瀷绉婚櫎鎺т欢
+            </summary>
+            <param name="type">Type.</param>
+        </member>
+        <member name="M:Shared.ViewGroup.RemoveViewByTag(System.Object)">
+            <summary>
+            鏍规嵁Tag绉婚櫎鎺т欢
+            </summary>
+            <param name="type">Type.</param>
+        </member>
+        <member name="T:Shared.TextView">
+            <summary>
+            鏂囨湰杈撳叆妗�
+            </summary>
+        </member>
+        <member name="P:Shared.TextView.TextSize">
+            <summary>
+            鏂囧瓧澶у皬
+            </summary>
+            <value>The size of the text.</value>
+        </member>
+        <member name="P:Shared.TextView.TextID">
+            <summary>
+            鏍规嵁ID鑾峰彇瀵瑰簲鐨勫娉�
+            </summary>
+        </member>
+        <member name="P:Shared.TextView.Text">
+            <summary>
+            鏂囨湰
+            </summary>
+            <value>鏂囨湰</value>
+        </member>
+        <member name="P:Shared.TextView.TextColor">
+            <summary>
+            鏂囨湰棰滆壊
+            </summary>
+        </member>
+        <member name="P:Shared.TextView.IsMoreLines">
+            <summary>
+            鏄惁鏀寔鎹㈣
+            </summary>
+            <value><c>true</c> if is more lines; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="M:Shared.MyUILable.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.MyUILable.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.MyUILable.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.MyUILable.AddSubview(UIKit.UIView)">
+            <summary>
+            鍥犱负杩欎釜瑙嗗浘寰堝鎬紝浼氳嚜鍔ㄥ姞浜嗕袱涓猆IImageView锛屾墍浠ヨ繖涓壒娈婂鐞嗕竴涓�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="P:Shared.MyUILable.Text">
+            <summary>
+            鏂囨湰
+            </summary>
+            <value>The text.</value>
+        </member>
+        <member name="P:Shared.MyUILable.TextColor">
+            <summary>
+            鏂囨湰鐨勯鑹�
+            </summary>
+            <value>鏂囨湰鐨勯鑹�</value>
+        </member>
+        <member name="P:Shared.MyUILable.TextSize">
+            <summary>
+            鏂囨湰鐨勫ぇ灏�
+            </summary>
+            <value>鏂囨湰鐨勫ぇ灏�</value>
+        </member>
+        <member name="T:Shared.Camera">
+            <summary>
+            鎷嶇収鎴栬�呴�夋嫨鍥剧墖
+            </summary>
+        </member>
+        <member name="F:Shared.Camera._callback">
+            <summary>
+            鎷嶇収鎴栬�呰鍙栧浘鐗囧畬鎴愭椂璋冪敤鐨勫姩浣�,string==null琛ㄧず鐢ㄦ埛鍙栨秷浜嗘媿鐓ф垨鑰呭彇娑堥�夋嫨鍥剧墖,string!=null,琛ㄧず鍥剧墖鐨勮矾寰�
+            </summary>
+        </member>
+        <member name="T:Shared.Camera.MyCameraDelegate">
+            <summary>
+            Camera delegate.
+            </summary>
+        </member>
+        <member name="M:Shared.Camera.TakePicture(System.Action{System.String},System.String,System.Boolean)">
+            <summary>
+            鎷嶇収
+            </summary>
+            <param name="callback">鍥炶皟鍑芥暟</param>
+            <param name="fileName">鏂囦欢鍚�</param>
+        </member>
+        <member name="M:Shared.Camera.SelectPicture(System.Action{System.String},System.String,System.Boolean)">
+            <summary>
+            閫夋嫨鍥剧墖
+            </summary>
+            <param name="callback">鍥炶皟鍑芥暟</param>
+            <param name="fileName">鏂囦欢鍚�</param>
+        </member>
+        <member name="T:Shared.DateView">
+            <summary>
+            Button 鎸夐敭
+            </summary>
+        </member>
+        <member name="P:Shared.DateView.Year">
+            <summary>
+            骞�
+            </summary>
+        </member>
+        <member name="P:Shared.DateView.Month">
+            <summary>
+            鏈�
+            </summary>
+        </member>
+        <member name="P:Shared.DateView.Day">
+            <summary>
+            澶�
+            </summary>
+        </member>
+        <member name="M:Shared.DateView.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Shared.DateView"/> class.
+            </summary>
+        </member>
+        <member name="M:Shared.DateView.MyUIDatePicker.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.DateView.MyUIDatePicker.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.DateView.MyUIDatePicker.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="P:Shared.DateView.MyUIDatePicker.current">
+            <summary>
+            褰撳墠鏃堕棿瀵硅薄
+            </summary>
+            <value>The current.</value>
+        </member>
+        <member name="T:Shared.TimeView">
+            <summary>
+            鏃堕棿瑙嗗浘
+            </summary>
+        </member>
+        <member name="P:Shared.TimeView.currentUITimePicker">
+            <summary>
+            褰撳墠瑙嗗浘
+            </summary>
+            <value>The android text.</value>
+        </member>
+        <member name="P:Shared.TimeView.Hour">
+            <summary>
+            鏃�
+            </summary>
+        </member>
+        <member name="P:Shared.TimeView.Minute">
+            <summary>
+            鍒�
+            </summary>
+        </member>
+        <member name="M:Shared.TimeView.#ctor">
+            <summary>
+            瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.TimeView.MyUITimePicker.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.TimeView.MyUITimePicker.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.TimeView.MyUITimePicker.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="T:Shared.ColorPicker">
+            <summary>
+            鑹叉澘
+            </summary>
+        </member>
+        <member name="M:Shared.ColorPicker.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Shared.Button"/> class.
+            </summary>
+        </member>
+        <member name="P:Shared.ColorPicker.ColorImagePath">
+            <summary>
+            鑹叉澘鍥�
+            </summary>
+            <value>The color image path.</value>
+        </member>
+        <member name="F:Shared.ColorPicker.ColorChaged">
+            <summary>
+            棰滆壊鍙樺寲
+            </summary>
+        </member>
+        <member name="M:Shared.ColorPicker.MyUIImageView.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.ColorPicker.MyUIImageView.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.ColorPicker.MyUIImageView.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="F:Shared.UrlMonitor.UserName">
+            <summary>
+            鐢ㄦ埛鍚�
+            </summary>
+        </member>
+        <member name="F:Shared.UrlMonitor.Password">
+            <summary>
+            瀵嗙爜
+            </summary>
+        </member>
+        <member name="F:Shared.UrlMonitor.URL">
+            <summary>
+            鎽勫儚澶寸殑鍥剧墖鍦板潃
+            </summary>
+        </member>
+        <member name="M:Shared.UrlMonitor.Start">
+            <summary>
+            鍚姩
+            </summary>
+        </member>
+        <member name="M:Shared.UrlMonitor.Stop">
+            <summary>
+            鍋滄鎾斁
+            </summary>
+        </member>
+        <member name="M:Shared.UrlMonitor.imimage(UIKit.UIImage)">
+            <summary>
+            鏃嬭浆褰撳墠鐢婚潰
+            </summary>
+            <returns>婧愬浘</returns>
+            <param name="image">鏃嬭浆鍚庣殑鐣岄潰</param>
+        </member>
+        <member name="M:Shared.LongPressMoveVerticalScrolViewLayout.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.LongPressMoveVerticalScrolViewLayout.replaceUIViewOfPoint(CoreGraphics.CGPoint,UIKit.UIView)">
+            <summary>
+            鏍规嵁鐐瑰嚮浣嶇疆鎵惧嚭鐐瑰嚮鍒扮殑瑙嗗浘
+            </summary>
+            <returns>The view of point.</returns>
+            <param name="point">Point.</param>
+            <param name="uiview">Uiview.</param>
+        </member>
+        <member name="F:Shared.LongPressMoveVerticalScrolViewLayout.ReplaceChanged">
+            <summary>
+            瀵规崲浣嶇疆鐨勪袱涓鍥�
+            </summary>
+        </member>
+        <member name="M:Shared.LongPressMoveVerticalScrolViewLayout.selectedUIViewOfPoint(CoreGraphics.CGPoint)">
+            <summary>
+            鏍规嵁鐐瑰嚮浣嶇疆鎵惧嚭鐐瑰嚮鍒扮殑瑙嗗浘
+            </summary>
+            <returns>杩斿洖鐐瑰嚮鍒扮殑瑙嗗浘</returns>
+            <param name="point">褰撳墠鐐瑰嚮浣嶇疆</param>
+        </member>
+        <member name="P:Shared.LongPressMoveVerticalScrolViewLayout.ScrollEnabled">
+            <summary>
+            鏄惁鍏佽婊戝姩
+            </summary>
+            <value><c>true</c> if scroll enabled; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.LongPressMoveVerticalScrolViewLayout.Decelerating">
+            <summary>
+            鏄惁姝e湪婊戝姩
+            </summary>
+            <value><c>true</c> if decelerating; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="F:Shared.LongPressMoveVerticalScrolViewLayout.ScrolledEventHandler">
+            <summary>
+            婊戝姩浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.LongPressMoveVerticalScrolViewLayout.MyLongPressMoveVerticalScrolViewLayout">
+            <summary>
+            鍨傜洿鏂瑰悜婊氬姩瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.LongPressMoveVerticalScrolViewLayout.MyLongPressMoveVerticalScrolViewLayout.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.LongPressMoveVerticalScrolViewLayout.MyLongPressMoveVerticalScrolViewLayout.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.LongPressMoveVerticalScrolViewLayout.MyLongPressMoveVerticalScrolViewLayout.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.LongPressMoveVerticalScrolViewLayout.MyLongPressMoveVerticalScrolViewLayout.AddSubview(UIKit.UIView)">
+            <summary>
+            妗嗘灦榛樿鍔犱簡涓や釜UIImageView 锛岃繖鏍峰彲浠ュ幓鎺夐粯璁ゆ坊鍔�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.replaceUIViewOfPoint(CoreGraphics.CGPoint,UIKit.UIView)">
+            <summary>
+            鏍规嵁鐐瑰嚮浣嶇疆鎵惧嚭鐐瑰嚮鍒扮殑瑙嗗浘
+            </summary>
+            <returns>The view of point.</returns>
+            <param name="point">Point.</param>
+            <param name="uiview">Uiview.</param>
+        </member>
+        <member name="F:Shared.MusicVerticalScrolViewLayout.ReplaceChanged">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="F:Shared.MusicVerticalScrolViewLayout.LongPressAction">
+            <summary>
+            闀挎寜浜嬩欢
+            </summary>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.selectedUIViewOfPoint(CoreGraphics.CGPoint)">
+            <summary>
+            鏍规嵁鐐瑰嚮浣嶇疆鎵惧嚭鐐瑰嚮鍒扮殑瑙嗗浘
+            </summary>
+            <returns>杩斿洖鐐瑰嚮鍒扮殑瑙嗗浘</returns>
+            <param name="point">褰撳墠鐐瑰嚮浣嶇疆</param>
+        </member>
+        <member name="T:Shared.MusicVerticalScrolViewLayout.MyMusicVerticalScrolViewLayout">
+            <summary>
+            鍨傜洿鏂瑰悜婊氬姩瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.MyMusicVerticalScrolViewLayout.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.MyMusicVerticalScrolViewLayout.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.MyMusicVerticalScrolViewLayout.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.MusicVerticalScrolViewLayout.MyMusicVerticalScrolViewLayout.AddSubview(UIKit.UIView)">
+            <summary>
+            妗嗘灦榛樿鍔犱簡涓や釜UIImageView 锛岃繖鏍峰彲浠ュ幓鎺夐粯璁ゆ坊鍔�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="T:Shared.ImageView">
+            <summary>
+            ImageView 
+            </summary>
+        </member>
+        <member name="M:Shared.ImageView.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:Shared.Button"/> class.
+            </summary>
+        </member>
+        <member name="P:Shared.ImageView.ImagePath">
+            <summary>
+            闈為�変腑鐘舵�佺殑鑳屾櫙鍥捐矾寰�
+            </summary>
+            <value>The un selected image path.</value>
+        </member>
+        <member name="M:Shared.MyImageView.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.MyImageView.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.MyImageView.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="P:Shared.WiimuUPnP.SSID">
+            <summary>
+            鑾峰彇褰撳墠WIFI鐨勫悕绉�
+            </summary>
+            <value>The ssid.</value>
+        </member>
+        <member name="M:Shared.WiimuUPnP.Start(System.String,System.Action{System.String})">
+            <summary>
+            鍚姩閰嶇疆鏃犵嚎涓婄綉
+            </summary>
+            <returns>The start.</returns>
+            <param name="password">瀵嗙爜</param>
+            <param name="a">閰嶇疆瀹屾垚鍚庡弽棣堢殑缁撴灉</param>
+        </member>
+        <member name="F:Shared.WiimuUPnP.dateTime">
+            <summary>
+            璁板綍寮�濮嬫椂闂�
+            </summary>
+        </member>
+        <member name="M:Shared.WiimuUPnP.Stop">
+            <summary>
+            鍋滄閰嶇疆鏃犵嚎涓婄綉
+            </summary>
+        </member>
+        <member name="M:Shared.BaseApplicationDelegate.registerForRemoteNotification(UIKit.UIApplication)">
+            <summary>
+            娉ㄥ唽杩滅▼娑堟伅鎺ㄩ��
+            </summary>
+            <param name="application">Application.</param>
+        </member>
+        <member name="P:Shared.BaseApplicationDelegate.MyCLLocationManager.IsLocationServicesEnabled">
+            <summary>
+            鐢ㄦ埛鏄惁鍏佽瀹氫綅鍔熻兘
+            </summary>
+        </member>
+        <member name="M:Shared.BaseApplicationDelegate.MyCLLocationManager.adjustDistanceFilter(CoreLocation.CLLocation)">
+            瑙勫垯: 濡傛灉閫熷害灏忎簬minSpeed m/s 鍒欐妸瑙﹀彂鑼冨洿璁惧畾涓�100m
+            鍚﹀垯灏嗚Е鍙戣寖鍥磋瀹氫负minSpeed*minInteval
+            姝ゆ椂鑻ラ�熷害鍙樺寲瓒呰繃10% 鍒欐洿鏂板綋鍓嶇殑瑙﹀彂鑼冨洿(杩欓噷闄愬埗鏄洜涓轰笉鑳戒笉鍋滅殑璁剧疆distanceFilter,
+            鍚﹀垯uploadLocation浼氫笉鍋滆瑙﹀彂)
+        </member>
+        <member name="M:Shared.BaseApplicationDelegate.RegisteredForRemoteNotifications(UIKit.UIApplication,Foundation.NSData)">
+            <summary>
+            娉ㄥ唽杩滅▼娑堟伅鎺ㄩ�佸洖璋冩柟娉�
+            </summary>
+            <param name="application">Application.</param>
+            <param name="deviceToken">Device token.</param>
+        </member>
+        <member name="F:Shared.MusicInfo.Title">
+            <summary>
+            姝屾洸鍚嶇О
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.Artist">
+            <summary>
+            姝屾洸鐨勬瓕鎵嬪悕 
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.Album">
+            <summary>
+            姝屾洸鐨勪笓杈戝悕     
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.AlbumId">
+            <summary>
+            姝屾洸涓撹緫ID
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.Data">
+            <summary>
+            姝屾洸鏂囦欢鐨勮矾寰�
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.Size">
+            <summary>
+            姝屾洸鐨勬�绘挱鏀炬椂闀�
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.Duration">
+            <summary>
+            姝屾洸鐨勬�绘挱鏀炬椂闀�
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.ID">
+            <summary>
+            闊充箰ID
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.URL">
+            <summary>
+            缃戠粶鍦板潃
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.filename">
+            <summary>
+              鏂囦欢鍚�
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.dlnalistName">
+            <summary>
+            DLNA鍒楄〃鍚�
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.Image">
+            <summary>
+            鍥剧墖
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.Cntype">
+            <summary>
+            鐢靛彴绫诲瀷
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.Cnkey">
+            <summary>
+            鐢靛彴绫诲瀷
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.IsDirectory">
+            <summary>
+            鏄惁鏄洰褰�
+            </summary>
+        </member>
+        <member name="F:Shared.MusicInfo.SourceType">
+            <summary>
+            USB  Local URL 
+            </summary>
+        </member>
+        <member name="P:Shared.MusicInfo.MusicInfoList">
+            <summary>
+            鑾峰彇鎵�鏈夌殑
+            </summary>
+        </member>
+        <member name="T:Shared.CommonClass">
+            <summary>
+            閫氱敤绫�
+            </summary>
+        </member>
+        <member name="M:Shared.CommonClass.OpenApp(System.String)">
+            <summary>
+            鎵撳紑App
+            </summary>
+            <param name="packageName">Package name.</param>
+        </member>
+        <member name="M:Shared.CommonClass.OpenAction(System.String)">
+            <summary>
+            璋冪敤鐣岄潰
+            </summary>
+            <param name="action">Action.</param>
+        </member>
+        <member name="M:Shared.PickerView.ShowSecondary(System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.Collections.Generic.List{System.String}},System.Action{System.Int32,System.Int32},System.Int32,System.Int32,System.String,System.String,System.String)">
+            <summary>
+            浜岀骇鑱斿姩寮圭獥 鏀寔鑷畾涔夋爣棰橈紝纭鎸夐挳锛屽彇娑堟寜閽枃瀛�
+            </summary>
+        </member>
+        <member name="M:Shared.PickerView.ShowNormal(System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String},System.Action{System.Int32,System.Int32,System.Int32},System.Int32,System.Int32,System.Int32,System.String,System.String,System.String)">
+            <summary>
+            涓嶈仈鍔ㄦ敮鎸佽嚜瀹氫箟鏍囬锛岀‘璁ゆ寜閽紝鍙栨秷鎸夐挳鏂囧瓧
+            </summary>
+        </member>
+        <member name="T:Shared.MyEchartsView">
+            <summary>
+            MyEchartsView
+            2020-06-19 UIWebView鏇挎崲涓篧KWebView
+            UIWebView宸茬粡寮冪敤锛屽悗闈㈠啀浣跨敤鐨凙PP灏嗕笉鑳藉彂甯冧笂鏋�
+            </summary>
+        </member>
+        <member name="P:Shared.MyEchartsView.JsonData.Title">
+            <summary>
+            鏍囬鍐呭
+            </summary>
+            <value>The title.</value>
+        </member>
+        <member name="P:Shared.MyEchartsView.JsonData.XArray">
+            <summary>
+            X杞村潗鏍囩偣
+            </summary>
+            <value>The XA rray.</value>
+        </member>
+        <member name="P:Shared.MyEchartsView.JsonData.YArray">
+            <summary>
+            Y杞村潗鏍囩偣
+            </summary>
+            <value>The YA rray.</value>
+        </member>
+        <member name="T:Shared.ArcSeekBar">
+            <summary>
+            HDLArcSeekBar 鎺т欢
+            </summary>
+        </member>
+        <member name="P:Shared.ArcSeekBar.mHDLArcSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLArcSeekBar.</value>
+        </member>
+        <member name="M:Shared.ArcSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.ArcSeekBar.RefreshFrame">
+            <summary>
+            鍒锋柊甯冨眬
+            </summary>
+        </member>
+        <member name="P:Shared.ArcSeekBar.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.ArcSeekBar.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.ArcSeekBar.X">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.ArcSeekBar.Y">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ArcWidthWithDefaultStyle">
+            <summary>
+            鍚屾椂璁剧疆鍦嗗姬鍜屾嫋鍔ㄥ渾褰㈢殑瀹�
+            </summary>
+            <value>瀹�</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ArcColor">
+            <summary>
+            鍦嗗姬榛樿鑳屾櫙棰滆壊
+            </summary>
+            <value>鑳屾櫙棰滆壊</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ProgressBarColor">
+            <summary>
+            杩涘害鏉¢鑹� 鍗曚竴棰滆壊涓嶆笎鍙�
+            </summary>
+            <value>鍗曚竴杩涘害鏉¢鑹�</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ThumbColor">
+            <summary>
+            鎷栧姩鎸夐挳鍦嗗舰棰滆壊
+            </summary>
+            <value>鎷栧姩鎸夐挳棰滆壊</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ThumbModeFill">
+            <summary>
+            鎷栧姩鎸夐挳榛樿褰㈢姸 濉弧瀹炲績鎴栬�呯┖蹇�
+            </summary>
+            <value>鏄惁濉弧</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ThumbRadius">
+            <summary>
+            鎷栧姩鎸夐挳鍦嗗舰鍗婂緞
+            </summary>
+            <value>鍗婂緞</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ArcWidth">
+            <summary>
+            鍦嗗姬瀹�
+            </summary>
+            <value>瀹�</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="M:Shared.ArcSeekBar.SetProgressBarColors(System.UInt32,System.UInt32)">
+            <summary>
+            璁剧疆杩涘害鏉� 娓愬彉棰滆壊鐨勫紑濮嬮鑹插拰缁撴潫棰滆壊
+            </summary>
+            <value>寮�濮嬮鑹层�佺粨鏉熼鑹�</value>
+        </member>
+        <member name="P:Shared.ArcSeekBar.OpenAngle">
+            <summary>
+            寮�鍙h搴�
+            </summary>
+        </member>
+        <member name="F:Shared.ArcSeekBar.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="M:Shared.TouchIDUtils.showTouchIDWithDescribe(System.String,System.String)">
+            <summary>
+            寮圭獥鎸囩汗楠岃瘉 descTitle锛氳緭鍏ュ瘑鐮侀獙璇佹寜閽爣棰�   mLocalizedReason锛歍ouch鏄剧ず鐨勬弿杩�
+            </summary>
+            <value>descTitle锛氳緭鍏ュ瘑鐮侀獙璇佹寜閽爣棰�   mLocalizedReason锛歍ouch鏄剧ず鐨勬弿杩�</value>
+        </member>
+        <member name="T:Shared.WaveSeekBar">
+            <summary>
+            HDLWaveSeekbar 鎺т欢
+            </summary>
+        </member>
+        <member name="P:Shared.WaveSeekBar.mHDLWaveSeekbar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLWaveSeekbar.</value>
+        </member>
+        <member name="M:Shared.WaveSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.WaveSeekBar.RefreshFrame">
+            <summary>
+            鍒锋柊甯冨眬
+            </summary>
+        </member>
+        <member name="P:Shared.WaveSeekBar.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.WaveSeekBar.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.WaveSeekBar.X">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.WaveSeekBar.Y">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.WaveSeekBar.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.WaveBorderWidth">
+            <summary>
+            鑳屾櫙杈规瀹藉害
+            </summary>
+            <value>鍗婂緞</value>
+        </member>
+        <member name="M:Shared.WaveSeekBar.SetProgressBarColors(System.UInt32,System.UInt32)">
+            <summary>
+            璁剧疆杩涘害鏉� 娓愬彉棰滆壊鐨勫紑濮嬮鑹插拰缁撴潫棰滆壊
+            </summary>
+            <value>寮�濮嬮鑹层�佺粨鏉熼鑹�</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.WaveBorderColor">
+            <summary>
+            鑳屾櫙杈规棰滆壊
+            </summary>
+            <value>鑳屾櫙杈规棰滆壊</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.CornerRadius">
+            <summary>
+            鍦嗚
+            </summary>
+            <value>鍦嗚</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.WavePadding">
+            <summary>
+            杩涘害鏉′笌杈规杈硅窛
+            </summary>
+            <value>鍗婂緞</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.IsProgressTextShow">
+            <summary>
+            鏄惁鏄剧ず杩涘害鏂囧瓧
+            </summary>
+            <value>鏄惁鏄剧ず杩涘害鏂囧瓧</value>
+        </member>
+        <member name="P:Shared.WaveSeekBar.NowProgressY">
+            <summary>
+            褰撳墠杩涘害鍊� Y鍧愭爣
+            </summary>
+            <value>Y鍧愭爣</value>
+        </member>
+        <member name="F:Shared.WaveSeekBar.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="M:Shared.HDLUtils.WriteLine(System.Object)">
+            <summary>
+            鍏ㄥ眬鎵撳嵃
+            </summary>
+        </member>
+        <member name="M:Shared.HDLUtils.createQRCode(System.String,System.Int32)">
+            <summary>
+            鐢熸垚浜岀淮鐮�
+            </summary>
+        </member>
+        <member name="M:Shared.HDLUtils.OpenUrl(System.String)">
+            <summary>
+            璺宠浆鎵撳紑APP鎴栬�匒pp Store涓嬭浇鍦板潃
+            </summary>
+            <param name="url"></param>
+        </member>
+        <member name="M:Shared.HDLUtils.OpenApp(System.String)">
+            <summary>
+            璺宠浆鎵撳紑APP
+            </summary>
+            <param name="url"></param>
+        </member>
+        <member name="T:Shared.UIPickerView">
+            <summary>
+            UIPickerView
+            </summary>
+        </member>
+        <member name="P:Shared.UIPickerView.mHDLPickerView">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The UIPickerView.</value>
+        </member>
+        <member name="M:Shared.UIPickerView.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.UIPickerView.RefreshFrame">
+            <summary>
+            鍒锋柊甯冨眬
+            </summary>
+        </member>
+        <member name="P:Shared.UIPickerView.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.UIPickerView.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.UIPickerView.X">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.UIPickerView.Y">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="M:Shared.UIPickerView.setCurrentItems(System.Int32,System.Int32,System.Int32)">
+            <summary>
+            璁剧疆PickerView 榛樿閫変腑椤�
+            </summary>
+        </member>
+        <member name="M:Shared.UIPickerView.setNPicker(System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.String})">
+            <summary>
+            璁剧疆PickerView 鏁版嵁
+            </summary>
+        </member>
+        <member name="M:Shared.UIPickerView.setPicker(System.Collections.Generic.List{System.String},System.Collections.Generic.List{System.Collections.Generic.List{System.String}})">
+            <summary>
+            璁剧疆PickerView 鏁版嵁
+            </summary>
+        </member>
+        <member name="M:Shared.UIPickerView.setTextColorCenter(System.UInt32,System.Int32)">
+            <summary>
+            璁剧疆PickerView 閫変腑鏂囧瓧鐨勯鑹�
+            </summary>
+        </member>
+        <member name="F:Shared.UIPickerView.OnSelectChangeEvent">
+            <summary>
+            Action
+            </summary>
+        </member>
+        <member name="F:Shared.UIPickerView.mOnSelectChangeListener">
+            <summary>
+            OnSelectChangeListener 缁ф壙鍝嶅簲浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.UICoverFlowView">
+            <summary>
+            UICoverFlowView 宸插簾寮冿紝鏆傜敤HorizontalPages浠f浛瀹炵幇
+            </summary>
+        </member>
+        <member name="P:Shared.UICoverFlowView.mHDLCoverFlow">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The UICoverFlowView.</value>
+        </member>
+        <member name="M:Shared.UICoverFlowView.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.UICoverFlowView.RefreshFrame">
+            <summary>
+            鍒锋柊甯冨眬
+            </summary>
+        </member>
+        <member name="P:Shared.UICoverFlowView.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.UICoverFlowView.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.UICoverFlowView.X">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.UICoverFlowView.Y">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.UICoverFlowView.PageIndex">
+            <summary>
+            璁剧疆鎴栬�呰幏鍙栧綋鍓嶇殑鐣岄潰绱㈠紩
+            </summary>
+            <value>The index of the page.</value>
+        </member>
+        <member name="F:Shared.UICoverFlowView.Parents">
+            <summary>
+            鐖跺鍣�
+            </summary>
+            <value>The parent.</value>
+        </member>
+        <member name="M:Shared.UICoverFlowView.AddChidren(Shared.View)">
+            <summary>
+            澧炲姞瀛愭帶浠�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.UICoverFlowView.RemoveAll">
+            <summary>
+            娓呯┖鎵�鏈夌殑鎺т欢
+            </summary>
+        </member>
+        <member name="M:Shared.UICoverFlowView.RemoveAt(System.Int32)">
+            <summary>
+            绉婚櫎鎸囧畾绱㈠紩瀵硅薄
+            </summary>
+            <param name="index">Index.</param>
+        </member>
+        <member name="M:Shared.UICoverFlowView.GetChildren(System.Int32)">
+            <summary>
+            鑾峰彇鎸囧畾绱㈠紩瀵硅薄
+            </summary>
+            <returns>The children.</returns>
+            <param name="index">Index.</param>
+        </member>
+        <member name="F:Shared.UICoverFlowView.OnSelectChangeEvent">
+            <summary>
+            Action
+            </summary>
+        </member>
+        <member name="F:Shared.UICoverFlowView.mOnSelectChangeListener">
+            <summary>
+            OnSelectChangeListener 缁ф壙鍝嶅簲浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.CropImage">
+            <summary>
+            鎷嶇収鎴栬�呴�夋嫨鍥剧墖
+            </summary>
+        </member>
+        <member name="F:Shared.CropImage.TypeCamera">
+            <summary>
+            閫夋嫨绫诲瀷鏄媿鐓�
+            </summary>
+        </member>
+        <member name="F:Shared.CropImage.TypePicture">
+            <summary>
+            閫夋嫨鍥剧墖
+            </summary>
+        </member>
+        <member name="M:Shared.CropImage.TakePicture(System.Action{System.String},System.String,System.Int32,System.Int32,System.Int32)">
+            <summary>
+            鎷嶇収
+            </summary>
+            <param name="callback">鍥炶皟鍑芥暟</param>
+            <param name="fileName">鏂囦欢鍚�</param>
+        </member>
+        <member name="M:Shared.CropImage.SelectPicture(System.Action{System.String},System.String,System.Int32,System.Int32,System.Int32)">
+            <summary>
+            閫夋嫨鍥剧墖
+            </summary>
+            <param name="callback">鍥炶皟鍑芥暟</param>
+            <param name="fileName">鏂囦欢鍚�</param>
+        </member>
+        <member name="T:Shared.GestureLockView">
+            <summary>
+            GestureLockView
+            </summary>
+        </member>
+        <member name="P:Shared.GestureLockView.mHDLGestureLockView">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The GestureLockView.</value>
+        </member>
+        <member name="M:Shared.GestureLockView.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.GestureLockView.RefreshFrame">
+            <summary>
+            鍒锋柊甯冨眬
+            </summary>
+        </member>
+        <member name="P:Shared.GestureLockView.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.GestureLockView.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.GestureLockView.X">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.GestureLockView.Y">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.GestureLockView.LockViewCorrectColor">
+            <summary>
+            璁剧疆姝g‘鍜屾櫘閫氭椂鐨勯鑹�
+            </summary>
+            <value>绾块鑹�</value>
+        </member>
+        <member name="P:Shared.GestureLockView.LockViewErrorColor">
+            <summary>
+            璁剧疆閿欒鏃剁殑棰滆壊
+            </summary>
+            <value>绾块鑹�</value>
+        </member>
+        <member name="P:Shared.GestureLockView.LockViewNormalColor">
+            <summary>
+            榛樿鍦嗙偣鑳屾櫙棰滆壊
+            </summary>
+            <value>绾块鑹�</value>
+        </member>
+        <member name="M:Shared.GestureLockView.showCorrectStatus(System.Boolean)">
+            <summary>
+            鏄剧ず鎵嬪娍瑙i攣view 鏄惁鏄剧ず姝g‘
+            </summary>
+        </member>
+        <member name="M:Shared.GestureLockView.SetSolidType(System.Boolean)">
+            <summary>
+            璁剧疆鏄惁涓哄疄蹇冨渾褰㈣В閿佹牱寮�
+            </summary>
+        </member>
+        <member name="F:Shared.GestureLockView.OnLockVerifyEvent">
+            <summary>
+            Action
+            </summary>
+        </member>
+        <member name="F:Shared.GestureLockView.mOnLockVerifyListener">
+            <summary>
+            OnLockVerifyListener 鎵嬪娍婊戝姩缁撴潫
+            </summary>
+        </member>
+        <member name="T:Shared.CurtainRollSeekBar">
+            <summary>
+            CurtainRollSeekBar 鍗峰笜鎺т欢
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.mHDLRollCurtainSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLRollCurtainSeekBar.</value>
+        </member>
+        <member name="M:Shared.CurtainRollSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.CurtainRollSeekBar.RefreshFrame">
+            <summary>
+            鍒锋柊甯冨眬
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.X">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.Y">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.CurtainPaddingLeftRight">
+            <summary>
+            杩涘害鏉′笌宸﹀彸杈规杈硅窛
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.CurtainPaddingTop">
+            <summary>
+            椤堕儴padding
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.IsOffline">
+            <summary>
+            鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.IsProgressTextShow">
+            <summary>
+            鏄惁鏄剧ず杩涘害鏂囧瓧
+            </summary>
+            <value>鏄惁鏄剧ず杩涘害鏂囧瓧</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBar.NowProgressY">
+            <summary>
+            褰撳墠杩涘害鍊� Y鍧愭爣
+            </summary>
+            <value>Y鍧愭爣</value>
+        </member>
+        <member name="F:Shared.CurtainRollSeekBar.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="T:Shared.CurtainSeekBar">
+            <summary>
+            CurtainSeekBar 寮�鍚堝笜鎺т欢
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.mHDLOACCurtainSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLOACCurtainSeekBar.</value>
+        </member>
+        <member name="M:Shared.CurtainSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.CurtainSeekBar.RefreshFrame">
+            <summary>
+            鍒锋柊甯冨眬
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.X">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.Y">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.CurtainPaddingLeftRight">
+            <summary>
+            杩涘害鏉′笌宸﹀彸杈规杈硅窛
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.CurtainPaddingTop">
+            <summary>
+            椤堕儴padding
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.IsOffline">
+            <summary>
+            鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.IsProgressTextShow">
+            <summary>
+            鏄惁鏄剧ず杩涘害鏂囧瓧
+            </summary>
+            <value>鏄惁鏄剧ず杩涘害鏂囧瓧</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBar.NowProgressX">
+            <summary>
+            褰撳墠杩涘害鍊� X鍧愭爣
+            </summary>
+            <value>X鍧愭爣</value>
+        </member>
+        <member name="F:Shared.CurtainSeekBar.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="T:Shared.VerticalRefreshLayout">
+            <summary>
+            浣嶇疆甯冨眬 甯︿笅鎷夊埛鏂�
+            </summary>
+        </member>
+        <member name="F:Shared.VerticalRefreshLayout._isCanHeaderRefresh">
+            <summary>鈥�        /// 鏄惁鏀寔涓嬫媺鍒锋柊鈥�        /// </summary>
+        </member>
+        <member name="M:Shared.VerticalRefreshLayout.BeginHeaderRefreshing">
+            <summary>鈥�        /// 澶村紑濮嬪埛鏂扳��        /// </summary>
+        </member>
+        <member name="M:Shared.VerticalRefreshLayout.EndHeaderRefreshing">
+            <summary>鈥�        /// 澶寸粨鏉熷埛鏂扳��        /// </summary>
+        </member>
+        <member name="P:Shared.VerticalRefreshLayout.VerticalScrollBarEnabled">
+            <summary>鈥�        /// 鏄惁鏄剧ず婊氬姩鏉♀��        /// </summary>
+        </member>
+        <member name="T:Shared.VerticalRefreshLayout.MyRefreshScrolViewLayout">
+            <summary>
+            鍨傜洿鏂瑰悜婊氬姩瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.VerticalRefreshLayout.MyRefreshScrolViewLayout.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.VerticalRefreshLayout.MyRefreshScrolViewLayout.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.VerticalRefreshLayout.MyRefreshScrolViewLayout.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.VerticalRefreshLayout.MyRefreshScrolViewLayout.AddSubview(UIKit.UIView)">
+            <summary>
+            妗嗘灦榛樿鍔犱簡涓や釜UIImageView 锛岃繖鏍峰彲浠ュ幓鎺夐粯璁ゆ坊鍔�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.VerticalRefreshLayout.AddChidren(Shared.View)">
+            <summary>
+            澧炲姞鎺т欢
+            </summary>
+            <param name="view">瀛愭帶浠�</param>
+        </member>
+        <member name="M:Shared.VerticalRefreshLayout.ReLocation">
+            <summary>
+            閲嶆柊鎺掍綅缃強璁惧鍐呭澶у皬
+            </summary>
+        </member>
+        <member name="M:Shared.VerticalRefreshLayout.RemoveAll">
+            <summary>
+            绉婚櫎鎵�鏈夌殑瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.VerticalRefreshLayout.Remove(Shared.View)">
+            <summary>
+            绉婚櫎褰撳墠瑙嗗浘
+            </summary>
+            <param name="view">褰撳墠瑙嗗浘</param>
+        </member>
+        <member name="M:Shared.VerticalRefreshLayout.RemoveAt(System.Int32)">
+            <summary>
+            绉婚櫎鎸囧畾绱㈠紩
+            </summary>
+            <param name="index">绱㈠紩</param>
+        </member>
+        <member name="F:Shared.VerticalRefreshLayout.ScrolledEventHandler">
+            <summary>
+            婊戝姩浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.ArcScaleSeekBar">
+            <summary>
+            ArcScaleSeekBar 绌鸿皟 鍒诲害鍦嗗姬鎺т欢
+            </summary>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.mHDLArcScaleSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLArcScaleSeekBar.</value>
+        </member>
+        <member name="M:Shared.ArcScaleSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.ArcScaleSeekBar.RefreshFrame">
+            <summary>
+            鍒锋柊甯冨眬
+            </summary>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.X">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.Y">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="M:Shared.ArcScaleSeekBar.SetProgressBarColors(System.UInt32,System.UInt32)">
+            <summary>
+            璁剧疆杩涘害鏉� 娓愬彉棰滆壊鐨勫紑濮嬮鑹插拰缁撴潫棰滆壊
+            </summary>
+            <value>寮�濮嬮鑹层�佺粨鏉熼鑹�</value>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.IsOffline">
+            <summary>
+            鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.ArcScaleSeekBar.IsProgressTextShow">
+            <summary>
+            鏄惁鏄剧ず杩涘害鏂囧瓧
+            </summary>
+            <value>鏄惁鏄剧ず杩涘害鏂囧瓧</value>
+        </member>
+        <member name="F:Shared.ArcScaleSeekBar.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="T:Shared.UIDrawerLayout">
+            <summary>
+            鍙虫粦鎶藉眽View
+            </summary>
+        </member>
+        <member name="P:Shared.UIDrawerLayout.mUIDrawerLayout">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The UICoverFlowView.</value>
+        </member>
+        <member name="F:Shared.UIDrawerLayout.leftView">
+            <summary>
+            宸︿晶鑿滃崟View
+            </summary>
+        </member>
+        <member name="F:Shared.UIDrawerLayout.mainView">
+            <summary>
+            涓昏彍鍗昖iew
+            </summary>
+        </member>
+        <member name="F:Shared.UIDrawerLayout.maskUIView">
+            <summary>
+            钂欏眰閬尅View
+            </summary>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.RefreshLeftViewFrame(CoreGraphics.CGRect,System.Boolean)">
+            <summary>
+            鍒锋柊宸iew鏄剧ず鐨勪綅缃�
+            </summary>
+            <param name="leftFrame">鏈�缁坴iew鐨勪綅缃�</param>
+            <param name="needAnimations">鏄惁闇�瑕佸钩绉诲姩鐢�</param>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.RefreshMaskUIViewBackgroundColor(System.nfloat)">
+            <summary>
+            鍒锋柊钂欏眰View鐨勪綅缃拰閫忔槑搴﹂鑹�
+            </summary>
+            <param name="leftViewX"></param>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.AddLeftView(Shared.View)">
+            <summary>
+            澧炲姞宸﹁竟瑙嗗浘
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.LeftViewRemoveAllViews">
+            <summary>
+            RemoveLeftView
+            </summary>
+        </member>
+        <member name="F:Shared.UIDrawerLayout.isDrawerLockModei">
+            <summary>
+            鏄惁閿佸畾鍙虫粦鍔熻兘锛� 閿佸畾鍚庡彸婊戝脊鍑鸿彍鍗曞け鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.OpenLeftMenu">
+            <summary>
+            鎵撳紑鎶藉眽view
+            </summary>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.CloseLeftMenu">
+            <summary>
+            鍏抽棴鎶藉眽view
+            </summary>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.ShowLeftView(System.Boolean)">
+            <summary>
+            鏄惁鎵撳紑鏄剧ず宸﹁竟鑿滃崟view
+            </summary>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.MoveLeftView(System.nfloat)">
+            <summary>
+            绉诲姩宸﹁竟view
+            </summary>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.ResetView">
+            <summary>
+            閲嶇疆宸﹁竟view
+            </summary>
+        </member>
+        <member name="T:Shared.UIDrawerLayout.MyUIDrawerLayout">
+            <summary>
+            鍨傜洿鏂瑰悜婊氬姩瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.MyUIDrawerLayout.HitTest(CoreGraphics.CGPoint,UIKit.UIEvent)">
+            <summary>
+            瀵绘壘鏈�閫傚悎鐨刅iew
+            瀹炵幇鎷︽埅
+            </summary>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.MyUIDrawerLayout.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.MyUIDrawerLayout.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.MyUIDrawerLayout.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.MyUIDrawerLayout.AddSubview(UIKit.UIView)">
+            <summary>
+            妗嗘灦榛樿鍔犱簡涓や釜UIImageView 锛岃繖鏍峰彲浠ュ幓鎺夐粯璁ゆ坊鍔�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="T:Shared.UIDrawerLayout.MyMaskUIView">
+            <summary>
+            钂欏眰View
+            </summary>
+        </member>
+        <member name="M:Shared.UIDrawerLayout.MyMaskUIView.HitTest(CoreGraphics.CGPoint,UIKit.UIEvent)">
+            <summary>
+            瀵绘壘鏈�閫傚悎鐨刅iew
+            瀹炵幇鎷︽埅
+            </summary>
+        </member>
+        <member name="T:Shared.CoverFlowLayout">
+            <summary>
+            浣嶇疆甯冨眬
+            </summary>
+        </member>
+        <member name="F:Shared.CoverFlowLayout.PageChange">
+            <summary>
+            椤甸潰鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="T:Shared.CoverFlowLayout.MyCoverFlowLayout">
+            <summary>
+            鍨傜洿鏂瑰悜婊氬姩瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.CoverFlowLayout.MyCoverFlowLayout.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.CoverFlowLayout.MyCoverFlowLayout.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.CoverFlowLayout.MyCoverFlowLayout.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.CoverFlowLayout.MyCoverFlowLayout.AddSubview(UIKit.UIView)">
+            <summary>
+            妗嗘灦榛樿鍔犱簡涓や釜UIImageView 锛岃繖鏍峰彲浠ュ幓鎺夐粯璁ゆ坊鍔�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.CoverFlowLayout.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="P:Shared.CoverFlowLayout.IsShowPoint">
+            <summary>
+             鏄惁鏄剧ず涓嬮潰涓�鎺掔殑鐐�
+            </summary>
+            <value><c>true</c> if is show point; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.CoverFlowLayout.ScrollEnabled">
+            <summary>
+            鏄惁鍏佽婊戝姩
+            </summary>
+            <value><c>true</c> if scroll enabled; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.CoverFlowLayout.PageIndex">
+            <summary>
+            璁剧疆鎴栬�呰幏鍙栧綋鍓嶇殑鐣岄潰绱㈠紩
+            </summary>
+            <value>The index of the page.</value>
+        </member>
+        <member name="M:Shared.CoverFlowLayout.AddChidren(Shared.View)">
+            <summary>
+            澧炲姞瀛愭帶浠�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.CoverFlowLayout.ReLocation">
+            <summary>
+            閲嶆柊鎺掍綅缃強璁惧鍐呭澶у皬
+            </summary>
+        </member>
+        <member name="P:Shared.CoverFlowLayout.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+            <value>The width.</value>
+        </member>
+        <member name="P:Shared.CoverFlowLayout.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="M:Shared.CoverFlowLayout.Remove(Shared.View)">
+            <summary>
+            绉婚櫎褰撳墠鎺т欢
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.CoverFlowLayout.RemoveAll">
+            <summary>
+            绉婚櫎鎵�鏈夌殑鎺т欢
+            </summary>
+        </member>
+        <member name="M:Shared.CoverFlowLayout.RemoveAt(System.Int32)">
+            <summary>
+            鏍规嵁绱㈠紩绉婚櫎鎺т欢
+            </summary>
+            <param name="index">Index.</param>
+        </member>
+        <member name="T:Shared.EditTextView">
+            <summary>
+            EditTextView 鏂囨湰杈撳叆妗�
+            鏀寔鎹㈣
+            </summary>
+        </member>
+        <member name="P:Shared.EditTextView.iosUITextView">
+            <summary>
+            褰撳墠瑙嗗浘
+            </summary>
+            <value>The ios user interface text view.</value>
+        </member>
+        <member name="P:Shared.EditTextView.TextSize">
+            <summary>
+            鏂囧瓧澶у皬
+            </summary>
+            <value>The size of the text.</value>
+        </member>
+        <member name="P:Shared.EditTextView.IsFirstResponder">
+            <summary>
+            鏄惁璁剧疆涓哄姞杞芥椂鏄剧ず杈撳叆閿洏
+            </summary>
+            <value><c>true</c> if is first responder; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.EditTextView.TextID">
+            <summary>
+            鏍规嵁ID鑾峰彇瀵瑰簲鐨勫娉�
+            </summary>
+            <value>The text I.</value>
+        </member>
+        <member name="P:Shared.EditTextView.Enable">
+            <summary>
+            鏄惁浣胯兘
+            </summary>
+            <value>鏄惁浣胯兘</value>
+        </member>
+        <member name="P:Shared.EditTextView.PlaceholderText">
+            <summary>
+            鏄剧ず鎻愮ず淇℃伅
+            </summary>
+            <value>The placeholder.</value>
+        </member>
+        <member name="P:Shared.EditTextView.PlaceholderTextColor">
+            <summary>
+            Gets or sets the color of the placeholder text.
+            </summary>
+            <value>The color of the placeholder text.</value>
+        </member>
+        <member name="P:Shared.EditTextView.SecureTextEntry">
+            <summary>
+            鏄惁鐢�*鍙烽殣钘忓瓧绗�
+            </summary>
+            <value>The secure text entry.</value>
+        </member>
+        <member name="M:Shared.EditTextView.SetTextContentType">
+            <summary>
+            瑙e喅iOS12 浠ヤ笂榛樿鎻愮ず鑷姩鐢熸垚寮哄瘑鐮�
+            </summary>
+        </member>
+        <member name="M:Shared.EditTextView.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.EditTextView.Refresh">
+            <summary>
+            鍒涙柊闇�瑕佸垱鏂扮殑淇℃伅
+            </summary>
+        </member>
+        <member name="P:Shared.EditTextView.Text">
+            <summary>
+            鏂囨湰
+            </summary>
+            <value>The text.</value>
+        </member>
+        <member name="P:Shared.EditTextView.TextColor">
+            <summary>
+            鏂囧瓧棰滆壊
+            </summary>
+            <value>The color of the text.</value>
+        </member>
+        <member name="P:Shared.EditTextView.IsSelected">
+            <summary>
+            Gets or sets a value indicating whether this instance is selected.
+            </summary>
+            <value><c>true</c> if this instance is selected; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.EditTextView.SelectedBackgroundColor">
+            <summary>
+            閫夋嫨鏃惰儗鏅鑹�
+            </summary>
+            <value>The color of the text.</value>
+        </member>
+        <member name="P:Shared.EditTextView.TextAlignment">
+            <summary>
+            Texts the alignment.
+            </summary>
+        </member>
+        <member name="P:Shared.EditTextView.SelectedImagePath">
+            <summary>
+            閫夋嫨鏃惰儗鏅浘璺緞
+            </summary>
+            <value>The selected image path.</value>
+        </member>
+        <member name="P:Shared.EditTextView.UnSelectedImagePath">
+            <summary>
+            闈為�変腑鐘舵�佺殑鑳屾櫙鍥捐矾寰�
+            </summary>
+            <value>The un selected image path.</value>
+        </member>
+        <member name="F:Shared.EditTextView.TextChangeEventHandler">
+            <summary>
+            杈撳叆鏂囧瓧鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="F:Shared.EditTextView.EditorEnterAction">
+            <summary>
+            鎸変簡杩斿洖鎸夐敭浜嬩欢
+            </summary>
+        </member>
+        <member name="P:Shared.EditTextView.Foucs">
+            <summary>
+            璁剧疆鐒︾偣
+            </summary>
+        </member>
+        <member name="M:Shared.EditTextView.InitIosPlaceholderUILabelWithHeight(System.Int32)">
+            <summary>
+            鍒锋柊placeholderUILabel甯冨眬
+            </summary>
+        </member>
+        <member name="M:Shared.EditTextView.HideSoftInput">
+            <summary>
+            闅愯棌杞敭鐩�
+            </summary>
+        </member>
+        <member name="M:Shared.EditTextView.MyEditTextView.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.EditTextView.MyEditTextView.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.EditTextView.MyEditTextView.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="T:Shared.HorizontalPages">
+            <summary>
+            浣嶇疆甯冨眬
+            </summary>
+        </member>
+        <member name="F:Shared.HorizontalPages.PageChange">
+            <summary>
+            椤甸潰鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="F:Shared.HorizontalPages.StartScrollAction">
+            <summary>
+            寮�濮嬫粦鍔ㄤ簨浠�
+            </summary>
+        </member>
+        <member name="F:Shared.HorizontalPages.EndScrollAction">
+            <summary>
+            缁撴潫婊戝姩浜嬩欢
+            </summary>
+        </member>
+        <member name="F:Shared.HorizontalPages.NoMoreAction">
+            <summary>
+            娌℃湁鏇村鎻愮ずAction锛屽凡缁忔槸鏈�鍚庝竴涓�
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalPages.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="F:Shared.HorizontalPages.IsSetLeftAndRightImageView">
+            <summary>
+            鏄惁璁剧疆浜嗚櫄鍋囪儗鏅疺iew 璁剧疆浜嗘墠鏄剧ず
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalPages.SetLeftAndRightImageView(Shared.ImageView,Shared.ImageView)">
+            <summary>
+            璁剧疆鎺у埗鏈�宸﹀拰鏈�鍙�2杈癸紝濉厖鐨勫亣鑳屾櫙View锛屼笉璁剧疆涓嶆樉绀猴紝闇�瑕佸湪AddChidren 鍓嶈皟鐢ㄨ鏂规硶
+            </summary>
+            <param name="mLeftImageView"></param>
+            <param name="mRightImageView"></param>
+        </member>
+        <member name="P:Shared.HorizontalPages.JMBJ">
+            <summary>
+            鐣岄潰涔嬮棿鐨勮竟璺�
+            </summary>
+        </member>
+        <member name="F:Shared.HorizontalPages.mTCBJ">
+            <summary>
+            绐佸嚭瀹藉害
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalPages.RefreshPageView">
+            <summary>
+            鑷姩璁$畻鍒锋柊鎵�鏈塚iew鐨勯珮搴︼紝瀹炵幇缂╂斁鏁堟灉
+            </summary>
+        </member>
+        <member name="F:Shared.HorizontalPages.MaxDistance">
+            <summary>
+            鍒锋柊鏈�澶ц窛绂诲��
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalPages.RefreshSubviewHeight(Shared.View,System.nfloat)">
+            <summary>
+            鍚屾椂鍒锋柊瀛恦iew 鍜孖mageView鐨勯珮搴︼紝鏆傛椂瑙e喅搴曢儴鍦嗚澶辨晥闂
+            </summary>
+            <param name="mView"></param>
+            <param name="height"></param>
+        </member>
+        <member name="M:Shared.HorizontalPages.RefreshViewWithChangeHeightNew">
+            <summary>
+            璁$畻婊戝姩缂╂斁楂樺害鐨勬柟娉�
+            </summary>
+        </member>
+        <member name="P:Shared.HorizontalPages.ScrollEnabled">
+            <summary>
+            鏄惁鍏佽婊戝姩
+            </summary>
+            <value><c>true</c> if scroll enabled; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="P:Shared.HorizontalPages.PageIndex">
+            <summary>
+            璁剧疆鎴栬�呰幏鍙栧綋鍓嶇殑鐣岄潰绱㈠紩
+            </summary>
+            <value>The index of the page.</value>
+        </member>
+        <member name="M:Shared.HorizontalPages.SendEndScrollAction">
+            <summary>
+            鍒ゆ柇鏄惁闇�瑕佸彂閫佺粨鏉熸粦鍔ㄤ簨浠�
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalPages.SendIfPageChange">
+            <summary>
+            鍒ゆ柇鏄惁瑕佸彂閫佹敼鍙樹簨浠�
+            </summary>
+        </member>
+        <member name="P:Shared.HorizontalPages.ISScrolling">
+            <summary>
+            鏄惁姝e湪婊戝姩
+            </summary>
+        </member>
+        <member name="P:Shared.HorizontalPages.Decelerating">
+            <summary>
+            鏄惁姝e湪婊戝姩
+            </summary>
+            <value><c>true</c> if decelerating; otherwise, <c>false</c>.</value>
+        </member>
+        <member name="M:Shared.HorizontalPages.AddChidren(Shared.View)">
+            <summary>
+            澧炲姞瀛愭帶浠�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.HorizontalPages.ReLocation">
+            <summary>
+            閲嶆柊鎺掍綅缃強璁惧鍐呭澶у皬
+            </summary>
+        </member>
+        <member name="P:Shared.HorizontalPages.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+            <value>The width.</value>
+        </member>
+        <member name="P:Shared.HorizontalPages.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+            <value>The height.</value>
+        </member>
+        <member name="P:Shared.HorizontalPages.Bounces">
+            <summary>
+            Bounces 
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalPages.Remove(Shared.View)">
+            <summary>
+            绉婚櫎褰撳墠鎺т欢
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="M:Shared.HorizontalPages.RemoveAll">
+            <summary>
+            绉婚櫎鎵�鏈夌殑鎺т欢
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalPages.RemoveAt(System.Int32)">
+            <summary>
+            鏍规嵁绱㈠紩绉婚櫎鎺т欢
+            </summary>
+            <param name="index">Index.</param>
+        </member>
+        <member name="T:Shared.HorizontalPages.MyHorizontalPages">
+            <summary>
+            鍨傜洿鏂瑰悜婊氬姩瑙嗗浘
+            </summary>
+        </member>
+        <member name="M:Shared.HorizontalPages.MyHorizontalPages.AddSubview(UIKit.UIView)">
+            <summary>
+            妗嗘灦榛樿鍔犱簡涓や釜UIImageView 锛岃繖鏍峰彲浠ュ幓鎺夐粯璁ゆ坊鍔�
+            </summary>
+            <param name="view">View.</param>
+        </member>
+        <member name="T:Shared.DiyImageSeekBar">
+            <summary>
+            DiyImageSeekBar 鑷畾涔夊浘鐗囨嫋鍒版寜閽殑SeekBar
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.mHDLDiyImageSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLDiyImageSeekBar.</value>
+        </member>
+        <member name="M:Shared.DiyImageSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.DiyImageSeekBar.RefreshFrame">
+            <summary>
+            鍒锋柊甯冨眬
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.X">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.Y">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.ProgressBarColor">
+            <summary>
+            褰撳墠杩涘害鏉¢鑹�
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.SeekBarBackgroundColor">
+            <summary>
+            褰撳墠杩涘害鏉¤儗鏅殑棰滆壊
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.SeekBarPadding">
+            <summary>
+            杩涘害鏉′笌宸﹀彸杈规杈硅窛
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.SeekBarViewHeight">
+            <summary>
+            杩涘害鏉¢珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.ThumbImageHeight">
+            <summary>
+            鎷栧姩鎸夐挳鍥剧墖楂樺害
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.ThumbImagePath">
+            <summary>
+            鎷栧姩鎸夐挳鍥剧墖
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.IsOffline">
+            <summary>
+            鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.DiyImageSeekBar.IsProgressTextShow">
+            <summary>
+            鏄惁鏄剧ず杩涘害鏂囧瓧
+            </summary>
+            <value>鏄惁鏄剧ず杩涘害鏂囧瓧</value>
+        </member>
+        <member name="F:Shared.DiyImageSeekBar.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="T:Shared.BaseSeekBar">
+            <summary>
+            BaseSeekBar 瀹炵幇ProgressChange 鏄惁灞忚斀鍒ゆ柇
+            </summary>
+        </member>
+        <member name="P:Shared.BaseSeekBar.ProgressChangeDelayTime">
+            <summary>
+            灞忚斀鏃堕棿闂撮殧 鍗曚綅ms
+            </summary>
+        </member>
+        <member name="M:Shared.BaseSeekBar.IsProgressChangeDelay">
+            <summary>
+            鍒ゆ柇鏄惁灞忚斀
+            </summary>
+        </member>
+        <member name="M:Shared.GradientMaskView.RefreshFrame">
+            <summary>
+            鍒锋柊甯冨眬
+            </summary>
+        </member>
+        <member name="P:Shared.GradientMaskView.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.GradientMaskView.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.GradientMaskView.X">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.GradientMaskView.Y">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="F:Shared.GradientMaskView.mGradientColors">
+            <summary>
+            0%锛�25%锛�50%锛�80%
+            </summary>
+        </member>
+        <member name="M:Shared.GradientMaskView.GradientButton.InitWithFrameArc(CoreGraphics.CGRect)">
+            <summary>
+            鍒锋柊甯冨眬
+            </summary>
+        </member>
+        <member name="M:Shared.GradientMaskView.GradientButton.DrawWithGradient(CoreGraphics.CGContext,CoreGraphics.CGRect)">
+            <summary>
+            缁樺埗娓愬彉鏁堟灉
+            </summary>
+            <param name="ctx"></param>
+            <param name="rect"></param>
+        </member>
+        <member name="M:Shared.GradientMaskView.GradientButton.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.GradientMaskView.GradientButton.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.GradientMaskView.GradientButton.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.ProgressLoading.StartLoading(System.Int32)">
+            <summary>
+            寮�濮婰oading绾跨▼
+            </summary>
+            <param name="mTime">鏈�灏�1000ms</param>
+        </member>
+        <member name="M:Shared.ProgressLoading.EndLoading">
+            <summary>
+            缁撴潫Loading
+            </summary>
+        </member>
+        <member name="M:Shared.ProgressLoading.HideLoading">
+            <summary>
+            缁撴潫Loading
+            </summary>
+        </member>
+        <member name="M:Shared.ProgressLoading.RefreshFrame">
+            <summary>
+            鍒锋柊甯冨眬
+            </summary>
+        </member>
+        <member name="P:Shared.ProgressLoading.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.ProgressLoading.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.ProgressLoading.X">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.ProgressLoading.Y">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.ProgressLoading.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.ProgressLoading.ProgressWidth">
+            <summary>
+            褰撳墠杩涘害瀹�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.ProgressLoading.ProgressRadius">
+            <summary>
+            褰撳墠杩涘害鍗婂緞
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.ProgressLoading.ProgressBarColor">
+            <summary>
+            杩涘害鏉¢鑹� 
+            </summary>
+            <value>鍗曚竴杩涘害鏉¢鑹�</value>
+        </member>
+        <member name="P:Shared.ProgressLoading.LoadingBackgroundColor">
+            <summary>
+            LoadingBackgroundColor 
+            </summary>
+            <value>鑳屾櫙棰滆壊</value>
+        </member>
+        <member name="M:Shared.ProgressLoading.ProgressLoadingView.InitWithFrameArc(CoreGraphics.CGRect)">
+            <summary>
+            鍒锋柊甯冨眬
+            </summary>
+        </member>
+        <member name="M:Shared.ProgressLoading.ProgressLoadingView.TouchesBegan(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮�濮�
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.ProgressLoading.ProgressLoadingView.TouchesMoved(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+             绉诲姩
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.ProgressLoading.ProgressLoadingView.TouchesEnded(Foundation.NSSet,UIKit.UIEvent)">
+            <summary>
+            鐐瑰嚮寮硅捣
+            </summary>
+            <param name="touches">Touches.</param>
+            <param name="evt">Evt.</param>
+        </member>
+        <member name="M:Shared.BaseApplicationDelegateForHdlOn.registerForRemoteNotification(UIKit.UIApplication)">
+            <summary>
+            娉ㄥ唽杩滅▼娑堟伅鎺ㄩ��
+            </summary>
+            <param name="application">Application.</param>
+        </member>
+        <member name="M:Shared.BaseApplicationDelegateForHdlOn.RegisteredForRemoteNotifications(UIKit.UIApplication,Foundation.NSData)">
+            <summary>
+            娉ㄥ唽杩滅▼娑堟伅鎺ㄩ�佸洖璋冩柟娉�
+            </summary>
+            <param name="application">Application.</param>
+            <param name="deviceToken">Device token.</param>
+        </member>
+        <member name="T:Shared.DiyImageVerticalSeekBar">
+            <summary>
+            DiyImageVerticalSeekBar 鑷畾涔夊浘鐗囨嫋鍒版寜閽殑 鍨傜洿SeekBar
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.mHDLDiyImageVerticalSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLDiyImageVerticalSeekBar.</value>
+        </member>
+        <member name="M:Shared.DiyImageVerticalSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.DiyImageVerticalSeekBar.RefreshFrame">
+            <summary>
+            鍒锋柊甯冨眬
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.X">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.Y">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.ProgressBarColor">
+            <summary>
+            褰撳墠杩涘害鏉¢鑹�
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.SeekBarBackgroundColor">
+            <summary>
+            褰撳墠杩涘害鏉¤儗鏅殑棰滆壊
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.SeekBarPadding">
+            <summary>
+            杩涘害鏉′笌宸﹀彸杈规杈硅窛
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.SeekBarViewHeight">
+            <summary>
+            杩涘害鏉¢珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.ThumbImageHeight">
+            <summary>
+            鎷栧姩鎸夐挳鍥剧墖楂樺害
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.ThumbImagePath">
+            <summary>
+            鎷栧姩鎸夐挳鍥剧墖
+            </summary>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.IsOffline">
+            <summary>
+            鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.DiyImageVerticalSeekBar.IsProgressTextShow">
+            <summary>
+            鏄惁鏄剧ず杩涘害鏂囧瓧
+            </summary>
+            <value>鏄惁鏄剧ず杩涘害鏂囧瓧</value>
+        </member>
+        <member name="F:Shared.DiyImageVerticalSeekBar.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="T:Shared.CurtainRollSeekBarOn">
+            <summary>
+            CurtainRollSeekBarOn
+            2020-06-18 HDL ON+ 鍗峰笜鍜岀櫨鍙剁獥鎺т欢
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.mHDLOnRollCurtainSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLOnRollCurtainSeekBar.</value>
+        </member>
+        <member name="M:Shared.CurtainRollSeekBarOn.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.CurtainRollSeekBarOn.RefreshFrame">
+            <summary>
+            鍒锋柊甯冨眬
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.X">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.Y">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.IsOffline">
+            <summary>
+            鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.IsProgressTextShow">
+            <summary>
+            鏄惁鏄剧ず杩涘害鏂囧瓧
+            </summary>
+            <value>鏄惁鏄剧ず杩涘害鏂囧瓧</value>
+        </member>
+        <member name="P:Shared.CurtainRollSeekBarOn.NowProgressY">
+            <summary>
+            褰撳墠杩涘害鍊� Y鍧愭爣
+            </summary>
+            <value>Y鍧愭爣</value>
+        </member>
+        <member name="M:Shared.CurtainRollSeekBarOn.SetBlindsType(System.Boolean)">
+            <summary>
+            璁剧疆鏄惁涓虹櫨鍙剁獥鏍峰紡
+            </summary>
+        </member>
+        <member name="F:Shared.CurtainRollSeekBarOn.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="T:Shared.CurtainSeekBarOn">
+            <summary>
+            CurtainSeekBarOn 寮�鍚堝笜鎺т欢
+            HDL ON+ 寮�鍚堝笜鎺т欢
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.mHDLOnOACCurtainSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLOnOACCurtainSeekBar.</value>
+        </member>
+        <member name="M:Shared.CurtainSeekBarOn.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.CurtainSeekBarOn.RefreshFrame">
+            <summary>
+            鍒锋柊甯冨眬
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.X">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.Y">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.ProgressBarUnitSring">
+            <summary>
+            杩涘害鍊兼樉绀哄崟浣�
+            </summary>
+            <value>鍗曚綅瀛楃</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.IsOffline">
+            <summary>
+            鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.ProgressTextColor">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧棰滆壊
+            </summary>
+            <value>鏂囧瓧棰滆壊</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.ProgressTextSize">
+            <summary>
+            褰撳墠杩涘害鍊兼樉绀虹殑鏂囧瓧澶у皬
+            </summary>
+            <value>鏂囧瓧澶у皬</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.IsProgressTextShow">
+            <summary>
+            鏄惁鏄剧ず杩涘害鏂囧瓧
+            </summary>
+            <value>鏄惁鏄剧ず杩涘害鏂囧瓧</value>
+        </member>
+        <member name="P:Shared.CurtainSeekBarOn.NowProgressX">
+            <summary>
+            褰撳墠杩涘害鍊� X鍧愭爣
+            </summary>
+            <value>X鍧愭爣</value>
+        </member>
+        <member name="F:Shared.CurtainSeekBarOn.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="T:Shared.DiyArcSeekBar">
+            <summary>
+            HDLDiyArcSeekBar 鎺т欢
+            </summary>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.mHDLDiyArcSeekBar">
+            <summary>
+             褰撳墠瑙嗗浘
+            </summary>
+            <value>The HDLDiyArcSeekBar.</value>
+        </member>
+        <member name="M:Shared.DiyArcSeekBar.#ctor">
+            <summary>
+            鏋勯�犲嚱鏁�
+            </summary>
+        </member>
+        <member name="M:Shared.DiyArcSeekBar.RefreshFrame">
+            <summary>
+            鍒锋柊甯冨眬
+            </summary>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.Width">
+            <summary>
+            鎺т欢瀹藉害
+            </summary>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.Height">
+            <summary>
+            鎺т欢鐨勯珮搴�
+            </summary>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.X">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.Y">
+            <summary>
+            鎺т欢鐨刋鍧愭爣
+            </summary>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.MaxValue">
+            <summary>
+            杩涘害鍊兼渶澶у��
+            </summary>
+            <value>鏈�澶у��</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.MinValue">
+            <summary>
+            杩涘害鍊兼渶灏忓��
+            </summary>
+            <value>鏈�灏忓��</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.Progress">
+            <summary>
+            褰撳墠杩涘害鍊�
+            </summary>
+            <value>杩涘害鍊�</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.ArcWidthWithDefaultStyle">
+            <summary>
+            鍚屾椂璁剧疆鍦嗗姬鍜屾嫋鍔ㄥ渾褰㈢殑瀹�
+            </summary>
+            <value>瀹�</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.ArcColor">
+            <summary>
+            鍦嗗姬榛樿鑳屾櫙棰滆壊
+            </summary>
+            <value>鑳屾櫙棰滆壊</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.ProgressBarColor">
+            <summary>
+            杩涘害鏉¢鑹� 鍗曚竴棰滆壊涓嶆笎鍙�
+            </summary>
+            <value>鍗曚竴杩涘害鏉¢鑹�</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.ArcWidth">
+            <summary>
+            鍦嗗姬瀹�
+            </summary>
+            <value>瀹�</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.IsClickable">
+            <summary>
+            鏄惁鍙互婊戝姩
+            </summary>
+            <value>鏄惁鍙互婊戝姩</value>
+        </member>
+        <member name="M:Shared.DiyArcSeekBar.SetProgressBarColors(System.UInt32,System.UInt32)">
+            <summary>
+            璁剧疆杩涘害鏉� 娓愬彉棰滆壊鐨勫紑濮嬮鑹插拰缁撴潫棰滆壊
+            </summary>
+            <value>寮�濮嬮鑹层�佺粨鏉熼鑹�</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.OpenAngle">
+            <summary>
+            寮�鍙h搴�
+            </summary>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.SeekBarPadding">
+            <summary>
+            杩涘害鏉′笌宸﹀彸杈规杈硅窛
+            </summary>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.ThumbImageHeight">
+            <summary>
+            鎷栧姩鎸夐挳鍥剧墖楂樺害
+            </summary>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.ThumbImagePath">
+            <summary>
+            鎷栧姩鎸夐挳鍥剧墖
+            </summary>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.IsOffline">
+            <summary>
+            鏄惁绂荤嚎 绂荤嚎鐨勮瘽绂佹婊戝姩骞剁粯鍒惰儗鏅伄鎸″眰
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.OfflineProgressBarColor">
+            <summary>
+            绂荤嚎鏁堟灉鏃� 杩涘害鏉¢鑹� 鍗曚竴棰滆壊涓嶆笎鍙�
+            </summary>
+            <value>鍗曚竴杩涘害鏉¢鑹�</value>
+        </member>
+        <member name="P:Shared.DiyArcSeekBar.IsThumbImgBtnShow">
+            <summary>
+            鏄惁鏄剧ず鎷栧姩鎸夐挳鍥剧墖
+            </summary>
+            <value>鏄惁绂荤嚎</value>
+        </member>
+        <member name="F:Shared.DiyArcSeekBar.OnProgressChangedEvent">
+            <summary>
+            EventHandler
+            </summary>
+        </member>
+        <member name="T:Shared.MyEchartsViewOn">
+            <summary>
+            MyEchartsViewOn HDLON+
+            
+            </summary>
+        </member>
+        <member name="M:Shared.MyEchartsViewOn.LoadFileUrl">
+            <summary>
+            鍔犺浇鏈湴HTML
+            </summary>
+        </member>
+        <member name="P:Shared.MyEchartsViewOn.JsonData.Title">
+            <summary>
+            鏍囬鍐呭
+            </summary>
+            <value>The title.</value>
+        </member>
+        <member name="P:Shared.MyEchartsViewOn.JsonData.XArray">
+            <summary>
+            X杞村潗鏍囩偣
+            </summary>
+            <value>The XA rray.</value>
+        </member>
+        <member name="P:Shared.MyEchartsViewOn.JsonData.YArray">
+            <summary>
+            Y杞村潗鏍囩偣
+            </summary>
+            <value>The YA rray.</value>
+        </member>
+        <member name="F:com.hdl.on.Volume.VolumeChange">
+            <summary>
+            澹伴煶鍙樺寲浜嬩欢
+            </summary>
+        </member>
+        <member name="P:com.hdl.on.Volume.MusicVolume">
+            <summary>
+            璁剧疆褰撳墠闊抽噺
+            </summary>
+            <param name="volume">Volume.</param>
+        </member>
+        <member name="F:com.hdl.on.Volume.beforeVolume">
+            <summary>
+            涔嬪墠鐨勯煶閲�
+            </summary>
+        </member>
+        <member name="M:com.hdl.on.Server.Start(System.Net.IPAddress)">
+            <summary>
+            鍚姩鐩戝惉鍙婂鐞�
+            </summary>
+        </member>
+        <member name="M:com.hdl.on.Server.beginGetContext(System.Net.HttpListener)">
+            <summary>
+            寮�濮嬪紓姝ユ帴鏀秇ttp璇锋眰
+            </summary>
+            <param name="listerner"></param>
+        </member>
+        <member name="M:com.hdl.on.Server.getContextCallBack(System.IAsyncResult)">
+            <summary>
+            鑾峰彇http璇锋眰锛屽苟澶勭悊
+            </summary>
+            <param name="ar"></param>
+        </member>
+    </members>
+</doc>
diff --git a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
index 5c0822a..bf17018 100755
--- a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
@@ -23,11 +23,11 @@
         /// <summary>
         /// 鍦烘櫙鍔熻兘涓儴鑳屾櫙bodyView(楂樺害涓鸿澶囪彍鍗曠殑閭d釜鐧借壊鑳屾櫙鐨勪笂閮ㄥ埌灞忓箷搴曢儴)
         /// </summary>
-        public FrameLayout functionSceneBodyView;
+        public NormalFrameLayout functionSceneBodyView;
         /// <summary>
         /// 涓儴鑳屾櫙bodyView(楂樺害涓哄満鏅姛鑳藉垏鎹㈡帶浠剁殑搴曢儴鍒板睆骞曞簳閮�)
         /// </summary>
-        public FrameLayout functionSceneAutoBodyView;
+        public NormalFrameLayout functionSceneAutoBodyView;
         /// <summary>
         /// 鍙充笂瑙掓坊鍔犳寜閽�
         /// </summary>
@@ -82,7 +82,7 @@
         private void InitTopControl()
         {
             //澶撮儴FrameLayout
-            this.topFrameLayout = new FrameLayout();
+            this.topFrameLayout = new NormalFrameLayout();
             topFrameLayout.Y = Application.GetRealHeight(104);
             topFrameLayout.Height = Application.GetRealHeight(127);
             topFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
@@ -130,7 +130,7 @@
         private void InitMidControls()
         {
             //搴旇鏄痓ody鍚�
-            this.bodyFrameLayout = new FrameLayout();
+            this.bodyFrameLayout = new NormalFrameLayout();
             bodyFrameLayout.Y = topFrameLayout.Bottom;
             bodyFrameLayout.Height = this.Height - topFrameLayout.Bottom;
             bodyFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
@@ -181,7 +181,7 @@
             }
 
             //鐩墠涓嶇煡閬撻儹闆煄鐨勮繖涓叿浣撴斁鍦ㄥ摢涓殑浣嶇疆
-            this.functionSceneAutoBodyView = new FrameLayout();
+            this.functionSceneAutoBodyView = new NormalFrameLayout();
             functionSceneAutoBodyView.Y = frameSwitchBack.Bottom;
             functionSceneAutoBodyView.Height = bodyFrameLayout.Height - frameSwitchBack.Bottom;
             bodyFrameLayout.AddChidren(functionSceneAutoBodyView);
@@ -317,7 +317,7 @@
             };
 
             //鍔熻兘鍜屽満鏅痓odyView
-            this.functionSceneBodyView = new FrameLayout();
+            this.functionSceneBodyView = new NormalFrameLayout();
             functionSceneBodyView.Y = roomSwitchContr.Bottom;
             functionSceneBodyView.Height = functionSceneAutoBodyView.Height - roomSwitchContr.Bottom;
             functionSceneAutoBodyView.AddChidren(functionSceneBodyView);
diff --git a/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
index f3f32b9..ff1b7c6 100755
--- a/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
@@ -21,15 +21,15 @@
         /// <summary>
         /// TopMenuFrameLayout
         /// </summary>
-        public FrameLayout topMenuFrameLayout = null;
+        public NormalFrameLayout topMenuFrameLayout = null;
         /// <summary>
         /// TopFrameLayout
         /// </summary>
-        public FrameLayout topFrameLayout = null;
+        public NormalFrameLayout topFrameLayout = null;
         /// <summary>
         /// bodyFrameLayout
         /// </summary>
-        public FrameLayout bodyFrameLayout = null;
+        public NormalFrameLayout bodyFrameLayout = null;
         /// <summary>
         /// 宸︽粦浣胯兘
         /// </summary>
@@ -102,14 +102,14 @@
             }
 
             //TopMenuFrameLayout鍋氭垚
-            topMenuFrameLayout = new FrameLayout();
+            topMenuFrameLayout = new NormalFrameLayout();
             topMenuFrameLayout.Height = ControlCommonResourse.TopMenuFrameHeight;
             topMenuFrameLayout.BackgroundColor = UserCenterColor.Current.TopFrameLayout;
             topMenuFrameLayout.Name = "topMenuFrameLayout";
             this.AddChidren(topMenuFrameLayout);
 
             //TopFrameLayout鍋氭垚
-            topFrameLayout = new FrameLayout();
+            topFrameLayout = new NormalFrameLayout();
             topFrameLayout.Height = ControlCommonResourse.TopFrameHeight;
             topFrameLayout.BackgroundColor = UserCenterColor.Current.TopFrameLayout;
             topFrameLayout.Y = topMenuFrameLayout.Bottom;
@@ -169,7 +169,7 @@
             {
                 bodyFrameLayout.RemoveAll();
             }
-            bodyFrameLayout = new FrameLayout();
+            bodyFrameLayout = new NormalFrameLayout();
             bodyFrameLayout.Height = ControlCommonResourse.BodyFrameHeight;
             bodyFrameLayout.Y = topFrameLayout.Bottom;
             bodyFrameLayout.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
index 511bc75..6f80b9b 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
@@ -62,7 +62,7 @@
                 //Y = openView.frameLayout.Bottom,
                 X = Application.GetRealWidth(80),
                 Width = Application.GetRealWidth(915),
-                Height = Application.GetRealHeight(160),
+                Height = Application.GetRealHeight(160),//婊戝姩鏉$埗鎺т欢楂樺害
                 IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
                 IsClickable = false,//杩涘害鏉℃槸鍚︽粦鍔�
                 ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉¢鑹�
@@ -1205,6 +1205,18 @@
                         };
                     }
                     break;
+                case DeviceType.ColorTemperatureLight: {
+
+                        
+
+
+                        flMain.RemoveFromParent();
+                        var nightlight = new Nightlight();
+                        UserView.HomePage.Instance.AddChidren(nightlight);
+                        UserView.HomePage.Instance.PageIndex += 1;
+                        nightlight.Show(common, false, _if[1]);
+                    }
+                    break;
             }
             completeView.Btncomplete.MouseUpEventHandler += (sender, e) =>
             {
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
index 711f0b1..7778c60 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -504,7 +504,86 @@
                                             }
                                         }
                                         break;
+                                    case DeviceType.ColorTemperatureLight:
+                                        {
+                                            icon = "ZigeeLogic/nightLight.png";
+                                            var taskList = actions["TaskList"] as List<Dictionary<string, string>>;
+                                            if (taskList == null)
+                                            {
+                                                continue;
+                                            }
+                                            foreach (var tasks in taskList)
+                                            {
+                                                switch (tasks["TaskType"])
+                                                {
+                                                    case "1":
+                                                        {
+                                                            if (tasks["Data1"] == "0")
+                                                            {
+                                                                state += Language.StringByID(MyInternationalizationString.close) + ";";
+                                                            }
+                                                            else
+                                                            {
+                                                                state += Language.StringByID(MyInternationalizationString.open) + ";";
+                                                            }
+                                                        }
+                                                        break;
 
+                                                }
+                                            }
+                                            foreach (var tasks in taskList)
+                                            {
+                                                switch (tasks["TaskType"])
+                                                {
+
+                                                    case "3":
+                                                        {
+                                                            var intvalue = int.Parse(tasks["Data1"]);
+                                                            var lightbrightnessvalue = (intvalue * 100) / 254;
+                                                            state += Language.StringByID(MyInternationalizationString.brightness) + lightbrightnessvalue.ToString() + "%;";
+                                                        }
+                                                        break;
+
+                                                }
+                                            }
+                                            foreach (var tasks in taskList)
+                                            {
+                                                switch (tasks["TaskType"])
+                                                {
+
+                                                    case "7":
+                                                        {
+                                                            if (tasks["Data1"] == "0")
+                                                            {
+                                                                state += Language.StringByID(MyInternationalizationString.buzzer) + Language.StringByID(MyInternationalizationString.close) + ";";
+                                                            }
+                                                            else
+                                                            {
+                                                                state += Language.StringByID(MyInternationalizationString.buzzer) + Language.StringByID(MyInternationalizationString.open) + ";";
+                                                            }
+                                                        }
+                                                        break;
+
+                                                }
+                                            }
+                                            foreach (var tasks in taskList)
+                                            {
+                                                switch (tasks["TaskType"])
+                                                {
+
+                                                    case "8":
+                                                        {
+                                                            var intvalue = int.Parse(tasks["Data1"]);
+                                                            var colorTemperatureValue = 1000000 / (intvalue * 100);
+                                                            state += Language.StringByID(MyInternationalizationString.colorTemperature) + colorTemperatureValue.ToString() + "K";
+                                                        }
+                                                        break;
+                                                }
+                                            }
+
+                                            state = state.TrimEnd(';');//鍘绘帀鏈�鍚庨偅涓�";"
+                                        }
+                                        break;
                                 }
 
 
@@ -567,9 +646,21 @@
                             case 8:
                                 {
                                     var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
-                                    var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
-                                    this.AddChidren(flMain);
-                                    CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_lockaction");
+                                    if (deviceinof.Type != DeviceType.ColorTemperatureLight)
+                                    {
+                                        var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+                                        this.AddChidren(flMain);
+                                        CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_lockaction");
+                                    }
+                                    else
+                                    {
+                                        var nightlight = new Nightlight();
+                                        UserView.HomePage.Instance.AddChidren(nightlight);
+                                        UserView.HomePage.Instance.PageIndex += 1;
+                                        nightlight.Show(deviceinof, true, "lockaction",actions);
+                                    }
+
+
                                 }
                                 break;
 
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
index 57bd780..57045c8 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicCommunalPage.cs
@@ -987,6 +987,86 @@
                                             }
                                         }
                                         break;
+                                    case DeviceType.ColorTemperatureLight:
+                                        {
+                                            icon = "ZigeeLogic/nightLight.png";
+                                            var taskList = actions["TaskList"] as List<Dictionary<string, string>>;
+                                            if (taskList == null)
+                                            {
+                                                continue;
+                                            }
+                                            foreach (var tasks in taskList)
+                                            {
+                                                switch (tasks["TaskType"])
+                                                {
+                                                    case "1":
+                                                        {
+                                                            if (tasks["Data1"] == "0")
+                                                            {
+                                                                state += Language.StringByID(MyInternationalizationString.close) + ";";
+                                                            }
+                                                            else
+                                                            {
+                                                                state += Language.StringByID(MyInternationalizationString.open) + ";";
+                                                            }
+                                                        }
+                                                        break;
+
+                                                }
+                                            }
+                                            foreach (var tasks in taskList)
+                                            {
+                                                switch (tasks["TaskType"])
+                                                {
+                                                   
+                                                    case "3":
+                                                        {
+                                                            var intvalue = int.Parse(tasks["Data1"]);
+                                                            var lightbrightnessvalue = (intvalue * 100) / 254;
+                                                            state += Language.StringByID(MyInternationalizationString.brightness) + lightbrightnessvalue.ToString() + "%;";
+                                                        }
+                                                        break;
+                                                
+                                                }
+                                            }
+                                            foreach (var tasks in taskList)
+                                            {
+                                                switch (tasks["TaskType"])
+                                                {
+                                                  
+                                                    case "7":
+                                                        {
+                                                            if (tasks["Data1"] == "0")
+                                                            {
+                                                                state += Language.StringByID(MyInternationalizationString.buzzer) + Language.StringByID(MyInternationalizationString.close) + ";";
+                                                            }
+                                                            else
+                                                            {
+                                                                state += Language.StringByID(MyInternationalizationString.buzzer) + Language.StringByID(MyInternationalizationString.open) + ";";
+                                                            }
+                                                        }
+                                                        break;
+                                                    
+                                                }
+                                            }
+                                            foreach (var tasks in taskList)
+                                            {
+                                                switch (tasks["TaskType"])
+                                                {
+                                                  
+                                                    case "8":
+                                                        {
+                                                            var intvalue = int.Parse(tasks["Data1"]);
+                                                            var colorTemperatureValue = 1000000/(intvalue *100);
+                                                            state += Language.StringByID(MyInternationalizationString.colorTemperature) + colorTemperatureValue.ToString() + "K";
+                                                        }
+                                                        break;
+                                                }
+                                            }
+
+                                            state=state.TrimEnd(';');//鍘绘帀鏈�鍚庨偅涓�";"
+                                        }
+                                        break;
                                 }
 
                             }
@@ -1121,9 +1201,19 @@
                             case 0:
                                 {
                                     var deviceinof = Method.GetCommonDevice(actions["DeviceAddr"].ToString(), actions["Epoint"].ToString());
-                                    var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
-                                    this.AddChidren(flMain);
-                                    CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_logic");
+                                    if (deviceinof.Type != DeviceType.ColorTemperatureLight)
+                                    {
+                                        var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+                                        this.AddChidren(flMain);
+                                        CurrentDeviceState.CurrentDeviceView(flMain, deviceinof, true, "action_logic");
+                                    }
+                                    else
+                                    {
+                                        var nightlight = new Nightlight();
+                                        UserView.HomePage.Instance.AddChidren(nightlight);
+                                        UserView.HomePage.Instance.PageIndex += 1;
+                                        nightlight.Show(deviceinof, true, "logic", actions);
+                                    }
                                 }
                                 break;
                             case 6:
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/LightView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/LightView.cs
new file mode 100755
index 0000000..5d95c6d
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/LightView.cs
@@ -0,0 +1,81 @@
+锘�
+using System;
+using System.Collections.Generic;
+using Shared.Common;
+using Shared.R;
+using ZigBee.Device;
+
+namespace Shared.Phone.Device.Logic.LogicView
+{
+    public class LightView
+    {
+
+        public FrameLayout frameLayout = new FrameLayout
+        {
+            Height = Application.GetRealHeight(150),
+        };
+        /// <summary>
+        /// 鍔熻兘鏍囬
+        /// </summary>
+        public Button titleBtn = new Button
+        {
+            X = Application.GetRealWidth(58),
+            Y = Application.GetRealHeight(34 + 20),
+            Height = Application.GetRealHeight(58),
+            Width = Application.GetRealWidth(400),
+            //TextID = MyInternationalizationString.logicathomegarrison,
+            TextAlignment = TextAlignment.CenterLeft,
+            TextColor = ZigbeeColor.Current.LogicBtnSelectedColor,
+            TextSize = 14,
+            
+        };
+        /// <summary>
+        /// 涓嬩竴绾ц彍鍗曞浘鏍�
+        /// </summary>
+        public Button nextBtn = new Button
+        {
+            Width = Application.GetMinRealAverage(103),
+            Height = Application.GetMinRealAverage(103),
+            UnSelectedImagePath = "ZigeeLogic/back1.png",
+            X = Application.GetRealWidth(920),
+            Y = Application.GetRealHeight(11 + 20),
+        };
+
+        /// <summary>
+        /// 鐘舵�佹樉绀烘枃鏈�
+        /// </summary>
+        public Button seletecdTextBtn = new Button
+        {
+            X = Application.GetRealWidth(300),
+            Y = Application.GetRealHeight(34+20),
+            Height = Application.GetRealHeight(58),
+            Width = Application.GetRealWidth(1080-300 - 126),
+            TextAlignment = TextAlignment.CenterRight,
+            TextColor = ZigbeeColor.Current.LogicBtnSelectedColor,
+            TextSize = 14,
+        };
+
+        public Button lineBtn = new Button
+        {
+            Width = Application.GetRealWidth(964),
+            Height = 1,
+            X = Application.GetRealWidth(54),
+            BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+        };
+        public Button clickviewBtn = new Button
+        {
+            Height = Application.GetRealHeight(150),
+        };
+        public FrameLayout Show()
+        {
+            frameLayout.AddChidren(titleBtn);
+            frameLayout.AddChidren(seletecdTextBtn);
+            frameLayout.AddChidren(nextBtn);
+            lineBtn.Y = frameLayout.Height - 1;
+            frameLayout.AddChidren(lineBtn);
+            frameLayout.AddChidren(clickviewBtn);
+            return frameLayout;
+        }
+
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index 6178384..6fba6f9 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -108,7 +108,7 @@
             List<string> devicetypelist = new List<string>();
             devicetypelist.Clear();
 
-            var lightjosn = devicelist.Find((device) => device.Type == DeviceType.DimmableLight || device.Type == DeviceType.OnOffOutput);
+            var lightjosn = devicelist.Find((device) => device.Type == DeviceType.DimmableLight || device.Type == DeviceType.OnOffOutput || device.Type == DeviceType.ColorTemperatureLight);
             if (lightjosn != null)
             {
                 devicetypelist.Add(Language.StringByID(MyInternationalizationString.Lights));
@@ -166,6 +166,7 @@
             {
                 DeviceTypeList.Add(DeviceType.OnOffOutput);//0x0101鍗佽繘鍒�257
                 DeviceTypeList.Add(DeviceType.DimmableLight);
+                DeviceTypeList.Add(DeviceType.ColorTemperatureLight);
             }
             else if (devicetype == Language.StringByID(MyInternationalizationString.Curtains))
             {
@@ -316,6 +317,12 @@
                         selectedpatm = "ZigeeLogic/selectedairswitch.png";
                     }
                     break;
+                case DeviceType.ColorTemperatureLight:
+                    {
+                        patm = "ZigeeLogic/nightLight.png";
+                        selectedpatm = "ZigeeLogic/nightLightSelected.png";
+                    }
+                    break;
             }
             button.UnSelectedImagePath = patm;
             button.SelectedImagePath = selectedpatm;
@@ -350,6 +357,7 @@
                         deviceTypeList.Add(DeviceType.WindowCoveringDevice);
                         deviceTypeList.Add(DeviceType.Thermostat);
                         deviceTypeList.Add(DeviceType.AirSwitch);
+                        deviceTypeList.Add(DeviceType.ColorTemperatureLight);
                         ///闂ㄩ攣鐗规畩
                        // deviceTypeList.Add(DeviceType.DoorLock);
                     }
@@ -372,6 +380,7 @@
                         deviceTypeList.Add(DeviceType.WindowCoveringDevice);
                         deviceTypeList.Add(DeviceType.Thermostat);
                         deviceTypeList.Add(DeviceType.AirSwitch);
+                        deviceTypeList.Add(DeviceType.ColorTemperatureLight);
                         ///闂ㄩ攣鐗规畩
                       // deviceTypeList.Add(DeviceType.DoorLock);
                     }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
new file mode 100755
index 0000000..8383026
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
@@ -0,0 +1,496 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Shared;
+using Shared.Common;
+using Shared.R;
+using ZigBee.Device;
+
+namespace Shared.Phone.Device.Logic
+{
+    public class Nightlight : FrameLayout
+    {
+        public Nightlight()
+        {
+            Tag = "Logic";
+        }
+        string selectedDeviceStatus = "";
+        Dictionary<string, object> actionsInfo = null;
+        List<Dictionary<string, string>> TaskList = null;
+        public void Show(CommonDevice common, bool edit,string str_if,Dictionary<string, object> editdeviceActionInfo = null)
+        {
+            actionsInfo = editdeviceActionInfo;
+            this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
+            TopView view = new TopView();
+            this.AddChidren(view.TopRowView());
+            view.toptitleNameBtn.Text = Name;
+            view.clickBtn.MouseDownEventHandler += (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+            var middle = new FrameLayout
+            {
+                Y = view.topRowLayout.Bottom,
+                Height = Application.GetRealHeight(Method.H - 184),
+                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
+            };
+            this.AddChidren(middle);
+
+            LogicView.LightView openView = new LogicView.LightView();
+            openView.titleBtn.Text = Language.StringByID(MyInternationalizationString.nightLightSwitch);
+            middle.AddChidren(openView.Show());
+            openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+            {
+                CurrentDeviceView("澶滅伅寮�鍏�", common, edit, openView.seletecdTextBtn);
+            };
+
+            LogicView.LightView brightnessView = new LogicView.LightView();
+            brightnessView.frameLayout.Y = openView.frameLayout.Bottom;
+            brightnessView.titleBtn.Text = Language.StringByID(MyInternationalizationString.brightness);
+            middle.AddChidren(brightnessView.Show());
+            brightnessView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+            {
+                CurrentDeviceView("浜害", common, edit, brightnessView.seletecdTextBtn);
+            };
+
+            LogicView.LightView colorTemperatureView = new LogicView.LightView();
+            colorTemperatureView.frameLayout.Y = brightnessView.frameLayout.Bottom;
+            colorTemperatureView.titleBtn.Text = Language.StringByID(MyInternationalizationString.colorTemperature);
+            middle.AddChidren(colorTemperatureView.Show());
+            colorTemperatureView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+            {
+                CurrentDeviceView("鑹叉俯", common, edit, colorTemperatureView.seletecdTextBtn);
+            };
+
+            LogicView.LightView buzzView = new LogicView.LightView();
+            buzzView.frameLayout.Y = colorTemperatureView.frameLayout.Bottom;
+            buzzView.titleBtn.Text = Language.StringByID(MyInternationalizationString.buzzer);
+            middle.AddChidren(buzzView.Show());
+            buzzView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+            {
+                CurrentDeviceView("铚傞福鍣�", common, edit, buzzView.seletecdTextBtn);
+            };
+
+            LogicView.SaveView saveView = new LogicView.SaveView();
+            saveView.frameLayout.Y = middle.Height - Application.GetRealHeight(260);
+            middle.AddChidren(saveView.Show());
+            saveView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+            {
+                if (selectedDeviceStatus != "" && actionsInfo != null)
+                {
+                    LogicIfon.AddDeviceActions(common, actionsInfo);
+                }
+                else
+                {
+                    if (!edit)
+                    {
+                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+                                    Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
+                                   Language.StringByID(MyInternationalizationString.confrim));
+                        alert.Show();
+                        return;
+                    }
+
+                }
+
+                if (str_if == "logic")
+                {
+                    var logicCommunalPage = new LogicCommunalPage();
+                    UserView.HomePage.Instance.AddChidren(logicCommunalPage);
+                    UserView.HomePage.Instance.PageIndex += 1;
+                    logicCommunalPage.Show(() => { });
+                }
+                else if (str_if == "lockaction")
+                {
+                    //闂ㄩ攣鑱斿姩浜嬩欢
+                    var lockLogicCommunalPage = new DoorLockLogic.LockLogicCommunalPage();
+                    UserView.HomePage.Instance.AddChidren(lockLogicCommunalPage);
+                    UserView.HomePage.Instance.PageIndex += 1;
+                    lockLogicCommunalPage.Show(() => { });
+                }
+
+            };
+
+            if (edit)
+            {
+                foreach (var deviceinfo in Common.Logic.CurrentLogic.Actions)
+                {
+                    if (deviceinfo["LinkType"].ToString() == "0")
+                    {
+
+                        if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr && deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
+                        {
+                            TaskList = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
+                            foreach (var tasks in TaskList)
+                            {
+                                switch (tasks["TaskType"])
+                                {
+                                    case "1":
+                                        {
+                                            if (tasks["Data1"] == "0")
+                                            {
+                                                openView.seletecdTextBtn.TextID = MyInternationalizationString.close;
+                                            }
+                                            else
+                                            {
+                                                openView.seletecdTextBtn.TextID = MyInternationalizationString.open;
+                                            }
+                                        }
+                                        break;
+                                    case "3":
+                                        {
+                                            var intvalue = int.Parse(tasks["Data1"]);
+                                            var lightbrightnessvalue = (intvalue * 100) / 254;
+                                            brightnessView.seletecdTextBtn.Text = lightbrightnessvalue.ToString() + "%";
+                                        }
+                                        break;
+                                    case "7":
+                                        {
+                                            if (tasks["Data1"] == "0")
+                                            {
+                                                buzzView.seletecdTextBtn.TextID = MyInternationalizationString.close;
+                                            }
+                                            else
+                                            {
+                                                buzzView.seletecdTextBtn.TextID = MyInternationalizationString.open;
+                                            }
+                                        }
+                                        break;
+                                    case "8":
+                                        {
+                                            var intvalue = int.Parse(tasks["Data1"]);
+                                            var lightbrightnessvalue = 1000000 / (intvalue * 100);
+                                            colorTemperatureView.seletecdTextBtn.Text = lightbrightnessvalue.ToString() + "K";
+                                        }
+                                        break;
+                                }
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        public void CurrentDeviceView(string if_str, CommonDevice common, bool edit, Button button)
+        {
+            var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
+            this.AddChidren(flMain);
+            UserView.HomePage.Instance.ScrollEnabled = false;//涓嶈褰撳墠鐣岄潰婊戝姩
+            CompleteView completeView = new CompleteView();
+            flMain.AddChidren(completeView.Show(2));
+            completeView.Btntitle.Text = LocalDevice.Current.GetDeviceEpointName(common);
+            EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
+            {
+                UserView.HomePage.Instance.ScrollEnabled = true;
+                flMain.RemoveFromParent();
+            };
+            flMain.MouseUpEventHandler += clickcancel;
+            completeView.Btncancel.MouseUpEventHandler += clickcancel;
+            if (actionsInfo == null)
+            {
+                actionsInfo = new Dictionary<string, object>();
+                TaskList = new List<Dictionary<string, string>>();
+                actionsInfo.Add("LinkType", 0);
+                actionsInfo.Add("DeviceAddr", common.DeviceAddr);
+                actionsInfo.Add("Epoint", common.DeviceEpoint);
+                actionsInfo.Add("Time", 0);
+                actionsInfo.Add("TaskList", TaskList);
+            }
+            string status = "";
+
+            switch (if_str)
+            {
+                case "澶滅伅寮�鍏�":
+                    {
+
+                        Dictionary<string, string> switchDictionary = new Dictionary<string, string>();
+                        Send.dictionary(switchDictionary, "TaskType", "1");
+                        Send.dictionary(switchDictionary, "Data2", "0");
+                        mFunView openView = new mFunView();
+                        openView.frameLayout.Y = Application.GetRealHeight(140 + 20);
+                        openView.titleBtn.TextID = MyInternationalizationString.open;
+                        completeView.Show(2).AddChidren(openView.Show());
+                        mFunView closeView = new mFunView();
+                        closeView.frameLayout.Y = Application.GetRealHeight(140 + 20 + 160);
+                        closeView.titleBtn.TextID = MyInternationalizationString.close;
+                        completeView.Show(2).AddChidren(closeView.Show());
+                        closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+                        ///鐐瑰嚮纭浜嬩欢
+                        openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+                        {
+                            selectedDeviceStatus = "1";
+                            openView.selectedIconBtn.Visible = true;
+                            closeView.selectedIconBtn.Visible = false;
+                            openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            Send.dictionary(switchDictionary, "Data1", "1");//榛樿鍊�
+                            DicValue("1", switchDictionary);
+                            status = Language.StringByID(MyInternationalizationString.open);
+                        };
+
+                        ///鐐瑰嚮鍙栨秷浜嬩欢
+                        closeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+                        {
+                            selectedDeviceStatus = "1";
+                            openView.selectedIconBtn.Visible = false;
+                            closeView.selectedIconBtn.Visible = true;
+                            openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            Send.dictionary(switchDictionary, "Data1", "0");//榛樿鍊�
+                            DicValue("1", switchDictionary);
+                            status = Language.StringByID(MyInternationalizationString.close);
+
+                        };
+                        if (TaskList != null && TaskList.Count != 0)
+                        {
+                            foreach (var value in TaskList)
+                            {
+                                if (value["TaskType"] == "1")
+                                {
+                                    if (value["Data1"] == "1")
+                                    {
+                                        openView.selectedIconBtn.Visible = true;
+                                        closeView.selectedIconBtn.Visible = false;
+                                    }
+                                    else
+                                    {
+                                        openView.selectedIconBtn.Visible = false;
+                                        closeView.selectedIconBtn.Visible = true;
+                                    }
+                                    break;
+                                }
+
+                            }
+                        }
+                    }
+                    break;
+                case "浜害":
+                    {
+                        Dictionary<string, string> brightnessDictionary = new Dictionary<string, string>();
+                        Send.dictionary(brightnessDictionary, "TaskType", "3");
+                        Send.dictionary(brightnessDictionary, "Data2", "0");
+                        var horizontalSeekBarVol = new DiyImageSeekBar
+                        {
+                            Y = Application.GetRealHeight(140),
+                            X = Application.GetRealWidth(78),
+                            Width = Application.GetRealWidth(918),
+                            Height = Application.GetRealHeight(320),//婊戝姩鏉$埗鎺т欢楂樺害
+                            IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
+                            IsClickable = true,//杩涘害鏉℃槸鍚︽粦鍔�
+                            ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉¢鑹�
+                            ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
+                            ThumbImageHeight = Application.GetRealHeight(89),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
+                            ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                            ProgressTextSize = 9,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�12
+                            SeekBarViewHeight = Application.GetRealHeight(6),//杩涘害鏉$殑楂樺害10
+                        };
+                        completeView.Show(2).AddChidren(horizontalSeekBarVol);
+                        EventHandler<int> progressclick = (sender, e) =>
+                        {
+                            selectedDeviceStatus = "3";
+                            int lightbrightnessvalue = (254 * horizontalSeekBarVol.Progress) / 100;
+                            Send.dictionary(brightnessDictionary, "Data1", lightbrightnessvalue.ToString());
+                            DicValue("3", brightnessDictionary);
+                            status = horizontalSeekBarVol.Progress.ToString() + "%";
+                        };
+                        horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
+                        horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
+
+                        if (TaskList != null && TaskList.Count != 0)
+                        {
+                            foreach (var value in TaskList)
+                            {
+                                if (value["TaskType"] == "3")
+                                {
+                                    var intvalue = int.Parse(value["Data1"]);
+                                    var lightbrightnessvalue = (intvalue * 100) / 254;
+                                    horizontalSeekBarVol.Progress = lightbrightnessvalue;
+                                    break;
+                                }
+
+                            }
+                        }
+                    }
+                    break;
+                case "鑹叉俯":
+                    {
+                        Dictionary<string, string> brightnessDictionary = new Dictionary<string, string>();
+                        Send.dictionary(brightnessDictionary, "TaskType", "8");
+                        Send.dictionary(brightnessDictionary, "Data2", "0");
+                        Button seekIconBtn = new Button
+                        {
+                            Y = Application.GetRealHeight(140 + 154),
+                            X = Application.GetRealWidth(78),
+                            Height = Application.GetRealHeight(12),
+                            Width = Application.GetRealWidth(918),
+                            UnSelectedImagePath = "ZigeeLogic/seek.png",
+                        };
+                        completeView.Show(2).AddChidren(seekIconBtn);
+                        var horizontalSeekBarVol = new DiyImageSeekBar
+                        {
+                            Y = Application.GetRealHeight(140),
+                            X = Application.GetRealWidth(78),
+                            Width = Application.GetRealWidth(918),
+                            Height = Application.GetRealHeight(320),//婊戝姩鏉$埗鎺т欢楂樺害
+                            IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
+                            IsClickable = true,//杩涘害鏉℃槸鍚︽粦鍔�
+                            ProgressBarColor = 0x00000000,// ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉¢鑹�
+                            SeekBarBackgroundColor = 0x00000000,
+                            ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
+                            ThumbImageHeight = Application.GetRealHeight(89),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
+                            ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+                            ProgressTextSize = 9,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�12
+                            SeekBarViewHeight = Application.GetRealHeight(12),//杩涘害鏉$殑楂樺害10
+                            MinValue = 30,
+                            MaxValue = 60,
+                            ProgressBarUnitSring = "K",//鍒囨崲鍗曚綅
+                        };
+                        completeView.Show(2).AddChidren(horizontalSeekBarVol);
+                        EventHandler<int> progressclick = (sender, e) =>
+                        {
+                            selectedDeviceStatus = "8";
+                            var lightbrightnessvalue = 1000000 / (100 * horizontalSeekBarVol.Progress);
+                            Send.dictionary(brightnessDictionary, "Data1", lightbrightnessvalue.ToString());
+                            DicValue("8", brightnessDictionary);
+                            status = horizontalSeekBarVol.Progress.ToString() + "K";
+                        };
+                        horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
+                        horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
+
+
+                        if (TaskList != null && TaskList.Count != 0)
+                        {
+                            foreach (var value in TaskList)
+                            {
+                                if (value["TaskType"] == "8")
+                                {
+                                    var intvalue = int.Parse(value["Data1"]);
+                                    var lightbrightnessvalue = 1000000 / (intvalue * 100);
+                                    horizontalSeekBarVol.Progress = lightbrightnessvalue;
+                                    break;
+                                }
+
+                            }
+                        }
+                    }
+                    break;
+                case "铚傞福鍣�":
+                    {
+                        Dictionary<string, string> switchDictionary = new Dictionary<string, string>();
+                        Send.dictionary(switchDictionary, "TaskType", "7");
+                        Send.dictionary(switchDictionary, "Data2", "0");
+
+
+                        mFunView openView = new mFunView();
+                        openView.frameLayout.Y = Application.GetRealHeight(140 + 20);
+                        openView.titleBtn.TextID = MyInternationalizationString.open;
+                        completeView.Show(2).AddChidren(openView.Show());
+                        mFunView closeView = new mFunView();
+                        closeView.frameLayout.Y = Application.GetRealHeight(140 + 20 + 160);
+                        closeView.titleBtn.TextID = MyInternationalizationString.close;
+                        completeView.Show(2).AddChidren(closeView.Show());
+                        closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+
+                        ///鐐瑰嚮纭浜嬩欢
+                        openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+                        {
+                            selectedDeviceStatus = "7";
+                            openView.selectedIconBtn.Visible = true;
+                            closeView.selectedIconBtn.Visible = false;
+                            openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            Send.dictionary(switchDictionary, "Data1", "1");//榛樿鍊�
+                            DicValue("7", switchDictionary);
+                            status = Language.StringByID(MyInternationalizationString.open);
+                        };
+
+                        ///鐐瑰嚮鍙栨秷浜嬩欢
+                        closeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+                        {
+                            selectedDeviceStatus = "7";
+                            openView.selectedIconBtn.Visible = false;
+                            closeView.selectedIconBtn.Visible = true;
+                            openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+                            closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
+                            Send.dictionary(switchDictionary, "Data1", "0");//榛樿鍊�
+                            DicValue("7", switchDictionary);
+                            status = Language.StringByID(MyInternationalizationString.close);
+
+                        };
+
+                        if (TaskList != null && TaskList.Count != 0)
+                        {
+                            foreach (var value in TaskList)
+                            {
+                                if (value["TaskType"] == "7")
+                                {
+                                    if (value["Data1"] == "1")
+                                    {
+                                        openView.selectedIconBtn.Visible = true;
+                                        closeView.selectedIconBtn.Visible = false;
+                                    }
+                                    else
+                                    {
+                                        openView.selectedIconBtn.Visible = false;
+                                        closeView.selectedIconBtn.Visible = true;
+                                    }
+                                    break;
+                                }
+
+                            }
+                        }
+                    }
+                    break;
+            }
+            completeView.Btncomplete.MouseUpEventHandler += (sender, e) =>
+            {
+                if (selectedDeviceStatus != "")
+                {
+
+                    flMain.RemoveFromParent();
+                    button.Text = status;
+
+                }
+                else
+                {
+                    if (!edit)
+                    {
+                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+                                    Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
+                                   Language.StringByID(MyInternationalizationString.confrim));
+                        alert.Show();
+                        return;
+                    }
+                    else
+                    {
+                        flMain.RemoveFromParent();
+                    }
+
+                }
+
+            };
+        }
+        public void DicValue(string str, Dictionary<string, string> dictionay)
+        {
+            bool d = false;
+            foreach (var tasks in TaskList)
+            {
+                if (tasks["TaskType"] == str)
+                {
+
+                    TaskList.Remove(tasks);
+                    TaskList.Add(dictionay);
+                    d = true;
+                    break;
+                }
+            }
+            if (!d)
+            {
+                if (TaskList != null)
+                {
+                    TaskList.Add(dictionay);
+                }
+            }
+        }
+    }
+
+}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
index a6cf276..feab18b 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
@@ -460,7 +460,6 @@
                     var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
                     this.AddChidren(flMain);
                     CurrentDeviceState.CurrentDeviceView(flMain, common, false, IfType);
-
                 };
                 deviceFramelayout.MouseUpEventHandler += devicclick;
                 bjFramelayout.MouseUpEventHandler += devicclick;
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs
index 9493372..a4001f1 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs
@@ -123,7 +123,7 @@
             btnColorBack.X = Application.GetRealWidth(266);
             btnColorBack.Y = btnColorView.Y + btnColorView.Height / 2 - HdlControlLogic.Current.GetPictrueRealSize(20) / 2;
             frameWhiteBack.AddChidren(btnColorBack);
-            //杩涘害鏉�(+60鐨勫亸绉婚噺,鑹叉俯鐨勮寖鍥存槸 3400~6000)
+            //杩涘害鏉�(+60鐨勫亸绉婚噺,鑹叉俯鐨勮寖鍥存槸 3000~6000)
             this.seekBarColor = new SeekBarControl(611 + 120);
             seekBarColor.Y = btnLightLine.Bottom + Application.GetRealHeight(58);
             seekBarColor.X = Application.GetRealWidth(266 - 60);
@@ -137,12 +137,12 @@
             seekBarColor.ProgressTextColor = UserCenterColor.Current.TextGrayColor2;
             seekBarColor.Gravity = Gravity.Frame;
             seekBarColor.ProgressBarUnitSring = "K";
-            seekBarColor.MinValue = 34;
+            seekBarColor.MinValue = 30;
             seekBarColor.MaxValue = 60;
             frameWhiteBack.AddChidren(seekBarColor);
             //璁剧疆鍒濆鍊�
             int colorValue = ((ColorTemperatureLight)this.device).ColorTemperature;
-            if (colorValue == 0) { colorValue = 3400; }
+            if (colorValue == 0) { colorValue = 3000; }
             seekBarColor.Progress = colorValue / 100;
 
             //铚傞福鍣ㄥ紑鍏筹細
@@ -288,7 +288,8 @@
                     if (nowColorValue != oldColorValue)
                     {
                         oldColorValue = nowColorValue;
-                        ((ColorTemperatureLight)this.device).SetColorTemperature(oldColorValue * 100);
+                        int value = 1000000 / (oldColorValue * 100);
+                        ((ColorTemperatureLight)this.device).SetColorTemperature(value);
                     }
                 }
                 if (this.canSetProgressValue == true)
@@ -302,7 +303,8 @@
                     if (nowColorValue != oldColorValue)
                     {
                         //鍙戦�佽壊娓╁��
-                        ((ColorTemperatureLight)this.device).SetColorTemperature(nowColorValue * 100);
+                        int value = 1000000 / (nowColorValue * 100);
+                        ((ColorTemperatureLight)this.device).SetColorTemperature(value);
                     }
                 }
             });
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs
index f216dfe..b436761 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs
@@ -17,6 +17,10 @@
         /// </summary>
         private List<ButtonBase> listControl = new List<ButtonBase>();
         /// <summary>
+        /// 鐣岄潰涓婂彲浠ユ搷浣滅殑鎺т欢
+        /// </summary>
+        private List<FrameLayout> listFrameLayout = new List<FrameLayout>();
+        /// <summary>
         /// 鎺т欢
         /// </summary>
         private PMSensor pMSensor = null;
@@ -72,24 +76,29 @@
             btnHumidityText.TextAlignment = TextAlignment.Center;
             frameHumidityPic.AddChidren(btnHumidityText);
 
-            //婀垮害鏁版嵁 
-            var btnHumidityStatus = new NormalViewControl(193, 92, true);
-            btnHumidityStatus.Y = Application.GetRealHeight(181);
+            //婀垮害鏂囨湰瀹瑰櫒
+            var frameHumidityTextFrameLayout = new FrameLayout();
+            frameHumidityTextFrameLayout.Gravity = Gravity.CenterHorizontal;
+            frameHumidityTextFrameLayout.Y = Application.GetRealHeight(113);
+            frameHumidityTextFrameLayout.Height = Application.GetRealHeight(160);
+            frameHumidityPic.AddChidren(frameHumidityTextFrameLayout);
+
+            //婀垮害鏁版嵁
+            var btnHumidityStatus = new NormalViewControl(193, 160, true);
             btnHumidityStatus.Text = "20";
             btnHumidityStatus.TextSize = 30;
             btnHumidityStatus.TextColor = ZigbeeColor.Current.XMWhite;
-            btnHumidityStatus.TextAlignment = TextAlignment.CenterRight;
-            frameHumidityPic.AddChidren(btnHumidityStatus);
+            btnHumidityStatus.TextAlignment = TextAlignment.BottomRight;
+            frameHumidityTextFrameLayout.AddChidren(btnHumidityStatus);
 
             //婀垮害鍗曚綅
-            var btnHumidityUnit = new NormalViewControl(60, 40, true);
-            btnHumidityUnit.Y = Application.GetRealHeight(181 + 46);
+            var btnHumidityUnit = new NormalViewControl(50, 140, true);
             btnHumidityUnit.X = btnHumidityStatus.Right;
             btnHumidityUnit.Text = "%";
             btnHumidityUnit.TextSize = 14;
             btnHumidityUnit.TextColor = ZigbeeColor.Current.XMWhite;
-            btnHumidityUnit.TextAlignment = TextAlignment.CenterLeft;
-            frameHumidityPic.AddChidren(btnHumidityUnit);
+            btnHumidityUnit.TextAlignment = TextAlignment.BottomLeft;
+            frameHumidityTextFrameLayout.AddChidren(btnHumidityUnit);
 
             //娓╁害瀹瑰櫒
             var frameTemperaturePic = new FrameLayout();
@@ -108,24 +117,29 @@
             btnTemperatureText.TextAlignment = TextAlignment.Center;
             frameTemperaturePic.AddChidren(btnTemperatureText);
 
+            // 娓╁害鏂囨湰瀹瑰櫒
+            var frameTemperatureTextFrameLayout = new FrameLayout();
+            frameTemperatureTextFrameLayout.Gravity = Gravity.CenterHorizontal;
+            frameTemperatureTextFrameLayout.Y = Application.GetRealHeight(113);
+            frameTemperatureTextFrameLayout.Height = Application.GetRealHeight(160);
+            frameTemperaturePic.AddChidren(frameTemperatureTextFrameLayout);
+
             //娓╁害鏁版嵁
-            var btnTemperatureStatus = new NormalViewControl(193, 92, true);
-            btnTemperatureStatus.Y = Application.GetRealHeight(181);
+            var btnTemperatureStatus = new NormalViewControl(193, 160, true);
             btnTemperatureStatus.Text = "20";
             btnTemperatureStatus.TextSize = 30;
             btnTemperatureStatus.TextColor = ZigbeeColor.Current.XMWhite;
-            btnTemperatureStatus.TextAlignment = TextAlignment.CenterRight;
-            frameTemperaturePic.AddChidren(btnTemperatureStatus);
+            btnTemperatureStatus.TextAlignment = TextAlignment.BottomRight;
+            frameTemperatureTextFrameLayout.AddChidren(btnTemperatureStatus);
 
             //娓╁害鍗曚綅
-            var btnTemperatureUnit = new NormalViewControl(50, 40, true);
-            btnTemperatureUnit.Y = Application.GetRealHeight(181 + 46);
+            var btnTemperatureUnit = new NormalViewControl(50, 140, true);
             btnTemperatureUnit.X = btnTemperatureStatus.Right;
             btnTemperatureUnit.Text = "鈩�";
             btnTemperatureUnit.TextSize = 14;
             btnTemperatureUnit.TextColor = ZigbeeColor.Current.XMWhite;
-            btnTemperatureUnit.TextAlignment = TextAlignment.CenterLeft;
-            frameTemperaturePic.AddChidren(btnTemperatureUnit);
+            btnTemperatureUnit.TextAlignment = TextAlignment.BottomLeft;
+            frameTemperatureTextFrameLayout.AddChidren(btnTemperatureUnit);
 
             //PM2.5浼犳劅鍣ㄧ殑PM2.5瀹瑰櫒
             var framePmPic = new FrameLayout();
@@ -144,24 +158,29 @@
             btnPmText.TextAlignment = TextAlignment.Center;
             framePmPic.AddChidren(btnPmText);
 
+            // PM2.5鏂囨湰瀹瑰櫒
+            var framePmTextFrameLayout = new FrameLayout();
+            framePmTextFrameLayout.Y = Application.GetRealHeight(113);
+            framePmTextFrameLayout.Gravity = Gravity.CenterHorizontal;
+            framePmTextFrameLayout.Height = Application.GetRealHeight(160);
+            framePmPic.AddChidren(framePmTextFrameLayout);
+
             //PM2.5鏁版嵁
-            var btnPmStatus = new NormalViewControl(162, 92, true);
-            btnPmStatus.Y = Application.GetRealHeight(181);
+            var btnPmStatus = new NormalViewControl(162, 160, true);
             btnPmStatus.Text = "155";
             btnPmStatus.TextSize = 30;
             btnPmStatus.TextColor = ZigbeeColor.Current.XMWhite;
-            btnPmStatus.TextAlignment = TextAlignment.CenterRight;
-            framePmPic.AddChidren(btnPmStatus);
+            btnPmStatus.TextAlignment = TextAlignment.BottomRight;
+            framePmTextFrameLayout.AddChidren(btnPmStatus);
 
-            //PM2.5鍗曚綅  锛堢4涓紝listControl銆�3銆戯級 
-            var btnPmUnit = new NormalViewControl(144, 48, true);
-            btnPmUnit.Y = Application.GetRealHeight(181 + 41);
+            //PM2.5鍗曚綅  锛堢4涓紝listControl銆�3銆戯級
+            var btnPmUnit = new NormalViewControl(144, 148, true);
             btnPmUnit.X = btnPmStatus.Right;
             btnPmUnit.Text = "渭g/m鲁";
             btnPmUnit.TextSize = 14;
             btnPmUnit.TextColor = ZigbeeColor.Current.XMWhite;
-            btnPmUnit.TextAlignment = TextAlignment.CenterLeft;
-            framePmPic.AddChidren(btnPmUnit);
+            btnPmUnit.TextAlignment = TextAlignment.BottomLeft;
+            framePmTextFrameLayout.AddChidren(btnPmUnit);
 
             this.listControl.Add(btnHumidityStatus);//锛堢1涓紝listControl銆�0銆戯級
             this.listControl.Add(btnTemperatureStatus);//锛堢2涓紝listControl銆�1銆戯級
@@ -169,7 +188,9 @@
             this.listControl.Add(btnPmUnit);//锛堢4涓紝listControl銆�3銆戯級
             this.listControl.Add(btnHumidityUnit);//锛堢5涓紝listControl銆�4銆戯級
             this.listControl.Add(btnTemperatureUnit);//锛堢6涓紝listControl銆�5銆戯級
-
+            this.listFrameLayout.Add(frameHumidityTextFrameLayout);//锛堢1涓紝listControl銆�0銆戯級
+            this.listFrameLayout.Add(frameTemperatureTextFrameLayout);//锛堢2涓紝listControl銆�1銆戯級
+            this.listFrameLayout.Add(framePmTextFrameLayout);//锛堢3涓紝listControl銆�2銆戯級
         }
         #endregion
 
@@ -254,40 +275,19 @@
             //璁剧疆鐘舵�佹枃瀛�
             var curText = Language.StringByID(R.MyInternationalizationString.AirQuality) + QuailityType();
             this.SetStatuText(curText);
-
-
-            if (pMSensor.currentHumidity <= 9 && pMSensor.currentHumidity >= 0)
-            {
-                this.listControl[0].Width = Application.GetRealWidth(168);
-                this.listControl[4].X = this.listControl[0].Right;
-            }
-            else if (pMSensor.currentHumidity < 100 && pMSensor.currentHumidity >= 10)
-            {
-                this.listControl[0].Width = Application.GetRealWidth(184);
-                this.listControl[4].X = this.listControl[0].Right;
-            }
-            else
-            {
-                this.listControl[0].Width = Application.GetRealWidth(188 + 30);
-                this.listControl[4].X = this.listControl[0].Right;
-            }
-
-            if (pMSensor.currentTemperature <= 9 && pMSensor.currentTemperature >= 0)
-            {
-                this.listControl[1].Width = Application.GetRealWidth(168);
-                this.listControl[5].X = this.listControl[1].Right;
-            }
-            else if (pMSensor.currentTemperature < 100 && pMSensor.currentTemperature >= 10)
-            {
-                this.listControl[1].Width = Application.GetRealWidth(190);
-                this.listControl[5].X = this.listControl[1].Right;
-            }
-            else
-            {
-                this.listControl[1].Width = Application.GetRealWidth(188 + 30);
-                this.listControl[5].X = this.listControl[1].Right;
-            }
-
+            this.listControl[0].Width = this.listControl[0].GetRealWidthByText();
+            this.listControl[4].X = this.listControl[0].Right;
+            this.listControl[1].Width = this.listControl[1].GetRealWidthByText();
+            this.listControl[5].X = this.listControl[1].Right;
+            this.listControl[2].Width = this.listControl[2].GetRealWidthByText();
+            this.listControl[3].X = this.listControl[2].Right;
+            this.listControl[3].Width = this.listControl[3].GetRealWidthByText();
+            this.listFrameLayout[0].Width = this.listControl[0].Width + this.listControl[4].Width;
+            this.listFrameLayout[1].Width = this.listControl[1].Width + this.listControl[5].Width;
+            this.listFrameLayout[2].Width = this.listControl[2].Width + this.listControl[3].Width;
+            this.listFrameLayout[0].Gravity = Gravity.CenterHorizontal;
+            this.listFrameLayout[1].Gravity = Gravity.CenterHorizontal;
+            this.listFrameLayout[2].Gravity = Gravity.CenterHorizontal;
         }
 
         /// <summary>
@@ -300,70 +300,34 @@
             if (pMSensor.currentPmData <= 35 && pMSensor.currentPmData >= 0)
             {
                 curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
-
-                if (pMSensor.currentPmData < 10)
-                {
-                    this.listControl[2].Width = Application.GetRealWidth(125);
-                    this.listControl[3].X = this.listControl[2].Right;
-                }
-                else
-                {
-                    this.listControl[2].Width = Application.GetRealWidth(145);
-                    this.listControl[3].X = this.listControl[2].Right;
-                }
             }
-
             else if (pMSensor.currentPmData <= 75 && pMSensor.currentPmData > 35)
             {
                 curQuality = Language.StringByID(R.MyInternationalizationString.GoodAirQuality);
-                this.listControl[2].Width = Application.GetRealWidth(145);
-                this.listControl[3].X = this.listControl[2].Right;
             }
             else if (pMSensor.currentPmData <= 115 && pMSensor.currentPmData > 75)
             {
                 curQuality = Language.StringByID(R.MyInternationalizationString.LightPollution);
-
-                if (pMSensor.currentPmData < 100)
-                {
-                    this.listControl[2].Width = Application.GetRealWidth(145);
-                    this.listControl[3].X = this.listControl[2].Right;
-                }
-                else
-                {
-                    this.listControl[2].Width = Application.GetRealWidth(162);
-                    this.listControl[3].X = this.listControl[2].Right;
-                }
             }
             else if (pMSensor.currentPmData <= 150 && pMSensor.currentPmData > 115)
             {
                 curQuality = Language.StringByID(R.MyInternationalizationString.Moderatelyolluted);
-                this.listControl[2].Width = Application.GetRealWidth(162);
-                this.listControl[3].X = this.listControl[2].Right;
             }
             else if (pMSensor.currentPmData <= 250 && pMSensor.currentPmData > 150)
             {
                 curQuality = Language.StringByID(R.MyInternationalizationString.HeavyPollution);
-                this.listControl[2].Width = Application.GetRealWidth(176);
-                this.listControl[3].X = this.listControl[2].Right;
             }
             else if (pMSensor.currentPmData > 250)
             {
                 curQuality = Language.StringByID(R.MyInternationalizationString.SeriousPollution);
-                this.listControl[2].Width = Application.GetRealWidth(176);
-                this.listControl[3].X = this.listControl[2].Right;
             }
             else
             {
                 curQuality = "";
-                this.listControl[2].Width = Application.GetRealWidth(162);
-                this.listControl[3].X = this.listControl[2].Right;
             }
             //璁剧疆鐘舵�佹枃瀛�
             return curQuality;
         }
         #endregion
-
-
-
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
index 9d9ac37..ca2af89 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
@@ -90,7 +90,7 @@
         private void InitTopFrameLayoutControl()
         {
             //澶撮儴瀹瑰櫒
-            base.topFrameLayout = new FrameLayout();
+            base.topFrameLayout = new NormalFrameLayout();
             topFrameLayout.Y = Application.GetRealHeight(60);
             topFrameLayout.Height = Application.GetRealHeight(127);
             topFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
@@ -255,7 +255,7 @@
             }
 
             //鍔熻兘鍜屽満鏅痓odyView
-            this.bodyFrameLayout = new FrameLayout();
+            this.bodyFrameLayout = new NormalFrameLayout();
             bodyFrameLayout.Y = functionSceneView.Bottom;
             bodyFrameLayout.Height = this.listBodyContr.frameTable.Height - functionSceneView.Bottom;
             bodyFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
diff --git a/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs b/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
index f97e4f8..af70771 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
@@ -22,7 +22,7 @@
         /// <summary>
         /// 鍔熻兘鐨勬甯冩帶浠�
         /// </summary>
-        private FrameLayout DeviceBodyTableControl = null;
+        private NormalFrameLayout DeviceBodyTableControl = null;
         /// <summary>
         /// 鍦烘櫙鐨勫垪琛ㄦ帶浠�
         /// </summary>
@@ -34,7 +34,7 @@
         /// <summary>
         /// 鍦烘櫙鐨勬甯冩帶浠�
         /// </summary>
-        private FrameLayout SceneBodyTableControl = null;
+        private NormalFrameLayout SceneBodyTableControl = null;
         /// <summary>
         /// 鍏ㄩ�夋帶浠�
         /// </summary>
@@ -98,12 +98,12 @@
             bodyFrameLayout.AddChidren(tabControl);
 
             //鍒濆鍖栧満鏅甯�
-            this.SceneBodyTableControl = new FrameLayout();
+            this.SceneBodyTableControl = new NormalFrameLayout();
             SceneBodyTableControl.Y = tabControl.Bottom;
             SceneBodyTableControl.Height = bodyFrameLayout.Height - tabControl.Bottom;
             bodyFrameLayout.AddChidren(SceneBodyTableControl);
             //鍒濆鍖栬澶囨甯�
-            this.DeviceBodyTableControl = new FrameLayout();
+            this.DeviceBodyTableControl = new NormalFrameLayout();
             DeviceBodyTableControl.Y = tabControl.Bottom;
             DeviceBodyTableControl.Height = bodyFrameLayout.Height - tabControl.Bottom;
             bodyFrameLayout.AddChidren(DeviceBodyTableControl);
diff --git a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundControlContentForm.cs b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundControlContentForm.cs
index 121602e..dd55a25 100755
--- a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundControlContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundControlContentForm.cs
@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using Shared.Common;
 using Shared.Phone.UserCenter.SmartSound.Util;
+using Shared.Phone.UserCenter.SmartSound.Widget;
 using ZigBee.Device;
 
 namespace Shared.Phone.UserCenter.SmartSound.Forms
@@ -22,8 +23,15 @@
         private VerticalListControl listView = null;
         
         private FrameLayout contentLayout = null;
-        public int CurrentIndex = 0;
+        /// <summary>
+        /// 褰撳墠妤煎眰鐨勭储寮�
+        /// </summary>
+        public int CurrentIndex = 0;
         private BottomClickButton bottomClickButton = null;
+        /// <summary>
+        /// 褰撳墠妤煎眰鐨勫悕绉�
+        /// </summary>
+        private static NormalViewControl pullLayoutText = null;
 
         public SmartSoundControlContentForm(SmartSoundInfo.SoundInfo soundInfo)            
         {
@@ -64,31 +72,57 @@
             bottomClickButton.Text = "纭";
             bottomClickButton.ButtonClickEvent += (sender, e) =>
             {
-                HdlThreadLogic.Current.RunThread(async () =>
+                if (SmartSound.getInstantiate().LayerList != null && SmartSound.getInstantiate().LayerList.Count > 0)
                 {
-                    this.ShowProgressBar();
-                    //淇濆瓨鏁版嵁
-                    if (SmartSound.getInstantiate().LayerList == null)
-                        SmartSound.getInstantiate().LayerList = new List<SmartSound.Layer>();
+                    //鐢熸垚涓�涓脊绐楃敾闈�
+                    var dialogForm = new TextDialog("纭鍒犻櫎鐜版湁鎴块棿鍒楄〃鐨勬墍鏈夋帶鍒跺唴瀹癸紝娣诲姞鍏ㄦ柊鐨勫満鏅拰鍔熻兘锛�", "纭");
+                    dialogForm.SetTitleText("鎻愮ず");
 
-                    SmartSound.getInstantiate().LayerList.Clear();
-                    SmartSound.getInstantiate().LayerList = CollateData();
-                    SmartSound.getInstantiate().TokenID = mSoundInfo.Id;
-                    SmartSound.getInstantiate().UserID = mSoundInfo.UserID;
-                    SmartSound.getInstantiate().HomeID = mSoundInfo.HomeID;
-
-                    //涓婁紶鏁版嵁鍒版湇鍔″櫒
-                    string str = await postBatchEdit();
-                    CloseProgressBar();
-
-                    HdlThreadLogic.Current.RunMainInThread(() =>
+                    //鎸変笅纭鎸夐挳
+                    dialogForm.ComfirmClickEvent += () =>
                     {
-                        CloseForm();
-                    });
-                });
+                        //鐢婚潰鍏抽棴
+                        dialogForm.CloseDialog();
+                        uploadData();
+                    };
+                }
+                else
+                {
+                    uploadData();
+                }
+               
             };
 
             bottomClickButton.Visible = false;
+        }
+
+        /// <summary>
+        /// 鎻愪氦鏁版嵁鍒版湇鍔″櫒
+        /// </summary>
+        private void uploadData()
+        {
+            HdlThreadLogic.Current.RunThread(async () =>
+            {
+                this.ShowProgressBar();
+                //淇濆瓨鏁版嵁
+                if (SmartSound.getInstantiate().LayerList == null)
+                    SmartSound.getInstantiate().LayerList = new List<SmartSound.Layer>();
+
+                SmartSound.getInstantiate().LayerList.Clear();
+                SmartSound.getInstantiate().LayerList = CollateData();
+                SmartSound.getInstantiate().TokenID = mSoundInfo.Id;
+                SmartSound.getInstantiate().UserID = mSoundInfo.UserID;
+                SmartSound.getInstantiate().HomeID = mSoundInfo.HomeID;
+
+                //涓婁紶鏁版嵁鍒版湇鍔″櫒
+                string str = await postBatchEdit();
+                CloseProgressBar();
+
+                HdlThreadLogic.Current.RunMainInThread(() =>
+                {
+                    CloseForm();
+                });
+            });
         }
 
         private void LoadAllRoomListView()
@@ -109,6 +143,7 @@
                     listView.Height = bodyFrameLayout.Height- Application.GetRealHeight(173);                    
                 }
 
+                pullLayoutText.Text = layer.LayerName;
                 listView.RemoveAll();
 
                 foreach(SmartSound.Room room in layer.RoomList)
@@ -332,7 +367,6 @@
             if (tempLayer == null) return;
 
           
-
             #region 娣诲姞妤煎眰
 
             bool floor_exists = false;
@@ -536,21 +570,21 @@
                 right_icon.ButtonClickEvent += (sender, e) =>
                 {
                     ShowPullList();
-                };
-
-                var layout = this.AddMostRightView(Layers[smartSoundDataAdd.CurrentIndex].LayerName, 300, false);                
-                layout.Name = "pullLayout";
-                layout.ButtonClickEvent += (sender, e) =>
+                };
+
+                pullLayoutText = this.AddMostRightView(Layers[smartSoundDataAdd.CurrentIndex].LayerName, 300, false);
+                pullLayoutText.Name = "pullLayout";
+                pullLayoutText.ButtonClickEvent += (sender, e) =>
                 {
                     ShowPullList();
                 };
+                pullLayoutText.Text = Layers[smartSoundDataAdd.CurrentIndex].LayerName;
 
                 if (Layers.Count == 1)
                 {
                     right_icon.Visible = false;
-                    layout.Visible = false;
-                }
-                
+                    pullLayoutText.Visible = false;
+                }                
             }
 
             private void ShowPullList()
@@ -558,14 +592,16 @@
                 //鎴块棿鍒楄〃琛寋鎴块棿鍒楄〃 textView锛屾ゼ灞備笅鎷夌獥}
                 //鏄剧ず鎴块棿{甯﹂�夋嫨妗嗙殑锛涘綋閫変腑浜嗘埧闂村悗闇�瑕佸湪搴曢儴寮瑰嚭纭鎸夐挳锛岀偣鍑荤‘璁よ烦杞埌鏂扮殑鐣岄潰}
                 var pull_frame = new TopRightMenuControl(Layers.Count, 2);
+                
                 pull_frame.Y = this.Height;
 
                 for (int i = 0; i < Layers.Count; i++)
                 {
+                    int index = i;
                     //鍒涘缓妤煎眰
                     pull_frame.AddRowMenu(Layers[i].LayerName, "Item/CreatFloor.png", "Item/CreatFloorSelected.png", () =>
                     {
-                        smartSoundDataAdd.CurrentIndex = i;
+                        smartSoundDataAdd.CurrentIndex = index;
                         smartSoundDataAdd.LoadAllRoomListView();
                     });
                 }
diff --git a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundControlForm.cs b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundControlForm.cs
index f85422e..f156c91 100755
--- a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundControlForm.cs
+++ b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundControlForm.cs
@@ -22,9 +22,17 @@
         public int CurrentIndex = 0;
         private MostRightIconControl btnAddDeviceIcon = null;
         /// <summary>
+        /// 褰撳墠妤煎眰鐨勫悕绉�
+        /// </summary>
+        private static NormalViewControl pullLayoutText = null;
+        /// <summary>
         ///  鏅鸿兘闊崇鏁版嵁
         /// </summary>
         private static SmartSoundInfo.SoundInfo mSoundInfo = null;
+        /// <summary>
+        /// 妤煎眰鎺т欢
+        /// </summary>
+        private MyPullControl myPullControl;
 
         public SmartSoundControlForm(SmartSoundInfo.SoundInfo soundInfo)
         {
@@ -83,6 +91,7 @@
                     if (SmartSound.getInstantiate().LayerList == null || SmartSound.getInstantiate().LayerList.Count < 1)
                     {
                         this.CloseProgressBar();
+                        this.ShowNotDataImage(this.bodyFrameLayout, new string[] { "杩樻病鏈夋帶鍒跺唴瀹瑰摝锛�", "鐐瑰嚮\"+\"娣诲姞" });
                         return;
                     }
 
@@ -90,35 +99,35 @@
                     this.bodyFrameLayout.AddChidren(contentLayout);
                     contentLayout.RemoveAll();
 
-                    var pullLayout = new MyPullControl(this, SmartSound.getInstantiate().LayerList);
-                    contentLayout.AddChidren(pullLayout);
-                    pullLayout.InitControl();
+                    myPullControl = new MyPullControl(this, SmartSound.getInstantiate().LayerList);
+                    contentLayout.AddChidren(myPullControl);
+                    myPullControl.InitControl();
 
                     LoadAllRoomListView();
-
-                    //鏃犳暟鎹殑鏃跺�欒鍋氫竴涓彁绀�
-                    {
-                        bool bol = false;
-                        for (int i = 0; i < SmartSound.getInstantiate().LayerList.Count; i++)
-                        {
-                            if (SmartSound.getInstantiate().LayerList[i].RoomList.Count > 0)
-                            {
-                                bol = true;
-                                break;
-                            }
-                        }
-
-                        if (!bol)
-                        {
-                            pullLayout.Visible = false;
-                            this.ShowNotDataImage(this.bodyFrameLayout, new string[] { "杩樻病鏈夋帶鍒跺唴瀹瑰摝锛�", "鐐瑰嚮\"+\"娣诲姞" });
-                        }
-                    }
-
+                    
                     this.CloseProgressBar();
 
                 });
             });
+        }
+
+
+        /// <summary>
+        /// 鍒ゆ柇鏄惁鏈夋暟鎹�
+        /// </summary>
+        /// <returns></returns>
+        private bool HaveData()
+        {
+            bool bol = false;
+            for (int i = 0; i < SmartSound.getInstantiate().LayerList.Count; i++)
+            {
+                if (SmartSound.getInstantiate().LayerList[i].RoomList.Count > 0)
+                {
+                    bol = true;
+                    break;
+                }
+            }
+            return bol;
         }
 
         /// <summary>
@@ -148,9 +157,9 @@
                     listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(173);
                 }
 
-                listView.RemoveAll();
-
                 SmartSound.Layer layer = SmartSound.getInstantiate().LayerList[CurrentIndex];
+                pullLayoutText.Text = layer.LayerName;
+                listView.RemoveAll();                               
 
                 foreach (SmartSound.Room room in layer.RoomList)
                 {
@@ -170,6 +179,13 @@
                         var delBtn = sender as NormalViewControl;
                         DelectRoom(delBtn);
                     };
+                }
+
+                if (!HaveData())
+                {
+                    SmartSound.getInstantiate().LayerList.Clear();
+                    myPullControl.Visible = false;
+                    this.ShowNotDataImage(this.bodyFrameLayout, new string[] { "杩樻病鏈夋帶鍒跺唴瀹瑰摝锛�", "鐐瑰嚮\"+\"娣诲姞" });
                 }
             }
             catch (Exception e)
@@ -223,9 +239,9 @@
         }
 
         private async Task<string> GetData()
-        {
-            // 浠庢湇鍔″櫒鑾峰彇鏁版嵁
-            string url = string.Format("https://developer.hdlcontrol.com/zigbeespeakerservice/BatchEdit?Platform&UserID={0}&TokenID={1}", mSoundInfo.UserID, mSoundInfo.Id);
+        {
+            // 浠庢湇鍔″櫒鑾峰彇鏁版嵁
+            string url = string.Format("https://developer.hdlcontrol.com/zigbeespeakerservice/BatchEdit?Platform&UserID={0}&TokenID={1}&HomeID={2}", mSoundInfo.UserID, mSoundInfo.Id,mSoundInfo.HomeID);
             return await MyHttpWebResponse.GetWebRequest(url);
         }
 
@@ -291,19 +307,19 @@
                     right_icon.ButtonClickEvent += (sender, e) =>
                     {
                         ShowPullList();
-                    };
-                   
-                    var layout = this.AddMostRightView(Layers[smartSoundControlData.CurrentIndex].LayerName, 300, false);
-                    layout.Name = "pullLayout";
-                    layout.ButtonClickEvent += (sender, e) =>
+                    };
+
+                    pullLayoutText = this.AddMostRightView(Layers[smartSoundControlData.CurrentIndex].LayerName, 300, false);
+                    pullLayoutText.Name = "pullLayout";
+                    pullLayoutText.ButtonClickEvent += (sender, e) =>
                     {
                         ShowPullList();
                     };
-
+                    pullLayoutText.Text = Layers[smartSoundControlData.CurrentIndex].LayerName;
                     if (SmartSound.getInstantiate().LayerList.Count < 2)
                     {
                         right_icon.Visible = false;
-                        layout.Visible = false;
+                        pullLayoutText.Visible = false;
                     }
                 }
                 catch(Exception e)
@@ -321,10 +337,11 @@
 
                 for (int i = 0; i < Layers.Count; i++)
                 {
+                    int index = i;
                     //鍒涘缓妤煎眰
                     pull_frame.AddRowMenu(Layers[i].LayerName, "Item/CreatFloor.png", "Item/CreatFloorSelected.png", () =>
                     {
-                        smartSoundControlData.CurrentIndex = i;
+                        smartSoundControlData.CurrentIndex = index;
                         smartSoundControlData.LoadAllRoomListView();
                     });
                 }
diff --git a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundListForm.cs b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundListForm.cs
index 5b1441d..ce3bca1 100755
--- a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundListForm.cs
+++ b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundListForm.cs
@@ -60,7 +60,7 @@
             helpBtn.MouseUpEventHandler += (sernder, e) =>
             {
                 //鐢熸垚涓�涓脊绐楃敾闈�
-                var dialogForm = new TextDialog("缁戝畾鏅鸿兘闊崇鍒扮涓夋柟 APP 杩涜鎿嶄綔", "璺宠浆鑷冲皬搴�");
+                var dialogForm = new TextDialog("缁戝畾鏅鸿兘闊崇鍒扮涓夋柟 APP 杩涜鎿嶄綔", "璺宠浆鑷冲皬搴PP");
                 dialogForm.SetTitleText("甯姪");
 
                 //鎸変笅纭鎸夐挳
@@ -68,6 +68,7 @@
                 {
                     //鐢婚潰鍏抽棴
                     dialogForm.CloseDialog();
+                    OpenXiaoDuAPP();
                 };
             };
         }
@@ -122,8 +123,8 @@
                     this.CloseProgressBar();
                 });                
             });           
-        }
-       
+        }
+       
         /// <summary>
         /// 鑾峰彇闊崇鍒楄〃
         /// </summary>
@@ -227,18 +228,48 @@
             }
         }
 
+        private void OpenXiaoDuAPP()
+        {
+            bool bol = false;
+            try
+            {
+#if Android
+                bol = HDLUtils.OpenAppWithPackageName("com.baidu.duer.superapp");
+#else                
+                bol=HDLUtils.OpenApp("xiaoduapp://");
+#endif
+
+                if (!bol)
+                {
+#if Android
+                    HDLUtils.OpenUrl("market://details?id=com.baidu.duer.superapp");
+#else
+                HDLUtils.OpenUrl("https://apps.apple.com/cn/app/%E5%B0%8F%E5%BA%A6/id1437733193");
+#endif
+                }
+            }
+            catch (Exception e)
+            {
+                string error = e.Message;
+                bol = false;
+            }
+        }
+
         /// <summary>
         /// 瑙i櫎缁戝畾寮圭獥
         /// </summary>
         private void ShowDelectDialog(SmartSoundInfo.SoundInfo smartSound)
         {
             //鐢熸垚涓�涓脊绐楃敾闈�
-            var dialogForm = new TextDialog("瑙i櫎缁戝畾闇�瑕佸埌绗笁鏂� APP 杩涜鎿嶄綔", "璺宠浆鑷冲皬搴�");
+            var dialogForm = new TextDialog("瑙i櫎缁戝畾闇�瑕佸埌绗笁鏂� APP 杩涜鎿嶄綔", "璺宠浆鑷冲皬搴PP");
             dialogForm.SetTitleText("瑙i櫎缁戝畾");
 
             //鎸変笅纭鎸夐挳
             dialogForm.ComfirmClickEvent += () =>
-            {
+            {
+                OpenXiaoDuAPP();
+
+                /*
                 HdlThreadLogic.Current.RunThread(() =>
                 {
                     this.ShowProgressBar("鍒犻櫎鏈嶅姟鍣ㄨ褰�...");
@@ -253,27 +284,10 @@
                     {
                         //鐢婚潰鍏抽棴
                         dialogForm.CloseDialog();
-                        bool bol = false;
-                        try
-                        {
-#if Android
-                            bol = HDLUtils.OpenAppWithPackageName("com.baidu.duer.superapp");
-#else
-                            HDLUtils.OpenApp("xiaoduapp://");
-#endif
-                        }
-                        catch (Exception e)
-                        {
-                            string error = e.Message;
-                            bol = false;
-                        }
-                        if (!bol)
-                        {
-                            this.ShowMassage(ShowMsgType.Tip, "鎵撳紑APP澶辫触");
-                        }
+                        OpenXiaoDuAPP();
                         iniView();
                     });
-                });
+                });*/
             };
         }
         /// <summary>
@@ -293,7 +307,6 @@
             //鎸変笅纭鎸夐挳
             dialogForm.ComfirmClickEvent += (async (textValue) =>
             {
-
                 //鐢婚潰鍏抽棴
                 dialogForm.CloseDialog();
 
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/FrameLayoutBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/FrameLayoutBase.cs
index 24b5d62..8f12071 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/FrameLayoutBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/FrameLayoutBase.cs
@@ -101,6 +101,17 @@
             }
         }
 
+        /// <summary>
+        /// 鈽嗏槅绉婚櫎鍏ㄩ儴鎺т欢鈽嗏槅
+        /// </summary>
+        public override void RemoveAll()
+        {
+            if (this.Parent != null)
+            {
+                base.RemoveAll();
+            }
+        }
+
         #endregion
 
         #region 鈻� Log鍑哄姏____________________________
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/RowLayoutBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/RowLayoutBase.cs
index b911db3..05bbfb4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/RowLayoutBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/RowLayoutBase.cs
@@ -43,6 +43,17 @@
             }
         }
 
+        /// <summary>
+        /// 鈽嗏槅绉婚櫎鍏ㄩ儴鎺т欢鈽嗏槅
+        /// </summary>
+        public override void RemoveAll()
+        {
+            if (this.Parent != null)
+            {
+                base.RemoveAll();
+            }
+        }
+
         #endregion
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
index 5dd649b..651a4ed 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
@@ -7,7 +7,7 @@
     /// <summary>
     /// 瀹夐槻绠$悊涓婚〉鐨勬帶浠�
     /// </summary>
-    public class SafetyMasterControl : FrameLayout
+    public class SafetyMasterControl : NormalFrameLayout
     {
         #region 鈻� 鍙橀噺澹版槑___________________________
 
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs
index 0d4f93f..e887519 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs
@@ -7,7 +7,7 @@
     /// <summary>
     /// 楠岃瘉鐮佹帶浠�
     /// </summary>
-    public class VerificationCodeControl : FrameLayout
+    public class VerificationCodeControl : NormalFrameLayout
     {
         #region 鈻� 鍙橀噺澹版槑___________________________
 
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
index d307b28..fd43d18 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
@@ -18,11 +18,11 @@
         /// <summary>
         /// 妗屽竷鎺т欢
         /// </summary>
-        private FrameLayout m_frameTable = null;
+        private NormalFrameLayout m_frameTable = null;
         /// <summary>
         /// 妗屽竷鎺т欢(杩欎釜涓滆タ涓嶈兘鍒狅紝鍥犱负鏈変簺鐣岄潰闇�瑕佷粬鐨勬甯�)
         /// </summary>
-        public FrameLayout frameTable
+        public NormalFrameLayout frameTable
         {
             get
             {
@@ -65,7 +65,7 @@
             {
                 return;
             }
-            this.m_frameTable = new FrameLayout();
+            this.m_frameTable = new NormalFrameLayout();
             this.m_frameTable.Width = this.Width;
             this.m_frameTable.Height = this.Height;
             base.AddChidren(this.m_frameTable);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
index f67e435..7f5b774 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
@@ -18,11 +18,11 @@
         /// <summary>
         /// 妗屽竷鎺т欢
         /// </summary>
-        private FrameLayout m_frameTable = null;
+        private NormalFrameLayout m_frameTable = null;
         /// <summary>
         /// 妗屽竷鎺т欢
         /// </summary>
-        public FrameLayout frameTable
+        public NormalFrameLayout frameTable
         {
             get
             {
@@ -66,7 +66,7 @@
             {
                 return;
             }
-            this.m_frameTable = new FrameLayout();
+            this.m_frameTable = new NormalFrameLayout();
             this.m_frameTable.Width = this.Width;
             this.m_frameTable.Height = this.Height;
             base.AddChidren(this.m_frameTable);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
index 282f443..b963f10 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
@@ -180,5 +180,31 @@
         }
 
         #endregion
+
+        #region 鈻� 涓�鑸柟娉昣__________________________
+
+        /// <summary>
+        /// 鎺т欢绉婚櫎
+        /// </summary>
+        public override void RemoveFromParent()
+        {
+            if (this.Parent != null)
+            {
+                base.RemoveFromParent();
+            }
+        }
+
+        /// <summary>
+        /// 鈽嗏槅绉婚櫎鍏ㄩ儴鎺т欢鈽嗏槅
+        /// </summary>
+        public override void RemoveAll()
+        {
+            if (this.Parent != null)
+            {
+                base.RemoveAll();
+            }
+        }
+
+        #endregion
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListRefreshControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListRefreshControl.cs
index ba307b5..ca95fac 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListRefreshControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListRefreshControl.cs
@@ -186,5 +186,31 @@
         }
 
         #endregion
+
+        #region 鈻� 涓�鑸柟娉昣__________________________
+
+        /// <summary>
+        /// 鎺т欢绉婚櫎
+        /// </summary>
+        public override void RemoveFromParent()
+        {
+            if (this.Parent != null)
+            {
+                base.RemoveFromParent();
+            }
+        }
+
+        /// <summary>
+        /// 鈽嗏槅绉婚櫎鍏ㄩ儴鎺т欢鈽嗏槅
+        /// </summary>
+        public override void RemoveAll()
+        {
+            if (this.Parent != null)
+            {
+                base.RemoveAll();
+            }
+        }
+
+        #endregion
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
index 601e1bd..b0bca1d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs
@@ -80,6 +80,9 @@
                     //鍙崇澶�
                     this.AddRightArrow();
 
+                    //璇诲彇璁惧鍔熻兘绫诲瀷
+                    this.ReadDeviceFunctionType();
+
                     this.ButtonClickEvent += (sender, e) =>
                     {
                         //鏄剧ず閫夋嫨璁惧鍔熻兘绫诲瀷鐨勭晫闈�
@@ -120,14 +123,34 @@
                 this.Text = selectNo == -1 ? string.Empty : listText[selectNo];
                 nowSelectNo = selectNo + 1;
 
-                //璁板綍璧峰綋鍓嶉�夋嫨鐨勫姛鑳界被鍨�
-                this.RefreshDfunctionType();
+                this.CanClick = false;
+                HdlThreadLogic.Current.RunThread(() =>
+                {
+                    //璁剧疆鍔熻兘绫诲瀷鍒扮綉鍏�
+                    var result = Common.LocalDevice.Current.SendDeviceFunctionTypeToGateway(this.device, (DeviceFunctionType)nowSelectNo);
+                    
+                    HdlThreadLogic.Current.RunMain(() =>
+                    {
+                        if (result == true)
+                        {
+                            //璁板綍璧峰綋鍓嶉�夋嫨鐨勫姛鑳界被鍨�
+                            this.RefreshDfunctionType();
 
-                //璁惧鏀瑰彉鍔熻兘绫诲瀷鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
-                UserView.UserPage.Instance.RefreshForm = true;
+                            //璁惧鏀瑰彉鍔熻兘绫诲瀷鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
+                            UserView.UserPage.Instance.RefreshForm = true;
 
-                //璋冪敤鍥炶皟鍑芥暟
-                this.FinishSelectEvent?.Invoke(nowSelectNo);
+                            //璋冪敤鍥炶皟鍑芥暟
+                            this.FinishSelectEvent?.Invoke(nowSelectNo);
+                        }
+                        else
+                        {
+                            //璁剧疆璁惧鍔熻兘绫诲瀷澶辫触
+                            var alert = new ShowMsgControl(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uSetDeviceFunctionTypeFail));
+                            alert.Show();
+                        }
+                        this.CanClick = true;
+                    });
+                });
             };
         }
         #endregion
@@ -309,5 +332,32 @@
         }
 
         #endregion
+
+        #region 鈻� 璇诲彇璁惧鍔熻兘绫诲瀷___________________
+
+        /// <summary>
+        /// 璇诲彇璁惧鍔熻兘绫诲瀷
+        /// </summary>
+        private void ReadDeviceFunctionType()
+        {
+            HdlThreadLogic.Current.RunThread(() =>
+            {
+                //璇诲彇璁惧鍔熻兘绫诲瀷
+                var info = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(this.device);
+                if (info != null && ((int)this.device.DfunctionType) != info.FunctionType)
+                {
+                    this.device.DfunctionType = (DeviceFunctionType)info.FunctionType;
+                    HdlThreadLogic.Current.RunMain(() =>
+                    {
+                        //鍒锋柊鎺т欢
+                        this.InitDefultData();
+                        //鍒锋柊璁惧鍔熻兘绫诲瀷
+                        this.RefreshDfunctionType();
+                    });
+                }
+            });
+        }
+
+        #endregion
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlCheckLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlCheckLogic.cs
index 86f3969..5252653 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlCheckLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlCheckLogic.cs
@@ -215,14 +215,14 @@
         /// 鎵ц浜屾瀹夊叏楠岃瘉(涓夌楠岃瘉鐨勬爣棰樹娇鐢ㄩ粯璁ゅ�硷細Touch ID楠岃瘉,瀵嗙爜楠岃瘉,鎵嬪娍楠岃瘉)
         /// </summary>
         /// <param name="SuccessAction">濡傛灉璁剧疆鏈夐獙璇佹柟寮�,骞朵笖楠岃瘉鎴愬姛鍚庢墠浼氳皟鐢ㄧ殑鍥炶皟鍑芥暟,涓嶇劧涓嶄細璋冪敤杩欎釜涓滆タ</param>
-        /// <param name="FailAction">濡傛灉瀹屽叏娌℃湁璁剧疆鏈夐獙璇佹柟寮�,鎵嶄細璋冪敤鐨勫洖璋冨嚱鏁�,涓嶇劧涓嶄細璋冪敤杩欎釜涓滆タ(鍙栨秷杈撳叆涓嶄細璋冪敤杩欎釜涓滆タ)</param>
-        public void CheckSecondarySecurity(Action SuccessAction, Action FailAction = null)
+        /// <param name="NotSettionAction">濡傛灉瀹屽叏娌℃湁璁剧疆鏈夐獙璇佹柟寮�,鎵嶄細璋冪敤鐨勫洖璋冨嚱鏁�,涓嶇劧涓嶄細璋冪敤杩欎釜涓滆タ(鍙栨秷杈撳叆涓嶄細璋冪敤杩欎釜涓滆タ)</param>
+        public void CheckSecondarySecurity(Action SuccessAction, Action NotSettionAction = null)
         {
             CheckSecondarySecurity(
                 Language.StringByID(R.MyInternationalizationString.uTouchIDCheck),
                 Language.StringByID(R.MyInternationalizationString.uPasswordAuthentication),
                 Language.StringByID(R.MyInternationalizationString.uGestureAuthentication),
-                SuccessAction, FailAction);
+                SuccessAction, NotSettionAction);
         }
 
         /// <summary>
@@ -232,8 +232,8 @@
         /// <param name="i_PasswordText">瀵嗙爜楠岃瘉鐨勬樉绀烘枃鏈�</param>
         /// <param name="i_GestureText">鎵嬪娍楠岃瘉鐨勬樉绀烘枃鏈�</param>
         /// <param name="SuccessAction">濡傛灉璁剧疆鏈夐獙璇佹柟寮�,骞朵笖楠岃瘉鎴愬姛鍚庢墠浼氳皟鐢ㄧ殑鍥炶皟鍑芥暟,涓嶇劧涓嶄細璋冪敤杩欎釜涓滆タ</param>
-        /// <param name="FailAction">濡傛灉瀹屽叏娌℃湁璁剧疆鏈夐獙璇佹柟寮�,鎵嶄細璋冪敤鐨勫洖璋冨嚱鏁�,涓嶇劧涓嶄細璋冪敤杩欎釜涓滆タ(鍙栨秷杈撳叆涓嶄細璋冪敤杩欎釜涓滆タ)</param>
-        public void CheckSecondarySecurity(string i_TouchText, string i_PasswordText, string i_GestureText, Action SuccessAction, Action FailAction = null)
+        /// <param name="NotSettionAction">濡傛灉瀹屽叏娌℃湁璁剧疆鏈夐獙璇佹柟寮�,鎵嶄細璋冪敤鐨勫洖璋冨嚱鏁�,涓嶇劧涓嶄細璋冪敤杩欎釜涓滆タ(鍙栨秷杈撳叆涓嶄細璋冪敤杩欎釜涓滆タ)</param>
+        public void CheckSecondarySecurity(string i_TouchText, string i_PasswordText, string i_GestureText, Action SuccessAction, Action NotSettionAction = null)
         {
             //鍏堟妸杩欎釜涓滆タ缃┖
             TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = null;
@@ -274,28 +274,28 @@
                     }
                 };
                 TouchIDUtils.Instance.showTouchIDWithDescribe(null, null);
-                FailAction = null;
+                NotSettionAction = null;
             }
             else if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.PswAuthentication) == false)
             {
                 //瀵嗙爜楠岃瘉
                 var form = new PswSecondarySecurityForm();
                 form.AddForm(i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
-                FailAction = null;
+                NotSettionAction = null;
             }
             else if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.GestureAuthentication) == false)
             {
                 //鎵嬪娍楠岃瘉
                 var form = new PswGestureSecirityForm();
                 form.AddForm(i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
-                FailAction = null;
+                NotSettionAction = null;
             }
             else
             {
                 //瀹屽叏娌℃湁璁剧疆鏈変换浣曢獙璇佹柟寮�
                 SuccessAction = null;
-                FailAction?.Invoke();
-                FailAction = null;
+                NotSettionAction?.Invoke();
+                NotSettionAction = null;
             }
         }
 
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
index 21a9022..26ed638 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
@@ -311,7 +311,7 @@
             }
 
             //璁剧疆浣忓畢ID鍒扮綉鍏�
-            bool flage2 = await this.SetHomeIdToGateway(zbGateway, Common.Config.Instance.HomeId);
+            bool flage2 = await this.SetHomeIdToGateway(zbGateway, Common.Config.Instance.HomeId, mode);
             if (flage2 == false)
             {
                 if (mode == ShowErrorMode.YES)
@@ -333,12 +333,12 @@
             if (flage1 == -1)
             {
                 //澶囦唤澶辫触鐨勭綉鍏矷D
-                HdlGatewayLogic.Current.BackupGatewayIdOnNotNetwork(zbGateway);
+                this.BackupGatewayIdOnNotNetwork(zbGateway);
             }
 
             //鏄惁宸茬粡瀛樺湪
             string gwID = zbGateway.GwId;
-            bool isEsist = HdlGatewayLogic.Current.IsGatewayExist(zbGateway);
+            bool isEsist = this.IsGatewayExist(zbGateway);
             if (isEsist == false)
             {
                 //鏂板缓涓�涓櫄鎷熺殑缃戝叧鍑烘潵
@@ -369,9 +369,21 @@
         /// <param name="zbGateway"></param>
         /// <param name="HomeId"></param>
         /// <returns></returns>
-        public async Task<bool> SetHomeIdToGateway(ZbGateway zbGateway, string HomeId)
+        public async Task<bool> SetHomeIdToGateway(ZbGateway zbGateway, string HomeId, ShowErrorMode mode)
         {
-            var info = await zbGateway.GwSetHomeIdAsync(HomeId);
+            ZbGateway realWay = null;
+            if (this.GetRealGateway(ref realWay, zbGateway) == false)
+            {
+                if (mode == ShowErrorMode.YES)
+                {
+                    //閿欒:缃戝叧瀵硅薄涓㈠け
+                    string msg = Language.StringByID(R.MyInternationalizationString.uErrorGatewayLostMsg);
+                    this.ShowTipMsg(msg);
+                }
+                return false;
+            }
+
+            var info = await realWay.GwSetHomeIdAsync(HomeId);
             if (info != null && info.gwSetHomeIdData != null)
             {
                 return true;
@@ -457,7 +469,7 @@
             }
 
             //璁剧疆浣忓畢ID鍒扮綉鍏�
-            bool flage2 = await this.SetHomeIdToGateway(zbGateway, Common.Config.Instance.HomeId);
+            bool flage2 = await this.SetHomeIdToGateway(zbGateway, Common.Config.Instance.HomeId, ShowErrorMode.YES);
             if (flage2 == false)
             {
                 //鍚戠綉鍏宠缃綇瀹匢D澶辫触
@@ -723,7 +735,7 @@
             if (hadReal == true && realWay.GatewayOnlineFlage == true)
             {
                 //娓呯┖缃戝叧鐨勪綇瀹匢D
-                bool result = await this.SetHomeIdToGateway(realWay, string.Empty);
+                bool result = await this.SetHomeIdToGateway(realWay, string.Empty, ShowErrorMode.YES);
                 if (result == false)
                 {
                     //缃戝叧瑙g粦澶辫触  涓嶇悊瀹�,鍥犱负缃戝叧鍙互鎸夋寜閿己鍒舵悳绱㈠緱鍒�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
index 4b198e9..71bc66b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -434,7 +434,8 @@
                         if (locadevice.Type == DeviceType.ColorTemperatureLight)
                         {
                             //姝ゅ睘鎬ц〃鏄庡綋鍓嶈壊娓�
-                            ((ColorTemperatureLight)locadevice).ColorTemperature = report.DeviceStatusReport.AttriBute[0].AttriButeData;
+                            int value = report.DeviceStatusReport.AttriBute[0].AttriButeData != 0 ? 1000000 / report.DeviceStatusReport.AttriBute[0].AttriButeData : 0;
+                            ((ColorTemperatureLight)locadevice).ColorTemperature = value;
                         }
                         //宸茬粡鎺ユ敹鍒扮姸鎬�
                         locadevice.HadReadDeviceStatu = true;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index a5f4373..3542581 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -372,17 +372,17 @@
         public static bool CheckCanAddForm(CommonFormBase form)
         {
             //鑾峰彇鐢婚潰鑻辨枃鍚嶅瓧
-            string formName = GetFormName(form);
+            string formId = GetFormID(form);
 
             //浜岄噸杩藉姞涓嶅彲
-            if (UserCenterResourse.DicActionForm.ContainsKey(formName) == false)
+            if (UserCenterResourse.DicActionForm.ContainsKey(formId) == false)
             {
                 return true;
             }
             //鏆傛椂杩欐牱寮勭湅鐪嬶紝濡傛灉閲嶅锛屽垯鍏抽棴鎺夊師鏉ョ殑鐣岄潰
-            var formTemp = UserCenterResourse.DicActionForm[formName];
+            var formTemp = UserCenterResourse.DicActionForm[formId];
             formTemp.CloseForm();
-            UserCenterResourse.DicActionForm.Remove(formName);
+            UserCenterResourse.DicActionForm.Remove(formId);
 
             return true;
         }
@@ -394,14 +394,14 @@
         public static void AddActionForm(CommonFormBase form)
         {
             //鑾峰彇鐢婚潰鑻辨枃鍚嶅瓧
-            string formName = GetFormName(form);
+            string formId = GetFormID(form);
 
             //浜岄噸杩藉姞涓嶅彲
-            if (UserCenterResourse.DicActionForm.ContainsKey(formName) == false)
+            if (UserCenterResourse.DicActionForm.ContainsKey(formId) == false)
             {
-                form.FormID = formName;
+                form.FormID = formId;
                 //鍐呭瓨娣诲姞
-                UserCenterResourse.DicActionForm[formName] = form;
+                UserCenterResourse.DicActionForm[formId] = form;
                 //娣诲姞鐢婚潰鏃讹紝瀹冭嚜韬氨鏄縺娲荤殑鐣岄潰
                 UserCenterResourse.NowActionFormID = form.FormID;
 
@@ -412,74 +412,43 @@
         /// <summary>
         /// 浠庡垪琛ㄤ腑绉婚櫎鐢婚潰
         /// </summary>
-        /// <param name="form">Form</param>
-        public static void RemoveActionForm(CommonFormBase form)
+        /// <param name="i_closeForm">鍏抽棴鐨勭晫闈�</param>
+        public static void RemoveActionForm(CommonFormBase i_closeForm)
         {
-            //鑾峰彇鐢婚潰鑻辨枃鍚嶅瓧
-            string formName = GetFormName(form);
+            //鑾峰彇鐢婚潰ID
+            string formId = GetFormID(i_closeForm);
 
-            if (UserCenterResourse.DicActionForm.ContainsKey(formName) == true)
+            if (UserCenterResourse.DicActionForm.ContainsKey(formId) == true)
             {
-                //鍒锋柊褰撳墠姝e湪鎿嶄綔鐨勭敾闈D
-                if (UserCenterResourse.NowActionFormID == UserCenterResourse.DicActionForm[formName].FormID)
-                {
-                    //鍚戝墠鎺ㄤ竴浣嶅嵆涓轰笅涓�涓縺娲荤殑鐣岄潰
-                    int index = UserCenterResourse.listActionFormId.IndexOf(UserCenterResourse.NowActionFormID) - 1;
-                    //鍒濆鍊�
-                    UserCenterResourse.NowActionFormID = string.Empty;
-                    var actionForm = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);
-
-                    if (index >= 0)
-                    {
-                        if (actionForm != null && actionForm is CommonFormBase)
-                        {
-                            string formId = ((CommonFormBase)actionForm).FormID;
-                            //瀵瑰簲寰愭缁ф壙浜嗗簳灞傦紝浣嗘槸涓嶅垵濮嬪寲鏁版嵁鐨勯棶棰�
-                            if (UserCenterResourse.listActionFormId.Contains(formId) == true)
-                            {
-                                //璋冪敤鐣岄潰閲嶆柊婵�娲荤殑鍑芥暟
-                                CallFormActionAgainEvent(form, index);
-                            }
-                        }
-                        else if (actionForm != null && actionForm is UserView.UserPage)
-                        {
-                            //杩欓噷瀹冨凡缁忛��鍒颁富椤典簡
-                            var nowForm = UserView.UserPage.Instance.GetNowActionForm();
-                            nowForm?.FormActionAgainEvent();
-                        }
-                    }
-                    else if (actionForm != null && actionForm is UserView.UserPage)
-                    {
-                        //杩欓噷瀹冨凡缁忛��鍒颁富椤典簡
-                        var nowForm = UserView.UserPage.Instance.GetNowActionForm();
-                        nowForm?.FormActionAgainEvent();
-                    }
-                }
                 //绉婚櫎ID
-                UserCenterResourse.listActionFormId.Remove(UserCenterResourse.DicActionForm[formName].FormID);
+                UserCenterResourse.listActionFormId.Remove(formId);
                 //绉婚櫎鐢婚潰
-                UserCenterResourse.DicActionForm.Remove(formName);
-            }
-        }
+                UserCenterResourse.DicActionForm.Remove(formId);
+                //娓呯┖
+                UserCenterResourse.NowActionFormID = string.Empty;
 
-        /// <summary>
-        /// 璋冪敤鐣岄潰閲嶆柊婵�娲荤殑鍑芥暟
-        /// </summary>
-        /// <param name="form">鍏抽棴鐨勭晫闈㈠璞�</param>
-        /// <param name="index">褰撳墠闇�瑕侀噸鏂版縺娲荤晫闈㈢殑绱㈠紩</param>
-        private static void CallFormActionAgainEvent(CommonFormBase form, int index)
-        {
-            //璁剧疆褰撳墠婵�娲荤殑鐢婚潰ID
-            UserCenterResourse.NowActionFormID = UserCenterResourse.listActionFormId[index];
-            //杩藉姞鏉′欢涓�:鍏抽棴鐨勭晫闈负EditorCommonForm鐨勬椂鍊欐墠澶勭悊
-            if ((form is EditorCommonForm) && UserCenterResourse.DicActionForm.ContainsKey(UserCenterResourse.NowActionFormID) == true)
-            {
-                try
+                var actionForm = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);
+                if (actionForm == null)
                 {
-                    var Myform = UserCenterResourse.DicActionForm[UserCenterResourse.NowActionFormID] as EditorCommonForm;
-                    //鐐瑰嚮寰堝揩鏃�,杩欎釜涓滆タ浼氭槸null,浣嗘槸DicActionForm閲岄潰涓嶆槸null,涓嶇煡閬撲负浠�涔�
-                    if (Myform != null)
+                    return;
+                }
+                //濡傛灉鍏抽棴鐨勭晫闈㈡槸DialogCommonForm绫诲瀷,鍒欎笉闇�瑕佽Е鍙戞縺娲诲嚱鏁�
+                if (i_closeForm is DialogCommonForm)
+                {
+                    if (actionForm is EditorCommonForm)
                     {
+                        UserCenterResourse.NowActionFormID = GetFormID((EditorCommonForm)actionForm);
+                    }
+                    return;
+                }
+                //鍏抽棴鐨勭晫闈负EditorCommonForm鐨勬椂鍊�
+                else if ((i_closeForm is EditorCommonForm) && (actionForm is EditorCommonForm))
+                {
+                    //鎺ヤ笅鏉ユ縺娲荤殑鐣岄潰id
+                    UserCenterResourse.NowActionFormID = GetFormID((CommonFormBase)actionForm);
+                    try
+                    {
+                        var Myform = actionForm as EditorCommonForm;
                         //閲嶇疆宸︽粦浣胯兘
                         Myform.ScrollEnabled = Myform.ScrollEnabled;
                         //瑙﹀彂鐣岄潰鍐嶆婵�娲荤殑浜嬩欢
@@ -490,25 +459,34 @@
                             HdlLogLogic.Current.WriteLog(1, Myform.FormID + " 琚縺娲�");
                         }
                     }
+                    catch (Exception ex)
+                    {
+                        //Log鍑哄姏
+                        HdlLogLogic.Current.WriteLog(ex, "鐣岄潰閲嶆柊婵�娲诲紓甯� " + UserCenterResourse.NowActionFormID);
+                    }
                 }
-                catch (Exception ex)
+                else if (actionForm is UserView.UserPage)
                 {
-                    //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
-                    //var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
-                    //alert.Show();
-
-                    //Log鍑哄姏
-                    HdlLogLogic.Current.WriteLog(ex, "鐣岄潰閲嶆柊婵�娲诲紓甯� " + UserCenterResourse.NowActionFormID);
+                    //娓呯┖
+                    UserCenterResourse.NowActionFormID = string.Empty;
+                    //杩欓噷瀹冨凡缁忛��鍒颁富椤典簡
+                    var nowForm = UserView.UserPage.Instance.GetNowActionForm();
+                    nowForm?.FormActionAgainEvent();
+                }
+                else
+                {
+                    //娓呯┖
+                    UserCenterResourse.NowActionFormID = string.Empty;
                 }
             }
         }
 
         /// <summary>
-        /// 鑾峰彇鐢婚潰鑻辨枃鍚嶅瓧
+        /// 鑾峰彇鐢婚潰ID
         /// </summary>
         /// <returns>The form name.</returns>
         /// <param name="form">Form.</param>
-        public static string GetFormName(CommonFormBase form)
+        private static string GetFormID(CommonFormBase form)
         {
             if (form.FormID != string.Empty)
             {
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
index 441b86e..d3c8be3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
@@ -375,7 +375,7 @@
                 var btnRoom = new Button
                 {
                     Height = Application.GetRealHeight(58),
-                    Width = Application.GetRealWidth(127),
+                    Width = Application.GetRealWidth(255),
                     Y = Application.GetRealHeight(58),
                     X = Application.GetRealWidth(14),
                     Text = room.Name,
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
index 5f6a110..5e12411 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
@@ -51,7 +51,7 @@
         /// <summary>
         /// 淇濆瓨瀹屾垚鎸夐挳
         /// </summary>
-        Button btnFinifh;
+        Button btnFinish;
         /// <summary>
         /// 妤煎眰鏂囨湰
         /// </summary>
@@ -165,7 +165,7 @@
             };
             this.midFrameLayout.AddChidren(bottomFrameLayout);
 
-            btnFinifh = new Button()
+            btnFinish = new Button()
             {
                 Width = Application.GetRealWidth(907),
                 Gravity = Gravity.CenterHorizontal,
@@ -176,10 +176,10 @@
                 IsBold = true,
                 TextSize = 16,
             };
-            bottomFrameLayout.AddChidren(btnFinifh);
+            bottomFrameLayout.AddChidren(btnFinish);
             #endregion
 
-            #region 鏁版嵁澶勭悊  
+            #region 鏁版嵁澶勭悊
             //鑾峰彇妤煎眰
             dicFloor = HdlRoomLogic.Current.GetFloorSortList();
             currentKey.currentSelectFloorId = BindInfo.GetCurrentSelectFloorId();
@@ -236,25 +236,25 @@
 
             if (curRoom.ListSceneId.Count == 0)
             {
-                btnFinifh.Enable = false;
-                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+                btnFinish.Enable = false;
+                btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
             }
             else
             {
-                btnFinifh.Enable = true;
-                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                btnFinish.Enable = true;
+                btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
             }
             if (targetListDevice.Count == 0 && targetListScene.Count == 0)
             {
-                btnFinifh.Enable = false;
-                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+                btnFinish.Enable = false;
+                btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
             }
             else
             {
-                btnFinifh.Enable = true;
-                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                btnFinish.Enable = true;
+                btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
             }
-            btnFinifh.MouseUpEventHandler += (sender, e) =>
+            btnFinish.MouseUpEventHandler += (sender, e) =>
             {
                 bool isFinish = false;
                 System.Threading.Tasks.Task.Run(() =>
@@ -284,9 +284,9 @@
                                 {
                                     Application.RunOnMainThread(() =>
                                     {
-                                        btnFinifh.Enable = true;
-                                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
+                                        btnFinish.Enable = true;
+                                        btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
                                         CommonPage.Loading.Hide();
                                     });
                                     return;
@@ -300,8 +300,8 @@
                             {
                                 Application.RunOnMainThread(() =>
                                 {
-                                    btnFinifh.Enable = true;
-                                    btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                                    btnFinish.Enable = true;
+                                    btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                                     CommonPage.Loading.Hide();
                                     var myTip = new Tip();
                                     myTip.Direction = AMPopTipDirection.None;
@@ -318,8 +318,8 @@
                         {
                             Application.RunOnMainThread(() =>
                             {
-                                btnFinifh.Enable = true;
-                                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                                btnFinish.Enable = true;
+                                btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                                 CommonPage.Loading.Hide();
                                 var myTip = new Tip();
                                 myTip.Direction = AMPopTipDirection.None;
@@ -333,8 +333,8 @@
                         {
                             Application.RunOnMainThread(() =>
                             {
-                                btnFinifh.Enable = true;
-                                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                                btnFinish.Enable = true;
+                                btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                                 var myTip = new Tip();
                                 myTip.Direction = AMPopTipDirection.None;
                                 myTip.CloseTime = 2;
@@ -396,16 +396,16 @@
                                             this.RemoveFromParent();
                                         }
                                         CommonPage.Loading.Hide();
-                                        btnFinifh.Enable = true;
-                                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                                        btnFinish.Enable = true;
+                                        btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                                     });
                                 }
                                 else if (dev.addedDeviceBindResponseData.Result == 1)
                                 {
                                     Application.RunOnMainThread(() =>
                                     {
-                                        btnFinifh.Enable = true;
-                                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                                        btnFinish.Enable = true;
+                                        btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                                         CommonPage.Loading.Hide();
                                         new Tip()
                                         {
@@ -413,7 +413,7 @@
                                             Text = Language.StringByID(R.MyInternationalizationString.BindFailed),
                                             Direction = AMPopTipDirection.Up,
                                             CloseTime = 1
-                                        }.Show(btnFinifh);
+                                        }.Show(btnFinish);
                                     });
                                     return;
                                 }
@@ -421,8 +421,8 @@
                                 {
                                     Application.RunOnMainThread(() =>
                                     {
-                                        btnFinifh.Enable = true;
-                                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                                        btnFinish.Enable = true;
+                                        btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                                         CommonPage.Loading.Hide();
                                         new Tip()
                                         {
@@ -430,7 +430,7 @@
                                             Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError),
                                             Direction = AMPopTipDirection.Up,
                                             CloseTime = 1
-                                        }.Show(btnFinifh);
+                                        }.Show(btnFinish);
                                     });
 
                                     return;
@@ -440,10 +440,10 @@
                             {
                                 Application.RunOnMainThread(() =>
                                 {
-                                    btnFinifh.Enable = true;
-                                    btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                                    btnFinish.Enable = true;
+                                    btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                                     CommonPage.Loading.Hide();
-                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
+                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
                                 });
 
                                 return;
@@ -510,7 +510,7 @@
                 var btnRoom = new Button
                 {
                     Height = Application.GetRealHeight(58),
-                    Width = Application.GetRealWidth(127),
+                    Width = Application.GetRealWidth(255),
                     Y = Application.GetRealHeight(58),
                     X = Application.GetRealWidth(14),
                     Text = room.Name,
@@ -568,23 +568,23 @@
                     curRoom = room;
                     if (curRoom.ListSceneId.Count == 0)
                     {
-                        btnFinifh.Enable = false;
-                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+                        btnFinish.Enable = false;
+                        btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
                     }
                     else
                     {
-                        btnFinifh.Enable = true;
-                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                        btnFinish.Enable = true;
+                        btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                     }
                     if (targetListDevice.Count == 0 && targetListScene.Count == 0)
                     {
-                        btnFinifh.Enable = false;
-                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+                        btnFinish.Enable = false;
+                        btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
                     }
                     else
                     {
-                        btnFinifh.Enable = true;
-                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                        btnFinish.Enable = true;
+                        btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                     }
                     RefreshSceneList(curRoom);
 
@@ -593,7 +593,7 @@
                 btnRoomFrameLayout.MouseUpEventHandler += eHandlerRoom;
                 index++;
             }
-            BindInfo.FinishDisplay(roomTempList, btnFinifh);
+            BindInfo.FinishDisplay(roomTempList, btnFinish);
             RefreshSceneList(curRoom);
         }
 
@@ -613,8 +613,8 @@
             var currentSceneUIList = GetMatchSceneUIList(curRoom);
             if (currentSceneUIList.Count == 0)
             {
-                btnFinifh.Enable = false;
-                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+                btnFinish.Enable = false;
+                btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
                 return;
             }
             foreach (var scene in currentSceneUIList)
@@ -736,13 +736,13 @@
                     }
                     if (targetListDevice.Count == 0 && targetListScene.Count == 0)
                     {
-                        btnFinifh.Enable = false;
-                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+                        btnFinish.Enable = false;
+                        btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
                     }
                     else
                     {
-                        btnFinifh.Enable = true;
-                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                        btnFinish.Enable = true;
+                        btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                     }
                 };
                 rowLayout.MouseUpEventHandler += hander;
@@ -753,13 +753,13 @@
             }
             if (targetListDevice.Count == 0 && targetListScene.Count == 0)
             {
-                btnFinifh.Enable = false;
-                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+                btnFinish.Enable = false;
+                btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
             }
             else
             {
-                btnFinifh.Enable = true;
-                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                btnFinish.Enable = true;
+                btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
             }
         }
 
@@ -906,13 +906,13 @@
                     RefreshSceneList(roomList[0]);
                     if (targetListDevice.Count == 0 && targetListScene.Count == 0)
                     {
-                        btnFinifh.Enable = false;
-                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+                        btnFinish.Enable = false;
+                        btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
                     }
                     else
                     {
-                        btnFinifh.Enable = true;
-                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                        btnFinish.Enable = true;
+                        btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                     }
                     dialog.Close();
                 };
@@ -942,7 +942,7 @@
         List<SceneUI> GetALlDispalyRoomSceneList()
         {
             currentKeyAllRoomSceneList.Clear();
-            // 鑾峰彇鎵�鏈夋埧闂� 
+            // 鑾峰彇鎵�鏈夋埧闂�
             var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
             foreach (var room in listAllRoom)
             {
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
index d0b4550..5c66c54 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindCommonLayout.cs
@@ -1,4 +1,5 @@
 锘縰sing System;
+using System.Collections.Generic;
 using Shared.Common;
 using ZigBee.Device;
 
@@ -11,6 +12,15 @@
 
         }
         #region 鈼� 鍙橀噺鐢虫槑__________________________
+        /// <summary>
+        /// 妤煎眰鍥炶皟
+        /// </summary>
+        public Action FloorAction = null;
+        /// <summary>
+        /// 閫変腑鐨勬ゼ灞傚洖璋僛
+        /// </summary>
+        public Action<string, Button> ChooseFloorAction = null;
+
         public FrameLayout topFrameLayout = new FrameLayout { Height = Application.GetRealHeight(184), BackgroundColor = ZigbeeColor.Current.XMTopFrameLayout };
         public FrameLayout midFrameLayout = new FrameLayout { Height = Application.GetRealHeight(1925 - 184), BackgroundColor = ZigbeeColor.Current.XMMidFrameLayout };
 
@@ -109,5 +119,202 @@
             };
             this.midFrameLayout.AddChidren(bottomFrameLayout1);
         }
+
+        /// <summary>
+        /// 娣诲姞妤煎眰UI
+        /// </summary> 
+        public void BindDownFrameLayout(FrameLayout frameLayout, Panel curControlDev, Dictionary<string, string> dicFloorList, ref Button btnFloorText)
+        {
+            var btnAddFrameLayout = new FrameLayout
+            {
+                X = Application.GetRealWidth(619),
+            };
+            this.titleFrameLayout.AddChidren(btnAddFrameLayout);
+
+            btnFloorText = new Button
+            {
+                Width = Application.GetRealWidth(300 - 69 - 58),
+                Text = Language.StringByID(R.MyInternationalizationString.FirstFloor),
+                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
+                TextSize = 14,
+                IsBold = true,
+                TextAlignment = TextAlignment.CenterRight,
+            };
+            btnAddFrameLayout.AddChidren(btnFloorText);
+
+            var btnBindDownFrameLayout = new FrameLayout
+            {
+                Width = Application.GetMinReal(69 + 58),
+                X = Application.GetRealWidth(300 - 69 - 58),
+            };
+            btnAddFrameLayout.AddChidren(btnBindDownFrameLayout);
+
+            var btnBindDown = new Button
+            {
+                Height = Application.GetMinReal(69),
+                Width = Application.GetMinReal(69),
+                UnSelectedImagePath = "BindPic/BindDown.png",
+                Gravity = Gravity.CenterVertical,
+            };
+            btnBindDownFrameLayout.AddChidren(btnBindDown);
+
+            EventHandler<MouseEventArgs> eHandlerBindDown = (sender, e) =>
+            {
+                if (dicFloorList == null)
+                {
+                    dicFloorList = new Dictionary<string, string>();
+                }
+                SideslipFramelayout(curControlDev, dicFloorList);
+            };
+            btnBindDown.MouseDownEventHandler += eHandlerBindDown;
+            btnBindDownFrameLayout.MouseDownEventHandler += eHandlerBindDown;
+            if (Common.Config.Instance.Home.FloorDics.Count == 0)
+            {
+                btnAddFrameLayout.Width = 0;
+            }
+            else
+            {
+                btnAddFrameLayout.Width = Application.GetRealWidth(300);
+            }
+        }
+
+        /// <summary>
+        /// 妤煎眰閫夋嫨鐨勪晶杈规爮
+        /// </summary>
+        void SideslipFramelayout(Panel curControlDev, Dictionary<string, string> dicFloorList)
+        {
+            var dialog = new Dialog
+            {
+            };
+            dialog.Show();
+
+            var flMain = new FrameLayout { BackgroundColor = 0x00000000 };
+            dialog.AddChidren(flMain);
+            flMain.MouseUpEventHandler += (sender11, e11) =>
+            {
+                dialog.Close();
+            };
+
+            var sidelipFrameLayout = new FrameLayout()
+            {
+                Width = Application.GetMinReal(449),
+                Y = Application.GetRealHeight(161),
+                X = Application.GetRealWidth(596),
+                BackgroundImagePath = "DoorLock/SideslipPic.png",
+            };
+            flMain.AddChidren(sidelipFrameLayout);
+
+            var btnSelectFloor = new Button()
+            {
+                Width = Application.GetRealWidth(200),
+                Height = Application.GetRealHeight(58),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(81),
+                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
+                TextSize = 14,
+                IsBold = true,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextID = R.MyInternationalizationString.SelectFloor,
+            };
+            sidelipFrameLayout.AddChidren(btnSelectFloor);
+
+            var sidelipVerticalScrolViewLayout = new VerticalScrolViewLayout()
+            {
+                Y = btnSelectFloor.Bottom + Application.GetRealHeight(45),
+                Height = Application.GetRealHeight(600),
+            };
+            sidelipFrameLayout.AddChidren(sidelipVerticalScrolViewLayout);
+
+            Button oldbutton = null;
+            Button oldbuttonText = null;
+            int count = 0;
+            foreach (var floorId in dicFloorList.Keys)
+            {
+                var rowFrameLayout = new RowLayout()
+                {
+                    Height = Application.GetRealHeight(152),
+                    LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+                    X = Application.GetRealWidth(81),
+                };
+                sidelipVerticalScrolViewLayout.AddChidren(rowFrameLayout);
+
+                var btnAllMethod = new Button()
+                {
+                    Width = Application.GetMinReal(81),
+                    Height = Application.GetMinReal(81),
+                    UnSelectedImagePath = "Floor/Floor.png",
+                    SelectedImagePath = "Floor/FloorSelected.png",
+                    Gravity = Gravity.CenterVertical,
+                };
+                rowFrameLayout.AddChidren(btnAllMethod);
+
+                var btnMethodText = new Button()
+                {
+                    Width = Application.GetRealWidth(311),
+                    Height = Application.GetRealHeight(58),
+                    X = Application.GetRealWidth(92),
+                    Gravity = Gravity.CenterVertical,
+                    TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+                    TextSize = 14,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    Text = dicFloorList[floorId],
+                };
+                rowFrameLayout.AddChidren(btnMethodText);
+
+                if (curControlDev.currentSelectFloorId == floorId)
+                {
+                    btnAllMethod.IsSelected = true;
+                    btnAllMethod.IsBold = true;
+                    btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                }
+
+                EventHandler<MouseEventArgs> hander = (sender, e) =>
+                {
+                    if (curControlDev.currentSelectFloorId == floorId)
+                    {
+                        return;
+                    }
+                    curControlDev.currentSelectFloorId = floorId;
+
+                    if (!btnMethodText.IsSelected)
+                    {
+                        if (oldbutton != null)
+                        {
+                            oldbutton.IsSelected = false;
+                        }
+                        if (oldbuttonText != null)
+                        {
+                            oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
+                        }
+                        oldbutton = btnMethodText;
+                        oldbuttonText = btnMethodText;
+                        btnMethodText.IsSelected = true;
+                        oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                        oldbuttonText.IsBold = true;
+                    }
+
+                    int index = 0;
+                    dialog.Close();
+                    ChooseFloorAction?.Invoke(floorId, btnMethodText);
+                };
+                btnAllMethod.MouseUpEventHandler += hander;
+                rowFrameLayout.MouseUpEventHandler += hander;
+                btnMethodText.MouseUpEventHandler += hander;
+                count++;
+            }
+
+            if (count == 0)
+            {
+                sidelipFrameLayout.Height = 0;
+            }
+            else if (count <= 4 && count > 0)
+            {
+                sidelipFrameLayout.Height = Application.GetRealHeight(180) + count * Application.GetRealHeight(150);
+            }
+            else
+            {
+                sidelipFrameLayout.Height = Application.GetMinReal(780);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
index 9524092..12546e0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
@@ -4,20 +4,741 @@
 using Shared.Common;
 using Shared.Phone.UserCenter.Device;
 using ZigBee.Device;
+using static ZigBee.Device.BindObj;
 using static ZigBee.Device.Panel;
 
 namespace Shared.Phone.UserCenter.DeviceBind
 {
     public class BindInfo
     {
+        #region 缁戝畾璁捐鐨勫彉閲忓畾涔�
         /// <summary>
-        /// 褰撳墠鎸夐敭閰嶇疆鐨勫姛鑳�
+        /// 褰撳墠璁惧缁戝畾绫诲瀷
         /// </summary>
-        public static int clusterID = 0;
+        public enum BindType
+        {
+            /// <summary>
+            /// 鏂伴
+            /// </summary>
+            FreshAir = 1,
+            /// <summary>
+            /// 娓╁害浼犳劅鍣�
+            /// </summary>
+            Temperature = 2,
+            /// <summary>
+            /// 婀垮害浼犳劅鍣�
+            /// </summary>
+            Humidity = 3,
+            /// <summary>
+            /// PM2.5浼犳劅鍣�
+            /// </summary>
+            PM = 4,
+            /// <summary>
+            /// 绌鸿皟鐩爣
+            /// </summary>
+            AC = 5,
+        }
+
+        #endregion
+
+        #region 缁戝畾娑夊強鐨勬暟鎹鐞�
         /// <summary>
-        /// 璁板綍鏃х殑鐩爣鍒楄〃
+        /// 鑾峰彇褰撳墠妤煎眰鍚嶇О
         /// </summary>
-        public static List<CommonDevice> oldTargetList = new List<CommonDevice>();
+        /// <returns></returns>
+        public static string GetCurrentKeyAllRoomList()
+        {
+            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
+            foreach (var floorId in dicFloor.Keys)
+            {
+                //绗竴涓ゼ灞�
+                return dicFloor[floorId];
+                break;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 鑾峰彇褰撳墠妤煎眰
+        /// </summary>
+        /// <returns></returns>
+        public static string GetCurrentSelectFloorId()
+        {
+            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();//
+            foreach (var floorId in dicFloor.Keys)
+            {
+                //绗竴涓ゼ灞�
+                return floorId;
+                break;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 鑾峰彇褰撳墠妤煎眰鍚嶇О
+        /// </summary>
+        /// <returns></returns>
+        public static string GetCurrentSelectFloorIdName()
+        {
+            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
+            foreach (var floorId in dicFloor.Keys)
+            {
+                //绗竴涓ゼ灞�
+                return dicFloor[floorId];
+                break;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 鑾峰彇褰撳墠妤煎眰鍚嶇О
+        /// fllodID:妤煎眰ID
+        /// </summary>
+        /// <returns></returns>
+        public static string GetBindTargetsFloorIdName(string curFllodID)
+        {
+            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
+            foreach (var floorId in dicFloor.Keys)
+            {
+                //褰撳墠妤煎眰
+                if (curFllodID == floorId)
+                {
+                    return dicFloor[floorId];
+                    break;
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// 鑾峰彇褰撳墠鎴块棿涓尮閰嶇殑鏀寔缁戝畾鐨勮澶囧垪琛�
+        /// currentRoomSupportBindDeviceList 褰撳墠鎴块棿涓敮鎸佽缁戝畾鐨勮澶囧垪琛�
+        /// curRoom 褰撳墠鎴块棿
+        /// curDeviceBindType 褰撳墠璁惧缁戝畾绫诲瀷
+        /// </summary>
+        /// <returns></returns>
+        public static List<CommonDevice> GetCurRoomSupportDeviceList(List<CommonDevice> currentRoomSupportBindDeviceList, Room curRoom, BindInfo.BindType curDeviceBindType)
+        {
+            currentRoomSupportBindDeviceList.Clear();
+            List<CommonDevice> curRoomDeviceListTemp = new List<CommonDevice>();
+            switch (curDeviceBindType)
+            {
+                case BindType.FreshAir:
+                    foreach (var deviceKeys in curRoom.ListDevice)
+                    {
+                        var device = LocalDevice.Current.GetDevice(deviceKeys);
+                        if (device != null)
+                        {
+                            if (BindInfo.checkRealFreshAirDevice(device) == false)
+                            {
+                                continue;
+                            }
+                            if (device.Type == DeviceType.FreshAir)
+                            {
+                                curRoomDeviceListTemp.Add(device);
+                            }
+                        }
+                    }
+                    break;
+                case BindType.Temperature:
+                    curRoomDeviceListTemp = GetMatchTemperatureSensorDevice(curRoom);
+                    break;
+                case BindType.Humidity:
+                    curRoomDeviceListTemp = GetMatchHumiditySensorDevice(curRoom);
+                    foreach (var deviceKeys in curRoom.ListDevice)
+                    {
+                        var device = LocalDevice.Current.GetDevice(deviceKeys);
+                        if (device != null)
+                        {
+                            if (device.Type == DeviceType.FreshAirHumiditySensor)
+                            {
+                                curRoomDeviceListTemp.Add(device);
+                            }
+                        }
+                    }
+                    break;
+                case BindType.PM:
+                    foreach (var deviceKeys in curRoom.ListDevice)
+                    {
+                        var device = LocalDevice.Current.GetDevice(deviceKeys);
+                        if (device != null)
+                        {
+                            if (device.Type == DeviceType.PMSensor)
+                            {
+                                curRoomDeviceListTemp.Add(device);
+                            }
+                        }
+                    }
+                    break;
+                case BindType.AC:
+                    foreach (var deviceKeys in curRoom.ListDevice)
+                    {
+                        var device = LocalDevice.Current.GetDevice(deviceKeys);
+                        if (device != null)
+                        {
+                            if (device.Type == DeviceType.Thermostat)
+                            {
+                                if (BindInfo.checkRealAcDevice(device) == false)
+                                {
+                                    continue;
+                                }
+                                curRoomDeviceListTemp.Add(device);
+                            }
+                        }
+                    }
+                    break;
+            }
+            return curRoomDeviceListTemp;
+        }
+
+        /// <summary>
+        /// 鍖归厤娓╁害浼犳劅鍣�
+        /// </summary>
+        /// <param name="room"></param>
+        public static List<CommonDevice> GetMatchTemperatureSensorDevice(Room room)
+        {
+            List<CommonDevice> roomIncludeMatchTempDevice = new List<CommonDevice>();
+            foreach (var de in room.ListDevice)
+            {
+                var device = LocalDevice.Current.GetDevice(de);
+                if (device != null)
+                {
+                    //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
+                    if (device.ZigbeeType != 1)
+                    {
+                        continue;
+                    }
+                    if (device.Type == DeviceType.TemperatureSensor)
+                    {
+                        var dev = device as TemperatureSensor;
+                        if (dev.SensorDiv == 1)
+                        {
+                            roomIncludeMatchTempDevice.Add(device);
+                        }
+                    }
+                    else if (device.Type == DeviceType.PMSensor)
+                    {
+                        var dev = device as PMSensor;
+                        foreach (var clu in dev.InClusterList)
+                        {
+                            if (clu.InCluster == 1026)
+                            {
+                                roomIncludeMatchTempDevice.Add(device);
+                            }
+                        }
+                    }
+                }
+            }
+            return roomIncludeMatchTempDevice;
+        }
+
+        /// <summary>
+        /// 鍖归厤婀垮害浼犳劅鍣�
+        /// </summary>
+        /// <param name="room"></param>
+        public static List<CommonDevice> GetMatchHumiditySensorDevice(Room room)
+        {
+            List<CommonDevice> roomIncludeMatchHumpDevice = new List<CommonDevice>();
+            foreach (var de in room.ListDevice)
+            {
+                var device = LocalDevice.Current.GetDevice(de);
+                if (device != null)
+                {
+                    //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
+                    if (device.ZigbeeType != 1)
+                    {
+                        continue;
+                    }
+                    if (device.Type == DeviceType.TemperatureSensor)
+                    {
+                        var dev = device as TemperatureSensor;
+                        if (dev.SensorDiv == 2)
+                        {
+                            roomIncludeMatchHumpDevice.Add(device);
+                        }
+                    }
+                    else if (device.Type == DeviceType.PMSensor)
+                    {
+                        var dev = device as PMSensor;
+                        foreach (var clu in dev.InClusterList)
+                        {
+                            if (clu.InCluster == 1029)
+                            {
+                                roomIncludeMatchHumpDevice.Add(device);
+                            }
+                        }
+                    }
+                }
+            }
+            return roomIncludeMatchHumpDevice;
+        }
+
+        /// <summary>
+        /// 鑾峰彇妤煎眰瀵瑰簲鐨勬埧闂村垪琛�
+        /// </summary>
+        /// <returns></returns>
+        public static List<Room> GetFloorRoomList()
+        {
+            var supportRoomListTemp = new List<Room>();
+            var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
+            if (Common.Config.Instance.Home.FloorDics.Count == 0)
+            {
+                // 鑾峰彇娌℃湁妤煎眰鎴块棿
+                foreach (var room in listAllRoom)
+                {
+                    if (string.IsNullOrEmpty(room.FloorId))
+                    {
+                        if (room.IsLove)
+                        {
+                            continue;
+                        }
+                        supportRoomListTemp.Add(room);
+                    }
+                }
+            }
+            else
+            {
+                // 鑾峰彇鏀寔鐨勬埧闂�
+                foreach (var room in listAllRoom)
+                {
+                    if (room.IsLove)
+                    {
+                        continue;
+                    }
+                    supportRoomListTemp.Add(room);
+                }
+            }
+            return supportRoomListTemp;
+        }
+
+        /// <summary>
+        /// 鑳芥樉绀虹殑鎴块棿鍒楄〃
+        /// curControlDev 鎺у埗璁惧
+        /// supportRoomList 鏈湴鎴块棿鍒楄〃
+        /// curDeviceBindType 褰撳墠璁惧缁戝畾绫诲瀷
+        /// </summary>
+        public static List<Room> GetSupportRoomList(Panel curControlDev, List<Room> supportRoomList, BindInfo.BindType curDeviceBindType)
+        {
+            var roomTempList = new List<Room>();
+            for (int i = 0; i < supportRoomList.Count; i++)
+            {
+                var room = supportRoomList[i];
+                //濡傛灉鎴块棿涓哄枩鐖盵鍚庢潵鏀瑰悕涓哄父鐢ㄦ埧闂碷锛屽垯涓嶆樉绀�
+                if (room.IsLove == true)
+                {
+                    continue;
+                }
+
+                //濡傛灉鎴块棿涓病鏈夎澶囷紝鍒欎笉鏄剧ず
+                if (room.ListDevice.Count == 0)
+                {
+                    continue;
+                }
+                else
+                {
+                    List<CommonDevice> roomIncludeMatchDevice = new List<CommonDevice>();
+
+                    //鎴块棿涓病鏈夊搴旂殑鏀寔缁戝畾鐨勭洰鏍�
+                    switch (curDeviceBindType)
+                    {
+                        case BindInfo.BindType.FreshAir:
+                            foreach (var de in room.ListDevice)
+                            {
+                                var device = LocalDevice.Current.GetDevice(de);
+                                if (device != null)
+                                {
+                                    //鑾峰彇璁惧绫诲瀷鐨�
+                                    var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+                                    //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
+                                    if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+                                    {
+                                        continue;
+                                    }
+                                    if (device.Type == DeviceType.FreshAir)
+                                    {
+                                        roomIncludeMatchDevice.Add(device);
+                                    }
+                                }
+                            }
+                            break;
+                        case BindInfo.BindType.Temperature:
+                            roomIncludeMatchDevice = BindInfo.GetMatchTemperatureSensorDevice(room);
+                            break;
+                        case BindInfo.BindType.Humidity:
+                            roomIncludeMatchDevice = GetMatchHumiditySensorDevice(room);
+                            foreach (var de in room.ListDevice)
+                            {
+                                var device = LocalDevice.Current.GetDevice(de);
+                                if (device != null)
+                                {
+                                    if (device.Type == DeviceType.FreshAirHumiditySensor)
+                                    {
+                                        roomIncludeMatchDevice.Add(device);
+                                    }
+                                }
+                            }
+                            break;
+                        case BindInfo.BindType.PM:
+                            foreach (var de in room.ListDevice)
+                            {
+                                var device = LocalDevice.Current.GetDevice(de);
+                                if (device != null)
+                                {
+                                    if (device.Type == DeviceType.PMSensor)
+                                    {
+                                        roomIncludeMatchDevice.Add(device);
+                                    }
+                                }
+                            }
+                            break;
+                        case BindInfo.BindType.AC:
+                            foreach (var de in room.ListDevice)
+                            {
+                                var device = LocalDevice.Current.GetDevice(de);
+                                if (device != null)
+                                {
+                                    if (device.Type == DeviceType.Thermostat)
+                                    {
+                                        if (BindInfo.checkRealAcDevice(device) == false)
+                                        {
+                                            continue;
+                                        }
+                                        roomIncludeMatchDevice.Add(device);
+                                    }
+                                }
+                            }
+                            break;
+                    }
+
+                    if (roomIncludeMatchDevice.Count == 0)
+                    {
+                        continue;
+                    }
+
+                    if (!string.IsNullOrEmpty(room.FloorId))
+                    {
+                        //鏈夋ゼ灞�
+                        if (room.FloorId == curControlDev.currentSelectFloorId)
+                        {
+                            roomTempList.Add(room);
+                        }
+                    }
+                    else
+                    {
+                        //娌℃湁妤煎眰
+                        roomTempList.Add(room);
+                    }
+                }
+            }
+            return roomTempList;
+        }
+
+        /// <summary>
+        /// 鑾峰彇鏈湴鏈垎閰嶇殑鏀寔褰撳墠绫诲瀷鐨勭粦瀹氳澶囧垪琛�
+        /// </summary>
+        /// <returns></returns>
+        public static List<CommonDevice> GetUndistributeDeviceList(List<CommonDevice> undistruibuteDevList, DeviceBind.BindInfo.BindType curDeviceBindType)
+        {
+            undistruibuteDevList.Clear();
+            List<CommonDevice> UndistributeCommonDeviceListTemp = new List<CommonDevice>();
+
+            //鑾峰彇鏈湴璁惧鍒楄〃
+            foreach (var tempDev in Shared.Common.LocalDevice.Current.listAllDevice)
+            {
+                //鑾峰彇璁惧鎵�灞炴埧闂�
+                var tempDevRoom = HdlRoomLogic.Current.GetRoomByDevice(tempDev);
+                if (tempDevRoom == null)
+                {
+                    UndistributeCommonDeviceListTemp.Add(tempDev);
+                }
+            }
+            switch (curDeviceBindType)
+            {
+                case BindType.FreshAir:
+                    foreach (var device in UndistributeCommonDeviceListTemp)
+                    {
+                        if (BindInfo.checkRealFreshAirDevice(device) == false)
+                        {
+                            continue;
+                        }
+                        if (device.Type == DeviceType.FreshAir)
+                        {
+                            undistruibuteDevList.Add(device);
+                        }
+                    }
+                    break;
+                case BindType.Temperature:
+                    foreach (var device in UndistributeCommonDeviceListTemp)
+                    {
+                        //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
+                        if (device.ZigbeeType != 1)
+                        {
+                            continue;
+                        }
+                        if (device.Type == DeviceType.TemperatureSensor)
+                        {
+                            var dev = device as TemperatureSensor;
+                            if (dev.SensorDiv == 1)
+                            {
+                                undistruibuteDevList.Add(device);
+                            }
+                        }
+                        else if (device.Type == DeviceType.PMSensor)
+                        {
+                            var dev = device as PMSensor;
+                            foreach (var clu in dev.InClusterList)
+                            {
+                                if (clu.InCluster == 1026)
+                                {
+                                    undistruibuteDevList.Add(device);
+                                }
+                            }
+                        }
+                    }
+                    break;
+                case BindType.Humidity:
+                    foreach (var device in UndistributeCommonDeviceListTemp)
+                    {
+                        //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
+                        if (device.ZigbeeType != 1)
+                        {
+                            continue;
+                        }
+                        if (device.Type == DeviceType.TemperatureSensor)
+                        {
+                            var dev = device as TemperatureSensor;
+                            if (dev.SensorDiv == 2)
+                            {
+                                undistruibuteDevList.Add(device);
+                            }
+                        }
+                        else if (device.Type == DeviceType.PMSensor)
+                        {
+                            var dev = device as PMSensor;
+                            foreach (var clu in dev.InClusterList)
+                            {
+                                if (clu.InCluster == 1029)
+                                {
+                                    undistruibuteDevList.Add(device);
+                                }
+                            }
+                        }
+                        if (device.Type == DeviceType.FreshAirHumiditySensor)
+                        {
+                            undistruibuteDevList.Add(device);
+                        }
+                    }
+                    break;
+                case BindType.PM:
+                    foreach (var device in UndistributeCommonDeviceListTemp)
+                    {
+                        if (device.Type == DeviceType.PMSensor)
+                        {
+                            undistruibuteDevList.Add(device);
+                        }
+                    }
+                    break;
+                case BindType.AC:
+                    foreach (var device in UndistributeCommonDeviceListTemp)
+                    {
+                        if (device.Type == DeviceType.Thermostat)
+                        {
+                            if (BindInfo.checkRealAcDevice(device) == false)
+                            {
+                                continue;
+                            }
+                            undistruibuteDevList.Add(device);
+                        }
+                    }
+                    break;
+            }
+
+            return undistruibuteDevList;
+        }
+
+        /// <summary>
+        /// 鎵�鏈夋埧闂翠腑鍖归厤鐨勬敮鎸佺粦瀹氱殑鎵�鏈夌洰鏍囧垪琛�
+        /// </summary>
+        /// <returns></returns>
+        public static List<CommonDevice> GetAllRoomSupportDeviceList(List<CommonDevice> currentPanelSupportBindDeviceList, List<Room> supportRoomList, DeviceBind.BindInfo.BindType curDeviceBindType)
+        {
+            currentPanelSupportBindDeviceList.Clear();
+            List<CommonDevice> currentPanelBindSupportDeviceListTemp = new List<CommonDevice>();
+            switch (curDeviceBindType)
+            {
+                case BindInfo.BindType.FreshAir:
+                    foreach (var r in supportRoomList)
+                    {
+                        if (r.ListDevice.Count == 0)
+                        {
+                            continue;
+                        }
+                        foreach (var deviceKeys in r.ListDevice)
+                        {
+                            var device = LocalDevice.Current.GetDevice(deviceKeys);
+                            if (device != null)
+                            {
+                                if (BindInfo.checkRealFreshAirDevice(device) == false)
+                                {
+                                    continue;
+                                }
+                                if (device.Type == DeviceType.FreshAir)
+                                {
+                                    currentPanelBindSupportDeviceListTemp.Add(device);
+                                }
+                            }
+                        }
+                    }
+                    break;
+                case BindInfo.BindType.Temperature:
+                    foreach (var r in supportRoomList)
+                    {
+                        if (r.ListDevice.Count == 0)
+                        {
+                            continue;
+                        }
+                        var deviceListTemp = GetMatchTemperatureSensorDevice(r);
+                        foreach (var dev in deviceListTemp)
+                        {
+                            currentPanelBindSupportDeviceListTemp.Add(dev);
+                        }
+                    }
+                    break;
+                case BindInfo.BindType.Humidity:
+                    foreach (var r in supportRoomList)
+                    {
+                        if (r.ListDevice.Count == 0)
+                        {
+                            continue;
+                        }
+                        var deviceListTemp = GetMatchHumiditySensorDevice(r);
+                        foreach (var dev in deviceListTemp)
+                        {
+                            currentPanelBindSupportDeviceListTemp.Add(dev);
+                        }
+                        foreach (var deviceKeys in r.ListDevice)
+                        {
+                            var device = LocalDevice.Current.GetDevice(deviceKeys);
+                            if (device != null)
+                            {
+                                if (device.Type == DeviceType.FreshAirHumiditySensor)
+                                {
+                                    currentPanelBindSupportDeviceListTemp.Add(device);
+                                }
+                            }
+                        }
+                    }
+                    break;
+                case BindInfo.BindType.PM:
+                    foreach (var r in supportRoomList)
+                    {
+                        if (r.ListDevice.Count == 0)
+                        {
+                            continue;
+                        }
+                        foreach (var deviceKeys in r.ListDevice)
+                        {
+                            var device = LocalDevice.Current.GetDevice(deviceKeys);
+                            if (device != null)
+                            {
+                                if (device.Type == DeviceType.PMSensor)
+                                {
+                                    currentPanelBindSupportDeviceListTemp.Add(device);
+                                }
+                            }
+                        }
+                    }
+                    break;
+                case BindInfo.BindType.AC:
+                    foreach (var r in supportRoomList)
+                    {
+                        if (r.ListDevice.Count == 0)
+                        {
+                            continue;
+                        }
+                        foreach (var deviceKeys in r.ListDevice)
+                        {
+                            var device = LocalDevice.Current.GetDevice(deviceKeys);
+                            if (device != null)
+                            {
+                                if (device.Type == DeviceType.Thermostat)
+                                {
+                                    if (BindInfo.checkRealAcDevice(device) == false)
+                                    {
+                                        continue;
+                                    }
+                                    currentPanelBindSupportDeviceListTemp.Add(device);
+                                }
+                            }
+                        }
+                    }
+                    break;
+            }
+            return currentPanelBindSupportDeviceListTemp;
+        }
+
+        /// <summary>
+        /// 妫�娴嬬洰鏍囨槸鍚﹁缁戝畾杩�
+        /// targetList 鎸夐敭閰嶇疆鐨勭洰鏍囧垪琛�
+        /// oldTargetList 闈㈡澘涓凡缁忓瓨鍦ㄧ殑鐩爣鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public static bool checkExistDevice(List<CommonDevice> targetList, List<CommonDevice> oldTargetList)
+        {
+            bool exist = false;
+            foreach (var oldDev in oldTargetList)
+            {
+                var key = oldDev.DeviceAddr + oldDev.DeviceEpoint;
+                var result = targetList.Find(obj => (obj != null) && (obj.DeviceAddr + obj.DeviceEpoint == key));
+                if (result != null)
+                {
+                    exist = true;
+                }
+                else
+                {
+                    exist = false;
+                }
+            }
+            return exist;
+        }
+
+        /// <summary>
+        /// 鏄惁鏄湡瀹炵殑绌鸿皟璁惧 銆愰儴鍒嗘槸鑳界粦瀹氱┖璋冪殑璁惧銆� 
+        /// </summary>
+        /// <param name="device"></param>
+        /// <returns></returns>
+        public static bool checkRealAcDevice(CommonDevice device)
+        {
+            bool result = true;
+            //鑾峰彇璁惧绫诲瀷鐨�
+            var clu = device.OutClusterList.Find((obj) => obj.OutCluster == 513);
+            if (clu != null)
+            {
+                result = false;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 鏄惁鏄湡瀹炵殑鏂伴璁惧 銆愰儴鍒嗘槸鑳界粦瀹氭柊椋庣殑璁惧銆� 
+        /// </summary>
+        /// <param name="device"></param>
+        /// <returns></returns>
+        public static bool checkRealFreshAirDevice(CommonDevice device)
+        {
+            bool result = true;
+            //鑾峰彇璁惧绫诲瀷鐨�
+            var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+            if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+            {
+                result = false;
+            }
+            if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleEnvironment)
+            {
+                result = false;
+            }
+            return result;
+        }
 
         /// <summary>
         /// 妫�娴嬭璁惧鑳藉惁鏄剧ず
@@ -101,88 +822,6 @@
                 }
             }
             return false;
-        }
-
-        /// <summary>
-        /// 搴曢儴瀹屾垚鎸夐挳鏄剧ず
-        /// </summary>
-        /// <returns></returns>
-        public static void FinishDisplay(List<Room> roomTempList, Button btnFinish)
-        {
-            if (roomTempList.Count == 0)
-            {
-                btnFinish.Enable = false;
-                btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
-            }
-            else
-            {
-                btnFinish.Enable = true;
-                btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-            }
-        }
-
-        /// <summary>
-        /// 鑾峰彇褰撳墠妤煎眰鍚嶇О
-        /// </summary>
-        /// <returns></returns>
-        public static string GetCurrentKeyAllRoomList()
-        {
-            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
-            foreach (var floorId in dicFloor.Keys)
-            {
-                //绗竴涓ゼ灞�
-                return dicFloor[floorId];
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// 鑾峰彇褰撳墠妤煎眰
-        /// </summary>
-        /// <returns></returns>
-        public static string GetCurrentSelectFloorId()
-        {
-            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();//
-            foreach (var floorId in dicFloor.Keys)
-            {
-                //绗竴涓ゼ灞�
-                return floorId;
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// 鑾峰彇褰撳墠妤煎眰鍚嶇О
-        /// </summary>
-        /// <returns></returns>
-        public static string GetCurrentSelectFloorIdName()
-        {
-            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
-            foreach (var floorId in dicFloor.Keys)
-            {
-                //绗竴涓ゼ灞�
-                return dicFloor[floorId];
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// 鑾峰彇褰撳墠妤煎眰鍚嶇О
-        /// fllodID:妤煎眰ID
-        /// </summary>
-        /// <returns></returns>
-        public static string GetBindTargetsFloorIdName(string curFllodID)
-        {
-            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
-            foreach (var floorId in dicFloor.Keys)
-            {
-                //褰撳墠妤煎眰
-                if (curFllodID == floorId)
-                {
-                    return dicFloor[floorId];
-                }
-            }
-            return null;
         }
 
         /// <summary>
@@ -394,5 +1033,24 @@
             }
             return dicCheck;
         }
+
+        /// <summary>
+        /// 搴曢儴瀹屾垚鎸夐挳鏄剧ず
+        /// </summary>
+        /// <returns></returns>
+        public static void FinishDisplay(List<Room> roomTempList, Button btnFinish)
+        {
+            if (roomTempList.Count == 0)
+            {
+                btnFinish.Enable = false;
+                btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+            }
+            else
+            {
+                btnFinish.Enable = true;
+                btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+            }
+        }
+        #endregion 
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
new file mode 100755
index 0000000..c1bac93
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
@@ -0,0 +1,876 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Shared.Common;
+using Shared.Phone.UserCenter.Device;
+using Shared.Phone.UserCenter.DeviceBind;
+using ZigBee.Device;
+using static ZigBee.Device.BindObj;
+using static ZigBee.Device.Panel;
+
+namespace Shared.Phone.UserCenter.Device.Bind
+{
+    /// <summary>
+    /// /鍙娇鐢ㄤ簬绠�绾﹀鍔熻兘闈㈡澘鐨勬柟娉�
+    /// </summary>
+    public class MutilfunctionPanelMethod
+    {
+        #region  鍙橀噺鐢虫槑 
+        /// <summary>
+        /// 寮�鍏崇殑涓暟聽[姣忔杩涘叆鍒板鍔熻兘缁戝畾鐣岄潰锛岄兘瑕佽閲嶆柊鍙栧�糫
+        /// </summary>
+        public static int curSwitchCount = 0;
+        /// <summary>
+        /// 鎻掑骇鐨勪釜鏁奥�
+        /// </summary>
+        public static int curSocketCount = 0;
+        /// <summary>
+        /// 鐏厜涓暟聽[浠庣户鐢靛櫒涓垎閰嶇殑鍔熻兘绫诲瀷鏄伅鍏塢
+        /// </summary>
+        public static int curLightFromRelayCount = 0;
+        /// <summary>
+        /// 璋冨厜涓暟聽
+        /// </summary>
+        public static int curLightCount = 0;
+        /// <summary>
+        /// 澶氬姛鑳介潰鏉夸腑琚粦瀹氱殑鐩爣
+        /// </summary>
+        public static System.Collections.Generic.Dictionary<string, List<BindListAllInfo>> bindTargetsFromMutilfunctionPanelList = new System.Collections.Generic.Dictionary<string, List<BindListAllInfo>>();
+        #endregion
+
+        /// <summary>
+        /// 鑾峰彇闈㈡澘宸茬粡缁戝畾鐨勫尮閰嶇被鍨嬬殑鍒楄〃
+        /// <param name="curBindType">褰撳墠绫诲瀷 0:鍦烘櫙  1:寮�鍏�  2:鎻掑骇  3:鐏厜  4:閬槼 5:绌鸿皟 6:鏂伴</param>
+        /// </summary>
+        /// <returns></returns>
+        public static List<BindListAllInfo> GetMatchBindList(int curBindType)
+        {
+            var tempList = new List<BindListAllInfo>();
+            int count1 = 0;
+            int count2 = 0;
+            foreach (var key in bindTargetsFromMutilfunctionPanelList.Keys)
+            {
+                var bList = bindTargetsFromMutilfunctionPanelList[key];
+                foreach (var bDev in bList)
+                {
+                    var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
+                    switch (curBindType)
+                    {
+                        case 0:
+                            if (bDev.KeyEpoint >= 32 && bDev.KeyEpoint <= 51)
+                            {
+                                tempList.Add(bDev);
+                            }
+                            break;
+                        case 1:
+                            if (bDev.KeyEpoint >= 52 && bDev.KeyEpoint <= 61)
+                            {
+                                if (device != null)
+                                {
+                                    if (device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+                                    {
+                                        tempList.Add(bDev);
+                                    }
+                                }
+                            }
+                            curSwitchCount = tempList.Count;
+                            break;
+                        case 2:
+                            if (bDev.KeyEpoint >= 52 && bDev.KeyEpoint <= 61)
+                            {
+                                if (device != null)
+                                {
+                                    if (device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+                                    {
+                                        tempList.Add(bDev);
+                                    }
+                                }
+                            }
+                            curSocketCount = tempList.Count;
+                            break;
+                        case 3:
+                            if (bDev.KeyEpoint >= 52 && bDev.KeyEpoint <= 61)
+                            {
+                                if (device != null)
+                                {
+                                    if (device.DfunctionType == DeviceFunctionType.A鐏厜)
+                                    {
+                                        tempList.Add(bDev);
+                                        count1++;
+                                    }
+                                }
+                            }
+                            curLightFromRelayCount = count1;
+                            if (bDev.KeyEpoint >= 22 && bDev.KeyEpoint <= 28)
+                            {
+                                if (device != null)
+                                {
+                                    if (device.Type == DeviceType.DimmableLight && bDev.BindCluster == 8)
+                                    {
+                                        tempList.Add(bDev);
+                                        count2++;
+                                    }
+                                }
+                            }
+                            curLightCount = count2;
+                            break;
+                        case 4:
+                            if (bDev.KeyEpoint >= 14 && bDev.KeyEpoint <= 21 && bDev.BindCluster == 258)
+                            {
+                                tempList.Add(bDev);
+                            }
+                            break;
+                        case 5:
+                            if (bDev.KeyEpoint >= 2 && bDev.KeyEpoint <= 4)
+                            {
+                                if (device != null)
+                                {
+                                    //绌鸿皟缁戝畾绫诲瀷
+                                    if (device.Type == DeviceType.Thermostat && bDev.BindCluster == 513)
+                                    {
+                                        //Thermostat鏄┖璋�
+                                        tempList.Add(bDev);
+                                    }
+                                }
+                            }
+                            break;
+                        case 6:
+                            if (bDev.KeyEpoint == 13)
+                            {
+                                if (device != null)
+                                {
+                                    if (device.Type == DeviceType.FreshAir && bDev.BindCluster == 514)
+                                    {
+                                        tempList.Add(bDev);
+                                    }
+                                }
+                            }
+                            break;
+                    }
+                }
+            }
+            return tempList;
+        }
+
+        /// <summary>
+        /// 鏀寔鍖归厤鐨勭鐐逛釜鏁�
+        /// <param name="curBindType">褰撳墠绫诲瀷 0:鍦烘櫙  1:寮�鍏�  2:鎻掑骇  3:鐏厜  4:閬槼 5:绌鸿皟 6:鏂伴</param>
+        /// </summary>
+        /// <returns></returns>
+        private static List<int> MatchEpointList(int curBindType)
+        {
+            var tempList = new List<int>();
+            switch (curBindType)
+            {
+                case 0:
+                    for (int i = 32; i < 52; i++)
+                    {
+                        tempList.Add(i);
+                    }
+                    break;
+                case 1:
+                case 2:
+                    for (int i = 52; i < 62; i++)
+                    {
+                        tempList.Add(i);
+                    }
+                    break;
+                case 3:
+                    //鏈�澶ф湁10涓户鐢靛櫒鐨勭伅鍏夛紝7涓皟鍏�
+                    for (int i = 52; i < 62; i++)
+                    {
+                        tempList.Add(i);
+                    }
+                    for (int i = MutilfunctionPanelMethod.curLightCount + 22; i < 29; i++)
+                    {
+                        tempList.Add(i);
+                    }
+                    break;
+                case 4:
+                    for (int i = 14; i < 22; i++)
+                    {
+                        tempList.Add(i);
+                    }
+                    break;
+                case 5:
+                    for (int i = 2; i < 5; i++)
+                    {
+                        tempList.Add(i);
+                    }
+                    break;
+                case 6:
+                    for (int i = 13; i < 14; i++)
+                    {
+                        tempList.Add(i);
+                    }
+                    break;
+                    //5~12鍦扮儹 绨� 0x0201
+            }
+            return tempList;
+        }
+
+        /// <summary>
+        /// 鑾峰彇闈㈡澘鏀寔缁戝畾鐨勭鐐瑰垪琛�
+        /// <param name="curBindType">褰撳墠绫诲瀷 0:鍦烘櫙  1:寮�鍏�  2:鎻掑骇  3:鐏厜  4:閬槼 5:绌鸿皟 6:鏂伴</param>
+        /// </summary>
+        /// <returns></returns>
+        public static List<int> GetMatchEpointList(int curBindType)
+        {
+            var tempList = MatchEpointList(curBindType);
+            foreach (var key in bindTargetsFromMutilfunctionPanelList.Keys)
+            {
+                var bList = bindTargetsFromMutilfunctionPanelList[key];
+                foreach (var bDev in bList)
+                {
+                    var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
+                    switch (curBindType)
+                    {
+                        case 0:
+                            if (bDev.KeyEpoint >= 32 && bDev.KeyEpoint <= 51)
+                            {
+                                tempList.Remove(bDev.KeyEpoint);
+                            }
+                            break;
+                        case 1:
+                        case 2:
+                            if (bDev.KeyEpoint >= 52 && bDev.KeyEpoint <= 61)
+                            {
+                                if (device != null)
+                                {
+                                    if (device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+                                    {
+                                        tempList.Remove(bDev.KeyEpoint);
+                                    }
+                                    if (device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+                                    {
+                                        tempList.Remove(bDev.KeyEpoint);
+                                    }
+                                    if (device.DfunctionType == DeviceFunctionType.A鐏厜)
+                                    {
+                                        tempList.Remove(bDev.KeyEpoint);
+                                    }
+                                }
+                            }
+                            break;
+                        case 3:
+                            if (bDev.KeyEpoint >= 52 && bDev.KeyEpoint <= 61)
+                            {
+                                if (device != null)
+                                {
+                                    if (device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+                                    {
+                                        tempList.Remove(bDev.KeyEpoint);
+                                    }
+                                    if (device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+                                    {
+                                        tempList.Remove(bDev.KeyEpoint);
+                                    }
+                                    if (device.DfunctionType == DeviceFunctionType.A鐏厜)
+                                    {
+                                        tempList.Remove(bDev.KeyEpoint);
+                                    }
+                                }
+                            }
+                            if (bDev.KeyEpoint >= 22 && bDev.KeyEpoint <= 28)
+                            {
+                                if (device != null)
+                                {
+                                    if (device.Type == DeviceType.DimmableLight && bDev.BindCluster == 8)
+                                    {
+                                        tempList.Remove(bDev.KeyEpoint);
+                                    }
+                                }
+                            }
+                            break;
+                        case 4:
+                            if (bDev.KeyEpoint >= 14 && bDev.KeyEpoint <= 21 && bDev.BindCluster == 258)
+                            {
+                                tempList.Remove(bDev.KeyEpoint);
+                            }
+                            break;
+                        case 5:
+                            if (bDev.KeyEpoint >= 2 && bDev.KeyEpoint <= 4)
+                            {
+                                if (device != null)
+                                {
+                                    //绌鸿皟缁戝畾绫诲瀷
+                                    if (device.Type == DeviceType.Thermostat && bDev.BindCluster == 513)
+                                    {
+                                        //Thermostat鏄┖璋�
+                                        tempList.Remove(bDev.KeyEpoint);
+                                    }
+                                }
+                            }
+                            break;
+                        case 6:
+                            if (bDev.KeyEpoint == 13)
+                            {
+                                if (device != null)
+                                {
+                                    if (device.Type == DeviceType.FreshAir && bDev.BindCluster == 514)
+                                    {
+                                        tempList.Remove(bDev.KeyEpoint);
+                                    }
+                                }
+                            }
+                            break;
+                    }
+                }
+            }
+            return tempList;
+        }
+
+
+        /// <summary>
+        /// 鑳芥樉绀虹殑鎴块棿鍒楄〃
+        /// </summary>
+        public static List<Room> GetSupportRoomList(Panel curControlDev, List<Room> supportRoomList, List<BindListAllInfo> curBindTypeList, int curDeviceBindType)
+        {
+            var roomTempList = new List<Room>();
+            for (int i = 0; i < supportRoomList.Count; i++)
+            {
+                var room = supportRoomList[i];
+                //濡傛灉鎴块棿涓哄枩鐖盵鍚庢潵鏀瑰悕涓哄父鐢ㄦ埧闂碷锛屽垯涓嶆樉绀�
+                if (room.IsLove == true)
+                {
+                    continue;
+                }
+
+                List<CommonDevice> roomIncludeMatchDevice = new List<CommonDevice>();
+                List<SceneUI> roomIncludeMatchScene = new List<SceneUI>();
+                if (curDeviceBindType == 0)
+                {
+                    foreach (var sceneId in room.ListSceneId)
+                    {
+                        var scene = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
+                        if (scene == null)
+                        {
+                            continue;
+                        }
+                        var tempSc = curBindTypeList.Find(obj => obj.BindScenesId == sceneId);
+                        if (tempSc == null)
+                        {
+                            //琚粦瀹氱洰鏍囦笉鑳藉啀娆″嚭鐜�
+                            roomIncludeMatchScene.Add(scene);
+                        }
+                    }
+                }
+                else
+                {
+                    foreach (var de in room.ListDevice)
+                    {
+                        var device = LocalDevice.Current.GetDevice(de);
+                        if (device != null)
+                        {
+                            var tempDev = curBindTypeList.Find(obj => obj.BindMacAddr + obj.BindEpoint == device.DeviceAddr + device.DeviceEpoint);
+                            if (tempDev == null)
+                            {
+                                switch (curDeviceBindType)
+                                {
+                                    case 1:
+                                        if (device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+                                        {
+                                            if (device.Type != DeviceType.AirSwitch)
+                                            {
+                                                roomIncludeMatchDevice.Add(device);
+                                            }
+                                        }
+                                        break;
+                                    case 2:
+                                        if (device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+                                        {
+                                            if (device.Type != DeviceType.AirSwitch)
+                                            {
+                                                roomIncludeMatchDevice.Add(device);
+                                            }
+                                        }
+                                        break;
+                                    case 3:
+                                        if (device.DfunctionType == DeviceFunctionType.A鐏厜)
+                                        {
+                                            if (device.Type != DeviceType.AirSwitch)
+                                            {
+                                                roomIncludeMatchDevice.Add(device);
+                                            }
+                                        }
+                                        if (device.Type == DeviceType.DimmableLight)
+                                        {
+                                            roomIncludeMatchDevice.Add(device);
+                                        }
+                                        break;
+                                    case 4:
+                                        if (device.Type == DeviceType.WindowCoveringDevice)
+                                        {
+                                            roomIncludeMatchDevice.Add(device);
+                                        }
+                                        break;
+                                    case 5:
+                                        if (device.Type == DeviceType.Thermostat)
+                                        {
+                                            //Thermostat鏄┖璋�
+                                            roomIncludeMatchDevice.Add(device);
+                                        }
+                                        break;
+                                    case 6:
+                                        if (device.Type == DeviceType.FreshAir)
+                                        {
+                                            if (BindInfo.checkRealFreshAirDevice(device) == false)
+                                            {
+                                                continue;
+                                            }
+                                            roomIncludeMatchDevice.Add(device);
+                                        }
+                                        break;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (curDeviceBindType == 0)
+                {
+                    if (room.ListSceneId.Count == 0)
+                    {
+                        continue;
+                    }
+                    if (roomIncludeMatchScene.Count == 0)
+                    {
+                        continue;
+                    }
+                }
+                else
+                {
+                    if (room.ListDevice.Count == 0)
+                    {
+                        continue;
+                    }
+                    if (roomIncludeMatchDevice.Count == 0)
+                    {
+                        continue;
+                    }
+                }
+
+
+                if (!string.IsNullOrEmpty(room.FloorId))
+                {
+                    //鏈夋ゼ灞�
+                    if (room.FloorId == curControlDev.currentSelectFloorId)
+                    {
+                        roomTempList.Add(room);
+                    }
+                }
+                else
+                {
+                    //娌℃湁妤煎眰
+                    roomTempList.Add(room);
+                }
+            }
+            return roomTempList;
+        }
+
+
+        /// <summary>
+        /// 鍖归厤鐨勭被鍨嬬粦瀹氭枃鏈釜鏁版彁绀�
+        /// </summary>
+        /// <param name="curBindType">褰撳墠绫诲瀷 0:鍦烘櫙  1:寮�鍏�  2:鎻掑骇  3:鐏厜  4:閬槼 5:绌鸿皟 6:鏂伴</param>
+        /// <param name="countTemp">寮�鍏冲拰鐏厜鍔ㄦ�佷釜鏁�</param>
+        /// <returns></returns>
+        public static string MatchTypeBindTextTip(int curBindType, int countDynamic = 0)
+        {
+            string[] msgArry = Language.StringByID(R.MyInternationalizationString.AddMoreTip).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
+            var tipText = msgArry[0];
+
+            switch (curBindType)
+            {
+                case 0:
+                    //鍦烘櫙鍏�20涓�
+                    var temp0 = 20 - countDynamic;
+                    tipText += temp0 + msgArry[1] + Language.StringByID(R.MyInternationalizationString.scene);
+                    break;
+                case 1:
+                    //寮�鍏冲叡10涓�
+                    var temp1 = 10 - countDynamic;
+                    tipText += temp1 + msgArry[1] + Language.StringByID(R.MyInternationalizationString.uDeviceBelongId13);
+                    break;
+                case 2:
+                    //寮�鍏冲叡10涓�
+                    var temp2 = 10 - countDynamic;
+                    tipText += temp2 + msgArry[1] + Language.StringByID(R.MyInternationalizationString.uDeviceBelongId14);
+                    break;
+                case 3:
+                    //寮�鍏充腑鍙垎閰嶇伅鍏夊姛鑳藉叡10涓紝璋冨厜鍗�7涓�
+                    var temp3 = 17 - countDynamic;
+                    tipText += temp3 + msgArry[1] + Language.StringByID(R.MyInternationalizationString.uDeviceBelongId15);
+                    break;
+                case 4:
+                    //閬槼鍏�8涓�
+                    var temp4 = 8 - countDynamic;
+                    tipText += temp4 + msgArry[1] + Language.StringByID(R.MyInternationalizationString.uDeviceBelongId100);
+                    break;
+                case 5:
+                    //绌鸿皟鍏�3涓�
+                    var temp5 = 3 - countDynamic;
+                    tipText += temp5 + msgArry[1] + Language.StringByID(R.MyInternationalizationString.uDeviceBelongId3600);
+                    break;
+                case 6:
+                    //鏂伴鍏�1涓�
+                    var temp6 = 1 - countDynamic;
+                    tipText += temp6 + msgArry[1] + Language.StringByID(R.MyInternationalizationString.uDeviceBelongId2310);
+                    break;
+            }
+            return tipText;
+        }
+
+        /// <summary>
+        /// 鎵�鏈夋埧闂翠腑鍖归厤鐨勬敮鎸佺粦瀹氱殑鎵�鏈夌洰鏍囧垪琛�
+        /// </summary>
+        /// <param name="currentPanelSupportBindDeviceList"></param>
+        /// <param name="supportRoomList"></param>
+        /// <param name="curDeviceBindType">褰撳墠璁惧缁戝畾绫诲瀷 1:寮�鍏�  2:鎻掑骇  3:鐏厜  4:閬槼 5:绌鸿皟 6:鏂伴</param>
+        /// <param name="curBindTypeList">褰撳墠绫诲瀷鐨勭粦瀹氳〃</param> 
+        /// <returns></returns>
+        public static List<CommonDevice> GetAllRoomSupportDeviceList(List<CommonDevice> currentPanelSupportBindDeviceList, List<Room> supportRoomList, List<BindListAllInfo> curBindTypeList, int curDeviceBindType)
+        {
+            currentPanelSupportBindDeviceList.Clear();
+            List<CommonDevice> currentPanelBindSupportDeviceListTemp = new List<CommonDevice>();
+            foreach (var r in supportRoomList)
+            {
+                if (r.ListDevice.Count == 0)
+                {
+                    continue;
+                }
+                foreach (var deviceKeys in r.ListDevice)
+                {
+                    var device = LocalDevice.Current.GetDevice(deviceKeys);
+                    if (device == null)
+                    {
+                        continue;
+                    }
+                    var tempDev = curBindTypeList.Find(obj => obj.BindMacAddr + obj.BindEpoint == deviceKeys);
+                    if (tempDev == null)
+                    {
+                        //琚粦瀹氱洰鏍囦笉鑳藉啀娆″嚭鐜�
+                        switch (curDeviceBindType)
+                        {
+                            case 1:
+                                if (device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+                                {
+                                    if (device.Type != DeviceType.AirSwitch)
+                                    {
+                                        currentPanelBindSupportDeviceListTemp.Add(device);
+                                    }
+                                }
+                                break;
+                            case 2:
+                                if (device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+                                {
+                                    if (device.Type != DeviceType.AirSwitch)
+                                    {
+                                        if (device.Type != DeviceType.AirSwitch)
+                                        {
+                                            currentPanelBindSupportDeviceListTemp.Add(device);
+                                        }
+                                    }
+                                }
+
+                                break;
+                            case 3:
+                                if (device.DfunctionType == DeviceFunctionType.A鐏厜)
+                                {
+                                    currentPanelBindSupportDeviceListTemp.Add(device);
+                                }
+                                if (device.Type == DeviceType.DimmableLight)
+                                {
+                                    currentPanelBindSupportDeviceListTemp.Add(device);
+                                }
+                                break;
+                            case 4:
+                                if (device.Type == DeviceType.WindowCoveringDevice)
+                                {
+                                    currentPanelBindSupportDeviceListTemp.Add(device);
+                                }
+                                break;
+                            case 5:
+                                if (device.Type == DeviceType.Thermostat)
+                                {
+                                    //Thermostat鏄┖璋�
+                                    currentPanelBindSupportDeviceListTemp.Add(device);
+                                }
+                                break;
+                            case 6:
+                                if (device.Type == DeviceType.FreshAir)
+                                {
+                                    if (BindInfo.checkRealFreshAirDevice(device) == false)
+                                    {
+                                        continue;
+                                    }
+                                    currentPanelBindSupportDeviceListTemp.Add(device);
+                                }
+                                break;
+
+                        }
+                    }
+                }
+            }
+            return currentPanelBindSupportDeviceListTemp;
+        }
+
+        /// <summary>
+        /// 鎵�鏈夋埧闂翠腑鍖归厤鐨勬敮鎸佺粦瀹氱殑鎵�鏈夌洰鏍囧垪琛�
+        /// </summary>
+        /// <param name="currentPanelSupportBindSceneList"></param>
+        /// <param name="supportRoomList"></param>
+        /// <param name="curBindTypeList">褰撳墠绫诲瀷鐨勭粦瀹氳〃</param> 
+        /// <param name="curDeviceBindType">褰撳墠璁惧缁戝畾绫诲瀷 0:鍦烘櫙</param>
+        /// <returns></returns>
+        public static List<SceneUI> GetAllRoomSupportSceneList(List<SceneUI> currentPanelSupportBindSceneList, List<Room> supportRoomList, List<BindListAllInfo> curBindTypeList, int curDeviceBindType = 0)
+        {
+            currentPanelSupportBindSceneList.Clear();
+            List<SceneUI> currentPanelBindSupportSceneListTemp = new List<SceneUI>();
+            foreach (var room in supportRoomList)
+            {
+                //濡傛灉鎴块棿涓哄枩鐖憋紝鍒欎笉鏄剧ず
+                if (room.IsLove == true)
+                {
+                    continue;
+                }
+                //濡傛灉鎴块棿涓病鏈夊満鏅紝鍒欎笉鏄剧ず
+                if (room.ListSceneId.Count == 0)
+                {
+                    continue;
+                }
+                foreach (var sceneId in room.ListSceneId)
+                {
+                    var scene = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
+                    if (scene == null)
+                    {
+                        continue;
+                    }
+                    var tempSc = curBindTypeList.Find(obj => obj.BindScenesId == sceneId);
+                    if (tempSc == null)
+                    {
+                        //琚粦瀹氱洰鏍囦笉鑳藉啀娆″嚭鐜�
+                        currentPanelSupportBindSceneList.Add(scene);
+                    }
+                }
+            }
+            return currentPanelSupportBindSceneList;
+        }
+
+
+        /// <summary>
+        /// 鑾峰彇鏈湴鏈垎閰嶇殑鏀寔褰撳墠绫诲瀷鐨勭粦瀹氳澶囧垪琛�
+        /// </summary>
+        /// <param name="undistruibuteDevList"></param>
+        /// <param name="curBindTypeList"></param>
+        /// <param name="curDeviceBindType">褰撳墠绫诲瀷鐨勭粦瀹氳〃</param>
+        /// <returns></returns>
+        public static List<CommonDevice> GetUndistributeDeviceList(List<CommonDevice> undistruibuteDevList, List<BindListAllInfo> curBindTypeList, int curDeviceBindType)
+        {
+            undistruibuteDevList.Clear();
+            List<CommonDevice> UndistributeCommonDeviceListTemp = new List<CommonDevice>();
+
+            //鑾峰彇鏈湴璁惧鍒楄〃
+            foreach (var tempDev in Shared.Common.LocalDevice.Current.listAllDevice)
+            {
+                //鑾峰彇璁惧鎵�灞炴埧闂�
+                var tempDevRoom = HdlRoomLogic.Current.GetRoomByDevice(tempDev);
+                if (tempDevRoom == null)
+                {
+                    UndistributeCommonDeviceListTemp.Add(tempDev);
+                }
+            }
+            foreach (var device in UndistributeCommonDeviceListTemp)
+            {
+                var tempDev = curBindTypeList.Find(obj => obj.BindMacAddr + obj.BindEpoint == device.DeviceAddr + device.DeviceEpoint);
+                if (tempDev == null)
+                {
+                    //琚粦瀹氱洰鏍囦笉鑳藉啀娆″嚭鐜�
+                    switch (curDeviceBindType)
+                    {
+                        case 1:
+                            if (device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+                            {
+                                if (device.Type != DeviceType.AirSwitch)
+                                {
+                                    undistruibuteDevList.Add(device);
+                                }
+                            }
+                            break;
+                        case 2:
+                            if (device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+                            {
+                                if (device.Type != DeviceType.AirSwitch)
+                                {
+                                    undistruibuteDevList.Add(device);
+                                }
+                            }
+
+                            break;
+                        case 3:
+                            if (device.DfunctionType == DeviceFunctionType.A鐏厜)
+                            {
+                                if (device.Type != DeviceType.AirSwitch)
+                                {
+                                    undistruibuteDevList.Add(device);
+                                }
+                            }
+                            if (device.Type == DeviceType.DimmableLight)
+                            {
+                                undistruibuteDevList.Add(device);
+                            }
+                            break;
+                        case 4:
+                            if (device.Type == DeviceType.WindowCoveringDevice)
+                            {
+                                undistruibuteDevList.Add(device);
+                            }
+                            break;
+                        case 5:
+                            if (device.Type == DeviceType.Thermostat)
+                            {
+                                //Thermostat鏄┖璋�
+                                undistruibuteDevList.Add(device);
+                            }
+                            break;
+                        case 6:
+                            if (device.Type == DeviceType.FreshAir)
+                            {
+                                if (BindInfo.checkRealFreshAirDevice(device) == false)
+                                {
+                                    continue;
+                                }
+                                undistruibuteDevList.Add(device);
+                            }
+                            break;
+
+                    }
+                }
+            }
+
+            return undistruibuteDevList;
+        }
+
+        /// <summary>
+        /// 鑾峰彇褰撳墠鎴块棿涓尮閰嶇殑鏀寔缁戝畾鐨勫満鏅垪琛�
+        /// </summary>
+        /// <returns></returns>
+        public static List<SceneUI> GetCurRoomSupportSceneList(Room curRoom, List<SceneUI> currentRoomSupportBindSceneList, List<BindListAllInfo> curBindTypeList, int curDeviceBindType = 0)
+        {
+            currentRoomSupportBindSceneList.Clear();
+            List<SceneUI> curRoomDeviceListTemp = new List<SceneUI>();
+            foreach (var sceneId in curRoom.ListSceneId)
+            {
+                var tempSc = curBindTypeList.Find(obj => obj.BindScenesId == sceneId);
+                if (tempSc != null)
+                {
+                    //琚粦瀹氱洰鏍囦笉鑳藉啀娆″嚭鐜�
+                    continue;
+                }
+                var scene = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
+                if (scene != null)
+                {
+                    curRoomDeviceListTemp.Add(scene);
+                }
+            }
+            return curRoomDeviceListTemp;
+        }
+
+        /// <summary>
+        /// 鑾峰彇褰撳墠鎴块棿涓尮閰嶇殑鏀寔缁戝畾鐨勮澶囧垪琛�
+        /// </summary>
+        /// <returns></returns>
+        public static List<CommonDevice> GetCurRoomSupportDeviceList(Room curRoom, List<CommonDevice> currentRoomSupportBindDeviceList, List<BindListAllInfo> curBindTypeList, int curDeviceBindType)
+        {
+            currentRoomSupportBindDeviceList.Clear();
+            List<CommonDevice> curRoomDeviceListTemp = new List<CommonDevice>();
+            foreach (var deviceKeys in curRoom.ListDevice)
+            {
+                var device = LocalDevice.Current.GetDevice(deviceKeys);
+                if (device != null)
+                {
+                    //鑾峰彇璁惧绫诲瀷鐨�
+                    var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+                    var tempDev = curBindTypeList.Find(obj => obj.BindMacAddr + obj.BindEpoint == device.DeviceAddr + device.DeviceEpoint);
+                    if (tempDev != null)
+                    {
+                        //琚粦瀹氱洰鏍囦笉鑳藉啀娆″嚭鐜�
+                        continue;
+                    }
+                    switch (curDeviceBindType)
+                    {
+                        case 1:
+                            if (device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+                            {
+                                if (device.Type != DeviceType.AirSwitch)
+                                {
+                                    curRoomDeviceListTemp.Add(device);
+                                }
+                            }
+                            break;
+                        case 2:
+                            if (device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+                            {
+                                if (device.Type != DeviceType.AirSwitch)
+                                {
+                                    curRoomDeviceListTemp.Add(device);
+                                }
+                            }
+
+                            break;
+                        case 3:
+                            if (device.DfunctionType == DeviceFunctionType.A鐏厜)
+                            {
+                                if (device.Type != DeviceType.AirSwitch)
+                                {
+                                    curRoomDeviceListTemp.Add(device);
+                                }
+                            }
+                            if (device.Type == DeviceType.DimmableLight)
+                            {
+                                if (deviceEnumInfo.ConcreteType != Common.DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+                                {
+                                    //Thermostat鏄┖璋�
+                                    curRoomDeviceListTemp.Add(device);
+                                }
+                            }
+                            break;
+                        case 4:
+                            if (device.Type == DeviceType.WindowCoveringDevice)
+                            {
+                                if (deviceEnumInfo.ConcreteType != Common.DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+                                {
+                                    //Thermostat鏄┖璋�
+                                    curRoomDeviceListTemp.Add(device);
+                                }
+                            }
+                            break;
+                        case 5:
+                            if (device.Type == DeviceType.Thermostat)
+                            {
+                                if (deviceEnumInfo.ConcreteType != Common.DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+                                {
+                                    //Thermostat鏄┖璋�
+                                    curRoomDeviceListTemp.Add(device);
+                                }
+                            }
+                            break;
+                        case 6:
+                            if (device.Type == DeviceType.FreshAir)
+                            {
+                                if (BindInfo.checkRealFreshAirDevice(device) == false)
+                                {
+                                    continue;
+                                }
+                                curRoomDeviceListTemp.Add(device);
+                            }
+                            break;
+
+                    }
+                }
+            }
+            return curRoomDeviceListTemp;
+        }
+
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionBindSensorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
similarity index 61%
rename from ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionBindSensorForm.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
index c7c2992..d7e25e7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionBindSensorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
@@ -1,36 +1,38 @@
 锘縰sing System;
 using System.Collections.Generic;
-using System.Linq.Expressions;
 using Shared.Common;
-using Shared.Phone.UserCenter.Safety;
+using Shared.Phone.UserCenter.DeviceBind;
 using ZigBee.Device;
 using static ZigBee.Device.BindObj;
 using static ZigBee.Device.Panel;
-
-namespace Shared.Phone.UserCenter.DeviceBind
+namespace Shared.Phone.UserCenter.Device.Bind
 {
-    public class PanelSimpleMutilfunctionBindSensorForm : BindCommonLayout
+    public class PaneTargetsBaseForm : BindCommonLayout
     {
         #region  鏋勯�犲嚱鏁�
         /// <summary>
         /// 鏋勯�犲嚱鏁�
         /// </summary>
         /// <param name="device"></param>
-        /// <param name="deviceBindType">1:娓╁害浼犳劅鍣�;2:婀垮害浼犳劅鍣� </param>
+        /// <param name="deviceBindType">1:鏂伴;2:娓╁害浼犳劅鍣�;3:婀垮害浼犳劅鍣�;4:PM2.5浼犳劅鍣�;5:绌鸿皟鐩爣</param>
         /// <param name="bindDev">缁戝畾鐩爣 </param>
-        public PanelSimpleMutilfunctionBindSensorForm(CommonDevice device, CommonDevice bindDev, int deviceBindType)
+        public PaneTargetsBaseForm(CommonDevice device, CommonDevice bindDev, DeviceBind.BindInfo.BindType deviceBindType)
         {
-            this.curControlDev = device as FreshAir;
+            curControlDev = new Panel();
+            curControlDev.DeviceAddr = device.DeviceAddr;
+            curControlDev.DeviceEpoint = device.DeviceEpoint;
+            curControlDev.CurrentGateWayId = device.CurrentGateWayId;
+            curControlDev.Type = device.Type;
             this.curBindDevice = bindDev;
             this.curDeviceBindType = deviceBindType;
         }
         #endregion
 
-        #region  鍙橀噺鐢虫槑 
+        #region  鍙橀噺鐢虫槑
         /// <summary>
-        /// 褰撳墠鏂伴闈㈡澘銆愭帶鍒惰澶囥��
+        /// 鎺у埗璁惧
         /// </summary>
-        FreshAir curControlDev;
+        Panel curControlDev;
         /// <summary>
         /// 褰撳墠琚粦璁惧
         /// </summary>
@@ -38,7 +40,7 @@
         /// <summary>
         /// 鏄剧ず琚粦瀹氳澶囨垨鍦烘櫙鐨剉iew
         /// </summary>
-        VerticalFrameRefreshControl midVerticalScrolViewLayout;
+        VerticalRefreshLayout midVerticalScrolViewLayout;
         /// <summary>
         /// 鏄剧ず鎴块棿鐨剉iew
         /// </summary>
@@ -47,6 +49,14 @@
         /// 鎸夐敭閰嶇疆鐨勭洰鏍囧垪琛�
         /// </summary>
         List<CommonDevice> targetList = new List<CommonDevice>();
+        /// <summary>
+        /// 鎸夐敭閰嶇疆鐨勭洰鏍囦复鏃跺垪琛�
+        /// </summary>
+        List<CommonDevice> targetListTemp = new List<CommonDevice>();
+        /// <summary>
+        /// 涓存椂鎴块棿
+        /// </summary>
+        Room tempRoom;
         /// <summary>
         /// 闈㈡澘涓凡缁忓瓨鍦ㄧ殑鐩爣鍒楄〃
         /// </summary>
@@ -57,8 +67,9 @@
         /// 2:娓╁害浼犳劅鍣�
         /// 3:婀垮害浼犳劅鍣�
         /// 4:PM2.5浼犳劅鍣�
+        /// 5:绌鸿皟鐩爣
         /// </summary>
-        int curDeviceBindType = 0;
+        DeviceBind.BindInfo.BindType curDeviceBindType = 0;
         /// <summary>
         /// 鏈湴鎴块棿鍒楄〃
         /// </summary>
@@ -72,6 +83,14 @@
         /// </summary>
         Button btnFloorText;
         /// <summary>
+        /// 绌虹洰鏍囨寜閽�
+        /// </summary>
+        Button btnTipPic;
+        /// <summary>
+        /// 绌虹洰鏍囨枃鏈�
+        /// </summary>
+        Button btnTipText;
+        /// <summary>
         /// 妤煎眰鍒楄〃
         /// </summary>
         Dictionary<string, string> dicFloorList;
@@ -79,6 +98,10 @@
         /// 鎵�鏈夋埧闂翠腑鏀寔琚粦瀹氱殑璁惧鍒楄〃
         /// </summary>
         List<CommonDevice> currentPanelSupportBindDeviceList = new List<CommonDevice>();
+        /// <summary>
+        /// 鏈垎閰嶇殑璁惧鍒楄〃
+        /// </summary>
+        List<CommonDevice> undistruibuteDevList = new List<CommonDevice>();
         /// <summary>
         /// 褰撳墠鎴块棿涓敮鎸佽缁戝畾鐨勮澶囧垪琛�
         /// </summary>
@@ -103,30 +126,48 @@
         /// PM缁戝畾鐩爣鍥炶皟
         /// </summary>
         public Action<string> actionPMTarget = null;
+        /// <summary>
+        /// Ac缁戝畾鐩爣鍥炶皟
+        /// </summary>
+        public Action<string> actionAcTarget = null;
 
         #endregion
 
-        #region UI璁捐 
+        #region UI璁捐
         /// <summary>
         /// 鐩爣椤垫樉绀�
         /// </summary>
         public void Show()
         {
-            #region 鏍囬鏍�
+            TitleUI();
+            //鏍囬鏍忎笅鐨刄I
+            MidFrameLayoutContent();
+            //鍒濆鍖栬澶囨暟鎹�
+            InitData();
+        }
+
+        /// <summary>
+        /// 鏍囬鏍�
+        /// </summary>
+        void TitleUI()
+        {
             string titleText = "";
             switch (curDeviceBindType)
             {
-                case 1:
-                    titleText = Language.StringByID(R.MyInternationalizationString.BindFreshAirTarget);
+                case DeviceBind.BindInfo.BindType.FreshAir:
+                    titleText = Language.StringByID(R.MyInternationalizationString.uNewWindTarget);
                     break;
-                case 2:
+                case DeviceBind.BindInfo.BindType.Temperature:
                     titleText = Language.StringByID(R.MyInternationalizationString.TemperatureSource);
                     break;
-                case 3:
+                case DeviceBind.BindInfo.BindType.Humidity:
                     titleText = Language.StringByID(R.MyInternationalizationString.HumiditySource);
                     break;
-                case 4:
+                case DeviceBind.BindInfo.BindType.PM:
                     titleText = Language.StringByID(R.MyInternationalizationString.PM25Source);
+                    break;
+                case DeviceBind.BindInfo.BindType.AC:
+                    titleText = Language.StringByID(R.MyInternationalizationString.AcTargets);
                     break;
             }
             this.TopFrameLayout(this, titleText);
@@ -138,68 +179,6 @@
             this.btnBack.MouseUpEventHandler += eHandlerBack;
             this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
             this.MidFrameLayout(this);
-            #endregion
-
-            //娣诲姞妤煎眰UI
-            BindDownFrameLayout();
-            //鏍囬鏍忎笅鐨刄I
-            MidFrameLayoutContent();
-            //鍒濆鍖栬澶囨暟鎹� 
-            InitData();
-        }
-
-        /// <summary>
-        /// 娣诲姞妤煎眰UI
-        /// </summary> 
-        void BindDownFrameLayout()
-        {
-            var btnAddFrameLayout = new FrameLayout
-            {
-                X = Application.GetRealWidth(619),
-            };
-            this.titleFrameLayout.AddChidren(btnAddFrameLayout);
-
-            btnFloorText = new Button
-            {
-                Width = Application.GetRealWidth(300 - 69 - 58),
-                Text = Language.StringByID(R.MyInternationalizationString.FirstFloor),
-                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
-                TextSize = 14,
-                IsBold = true,
-                TextAlignment = TextAlignment.CenterRight,
-            };
-            btnAddFrameLayout.AddChidren(btnFloorText);
-
-            var btnBindDownFrameLayout = new FrameLayout
-            {
-                Width = Application.GetMinReal(69 + 58),
-                X = Application.GetRealWidth(300 - 69 - 58),
-            };
-            btnAddFrameLayout.AddChidren(btnBindDownFrameLayout);
-
-            var btnBindDown = new Button
-            {
-                Height = Application.GetMinReal(69),
-                Width = Application.GetMinReal(69),
-                UnSelectedImagePath = "BindPic/BindDown.png",
-                Gravity = Gravity.CenterVertical,
-            };
-            btnBindDownFrameLayout.AddChidren(btnBindDown);
-
-            EventHandler<MouseEventArgs> eHandlerBindDown = (sender, e) =>
-            {
-                SideslipFramelayout();
-            };
-            btnBindDown.MouseDownEventHandler += eHandlerBindDown;
-            btnBindDownFrameLayout.MouseDownEventHandler += eHandlerBindDown;
-            if (Common.Config.Instance.Home.FloorDics.Count == 0)
-            {
-                btnAddFrameLayout.Width = 0;
-            }
-            else
-            {
-                btnAddFrameLayout.Width = Application.GetRealWidth(300);
-            }
         }
 
         /// <summary>
@@ -221,7 +200,7 @@
             btnMidTopLayout.AddChidren(btnHorizontalScrolViewLayout);
 
             //璁惧鏍�
-            midVerticalScrolViewLayout = new VerticalFrameRefreshControl()
+            midVerticalScrolViewLayout = new VerticalRefreshLayout()
             {
                 Y = btnMidTopLayout.Bottom,
                 Height = Application.GetRealHeight(1145),
@@ -237,14 +216,73 @@
             var bottomFrameLayout = new FrameLayout()
             {
                 Width = LayoutParams.MatchParent,
-                Height = Application.GetRealHeight(127),
-                Y = Application.GetRealHeight(1472),
+                Height = Application.GetRealHeight(84 * 2 + 127),
+                Y = Application.GetRealHeight(1388),
             };
             this.midFrameLayout.AddChidren(bottomFrameLayout);
 
+            var btnTipPicFrameLayout = new FrameLayout()
+            {
+                Width = Application.GetMinReal(40 + 23 + 37),
+                Height = Application.GetMinReal(40 + 44 - 10),
+                X = Application.GetMinReal(383 - 37),
+            };
+            bottomFrameLayout.AddChidren(btnTipPicFrameLayout);
+
+            btnTipPic = new Button()
+            {
+                Width = Application.GetMinReal(40),
+                Height = Application.GetMinReal(40),
+                X = Application.GetMinReal(40),
+                Y = Application.GetRealHeight(22),
+                UnSelectedImagePath = "BindPic/EmptyTargets.png",
+                SelectedImagePath = "BindPic/EmptyTargetsSelected.png",
+            };
+            btnTipPicFrameLayout.AddChidren(btnTipPic);
+
+            btnTipText = new Button()
+            {
+                Height = Application.GetRealHeight(84 - 10),
+                X = Application.GetMinReal(444),
+                Width = Application.GetMinReal(1080 - 446),
+                TextID = R.MyInternationalizationString.BindEmptyTargets,
+                TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,//XMTopTitleText
+                TextSize = 12,
+                TextAlignment = TextAlignment.CenterLeft,
+            };
+            bottomFrameLayout.AddChidren(btnTipText);
+
+            EventHandler<MouseEventArgs> eHandlerEmptyTargets = (sender, e) =>
+            {
+                if (!btnFinifh.Enable)
+                {
+                    return;
+                }
+                if (btnTipPic.IsSelected)
+                {
+                    btnTipPic.IsSelected = false;
+                    foreach (var d in targetListTemp)
+                    {
+                        targetList.Add(d);
+                    }
+                    btnTipText.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
+                }
+                else
+                {
+                    btnTipPic.IsSelected = true;
+                    targetList.Clear();
+                    btnTipText.TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText;
+                }
+                RefreshDeviceList(tempRoom);
+            };
+            btnTipPicFrameLayout.MouseDownEventHandler += eHandlerEmptyTargets;
+            btnTipPic.MouseDownEventHandler += eHandlerEmptyTargets;
+
             btnFinifh = new Button()
             {
-                Width = Application.GetRealWidth(907),
+                Width = Application.GetRealWidth(907),
+                Height = Application.GetRealHeight(127),
+                Y = Application.GetRealHeight(49 + 35),
                 Gravity = Gravity.CenterHorizontal,
                 Radius = (uint)Application.GetRealHeight(127) / 2,
                 TextID = R.MyInternationalizationString.Save,
@@ -254,7 +292,7 @@
                 TextSize = 16,
             };
             bottomFrameLayout.AddChidren(btnFinifh);
-            btnFinifh.MouseUpEventHandler += async (sender, e) =>
+            btnFinifh.MouseUpEventHandler += (sender, e) =>
             {
                 SaveTarget();
             };
@@ -276,9 +314,16 @@
             Button curentOldRoom = null;
             FrameLayout curentOldRoomFrameLayout = null;
             int index = 0;
-            var roomTempList = GetSupportRoomList();
+            var roomTempList = BindInfo.GetSupportRoomList(curControlDev, supportRoomList, curDeviceBindType);
             Room slectedRoom = null;
 
+            var roomUn = new Room();
+            roomUn.Name = Language.StringByID(R.MyInternationalizationString.Undistributed);
+            roomUn.Id = "UndistributedId";
+            if (undistruibuteDevList.Count != 0)
+            {
+                roomTempList.Add(roomUn);
+            }
             for (int i = 0; i < roomTempList.Count; i++)
             {
                 var room = roomTempList[i];
@@ -292,7 +337,7 @@
                 var btnRoomFrameLayout = new FrameLayout
                 {
                     Height = Application.GetMinReal(159),
-                    Width = Application.GetMinReal(255),
+                    Width = Application.GetMinReal(255 + 20),
                     Y = Application.GetRealHeight(23),
                     X = Application.GetRealWidth(5),
                     BackgroundImagePath = "Item/RoomIconBackground.png",
@@ -302,8 +347,8 @@
 
                 var btnRoom = new Button
                 {
-                    Height = Application.GetRealHeight(58),
-                    Width = Application.GetRealWidth(127),
+                    Height = Application.GetRealHeight(66),
+                    Width = Application.GetRealWidth(187),
                     Y = Application.GetRealHeight(58),
                     X = Application.GetRealWidth(14),
                     Text = room.Name,
@@ -322,10 +367,10 @@
                     curentOldRoomFrameLayout = btnRoomFrameLayout;
                 }
 
-                //琚粦瀹氱殑鐩爣杩樻湭鍒嗛厤鍖哄煙锛岄粯璁ゆ槸绗竴涓�
+                //琚粦瀹氱殑鐩爣杩樻湭鍒嗛厤鍖哄煙锛岄粯璁ゆ槸鏈�鍚庝竴涓紝鏈垎閰嶆埧闂�
                 if (string.IsNullOrEmpty(curControlDev.currentSelectRoomId))
                 {
-                    if (index == 0)
+                    if (index == roomTempList.Count - 1)
                     {
                         btnRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
                         btnRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
@@ -376,7 +421,7 @@
                     //鏂伴闈㈡澘淇濆瓨浣胯兘
                     btnFinifh.Enable = true;
                     btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-
+                    tempRoom = curRoom;
                     RefreshDeviceList(curRoom);
                 };
                 btnRoom.MouseUpEventHandler += eHandlerRoom;
@@ -393,14 +438,20 @@
             {
                 if (slectedRoom == null)
                 {
-                    curRoom = roomTempList[0];
+                    //鏈�変腑榛樿鏈�鍚庝竴涓�滄湭鍒嗛厤閫変腑鈥�
+                    curRoom = roomTempList[index - 1];
+                    var view = btnHorizontalScrolViewLayout.GetChildren(index - 1);
+                    var frame = (FrameLayout)view;
+                    var btn = (Button)frame.GetChildren(0);
+                    frame.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
+                    btn.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
                 }
                 else
                 {
                     curRoom = slectedRoom;
                 }
             }
-
+            tempRoom = curRoom;
             RefreshDeviceList(curRoom);
         }
 
@@ -414,7 +465,14 @@
             Button oldDevice = null;
             int curIndex = 0;
 
-            currentRoomSupportBindDeviceList = GetCurRoomSupportDeviceList(curRoom);
+            if (curRoom.Id == "UndistributedId")
+            {
+                currentRoomSupportBindDeviceList = BindInfo.GetUndistributeDeviceList(undistruibuteDevList, curDeviceBindType);
+            }
+            else
+            {
+                currentRoomSupportBindDeviceList = BindInfo.GetCurRoomSupportDeviceList(currentRoomSupportBindDeviceList, curRoom, curDeviceBindType);
+            }
             if (currentRoomSupportBindDeviceList.Count == 0)
             {
                 btnFinifh.Enable = false;
@@ -445,7 +503,6 @@
                 {
                     Width = Application.GetRealWidth(790),
                     X = devicePic.Right + Application.GetRealWidth(20),
-                    TextColor = Shared.Common.ZigbeeColor.Current.TextBlack,
                     TextAlignment = TextAlignment.CenterLeft,
                     TextSize = 15,
                     Text = Common.LocalDevice.Current.GetDeviceEpointName(device),
@@ -477,28 +534,38 @@
                 {
                     line2.Visible = false;
                 }
-
+                if (Common.LocalDevice.Current.CheckDeviceIsOnline(device) == true)
+                {
+                    btnBindName.TextColor = Shared.Common.ZigbeeColor.Current.TextBlack;
+                }
+                else
+                {
+                    btnBindName.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
+                }
                 switch (curDeviceBindType)
                 {
-                    case 1:
+                    case DeviceBind.BindInfo.BindType.FreshAir:
                         devicePic.UnSelectedImagePath = "Device/FreshAirEpoint.png";
                         break;
-                    case 2:
+                    case DeviceBind.BindInfo.BindType.Temperature:
                         devicePic.UnSelectedImagePath = "Device/SensorTemperature.png";
                         if (device.Type == DeviceType.PMSensor)
                         {
                             btnBindName.Text = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
                         }
                         break;
-                    case 3:
+                    case DeviceBind.BindInfo.BindType.Humidity:
                         devicePic.UnSelectedImagePath = "Device/SensorHumidity.png";
                         if (device.Type == DeviceType.PMSensor)
                         {
                             btnBindName.Text = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
                         }
                         break;
-                    case 4:
+                    case DeviceBind.BindInfo.BindType.PM:
                         devicePic.UnSelectedImagePath = "Device/AirQualitySensorEpoint.png";
+                        break;
+                    case DeviceBind.BindInfo.BindType.AC:
+                        devicePic.UnSelectedImagePath = "Device/AirConditionerEpoint.png";
                         break;
                 }
                 #endregion
@@ -519,7 +586,21 @@
 
                 EventHandler<MouseEventArgs> hander = (sender, e) =>
                 {
-                    btnChoose.IsSelected = !btnChoose.IsSelected;
+                    if (btnChoose.IsSelected)
+                    {
+                        return;
+                    }
+                    if (btnTipPic.IsSelected)
+                    {
+                        btnTipPic.IsSelected = false;
+                        foreach (var d in targetListTemp)
+                        {
+                            targetList.Add(d);
+                        }
+                        btnTipText.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
+                    }
+                    btnChoose.IsSelected = true;
+
                     if (!btnChoose.IsSelected)
                     {
                         if (oldDevice != null)
@@ -545,8 +626,11 @@
                         targetList.Clear();
                         targetList.Add(device);
                     }
-
-                    //鏂伴闈㈡澘锛氱敱浜庣洰鏍囨病鏈夋彁渚涘垹闄ゆ帴鍙o紝鎵�浠ュ彲浠ュ彇娑堥�変腑鑳戒繚瀛�
+                    targetListTemp.Clear();
+                    foreach (var d in targetList)
+                    {
+                        targetListTemp.Add(d);
+                    }
                     btnFinifh.Enable = true;
                     btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                 };
@@ -558,148 +642,6 @@
             }
         }
 
-        /// <summary>
-        /// 妤煎眰閫夋嫨鐨勪晶杈规爮
-        /// </summary>
-        void SideslipFramelayout()
-        {
-            var dialog = new Dialog
-            {
-            };
-            dialog.Show();
-
-            var flMain = new FrameLayout { BackgroundColor = 0x00000000 };
-            dialog.AddChidren(flMain);
-            flMain.MouseUpEventHandler += (sender11, e11) =>
-            {
-                dialog.Close();
-            };
-
-            var sidelipFrameLayout = new FrameLayout()
-            {
-                Width = Application.GetMinReal(449),
-                Y = Application.GetRealHeight(161),
-                X = Application.GetRealWidth(596),
-                BackgroundImagePath = "DoorLock/SideslipPic.png",
-            };
-            flMain.AddChidren(sidelipFrameLayout);
-
-            var btnSelectFloor = new Button()
-            {
-                Width = Application.GetRealWidth(200),
-                Height = Application.GetRealHeight(58),
-                X = Application.GetRealWidth(81),
-                Y = Application.GetRealHeight(81),
-                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
-                TextSize = 14,
-                IsBold = true,
-                TextAlignment = TextAlignment.CenterLeft,
-                TextID = R.MyInternationalizationString.SelectFloor,
-            };
-            sidelipFrameLayout.AddChidren(btnSelectFloor);
-
-            var sidelipVerticalScrolViewLayout = new VerticalScrolViewLayout()
-            {
-                Y = btnSelectFloor.Bottom + Application.GetRealHeight(45),
-                Height = Application.GetRealHeight(600),
-            };
-            sidelipFrameLayout.AddChidren(sidelipVerticalScrolViewLayout);
-
-            Button oldbutton = null;
-            Button oldbuttonText = null;
-            int count = 0;
-            foreach (var floorId in dicFloorList.Keys)
-            {
-                var rowFrameLayout = new RowLayout()
-                {
-                    Height = Application.GetRealHeight(152),
-                    LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
-                    X = Application.GetRealWidth(81),
-                };
-                sidelipVerticalScrolViewLayout.AddChidren(rowFrameLayout);
-
-                var btnAllMethod = new Button()
-                {
-                    Width = Application.GetMinReal(81),
-                    Height = Application.GetMinReal(81),
-                    UnSelectedImagePath = "Floor/Floor.png",
-                    SelectedImagePath = "Floor/FloorSelected.png",
-                    Gravity = Gravity.CenterVertical,
-                };
-                rowFrameLayout.AddChidren(btnAllMethod);
-
-                var btnMethodText = new Button()
-                {
-                    Width = Application.GetRealWidth(311),
-                    Height = Application.GetRealHeight(58),
-                    X = Application.GetRealWidth(92),
-                    Gravity = Gravity.CenterVertical,
-                    TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
-                    TextSize = 14,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    Text = dicFloorList[floorId],
-                };
-                rowFrameLayout.AddChidren(btnMethodText);
-
-                if (curControlDev.currentSelectFloorId == floorId)
-                {
-                    btnAllMethod.IsSelected = true;
-                    btnAllMethod.IsBold = true;
-                    btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                }
-
-                string curFloorId = floorId;
-                EventHandler<MouseEventArgs> hander = (sender, e) =>
-                {
-                    if (curControlDev.currentSelectFloorId == curFloorId)
-                    {
-                        return;
-                    }
-                    curControlDev.currentSelectFloorId = curFloorId;
-                    btnFloorText.Text = dicFloorList[floorId];
-
-                    //鑾峰彇妤煎眰涓埧闂村垪琛� 
-                    supportRoomList = GetFloorRoomList();
-                    if (!btnMethodText.IsSelected)
-                    {
-                        if (oldbutton != null)
-                        {
-                            oldbutton.IsSelected = false;
-                        }
-                        if (oldbuttonText != null)
-                        {
-                            oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
-                        }
-                        oldbutton = btnMethodText;
-                        oldbuttonText = btnMethodText;
-                        btnMethodText.IsSelected = true;
-                        oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                        oldbuttonText.IsBold = true;
-                    }
-
-                    int index = 0;
-                    RefreshRoomList();
-                    dialog.Close();
-                };
-                btnAllMethod.MouseUpEventHandler += hander;
-                rowFrameLayout.MouseUpEventHandler += hander;
-                btnMethodText.MouseUpEventHandler += hander;
-                count++;
-            }
-
-            if (count == 0)
-            {
-                sidelipFrameLayout.Height = 0;
-            }
-            else if (count <= 4 && count > 0)
-            {
-                sidelipFrameLayout.Height = Application.GetRealHeight(180) + count * Application.GetRealHeight(150);
-            }
-            else
-            {
-                sidelipFrameLayout.Height = Application.GetMinReal(780);
-            }
-        }
         #endregion
 
         #region 鏁版嵁澶勭悊
@@ -722,10 +664,12 @@
                     //鑾峰彇妤煎眰
                     dicFloorList = HdlRoomLogic.Current.GetFloorSortList();
                     //鑾峰彇妤煎眰涓埧闂村垪琛�
-                    supportRoomList = GetFloorRoomList();
+                    supportRoomList = BindInfo.GetFloorRoomList();
 
                     //鑾峰彇鎵�鏈夋埧闂翠腑鍖归厤鐨勮兘缁戠殑鐩爣
-                    currentPanelSupportBindDeviceList = GetAllRoomSupportDeviceList();
+                    currentPanelSupportBindDeviceList = BindInfo.GetAllRoomSupportDeviceList(currentPanelSupportBindDeviceList, supportRoomList, curDeviceBindType);
+                    //鑾峰彇鏈湴鏈垎閰嶇殑鏀寔褰撳墠绫诲瀷鐨勭粦瀹氳澶囧垪琛�
+                    undistruibuteDevList = BindInfo.GetUndistributeDeviceList(undistruibuteDevList, curDeviceBindType);
 
                     //鑾峰彇闈㈡澘涓瓨鍦ㄧ殑缁戝畾鐩爣
                     var panelBindListRes = HdlDeviceBindLogic.Current.GetDeviceBindAsync(curControlDev);
@@ -749,87 +693,36 @@
 
                     targetList.Clear();
                     //閫変腑鐩爣鍒楄〃 targetList
-                    if (currentPanelSupportBindDeviceList.Count != 0 && curControlDev.bindList.Count != 0)
+                    if (curControlDev.bindList.Count != 0)
                     {
                         foreach (var bindDev in curControlDev.bindList)
                         {
                             var mainKey = bindDev.BindMacAddr + bindDev.BindEpoint;
-                            var dev = currentPanelSupportBindDeviceList.Find(obj => (obj != null) && (obj.DeviceAddr + obj.DeviceEpoint == mainKey));
-                            if (dev != null)
+
+                            //鍒嗛厤鐨勭洰鏍囧垪琛�
+                            if (currentPanelSupportBindDeviceList.Count != 0)
                             {
-                                var device = LocalDevice.Current.GetDevice(dev.DeviceAddr, dev.DeviceEpoint);
-                                if (device != null)
+                                var dev = currentPanelSupportBindDeviceList.Find(obj => (obj != null) && (obj.DeviceAddr + obj.DeviceEpoint == mainKey));
+                                if (dev != null)
                                 {
-                                    switch (curDeviceBindType)
+                                    var device = LocalDevice.Current.GetDevice(dev.DeviceAddr, dev.DeviceEpoint);
+                                    if (device != null)
                                     {
-                                        case 1:
-                                            //鑾峰彇璁惧绫诲瀷鐨�
-                                            var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
-                                            //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
-                                            if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
-                                            {
-                                                continue;
-                                            }
-                                            if (device.Type == DeviceType.FreshAir)
-                                            {
-                                                targetList.Add(device);
-                                                oldTargetList.Add(device);
-                                            }
-                                            break;
-                                        case 2:
-                                            if (device.Type == DeviceType.TemperatureSensor)
-                                            {
-                                                var bDev = device as TemperatureSensor;
-                                                if (bDev.SensorDiv == 1)
-                                                {
-                                                    targetList.Add(device);
-                                                    oldTargetList.Add(device);
-                                                }
-                                            }
-                                            if (device.Type == DeviceType.PMSensor)
-                                            {
-                                                if (bindDev.BindCluster == 1026)
-                                                {
-                                                    targetList.Add(device);
-                                                    oldTargetList.Add(device);
-                                                }
-                                            }
-                                            break;
-                                        case 3:
-                                            if (device.Type == DeviceType.TemperatureSensor)
-                                            {
-                                                var bDev = device as TemperatureSensor;
-                                                if (bDev.SensorDiv == 2)
-                                                {
-                                                    targetList.Add(device);
-                                                    oldTargetList.Add(device);
-                                                }
-                                            }
-                                            if (device.Type == DeviceType.FreshAirHumiditySensor)
-                                            {
-                                                targetList.Add(device);
-                                                oldTargetList.Add(device);
-                                            }
-                                            if (device.Type == DeviceType.PMSensor)
-                                            {
-                                                if (bindDev.BindCluster == 1029)
-                                                {
-                                                    targetList.Add(device);
-                                                    oldTargetList.Add(device);
-                                                }
-                                            }
-                                            break;
-                                        case 4:
-                                            //PM2.5
-                                            if (device.Type == DeviceType.PMSensor)
-                                            {
-                                                if (bindDev.BindCluster == 1066)
-                                                {
-                                                    targetList.Add(device);
-                                                    oldTargetList.Add(device);
-                                                }
-                                            }
-                                            break;
+                                        BindTypeTargetsList(device, bindDev);
+                                    }
+                                }
+                            }
+
+                            //鏈垎閰嶇殑鐩爣鍒楄〃
+                            if (undistruibuteDevList.Count != 0)
+                            {
+                                var dev = undistruibuteDevList.Find(obj => (obj != null) && (obj.DeviceAddr + obj.DeviceEpoint == mainKey));
+                                if (dev != null)
+                                {
+                                    var device = LocalDevice.Current.GetDevice(dev.DeviceAddr, dev.DeviceEpoint);
+                                    if (device != null)
+                                    {
+                                        BindTypeTargetsList(device, bindDev);
                                     }
 
                                 }
@@ -845,6 +738,16 @@
                 {
                     Application.RunOnMainThread(() =>
                     {
+                        BindDownFrameLayout(this.midFrameLayout, curControlDev, dicFloorList, ref btnFloorText);
+                        ChooseFloorAction += (floorId, btnMethodText) =>
+                        {
+                            btnFloorText.Text = dicFloorList[floorId];
+                            //鑾峰彇妤煎眰涓埧闂村垪琛�
+                            supportRoomList = BindInfo.GetFloorRoomList();
+                            //鑾峰彇鏈湴鏈垎閰嶇殑鏀寔褰撳墠绫诲瀷鐨勭粦瀹氳澶囧垪琛�
+                            undistruibuteDevList = BindInfo.GetUndistributeDeviceList(undistruibuteDevList, curDeviceBindType);
+                            RefreshRoomList();
+                        };
 
                         //棣栨鏄惁鑳界偣鍑讳繚瀛�
                         if (targetList.Count == 0)
@@ -865,7 +768,7 @@
                         {
                             foreach (var dev in targetList)
                             {
-                                //鑾峰彇鏈湴璁惧鍒楄〃 
+                                //鑾峰彇鏈湴璁惧鍒楄〃
                                 var localDeviceList = Shared.Common.LocalDevice.Current.listAllDevice;
                                 var tempDev = localDeviceList.Find(obj => obj.DeviceAddr == dev.DeviceAddr && obj.DeviceEpoint == dev.DeviceEpoint);
                                 if (tempDev != null)
@@ -876,6 +779,10 @@
                                     {
                                         curControlDev.currentSelectRoomId = tempDevRoom.Id;
                                         curControlDev.currentSelectFloorId = tempDevRoom.FloorId;
+                                    }
+                                    else
+                                    {
+                                        curControlDev.currentSelectRoomId = "UndistributedId";
                                     }
                                 }
                             }
@@ -934,23 +841,36 @@
                                 removeDevice.BindType = 0;
                                 switch (curDeviceBindType)
                                 {
-                                    case 1:
+                                    case BindInfo.BindType.FreshAir:
                                         removeDevice.BindCluster = 514;
                                         break;
-                                    case 2:
+                                    case BindInfo.BindType.Temperature:
                                         removeDevice.BindCluster = 1026;
                                         break;
-                                    case 3:
+                                    case BindInfo.BindType.Humidity:
                                         removeDevice.BindCluster = 1029;
                                         break;
-                                    case 4:
-                                        //PM2.5
+                                    case BindInfo.BindType.PM:
                                         removeDevice.BindCluster = 1066;
+                                        break;
+                                    case BindInfo.BindType.AC:
+                                        removeDevice.BindCluster = 513;//Ac闇�瑕佺粦瀹�2涓皣513鍜�514
                                         break;
                                 }
                                 removeDevice.BindMacAddr = bd.DeviceAddr;
                                 removeDevice.BindEpoint = bd.DeviceEpoint;
                                 delDevice.RemoveBindList.Add(removeDevice);
+
+                                if (curDeviceBindType == BindInfo.BindType.AC)
+                                {
+                                    //瑕佺Щ闄ょ┖璋冿細闇�瑕佺Щ闄�513锛�514
+                                    var removeDevice3 = new RemoveBindListObj();
+                                    removeDevice3.BindCluster = 514;
+                                    removeDevice3.BindType = 0;
+                                    removeDevice3.BindMacAddr = bd.DeviceAddr;
+                                    removeDevice3.BindEpoint = bd.DeviceEpoint;
+                                    delDevice.RemoveBindList.Add(removeDevice3);
+                                }
 
                                 var delResult = new DelDeviceBindResponseAllData();
                                 delResult = HdlDeviceBindLogic.Current.DelDeviceBindAsync(delDevice);
@@ -973,35 +893,9 @@
                                         {
                                             foreach (var d in delResult.delDeviceBindResponseData.RemoveBindList)
                                             {
-                                                if (d.Result == 1)
+                                                if (d.Result == 0 || d.Result == 1)
                                                 {
-                                                    switch (curDeviceBindType)
-                                                    {
-                                                        case 1:
-                                                            if (actionFreshAirTarget != null)
-                                                            {
-                                                                actionFreshAirTarget("");
-                                                            }
-                                                            break;
-                                                        case 2:
-                                                            if (actionTemperatureTarget != null)
-                                                            {
-                                                                actionTemperatureTarget("");
-                                                            }
-                                                            break;
-                                                        case 3:
-                                                            if (actionHumidityTarget != null)
-                                                            {
-                                                                actionHumidityTarget("");
-                                                            }
-                                                            break;
-                                                        case 4:
-                                                            if (actionPMTarget != null)
-                                                            {
-                                                                actionPMTarget("");
-                                                            }
-                                                            break;
-                                                    }
+                                                    EmptyTargesMess();
                                                     Application.RunOnMainThread(() =>
                                                     {
                                                         CommonPage.Loading.Hide();
@@ -1028,33 +922,7 @@
                                     {
                                         if (delResult.removeBindResultResponseData.Result == 0)
                                         {
-                                            switch (curDeviceBindType)
-                                            {
-                                                case 1:
-                                                    if (actionFreshAirTarget != null)
-                                                    {
-                                                        actionFreshAirTarget("");
-                                                    }
-                                                    break;
-                                                case 2:
-                                                    if (actionTemperatureTarget != null)
-                                                    {
-                                                        actionTemperatureTarget("");
-                                                    }
-                                                    break;
-                                                case 3:
-                                                    if (actionHumidityTarget != null)
-                                                    {
-                                                        actionHumidityTarget("");
-                                                    }
-                                                    break;
-                                                case 4:
-                                                    if (actionPMTarget != null)
-                                                    {
-                                                        actionPMTarget("");
-                                                    }
-                                                    break;
-                                            }
+                                            EmptyTargesMess();
                                             Application.RunOnMainThread(() =>
                                             {
                                                 CommonPage.Loading.Hide();
@@ -1081,19 +949,33 @@
                         }
                         else
                         {
-                            //娌℃湁鐩爣鎻愮ず
-                            Application.RunOnMainThread(() =>
+                            if (btnTipPic.IsSelected)
                             {
-                                var myTip = new Tip();
-                                myTip.Direction = AMPopTipDirection.None;
-                                myTip.CloseTime = 2;
-                                myTip.Text = Language.StringByID(R.MyInternationalizationString.BindDeviceTargetIsEmpty);
-                                myTip.Show(Common.CommonPage.Instance);
-                                btnFinifh.Enable = true;
-                                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                                CommonPage.Loading.Hide();
-                            });
-                            return;
+                                EmptyTargesMess();
+                                Application.RunOnMainThread(() =>
+                                {
+                                    CommonPage.Loading.Hide();
+                                    btnFinifh.Enable = true;
+                                    btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                                    this.RemoveFromParent();
+                                });
+                            }
+                            else
+                            {
+                                //娌℃湁鐩爣鎻愮ず
+                                Application.RunOnMainThread(() =>
+                                {
+                                    var myTip = new Tip();
+                                    myTip.Direction = AMPopTipDirection.None;
+                                    myTip.CloseTime = 2;
+                                    myTip.Text = Language.StringByID(R.MyInternationalizationString.BindDeviceTargetIsEmpty);
+                                    myTip.Show(Common.CommonPage.Instance);
+                                    btnFinifh.Enable = true;
+                                    btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                                    CommonPage.Loading.Hide();
+                                });
+                                return;
+                            }
                         }
                     }
                     catch (Exception ex)
@@ -1111,7 +993,7 @@
             {
                 //閫変腑鐩爣
                 //1銆佸凡缁忕粦瀹氳繃鐨勭洰鏍�
-                if (checkExistDevice())
+                if (BindInfo.checkExistDevice(targetList, oldTargetList))
                 {
                     Application.RunOnMainThread(() =>
                     {
@@ -1160,7 +1042,7 @@
                                         {
                                             foreach (var d in delResult.delDeviceBindResponseData.RemoveBindList)
                                             {
-                                                if (d.Result != 1)
+                                                if (d.Result != 0 && d.Result != 1)
                                                 {
                                                     Application.RunOnMainThread(() =>
                                                     {
@@ -1220,7 +1102,7 @@
                                         {
                                             foreach (var d in delResult.delDeviceBindResponseData.RemoveBindList)
                                             {
-                                                if (d.Result != 1)
+                                                if (d.Result != 0 && d.Result != 1)
                                                 {
                                                     Application.RunOnMainThread(() =>
                                                     {
@@ -1262,18 +1144,20 @@
                             var addBindInfo = new AddBindListObj();
                             switch (curDeviceBindType)
                             {
-                                case 1:
+                                case BindInfo.BindType.FreshAir:
                                     addBindInfo.BindCluster = 514;
                                     break;
-                                case 2:
+                                case BindInfo.BindType.Temperature:
                                     addBindInfo.BindCluster = 1026;
                                     break;
-                                case 3:
+                                case BindInfo.BindType.Humidity:
                                     addBindInfo.BindCluster = 1029;
                                     break;
-                                case 4:
-                                    //PM2.5
+                                case BindInfo.BindType.PM:
                                     addBindInfo.BindCluster = 1066;
+                                    break;
+                                case BindInfo.BindType.AC:
+                                    addBindInfo.BindCluster = 513;
                                     break;
                             }
                             addBindInfo.BindType = 0;
@@ -1282,17 +1166,31 @@
                             addBindeDev.BindName = Common.LocalDevice.Current.GetDeviceEpointName(de);
                             switch (curDeviceBindType)
                             {
-                                case 2:
+                                case BindInfo.BindType.Temperature:
                                     if (de.Type == DeviceType.PMSensor)
                                     {
                                         addBindeDev.BindName = Common.LocalDevice.Current.GetDeviceEpointName(de) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
                                     }
                                     break;
-                                case 3:
+                                case BindInfo.BindType.Humidity:
                                     if (de.Type == DeviceType.PMSensor)
                                     {
                                         addBindeDev.BindName = Common.LocalDevice.Current.GetDeviceEpointName(de) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
                                     }
+                                    break;
+                            }
+
+                            //閮ㄥ垎鐩爣闇�瑕佷簩娆$粦瀹氱浜岀鍔熻兘
+                            var addBindInfo2 = new AddBindListObj();
+                            addBindInfo2.BindType = 0;
+                            addBindInfo2.BindMacAddr = de.DeviceAddr;
+                            addBindInfo2.BindEpoint = de.DeviceEpoint;
+                            switch (curDeviceBindType)
+                            {
+                                case BindInfo.BindType.AC:
+                                    //瑕佺粦瀹氱┖璋冿細闇�瑕佺粦瀹�513锛�514
+                                    addBindInfo2.BindCluster = 514;
+                                    addBindeDev.BindList.Add(addBindInfo2);
                                     break;
                             }
                             addBindeDev.BindList.Add(addBindInfo);
@@ -1316,30 +1214,37 @@
                             if (dev.addedDeviceBindResponseData.Result == 0)
                             {
                                 targetList.Clear();
+                                targetListTemp.Clear();
                                 switch (curDeviceBindType)
                                 {
-                                    case 1:
+                                    case BindInfo.BindType.FreshAir:
                                         if (actionFreshAirTarget != null)
                                         {
                                             actionFreshAirTarget(addBindeDev.BindName);
                                         }
                                         break;
-                                    case 2:
+                                    case BindInfo.BindType.Temperature:
                                         if (actionTemperatureTarget != null)
                                         {
                                             actionTemperatureTarget(addBindeDev.BindName);
                                         }
                                         break;
-                                    case 3:
+                                    case BindInfo.BindType.Humidity:
                                         if (actionHumidityTarget != null)
                                         {
                                             actionHumidityTarget(addBindeDev.BindName);
                                         }
                                         break;
-                                    case 4:
+                                    case BindInfo.BindType.PM:
                                         if (actionPMTarget != null)
                                         {
                                             actionPMTarget(addBindeDev.BindName);
+                                        }
+                                        break;
+                                    case BindInfo.BindType.AC:
+                                        if (actionAcTarget != null)
+                                        {
+                                            actionAcTarget(addBindeDev.BindName);
                                         }
                                         break;
                                 }
@@ -1356,6 +1261,8 @@
                             {
                                 Application.RunOnMainThread(() =>
                                 {
+                                    btnFinifh.Enable = true;
+                                    btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                                     CommonPage.Loading.Hide();
                                     new Tip()
                                     {
@@ -1365,8 +1272,7 @@
                                         CloseTime = 1
                                     }.Show(CommonPage.Instance);
                                 });
-                                btnFinifh.Enable = true;
-                                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+
                                 return;
                             }
                             else
@@ -1402,6 +1308,139 @@
         }
 
         /// <summary>
+        /// 鐩爣涓虹┖鏃剁殑鏂囨湰鏄剧ず
+        /// </summary>
+        void EmptyTargesMess()
+        {
+            switch (curDeviceBindType)
+            {
+                case BindInfo.BindType.FreshAir:
+                    if (actionFreshAirTarget != null)
+                    {
+                        actionFreshAirTarget("");
+                    }
+                    break;
+                case BindInfo.BindType.Temperature:
+                    if (actionTemperatureTarget != null)
+                    {
+                        actionTemperatureTarget("");
+                    }
+                    break;
+                case BindInfo.BindType.Humidity:
+                    if (actionHumidityTarget != null)
+                    {
+                        actionHumidityTarget("");
+                    }
+                    break;
+                case BindInfo.BindType.PM:
+                    if (actionPMTarget != null)
+                    {
+                        actionPMTarget("");
+                    }
+                    break;
+                case BindInfo.BindType.AC:
+                    if (actionAcTarget != null)
+                    {
+                        actionAcTarget("");
+                    }
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// 缁戝畾鐩爣鍒楄〃
+        /// </summary>
+        /// <param name="device"></param>
+        /// <param name="bindDev"></param>
+        void BindTypeTargetsList(CommonDevice device, BindListResponseObj bindDev)
+        {
+            switch (curDeviceBindType)
+            {
+                case BindInfo.BindType.FreshAir:
+                    //鑾峰彇璁惧绫诲瀷鐨�
+                    var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+                    //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
+                    if (deviceEnumInfo.ConcreteType != Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+                    {
+                        if (device.Type == DeviceType.FreshAir)
+                        {
+                            targetList.Add(device);
+                            oldTargetList.Add(device);
+                        }
+                    }
+                    break;
+                case BindInfo.BindType.Temperature:
+                    if (device.Type == DeviceType.TemperatureSensor)
+                    {
+                        var bDev = device as TemperatureSensor;
+                        if (bDev.SensorDiv == 1)
+                        {
+                            targetList.Add(device);
+                            oldTargetList.Add(device);
+                        }
+                    }
+                    if (device.Type == DeviceType.PMSensor)
+                    {
+                        if (bindDev.BindCluster == 1026)
+                        {
+                            targetList.Add(device);
+                            oldTargetList.Add(device);
+                        }
+                    }
+                    break;
+                case BindInfo.BindType.Humidity:
+                    if (device.Type == DeviceType.TemperatureSensor)
+                    {
+                        var bDev = device as TemperatureSensor;
+                        if (bDev.SensorDiv == 2)
+                        {
+                            targetList.Add(device);
+                            oldTargetList.Add(device);
+                        }
+                    }
+                    if (device.Type == DeviceType.FreshAirHumiditySensor)
+                    {
+                        targetList.Add(device);
+                        oldTargetList.Add(device);
+                    }
+                    if (device.Type == DeviceType.PMSensor)
+                    {
+                        if (bindDev.BindCluster == 1029)
+                        {
+                            targetList.Add(device);
+                            oldTargetList.Add(device);
+                        }
+                    }
+                    break;
+                case BindInfo.BindType.PM:
+                    if (device.Type == DeviceType.PMSensor)
+                    {
+                        if (bindDev.BindCluster == 1066)
+                        {
+                            targetList.Add(device);
+                            oldTargetList.Add(device);
+                        }
+                    }
+                    break;
+                case BindInfo.BindType.AC:
+                    if (device.Type == DeviceType.Thermostat)
+                    {
+                        if (bindDev.BindCluster == 513)
+                        {
+                            targetList.Add(device);
+                            oldTargetList.Add(device);
+                        }
+                    }
+                    break;
+            }
+            targetListTemp.Clear();
+            foreach (var d in targetList)
+            {
+                targetListTemp.Add(d);
+            }
+        }
+
+        /// <summary>
         /// 褰撳墠琚粦瀹氳澶囨墍灞炴ゼ灞傚拰鎴块棿
         /// </summary>
         /// <param name="bindDev"></param>
@@ -1411,7 +1450,7 @@
             {
                 return;
             }
-            //鑾峰彇鏈湴璁惧鍒楄〃 
+            //鑾峰彇鏈湴璁惧鍒楄〃
             var localDeviceList = Shared.Common.LocalDevice.Current.listAllDevice;
             var tempDev = localDeviceList.Find(obj => obj.DeviceAddr == bindDev.DeviceAddr && obj.DeviceEpoint == bindDev.DeviceEpoint);
             if (tempDev != null)
@@ -1424,29 +1463,6 @@
                     curControlDev.currentSelectFloorId = tempDevRoom.FloorId;
                 }
             }
-        }
-
-        /// <summary>
-        /// 妫�娴嬬洰鏍囨槸鍚﹁缁戝畾杩�
-        /// </summary>
-        /// <returns></returns>
-        private bool checkExistDevice()
-        {
-            bool exist = false;
-            foreach (var oldDev in oldTargetList)
-            {
-                var key = oldDev.DeviceAddr + oldDev.DeviceEpoint;
-                var result = targetList.Find(obj => (obj != null) && (obj.DeviceAddr + obj.DeviceEpoint == key));
-                if (result != null)
-                {
-                    exist = true;
-                }
-                else
-                {
-                    exist = false;
-                }
-            }
-            return exist;
         }
 
         /// <summary>
@@ -1463,412 +1479,26 @@
             removeDevice.BindType = 0;
             switch (curDeviceBindType)
             {
-                case 1:
+                case BindInfo.BindType.FreshAir:
                     removeDevice.BindCluster = 514;
                     break;
-                case 2:
+                case BindInfo.BindType.Temperature:
                     removeDevice.BindCluster = 1026;
                     break;
-                case 3:
+                case BindInfo.BindType.Humidity:
                     removeDevice.BindCluster = 1029;
                     break;
-                case 4:
-                    //PM2.5
+                case BindInfo.BindType.PM:
                     removeDevice.BindCluster = 1066;
+                    break;
+                case BindInfo.BindType.AC:
+                    removeDevice.BindCluster = 513;
                     break;
             }
             removeDevice.BindMacAddr = bd.DeviceAddr;
             removeDevice.BindEpoint = bd.DeviceEpoint;
             delDevice.RemoveBindList.Add(removeDevice);
             return delDevice;
-        }
-
-        /// <summary>
-        /// 鑳芥樉绀虹殑鎴块棿鍒楄〃
-        /// </summary>
-        private List<Room> GetSupportRoomList()
-        {
-            var roomTempList = new List<Room>();
-            for (int i = 0; i < supportRoomList.Count; i++)
-            {
-                var room = supportRoomList[i];
-                //濡傛灉鎴块棿涓哄枩鐖盵鍚庢潵鏀瑰悕涓哄父鐢ㄦ埧闂碷锛屽垯涓嶆樉绀�
-                if (room.IsLove == true)
-                {
-                    continue;
-                }
-
-                //濡傛灉鎴块棿涓病鏈夎澶囷紝鍒欎笉鏄剧ず
-                if (room.ListDevice.Count == 0)
-                {
-                    continue;
-                }
-                else
-                {
-                    List<CommonDevice> roomIncludeMatchDevice = new List<CommonDevice>();
-
-                    //鎴块棿涓病鏈夊搴旂殑鏀寔缁戝畾鐨勭洰鏍�
-                    switch (curDeviceBindType)
-                    {
-                        case 1:
-                            foreach (var de in room.ListDevice)
-                            {
-                                var device = LocalDevice.Current.GetDevice(de);
-
-                                if (device != null)
-                                {
-                                    //鑾峰彇璁惧绫诲瀷鐨�
-                                    var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
-                                    //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
-                                    if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
-                                    {
-                                        continue;
-                                    }
-                                    if (device.Type == DeviceType.FreshAir)
-                                    {
-                                        roomIncludeMatchDevice.Add(device);
-                                    }
-                                }
-                            }
-                            break;
-                        case 2:
-                            roomIncludeMatchDevice = GetMatchTemperatureSensorDevice(room);
-                            break;
-                        case 3:
-                            roomIncludeMatchDevice = GetMatchHumiditySensorDevice(room);
-                            foreach (var de in room.ListDevice)
-                            {
-                                var device = LocalDevice.Current.GetDevice(de);
-                                if (device != null)
-                                {
-                                    if (device.Type == DeviceType.FreshAirHumiditySensor)
-                                    {
-                                        roomIncludeMatchDevice.Add(device);
-                                    }
-                                }
-                            }
-                            break;
-                        case 4:
-                            foreach (var de in room.ListDevice)
-                            {
-                                var device = LocalDevice.Current.GetDevice(de);
-                                if (device != null)
-                                {
-                                    if (device.Type == DeviceType.PMSensor)
-                                    {
-                                        roomIncludeMatchDevice.Add(device);
-                                    }
-                                }
-                            }
-                            break;
-                    }
-
-                    if (roomIncludeMatchDevice.Count == 0)
-                    {
-                        continue;
-                    }
-
-                    if (!string.IsNullOrEmpty(room.FloorId))
-                    {
-                        //鏈夋ゼ灞�
-                        if (room.FloorId == curControlDev.currentSelectFloorId)
-                        {
-                            roomTempList.Add(room);
-                        }
-                    }
-                    else
-                    {
-                        //娌℃湁妤煎眰
-                        roomTempList.Add(room);
-                    }
-                }
-            }
-            return roomTempList;
-        }
-
-        /// <summary>
-        /// 鍖归厤娓╁害浼犳劅鍣�
-        /// </summary>
-        /// <param name="room"></param>
-        List<CommonDevice> GetMatchTemperatureSensorDevice(Room room)
-        {
-            List<CommonDevice> roomIncludeMatchTempDevice = new List<CommonDevice>();
-            foreach (var de in room.ListDevice)
-            {
-                var device = LocalDevice.Current.GetDevice(de);
-                if (device != null)
-                {
-                    //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
-                    if (device.ZigbeeType != 1)
-                    {
-                        continue;
-                    }
-                    if (device.Type == DeviceType.TemperatureSensor)
-                    {
-                        var dev = device as TemperatureSensor;
-                        if (dev.SensorDiv == 1)
-                        {
-                            roomIncludeMatchTempDevice.Add(device);
-                        }
-                    }
-                    else if (device.Type == DeviceType.PMSensor)
-                    {
-                        var dev = device as PMSensor;
-                        foreach (var clu in dev.InClusterList)
-                        {
-                            if (clu.InCluster == 1026)
-                            {
-                                roomIncludeMatchTempDevice.Add(device);
-                            }
-                        }
-                    }
-                }
-            }
-            return roomIncludeMatchTempDevice;
-        }
-
-        /// <summary>
-        /// 鍖归厤婀垮害浼犳劅鍣�
-        /// </summary>
-        /// <param name="room"></param>
-        List<CommonDevice> GetMatchHumiditySensorDevice(Room room)
-        {
-            List<CommonDevice> roomIncludeMatchHumpDevice = new List<CommonDevice>();
-            foreach (var de in room.ListDevice)
-            {
-                var device = LocalDevice.Current.GetDevice(de);
-                if (device != null)
-                {
-                    //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
-                    if (device.ZigbeeType != 1)
-                    {
-                        continue;
-                    }
-                    if (device.Type == DeviceType.TemperatureSensor)
-                    {
-                        var dev = device as TemperatureSensor;
-                        if (dev.SensorDiv == 2)
-                        {
-                            roomIncludeMatchHumpDevice.Add(device);
-                        }
-                    }
-                    else if (device.Type == DeviceType.PMSensor)
-                    {
-                        var dev = device as PMSensor;
-                        foreach (var clu in dev.InClusterList)
-                        {
-                            if (clu.InCluster == 1029)
-                            {
-                                roomIncludeMatchHumpDevice.Add(device);
-                            }
-                        }
-                    }
-                }
-            }
-            return roomIncludeMatchHumpDevice;
-        }
-
-        /// <summary>
-        /// 鑾峰彇妤煎眰瀵瑰簲鐨勬埧闂村垪琛�
-        /// </summary>
-        /// <returns></returns>
-        private List<Room> GetFloorRoomList()
-        {
-            supportRoomList.Clear();
-            var supportRoomListTemp = new List<Room>();
-            var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
-            if (Common.Config.Instance.Home.FloorDics.Count == 0)
-            {
-                // 鑾峰彇娌℃湁妤煎眰鎴块棿
-                foreach (var room in listAllRoom)
-                {
-                    if (string.IsNullOrEmpty(room.FloorId))
-                    {
-                        if (room.IsLove)
-                        {
-                            continue;
-                        }
-                        supportRoomListTemp.Add(room);
-                    }
-                }
-            }
-            else
-            {
-                // 鑾峰彇鏀寔鐨勬埧闂�
-                foreach (var room in listAllRoom)
-                {
-                    if (room.IsLove)
-                    {
-                        continue;
-                    }
-                    supportRoomListTemp.Add(room);
-                }
-            }
-            return supportRoomListTemp;
-        }
-
-        /// <summary>
-        /// 鎵�鏈夋埧闂翠腑鍖归厤鐨勬敮鎸佺粦瀹氱殑鎵�鏈夌洰鏍囧垪琛�
-        /// </summary>
-        /// <returns></returns>
-        List<CommonDevice> GetAllRoomSupportDeviceList()
-        {
-            currentPanelSupportBindDeviceList.Clear();
-            List<CommonDevice> currentPanelBindSupportDeviceListTemp = new List<CommonDevice>();
-            switch (curDeviceBindType)
-            {
-                case 1:
-                    foreach (var r in supportRoomList)
-                    {
-                        if (r.ListDevice.Count == 0)
-                        {
-                            continue;
-                        }
-                        foreach (var deviceKeys in r.ListDevice)
-                        {
-                            var device = LocalDevice.Current.GetDevice(deviceKeys);
-                            if (device != null)
-                            {
-                                //鑾峰彇璁惧绫诲瀷鐨�
-                                var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
-                                //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
-                                if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
-                                {
-                                    continue;
-                                }
-                                if (device.Type == DeviceType.FreshAir)
-                                {
-                                    currentPanelBindSupportDeviceListTemp.Add(device);
-                                }
-                            }
-                        }
-                    }
-                    break;
-                case 2:
-                    foreach (var r in supportRoomList)
-                    {
-                        if (r.ListDevice.Count == 0)
-                        {
-                            continue;
-                        }
-                        var deviceListTemp = GetMatchTemperatureSensorDevice(r);
-                        foreach (var dev in deviceListTemp)
-                        {
-                            currentPanelBindSupportDeviceListTemp.Add(dev);
-                        }
-                    }
-                    break;
-                case 3:
-                    foreach (var r in supportRoomList)
-                    {
-                        if (r.ListDevice.Count == 0)
-                        {
-                            continue;
-                        }
-                        var deviceListTemp = GetMatchHumiditySensorDevice(r);
-                        foreach (var dev in deviceListTemp)
-                        {
-                            currentPanelBindSupportDeviceListTemp.Add(dev);
-                        }
-                        foreach (var deviceKeys in r.ListDevice)
-                        {
-                            var device = LocalDevice.Current.GetDevice(deviceKeys);
-                            if (device != null)
-                            {
-                                if (device.Type == DeviceType.FreshAirHumiditySensor)
-                                {
-                                    currentPanelBindSupportDeviceListTemp.Add(device);
-                                }
-                            }
-                        }
-                    }
-                    break;
-                case 4:
-                    foreach (var r in supportRoomList)
-                    {
-                        if (r.ListDevice.Count == 0)
-                        {
-                            continue;
-                        }
-                        foreach (var deviceKeys in r.ListDevice)
-                        {
-                            var device = LocalDevice.Current.GetDevice(deviceKeys);
-                            if (device != null)
-                            {
-                                if (device.Type == DeviceType.PMSensor)
-                                {
-                                    currentPanelBindSupportDeviceListTemp.Add(device);
-                                }
-                            }
-                        }
-                    }
-                    break;
-            }
-            return currentPanelBindSupportDeviceListTemp;
-        }
-
-        /// <summary>
-        /// 鑾峰彇褰撳墠鎴块棿涓尮閰嶇殑鏀寔缁戝畾鐨勮澶囧垪琛�
-        /// </summary>
-        /// <returns></returns>
-        List<CommonDevice> GetCurRoomSupportDeviceList(Room curRoom)
-        {
-            currentRoomSupportBindDeviceList.Clear();
-            List<CommonDevice> curRoomDeviceListTemp = new List<CommonDevice>();
-            switch (curDeviceBindType)
-            {
-                case 1:
-                    foreach (var deviceKeys in curRoom.ListDevice)
-                    {
-                        var device = LocalDevice.Current.GetDevice(deviceKeys);
-                        if (device != null)
-                        {
-                            //鑾峰彇璁惧绫诲瀷鐨�
-                            var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
-                            //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
-                            if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
-                            {
-                                continue;
-                            }
-                            if (device.Type == DeviceType.FreshAir)
-                            {
-                                curRoomDeviceListTemp.Add(device);
-                            }
-                        }
-                    }
-                    break;
-                case 2:
-                    curRoomDeviceListTemp = GetMatchTemperatureSensorDevice(curRoom);
-                    break;
-                case 3:
-                    curRoomDeviceListTemp = GetMatchHumiditySensorDevice(curRoom);
-                    foreach (var deviceKeys in curRoom.ListDevice)
-                    {
-                        var device = LocalDevice.Current.GetDevice(deviceKeys);
-                        if (device != null)
-                        {
-                            if (device.Type == DeviceType.FreshAirHumiditySensor)
-                            {
-                                curRoomDeviceListTemp.Add(device);
-                            }
-                        }
-                    }
-                    break;
-                case 4:
-                    foreach (var deviceKeys in curRoom.ListDevice)
-                    {
-                        var device = LocalDevice.Current.GetDevice(deviceKeys);
-                        if (device != null)
-                        {
-                            if (device.Type == DeviceType.PMSensor)
-                            {
-                                curRoomDeviceListTemp.Add(device);
-                            }
-                        }
-                    }
-                    break;
-            }
-            return curRoomDeviceListTemp;
         }
         #endregion
 
@@ -1882,9 +1512,9 @@
             actionTemperatureTarget = null;
             actionHumidityTarget = null;
             actionPMTarget = null;
+            FloorAction = null;
             base.RemoveFromParent();
         }
         #endregion
     }
 }
-
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
index a4417a0..3683150 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -333,11 +333,28 @@
             var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
             if (isShow == true)
             {
+                //澶囨敞锛氶潰鏉夸腑鍙樉绀虹湡瀹炵殑璁惧锛屽叾浠栧睘浜庣粦瀹氱殑鍥炶矾涓嶆樉绀�
                 //鑾峰彇杩欎竴鍫嗚澶囨椂灞炰簬浠�涔堢被鍨嬬殑
                 var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
                 if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
                 {
                     var listTemp = Common.LocalDevice.Current.GetMutilfunctionPanelByMac(listDevice);
+                    //灞曞紑妯″紡鏃讹紝鎵╁ぇ渚濇嵁涓�:瀹冩湁鍑犱釜瀛愭帶浠�
+                    heightValue = (listTemp.Count + 1) * (ControlCommonResourse.ListViewRowHeight + rowInfo.frameTable.rowSpace);
+                    //鏍囬鑷繁灏辨槸涓�涓瓙鎺т欢
+                    if (rowInfo.frameTable.ChildrenCount == 1)
+                    {
+                        foreach (CommonDevice info in listTemp)
+                        {
+                            //鍔犺浇瀹冪殑鍒楄〃
+                            this.AddDeviceDetailRow(rowInfo.frameTable, info, deviceEnumInfo);
+                        }
+                    }
+                }
+                else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir
+                       || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
+                {
+                    var listTemp = Common.LocalDevice.Current.GetPanelMatchEpointByMac(listDevice);
                     //灞曞紑妯″紡鏃讹紝鎵╁ぇ渚濇嵁涓�:瀹冩湁鍑犱釜瀛愭帶浠�
                     heightValue = (listTemp.Count + 1) * (ControlCommonResourse.ListViewRowHeight + rowInfo.frameTable.rowSpace);
                     //鏍囬鑷繁灏辨槸涓�涓瓙鎺т欢
@@ -497,6 +514,27 @@
                     var form = new DeviceFunctionSettionForm();
                     form.AddForm(device, true);
                 }
+            }
+            //绠�绾︾幆澧冮潰鏉跨殑鎸夐敭閰嶇疆
+            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
+            {
+
+                if (device.Type == DeviceType.FreshAir || device.Type == DeviceType.Thermostat)
+                {
+                    var form = new DevicePanel.PanelSimpleEnvironmentButtonSettionForm();
+                    form.AddForm(device);
+                }
+                else
+                {
+                    var form = new DeviceFunctionSettionForm();
+                    form.AddForm(device, true);
+                }
+            }
+            //绠�绾︾幆澧冮潰鏉跨殑鎸夐敭閰嶇疆
+            else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+            {
+                var form = new DeviceFunctionSettionForm();
+                form.AddForm(device, true);
             }
             //鏂规偊闈㈡澘
             else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
@@ -1019,6 +1057,20 @@
                 {
                     continue;
                 }
+
+                //鑾峰彇璁惧绫诲瀷鐨�
+                var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+                if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleEnvironment)
+                {
+                    foreach (var outClu in device.OutClusterList)
+                    {
+                        //鍘绘帀绠�绾︾幆澧冮潰鏉跨被鐨勫悇绉嶆湇鍔$璁惧锛屽鍐呮満涓嶆樉绀�
+                        if (outClu.OutCluster == 513)
+                        {
+                            continue;
+                        }
+                    }
+                }
                 if (dic.ContainsKey(device.DeviceAddr) == false)
                 {
                     dic[device.DeviceAddr] = new List<CommonDevice>();
@@ -1281,7 +1333,7 @@
         }
         #endregion
 
-        #region 鈻� 鑷畾涔夋櫤鑳介煶绠辨帶浠禵____________________
+        #region 鈻� 鑷畾涔夋櫤鑳介煶绠辨帶浠禵________________
 
         /// <summary>
         /// 鑷畾涔夌綉鍏虫帶浠�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index c4a9f56..721ae90 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Shared.Common;
+using Shared.Phone.UserCenter.Device.Bind;
+using Shared.Phone.UserCenter.DeviceBind;
 using ZigBee.Device;
 
 namespace Shared.Phone.UserCenter.Device
@@ -33,7 +35,30 @@
         /// 涓ぎ绌鸿皟鐨勭増鏈帶浠�
         /// </summary>
         private NormalViewControl btnAirConditionerVersion = null;
-
+        /// <summary>
+        /// 绠�绾﹂潰鏉跨粦瀹氱殑娓╁害鐩爣鍚嶅瓧
+        /// </summary>
+        private string bindTemperatureName = string.Empty;
+        /// <summary>
+        /// 绠�绾﹂潰鏉跨粦瀹氱殑婀垮害鐩爣鍚嶅瓧
+        /// </summary>
+        private string bindHumidityName = string.Empty;
+        /// <summary>
+        /// 绠�绾﹂潰鏉跨粦瀹氳缁戠洰鏍囨槸娓╁害
+        /// </summary>
+        private CommonDevice bindTemperatureDev;
+        /// <summary>
+        /// 绠�绾﹂潰鏉跨粦瀹氳缁戠洰鏍囨槸婀垮害
+        /// </summary>
+        private CommonDevice bindHumidityDev;
+        /// <summary>
+        ///  绠�绾﹂潰鏉垮綋鍓峂ac
+        /// </summary>
+        private string deviceMacTemp = string.Empty;
+        // <summary>
+        /// 绠�绾﹂潰鏉夸腑琚粦瀹氱殑娓╂箍搴︾洰鏍囧垪琛�
+        /// </summary>
+        private List<BindObj.BindListResponseObj> bindList = new List<BindObj.BindListResponseObj>();
         #endregion
 
         #region 鈻� 鍒濆鍖朹____________________________
@@ -50,8 +75,8 @@
                 //閽堝鍗曠函鍙湁涓�涓�200绔偣鐨勮澶�
                 listNewDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));
             }
-
             this.listDeviceType.Clear();
+            deviceMacTemp = deviceMac;
             foreach (var device in listNewDevice)
             {
                 //鏀堕泦璁惧绫诲瀷
@@ -71,6 +96,17 @@
 
             //閲嶆柊鑾峰彇纭欢淇℃伅
             this.RefreshHardFirmwareInfo();
+
+            //绠�绾﹀鍔熻兘闈㈡澘鑾峰彇缁戝畾鐩爣鐨勬樉绀�
+            if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+            {
+                //绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧淇℃伅
+                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);
+                var key = new ZigBee.Device.Panel();
+                key.DeviceAddr = deviceMac;
+                key.CurrentGateWayId = dev.CurrentGateWayId;
+                InitBindInfo(key);
+            }
         }
 
         /// <summary>
@@ -251,11 +287,10 @@
             else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
             {
                 //绠�绾﹀鍔熻兘闈㈡澘
-                this.AddIBindRow();
+                this.AddIBindRow(deviceMacTemp);
                 this.AddFunctionSettionRow();
-                this.AddHumiditySourceRow();
-                this.AddTemperatureSensorRow();
-
+                this.AddHumiditySourceRow(deviceMacTemp);
+                this.AddTemperatureSensorRow(deviceMacTemp);
             }
             else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
             {
@@ -563,13 +598,14 @@
             btnFunction.AddBottomLine();
             btnFunction.ButtonClickEvent += (sender, e) =>
             {
-                var form = new DeviceBind.PanelSimpleEnvironmentTargetsForm();
-
+                //绠�绾︾幆澧冮潰鏉跨殑鎸夐敭閰嶇疆
+                var form = new DevicePanel.PanelSimpleEnvironmentButtonSettionForm();
+                form.AddForm(listNewDevice[0]);
             };
         }
 
         #endregion
-		
+
         #endregion
 
         #region 鈻� 鎸夐敭璁剧疆(鏂规偊)_____________________
@@ -610,10 +646,15 @@
                         var form = new DevicePanel.PanelFangyueEnvironmentButtonSettionForm();
                         form.AddForm(listNewDevice[0]);
                     }
-                    else
+                    else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
                     {
                         //鏂规偊鏂伴闈㈡澘鐨勬寜閿厤缃�
                         var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();
+                        form.AddForm(listNewDevice[0]);
+                    }
+                    else
+                    {
+                        var form = new DevicePanel.PanelFangyueButtonSettionForm();
                         form.AddForm(listNewDevice[0]);
                     }
                 };
@@ -776,6 +817,15 @@
                 {
                     var form = new DevicePanel.PanelFangyueFunctionSettionForm();
                     form.AddForm(listNewDevice[0], deviceEnumInfo);
+                }
+                //绠�绾︾幆澧冮潰鏉跨殑鎸夐敭閰嶇疆
+                else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+                {
+                    var form = new DeviceFunctionSettionForm();
+                    if (listNewDevice.Count > 62)
+                    {
+                        form.AddForm(listNewDevice[62], true);
+                    }
                 }
                 //娌充笢鐨勯潰鏉胯澶�
                 else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘 && deviceEnumInfo.IsHdlDevice == true)
@@ -965,9 +1015,9 @@
 
         #region 鈻�  绠�绾﹀鍔熻兘闈㈡澘鐢╛__________________
         /// <summary>
-        /// 娣诲姞銆愮粦瀹氱洰鏍囥�戣 
+        /// 娣诲姞銆愮粦瀹氱洰鏍囥�戣
         /// </summary>
-        private void AddIBindRow()
+        private void AddIBindRow(string deviceMac)
         {
             string bindTargets = Language.StringByID(R.MyInternationalizationString.uBindTargets);
             var btnBindTargets = new FrameRowControl(listview.rowSpace / 2);
@@ -979,14 +1029,17 @@
             btnBindTargets.AddBottomLine();
             btnBindTargets.ButtonClickEvent += (sender, e) =>
             {
-                var form = new DeviceBind.PanelSimpleMutilfunctionTargetsForm();
+                var simpleMutilfunctionTargetsPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionTargetsForm(deviceMac);
+                Shared.Phone.UserView.HomePage.Instance.AddChidren(simpleMutilfunctionTargetsPage);
+                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+                simpleMutilfunctionTargetsPage.Show();
             };
         }
 
         /// <summary>
         ///  婀垮害鏉ユ簮琛�
         /// </summary>
-        private void AddHumiditySourceRow()
+        private void AddHumiditySourceRow(string deviceMac)
         {
             //婀垮害
             var rowHumidity = new FrameRowControl(listview.rowSpace / 2);
@@ -997,40 +1050,48 @@
             //鍙崇澶�
             rowHumidity.AddRightArrow();
             var msg = Language.StringByID(R.MyInternationalizationString.nothing);
-            //if (!string.IsNullOrEmpty(bindHumidityName))
-            //{
-            //    msg = bindHumidityName;
-            //}
+            if (!string.IsNullOrEmpty(bindHumidityName))
+            {
+                msg = bindHumidityName;
+            }
             var btnHumidityStatu = rowHumidity.AddMostRightView(msg, 700);
             rowHumidity.ButtonClickEvent += (sender, e) =>
             {
-                //var key = new Panel();
-                //var bindHumiditySensorPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionBindSensorForm(key, bindHumidityDev, 3);
-                //Shared.Phone.UserView.HomePage.Instance.AddChidren(bindHumiditySensorPage);
-                //Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
-                //bindHumiditySensorPage.Show();
 
-                //bindHumiditySensorPage.actionHumidityTarget += (bindName) =>
-                //{
-                //    Application.RunOnMainThread(() =>
-                //    {
-                //        if (string.IsNullOrEmpty(bindName))
-                //        {
-                //            btnHumidityStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
-                //        }
-                //        else
-                //        {
-                //            btnHumidityStatu.Text = bindName;
-                //        }
-                //    });
-                //};
+                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+                var device = new CommonDevice();
+                if (dev != null)
+                {
+                    device.CurrentGateWayId = dev.CurrentGateWayId;
+                }
+                device.Type = DeviceType.OnOffSwitch;
+                device.DeviceAddr = deviceMac;
+                device.DeviceEpoint = 65;//鑳界粦瀹氭箍搴︾殑鍥炶矾
+                var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindHumidityDev, BindInfo.BindType.Humidity);
+                Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
+                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+                paneTargetsBaseFormp.Show();
+                paneTargetsBaseFormp.actionHumidityTarget += (bindName) =>
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (string.IsNullOrEmpty(bindName))
+                        {
+                            btnHumidityStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
+                        }
+                        else
+                        {
+                            btnHumidityStatu.Text = bindName;
+                        }
+                    });
+                };
             };
         }
 
         /// <summary>
         ///  娓╁害鏉ユ簮琛�
         /// </summary>
-        private void AddTemperatureSensorRow()
+        private void AddTemperatureSensorRow(string deviceMac)
         {
             //娓╁害鏉ユ簮
             var rowTemPerature = new FrameRowControl(listview.rowSpace / 2);
@@ -1041,35 +1102,158 @@
             //鍙崇澶�
             rowTemPerature.AddRightArrow();
             var msg = Language.StringByID(R.MyInternationalizationString.nothing);
-            //if (!string.IsNullOrEmpty(bindTemperatureName))
-            //{
-            //    msg = bindTemperatureName;
-            //}
+            if (!string.IsNullOrEmpty(bindTemperatureName))
+            {
+                msg = bindTemperatureName;
+            }
             var btnTemperatureStatu = rowTemPerature.AddMostRightView(msg, 700);
             rowTemPerature.ButtonClickEvent += (sender, e) =>
             {
-                //var key = new Panel();
-                //var bindTemperatureSensorPage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(key, bindTemperatureDev, 2);
-                //Shared.Phone.UserView.HomePage.Instance.AddChidren(bindTemperatureSensorPage);
-                //Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
-                //bindTemperatureSensorPage.Show();
-
-                //bindTemperatureSensorPage.actionTemperatureTarget += (bindName) =>
-                //{
-                //    Application.RunOnMainThread(() =>
-                //    {
-                //        if (string.IsNullOrEmpty(bindName))
-                //        {
-                //            btnTemperatureStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
-                //        }
-                //        else
-                //        {
-                //            btnTemperatureStatu.Text = bindName;
-                //        }
-                //    });
-                //};
+                var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+                var device = new CommonDevice();
+                if (dev != null)
+                {
+                    device.CurrentGateWayId = dev.CurrentGateWayId;
+                }
+                device.Type = DeviceType.OnOffSwitch;
+                device.DeviceAddr = deviceMac;
+                device.DeviceEpoint = 64;//鑳界粦瀹氭俯搴︾殑鍥炶矾
+                var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindTemperatureDev, BindInfo.BindType.Temperature);
+                Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
+                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+                paneTargetsBaseFormp.Show();
+                paneTargetsBaseFormp.actionTemperatureTarget += (bindName) =>
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (string.IsNullOrEmpty(bindName))
+                        {
+                            btnTemperatureStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
+                        }
+                        else
+                        {
+                            btnTemperatureStatu.Text = bindName;
+                        }
+                    });
+                };
             };
         }
+
+        /// <summary>
+        ///璇绘俯婀垮害鏁版嵁
+        /// </summary>
+        void InitBindInfo(CommonDevice curControlDev)
+        {
+            System.Threading.Tasks.Task.Run(async () =>
+            {
+                try
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        CommonPage.Loading.Start("");
+                    });
+                    //1銆佽幏鍘荤粦瀹氱殑娓╁害浼犳劅鍣�
+                    curControlDev.DeviceEpoint = 64;
+                    var result = await GetBindName(curControlDev);
+                    if (!result)
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+                        });
+                        return;
+                    }
+
+                    //2銆佽幏鍘荤粦瀹氱殑婀垮害搴︿紶鎰熷櫒
+                    curControlDev.DeviceEpoint = 65;
+                    var result2 = await GetBindName(curControlDev);
+                    if (!result2)
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+                        });
+                        return;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    var mess = ex.Message;
+                }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        //鍒濆鍖栦腑閮ㄦ帶浠�
+                        this.InitMiddleFrame();
+                        CommonPage.Loading.Hide();
+                    });
+                }
+            });
+        }
+
+        /// <summary>
+        /// 鑾峰彇缁戝畾鐨勬俯婀垮害鐩爣
+        /// </summary>
+        /// <param name="curControlDev"></param>
+        /// <returns></returns>
+        private async System.Threading.Tasks.Task<bool> GetBindName(CommonDevice curControlDev)
+        {
+            bool result = false;
+            var panelBindListRes = HdlDeviceBindLogic.Current.GetDeviceBindAsync(curControlDev);
+            if (panelBindListRes != null && panelBindListRes.getAllBindResponseData != null)
+            {
+                bindList = panelBindListRes.getAllBindResponseData.BindList;
+                foreach (var bDev in bindList)
+                {
+                    var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
+                    if (device.Type == DeviceType.TemperatureSensor)
+                    {
+                        var bD = device as TemperatureSensor;
+                        if (bD.SensorDiv == 1 && bDev.BindCluster == 1026)
+                        {
+                            if (string.IsNullOrEmpty(bDev.ESName))
+                            {
+                                bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+                            }
+                            else
+                            {
+                                bindTemperatureName = bDev.ESName;
+                            }
+                            bindTemperatureDev = device;
+                        }
+                        if (bD.SensorDiv == 2 && bDev.BindCluster == 1029)
+                        {
+                            if (string.IsNullOrEmpty(bDev.ESName))
+                            {
+                                bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+                            }
+                            else
+                            {
+                                bindHumidityName = bDev.ESName;
+                            }
+
+                            bindHumidityDev = device;
+                        }
+                    }
+                    if (device.Type == DeviceType.FreshAirHumiditySensor)
+                    {
+                        if (string.IsNullOrEmpty(bDev.ESName))
+                        {
+                            bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+                        }
+                        else
+                        {
+                            bindHumidityName = bDev.ESName;
+                        }
+
+                        bindHumidityDev = device;
+                    }
+                }
+                result = true;
+            }
+            return result;
+        }
         #endregion
 
         #region 鈻� 鍔熻兘绫诲瀷(绌烘皵寮�鍏充笓鐢�)_____________
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs
index 0bdf308..eb369a4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs
@@ -78,7 +78,7 @@
             bodyFrameLayout.AddChidren(frameTransparent);
 
             //鏄庣粏鍒楄〃鐨勬甯冿紝鐧借壊鑳屾櫙(瀹冧笌瀹為檯楂樺害灏忎簡鍗婁釜寮у害鐨勫渾)
-            var detailBackFrame = new FrameLayout();
+            var detailBackFrame = new NormalFrameLayout();
             detailBackFrame.Y = halfRoundHeigth;
             detailBackFrame.Height = frameTransparent.Height;
             detailBackFrame.BackgroundColor = UserCenterColor.Current.White;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
index b2814b2..37db0f1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
@@ -12,7 +12,6 @@
         /// 鍒楄〃鎺т欢
         /// </summary>
         private VerticalScrolViewLayout listview = null;
-
         /// <summary>
         /// 闈㈡澘鐨勫洖璺�
         /// </summary>
@@ -33,6 +32,28 @@
         /// 鎸夐敭鐨勯鑹叉暟鎹�
         /// </summary>
         private Panel.KeyColorData keyColorData = null;
+        /// <summary>
+        /// 閫夋嫨鐫$湢鏃堕棿鐨勪簨浠� value:绱㈠紩(浠�0寮�濮�)  鏂囨湰淇℃伅璇风敤Text鑾峰彇
+        /// </summary>
+        public Action<int> timeAction = null;
+        /// <summary>
+        /// 褰撳墠閫夋嫨鐨勫姛鑳界被鍨嬬储寮�
+        /// </summary>
+        private int nowSelectNo = 0;
+        /// <summary>
+        /// /// <summary>
+        /// 鐫$湢鏃堕棿鐨勫��
+        /// </summary>
+        /// </summary>
+        public string sleepTimeText
+        {
+            get { return btnSleepTime.Text; }
+            set { btnSleepTime.Text = value; }
+        }
+        /// <summary>
+        ///鐫$湢鏃堕棿 
+        /// </summary>
+        public NormalViewControl btnSleepTime = null;
 
         #endregion
 
@@ -109,7 +130,7 @@
         /// <param name="frameLinght">鍚勭鑳屽厜鐏殑瀹瑰櫒(鎺т欢浼哥缉浣跨敤)</param>
         private void AddEnergyConservationRow()
         {
-            //缂╁皬:170  鎵╁ぇ:429
+            //缂╁皬:170  鎵╁ぇ:614
             var frameBack = new FrameRowControl();
             frameBack.BackgroundColor = UserCenterColor.Current.White;
             frameBack.UseClickStatu = false;
@@ -125,7 +146,7 @@
                 btnSwitch.IsSelected = !btnSwitch.IsSelected;
                 energyModeInfo.enable = btnSwitch.IsSelected;
                 //灞曞紑鎴栬�呯缉灏忕殑楂樺害
-                var value = Application.GetRealHeight(443);
+                var value = Application.GetRealHeight(614);
                 if (btnSwitch.IsSelected == true)
                 {
                     frameBack.Height += value;
@@ -191,12 +212,23 @@
             if (energyModeInfo.enable == true)
             {
                 //灞曞紑鎴栬�呯缉灏忕殑楂樺害
-                var value = Application.GetRealHeight(443);
+                var value = Application.GetRealHeight(614);
                 frameBack.Height += value;
             }
 
             //娣诲姞鎺ヨ繎鎰熷簲
             this.AddProximitySensorsRow(frameBack);
+
+            //搴曠嚎  
+            var btnLine = new NormalViewControl(965, 5, true);
+            btnLine.Height = 1;
+            btnLine.X = Application.GetRealWidth(52);
+            btnLine.Y = Application.GetRealHeight(484 + 127);
+            btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
+            frameBack.AddChidren(btnLine);
+
+            //娣诲姞鐫$湢鏃堕棿
+            this.AddSleepTimeRow(frameBack);
         }
 
         #endregion
@@ -230,6 +262,100 @@
             {
                 btnSwitch.IsSelected = true;
             }
+        }
+        #endregion
+
+        #region 鈻� 鐫$湢鏃堕棿___________________________
+
+        /// <summary>
+        /// 鐫$湢鏃堕棿琛�
+        /// </summary>
+        private void AddSleepTimeRow(FrameRowControl frameRowControl)
+        {
+            //鐫$湢鏃堕棿琛�
+            var frameBack = new FrameRowControl();
+            frameBack.BackgroundColor = UserCenterColor.Current.White;
+            frameBack.UseClickStatu = false;
+            frameBack.Y = Application.GetRealHeight(784 - 170);
+            frameBack.Height = Application.GetRealHeight(170);
+            frameRowControl.AddChidren(frameBack);
+
+            //鐫$湢鏃堕棿
+            frameBack.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.SleepTime), 400);
+            //鍙崇澶�
+            frameBack.AddRightArrow();
+            btnSleepTime = new NormalViewControl(700, true);
+            switch (energyModeInfo.time)
+            {
+                case 15:
+                    btnSleepTime.Text = "15s";
+                    nowSelectNo = 0;
+                    break;
+                case 60:
+                    btnSleepTime.Text = "1min";
+                    nowSelectNo = 1;
+                    break;
+                case 300:
+                    btnSleepTime.Text = "5min";
+                    nowSelectNo = 2;
+                    break;
+            }
+            frameBack.AddMostRightView(this.sleepTimeText, 700);
+
+            timeAction = null;
+            timeAction += (nowSelectNo) =>
+            {
+                switch (nowSelectNo)
+                {
+                    case 0:
+                        energyModeInfo.time = 15;
+                        break;
+                    case 1:
+                        energyModeInfo.time = 60;
+                        break;
+                    case 2:
+                        energyModeInfo.time = 300;
+                        break;
+                }
+                AddSleepTimeRow(frameRowControl);
+            };
+            frameBack.ButtonClickEvent += (sender, e) =>
+            {
+                this.ShowSelectDeviceSleepTimeListForm();
+            };
+        }
+        #endregion
+
+        #region 鈻� 鏄剧ず閫夋嫨璁惧鐫$湢鏃堕棿_______________ 
+        /// <summary>
+        /// 鏄剧ず閫夋嫨璁惧鐫$湢鏃堕棿鐨勭晫闈�
+        /// </summary>
+        public void ShowSelectDeviceSleepTimeListForm()
+        {
+            //鏄剧ず鍒楄〃
+            var listText = new List<string>();
+            listText.Add("15s");
+            listText.Add("1min");
+            listText.Add("5min");
+            //鏍囬:閫夋嫨鍔熻兘绫诲瀷
+            var title = Language.StringByID(R.MyInternationalizationString.SleepTime);
+
+            var form = new BottomItemSelectForm();
+            form.CancelCallEvent = false;//鍏佽鍙栨秷
+            form.AddForm(title, listText, nowSelectNo);
+            form.FinishSelectEvent += (selectNo) =>
+            {
+                if (selectNo == nowSelectNo)
+                {
+                    //閫夋嫨鐨勬槸鐩稿悓鐨�
+                    return;
+                }
+                //-1:閫夋嫨鍙栨秷
+                this.sleepTimeText = selectNo == -1 ? string.Empty : listText[selectNo];
+                nowSelectNo = selectNo;
+                //璋冪敤鍥炶皟鍑芥暟
+                this.timeAction?.Invoke(nowSelectNo);
+            };
         }
         #endregion
 
@@ -512,23 +638,46 @@
 
             frameColor.ButtonClickEvent += (sender, e) =>
             {
-                PanelColor(btnColor, seekBar1, R1, G1, B1);
+                PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
             };
             btnColorView.ButtonClickEvent += (sender, e) =>
             {
-                PanelColor(btnColor, seekBar1, R1, G1, B1);
+                PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
             };
             btnColor.ButtonClickEvent += (sender, e) =>
             {
-                PanelColor(btnColor, seekBar1, R1, G1, B1);
+                PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
             };
             btnColorLine.ButtonClickEvent += (sender, e) =>
             {
-                PanelColor(btnColor, seekBar1, R1, G1, B1);
+                PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
             };
             btnRight.ButtonClickEvent += (sender, e) =>
             {
-                PanelColor(btnColor, seekBar1, R1, G1, B1);
+                PanelAfterColor(btnColor, seekBar1, R1, G1, B1);
+            };
+        }
+
+        /// <summary>
+        /// PanelColorBefore
+        /// </summary>
+        private void PanelAfterColor(NormalViewControl btnColor, SeekBarControl seekBar1, int R1, int G1, int B1)
+        {
+            var form = new PanelColorSelectForm();
+            form.AddForm(R1, G1, B1);
+            form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>
+            {
+                R1 = Rcolor;
+                G1 = Gcolor;
+                B1 = Bcolor;
+
+                this.keyColorData.OpenColorR = Convert.ToString(Rcolor, 16);
+                this.keyColorData.OpenColorG = Convert.ToString(Gcolor, 16);
+                this.keyColorData.OpenColorB = Convert.ToString(Bcolor, 16);
+
+                btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
+                //鍙樻洿婊戝姩鏉$殑棰滆壊
+                seekBar1.ProgressBarColor = btnColor.BackgroundColor;
             };
         }
         #endregion
@@ -600,7 +749,6 @@
 
             //鑺傝兘妯″紡淇敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
             //鑲栧織璞粰鎸夐敭鎺у埗闈㈡澘锛堝洓寮�鍏帶锛夎澶囷紝璇撮粯璁�15绉掓椂闂达紝杩欐牱鎺ヨ繎鎰熷簲鍔熻兘鎵嶅悎鐞�
-            energyModeInfo.time = 15;
             result = HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(panelDevice, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
             if (result == false)
             {
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs
new file mode 100755
index 0000000..ce40ff6
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBrightnessAdjustForm.cs
@@ -0,0 +1,791 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using ZigBee.Device;
+namespace Shared.Phone.UserCenter.DevicePanel
+{
+    public class PanelBrightnessAdjustForm : EditorCommonForm
+    {
+        #region 鈻� 鍙橀噺澹版槑___________________________
+        /// <summary>
+        /// 鍒楄〃鎺т欢
+        /// </summary>
+        private VerticalScrolViewLayout listview = null;
+        /// <summary>
+        /// 闈㈡澘鐨勫洖璺�
+        /// </summary>
+        private Panel panelDevice;
+        /// <summary>
+        /// 璁惧鐨勬煇涓�鍥炶矾
+        /// </summary>
+        private CommonDevice deviceObj = null;
+        /// <summary>
+        /// 浜害璋冭妭鐨勪俊鎭�
+        /// </summary>
+        private Panel.PanelSwitchLevelInfo linghtLevelInfo = null;
+        /// <summary>
+        /// 浜害璋冭妭鐨勪俊鎭�
+        /// </summary>
+        private Panel.PanelProximitySensorInfo proximitySensorsInfo = null;
+        /// <summary>
+        /// 鑺傝兘妯″紡
+        /// </summary>
+        private Panel.PanelSaveEnergyModeInfo energyModeInfo = null;
+        /// <summary>
+        /// 鎸夐敭鐨勯鑹叉暟鎹�
+        /// </summary>
+        private Panel.KeyColorData keyColorData = null;
+        /// <summary>
+        /// 閫夋嫨鐫$湢鏃堕棿鐨勪簨浠� value:绱㈠紩(浠�0寮�濮�)  鏂囨湰淇℃伅璇风敤Text鑾峰彇
+        /// </summary>
+        public Action<int> timeAction = null;
+        /// <summary>
+        /// 褰撳墠閫夋嫨鐨勫姛鑳界被鍨嬬储寮�
+        /// </summary>
+        private int nowSelectNo = 0;
+        /// <summary>
+        /// /// <summary>
+        /// 鐫$湢鏃堕棿鐨勫��
+        /// </summary>
+        /// </summary>
+        public string sleepTimeText
+        {
+            get { return btnSleepTime.Text; }
+            set { btnSleepTime.Text = value; }
+        }
+        /// <summary>
+        ///鐫$湢鏃堕棿 
+        /// </summary>
+        public NormalViewControl btnSleepTime = null;
+        #endregion
+
+        #region 鈻� 鍒濆鍖朹____________________________
+
+        /// <summary>
+        /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+        /// </summary>
+        /// <param name="i_device">璁惧鐨勬煇涓�鍥炶矾</param>
+        public void ShowForm(CommonDevice device)
+        {
+            //宸︽粦浣胯兘涓嶅彲
+            this.ScrollEnabled = false;
+            this.deviceObj = device;
+            this.panelDevice = new Panel();
+            this.panelDevice.DeviceAddr = this.deviceObj.DeviceAddr;
+            this.panelDevice.DeviceEpoint = 200;
+            this.panelDevice.CurrentGateWayId = this.deviceObj.CurrentGateWayId;
+
+            //璁剧疆澶撮儴淇℃伅
+            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uLightRegulation));
+
+            //鍒濆鍖栦腑閮ㄤ俊鎭�
+            this.InitMiddleFrame();
+        }
+
+        /// <summary>
+        /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+        /// </summary>
+        private async void InitMiddleFrame()
+        {
+            //鑾峰彇璁惧鍒濆鏁版嵁
+            var result = await this.GetDeviceDefultData();
+            if (result == false)
+            {
+                return;
+            }
+
+            //娓呯┖bodyFrame
+            this.ClearBodyFrame();
+
+            listview = new VerticalScrolViewLayout();
+            listview.Height = Application.GetRealHeight(1981 - 184);
+            bodyFrameLayout.AddChidren(listview);
+
+            HdlThreadLogic.Current.RunMain(() =>
+            {
+                //娣诲姞鑺傝兘妯″紡鎺т欢
+                this.AddEnergyConservationRow();
+
+                //娣诲姞灞忓箷浜害绾у埆鎺т欢
+                this.AddScreenBrightnesLevelControl();
+
+                //鑾峰彇璁惧绫诲瀷鐨�
+                var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { deviceObj });
+                if (deviceEnumInfo.ConcreteType != Common.DeviceConcreteType.ButtonPanel_SimpleEnvironment)
+                {
+                    //娣诲姞闈㈡澘鐨勯鑹�
+                    this.AddColorControl();
+                }
+
+                this.FinishInitControl(listview, energyModeInfo.enable);
+
+                //淇濆瓨
+                var btnSave = new BottomClickButton();
+                btnSave.TextID = R.MyInternationalizationString.uSave;
+                bodyFrameLayout.AddChidren(btnSave);
+                btnSave.ButtonClickEvent += (sender, e) =>
+                {
+                    //淇濆瓨闈㈡澘鏁版嵁
+                    this.SavePanelData();
+                };
+            });
+        }
+
+        #endregion
+
+        #region 鈻� 灞忓箷浜害绾у埆_______________________ 
+        /// <summary>
+        /// 娣诲姞灞忓箷浜害绾у埆鎺т欢
+        /// </summary>
+        private void AddScreenBrightnesLevelControl()
+        {
+            var btnEspace = new NormalViewControl(600, 58, true);
+            btnEspace.X = ControlCommonResourse.XXLeft;
+            listview.AddChidren(btnEspace);
+
+            var frameBack = new FrameLayout();
+            frameBack.Height = Application.GetRealHeight(429);
+            frameBack.Y = Application.GetRealHeight(58);
+            frameBack.BackgroundColor = UserCenterColor.Current.White;
+            listview.AddChidren(frameBack);
+
+            //灞忓箷浜害绾у埆
+            var btnLevelView = new NormalViewControl(400, 60, true);
+            btnLevelView.X = ControlCommonResourse.XXLeft;
+            btnLevelView.Y = Application.GetRealHeight(54);
+            btnLevelView.TextID = R.MyInternationalizationString.uScreenBrightnesLevel;
+            frameBack.AddChidren(btnLevelView);
+
+            //?绾�
+            string strRank = Language.StringByID(R.MyInternationalizationString.uRank);
+            var btnLevel = new NormalViewControl(167, 60, true);
+            btnLevel.X = Application.GetRealWidth(855);
+            btnLevel.Y = Application.GetRealHeight(54);
+            btnLevel.TextAlignment = TextAlignment.CenterRight;
+            btnLevel.TextColor = UserCenterColor.Current.TextGrayColor1;
+            frameBack.AddChidren(btnLevel);
+
+            //褰撳墠浜害
+            var btnProgressView1 = new NormalViewControl(200, 50, true);
+            btnProgressView1.X = ControlCommonResourse.XXLeft;
+            btnProgressView1.Y = Application.GetRealHeight(157);
+            btnProgressView1.TextSize = 12;
+            btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
+            btnProgressView1.TextID = R.MyInternationalizationString.uNowLuminance;
+            frameBack.AddChidren(btnProgressView1);
+            var btnProgress1 = new NormalViewControl(200, 50, true);
+            btnProgress1.X = Application.GetRealWidth(222);
+            btnProgress1.Y = Application.GetRealHeight(157);
+            btnProgress1.TextSize = 12;
+            btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
+            frameBack.AddChidren(btnProgress1);
+
+            //杩涘害鏉�
+            var seekBar1 = new SeekBarControl();
+            seekBar1.SeekBarPadding = 25;
+            seekBar1.MaxValue = 5;
+            seekBar1.ProgressBarColor = 0xff3e99f4;
+            seekBar1.Y = Application.GetRealHeight(253);
+            frameBack.AddChidren(seekBar1);
+            seekBar1.ProgressChangedEvent += (div, value) =>
+            {
+                if (value == 0)
+                {
+                    btnProgress1.Text = (value + 1).ToString();
+                }
+                else
+                {
+                    btnProgress1.Text = value.ToString();
+                }
+
+                switch (value)
+                {
+                    case 0:
+                    case 1:
+                        linghtLevelInfo.panelDirectionsLevel = 20;
+                        btnLevel.Text = "1" + strRank;
+
+                        break;
+                    case 2:
+                        linghtLevelInfo.panelDirectionsLevel = 40;
+                        btnLevel.Text = "2" + strRank;
+                        break;
+                    case 3:
+                        linghtLevelInfo.panelDirectionsLevel = 60;
+                        btnLevel.Text = "3" + strRank;
+                        break;
+                    case 4:
+                        linghtLevelInfo.panelDirectionsLevel = 80;
+                        btnLevel.Text = "4" + strRank;
+                        break;
+                    case 5:
+                        linghtLevelInfo.panelDirectionsLevel = 100;
+                        btnLevel.Text = "5" + strRank;
+                        break;
+                }
+                listview.ScrollEnabled = false;
+            };
+            seekBar1.OnStopTrackingTouchEvent += (sender, e) =>
+            {
+                listview.ScrollEnabled = true;
+            };
+            seekBar1.OnStopTrackingTouchEvent += (div, value) =>
+            {
+                if (value == 0)
+                {
+                    seekBar1.Progress = 1;
+                }
+                else
+                {
+                    seekBar1.Progress = value;
+                }
+            };
+
+            if (linghtLevelInfo.panelDirectionsLevel <= 20 && linghtLevelInfo.panelDirectionsLevel >= 0)
+            {
+                btnLevel.Text = "1" + strRank;
+                btnProgress1.Text = "1";
+                seekBar1.Progress = 1;
+            }
+            else if (linghtLevelInfo.panelDirectionsLevel <= 40 && linghtLevelInfo.panelDirectionsLevel > 20)
+            {
+                btnLevel.Text = "2" + strRank;
+                btnProgress1.Text = "2";
+                seekBar1.Progress = 2;
+            }
+            else if (linghtLevelInfo.panelDirectionsLevel <= 60 && linghtLevelInfo.panelDirectionsLevel > 40)
+            {
+                btnLevel.Text = "3" + strRank;
+                btnProgress1.Text = "3";
+                seekBar1.Progress = 3;
+            }
+            else if (linghtLevelInfo.panelDirectionsLevel <= 80 && linghtLevelInfo.panelDirectionsLevel > 60)
+            {
+                btnLevel.Text = "4" + strRank;
+                btnProgress1.Text = "4";
+                seekBar1.Progress = 4;
+            }
+            else if (linghtLevelInfo.panelDirectionsLevel <= 100 && linghtLevelInfo.panelDirectionsLevel > 80)
+            {
+                btnLevel.Text = "5" + strRank;
+                btnProgress1.Text = "5";
+                seekBar1.Progress = 5;
+            }
+            else
+            {
+                btnLevel.Text = "1" + strRank;
+                btnProgress1.Text = "1";
+                seekBar1.Progress = 1;
+            }
+
+            var btnTemp1 = new NormalViewControl(200, 50, true);
+            btnTemp1.X = ControlCommonResourse.XXLeft;
+            btnTemp1.Y = Application.GetRealHeight(322);
+            btnTemp1.TextSize = 12;
+            btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+            btnTemp1.Text = "1";
+            frameBack.AddChidren(btnTemp1);
+
+            var btnTemp2 = new NormalViewControl(100, 50, true);
+            btnTemp2.X = frameBack.Width - ControlCommonResourse.XXLeft - Application.GetRealWidth(100);
+            btnTemp2.Y = Application.GetRealHeight(322);
+            btnTemp2.TextAlignment = TextAlignment.CenterRight;
+            btnTemp2.TextSize = 12;
+            btnTemp2.TextColor = UserCenterColor.Current.TextGrayColor3;
+            btnTemp2.Text = "5";
+            frameBack.AddChidren(btnTemp2);
+        }
+        #endregion
+
+        #region 鈻� 鑳屽厜棰滆壊_________________________
+
+        /// <summary>
+        /// 娣诲姞鑳屽厜棰滆壊鎺т欢
+        /// </summary>
+        private void AddColorControl()
+        {
+            var btnEspace = new NormalViewControl(600, 58, true);
+            btnEspace.X = ControlCommonResourse.XXLeft;
+            listview.AddChidren(btnEspace);
+
+            //鑳屾櫙
+            var frameBack = new FrameLayout();
+            frameBack.Y = Application.GetRealHeight(490);
+            frameBack.Height = Application.GetRealHeight(170);
+            frameBack.BackgroundColor = UserCenterColor.Current.White;
+            listview.AddChidren(frameBack);
+
+            //鑳屽厜鐏鑹�
+            var btnLevelView = new NormalViewControl(400, 60, true);
+            btnLevelView.X = ControlCommonResourse.XXLeft;
+            btnLevelView.Y = Application.GetRealHeight(54);
+            btnLevelView.Gravity = Gravity.CenterVertical;
+            btnLevelView.TextID = R.MyInternationalizationString.BackgroundLightColor;
+            frameBack.AddChidren(btnLevelView);
+
+            var frameColor = new FrameLayoutStatuControl();
+            frameColor.UseClickStatu = false;
+            frameColor.Width = Application.GetRealHeight(262);
+            frameColor.Height = this.GetPictrueRealSize(79);
+            frameColor.Gravity = Gravity.CenterVertical;
+            frameColor.X = frameBack.Width - ControlCommonResourse.XXLeft - Application.GetRealHeight(262);
+            frameBack.AddChidren(frameColor);
+
+            //棰滆壊
+            var btnColorView = new NormalViewControl(Application.GetRealHeight(110), this.GetPictrueRealSize(49), false);
+            btnColorView.Gravity = Gravity.CenterVertical;
+            btnColorView.TextAlignment = TextAlignment.CenterRight;
+            btnColorView.TextSize = 12;
+            btnColorView.Y = Application.GetRealHeight(5);
+            btnColorView.TextColor = UserCenterColor.Current.TextGrayColor1;
+            btnColorView.TextID = R.MyInternationalizationString.uColor;
+            frameColor.AddChidren(btnColorView, ChidrenBindMode.BindEvent);
+
+            int R1 = Convert.ToInt32(this.keyColorData.OpenColorR, 16);
+            int G1 = Convert.ToInt32(this.keyColorData.OpenColorG, 16);
+            int B1 = Convert.ToInt32(this.keyColorData.OpenColorB, 16);
+            uint backColor = this.GetColorByRGB((byte)R1, (byte)G1, (byte)B1);
+
+            //棰滆壊澶栨 
+            var btnColorLine = new FrameLayoutStatuControl();
+            btnColorLine.Width = Application.GetRealHeight(79);
+            btnColorLine.Height = this.GetPictrueRealSize(79);
+            btnColorLine.X = btnColorView.Right + Application.GetRealHeight(18);
+            btnColorLine.Radius = (uint)this.GetPictrueRealSize(79) / 2;
+            btnColorLine.BorderWidth = 1;
+            btnColorLine.BorderColor = 0xffcccccc;
+            frameColor.AddChidren(btnColorLine, ChidrenBindMode.BindEvent);
+
+            var btnColor = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(69), false);
+            btnColor.Gravity = Gravity.Center;
+            btnColor.Radius = (uint)this.GetPictrueRealSize(69) / 2;
+            btnColor.BackgroundColor = backColor;
+            btnColorLine.AddChidren(btnColor, ChidrenBindMode.BindEvent);
+
+            var btnRight = new NormalViewControl(this.GetPictrueRealSize(58), this.GetPictrueRealSize(58), false);
+            btnRight.UnSelectedImagePath = "Item/RightNext.png";
+            btnRight.Y = Application.GetRealHeight(5);
+            btnRight.X = frameColor.Width - this.GetPictrueRealSize(58);
+            frameColor.AddChidren(btnRight, ChidrenBindMode.BindEvent);
+            btnRight.Y += this.GetPictrueRealSize(8);
+
+            frameColor.ButtonClickEvent += (sender, e) =>
+            {
+                PanelColor(btnColor, R1, G1, B1);
+            };
+            btnColorView.ButtonClickEvent += (sender, e) =>
+            {
+                PanelColor(btnColor, R1, G1, B1);
+            };
+            btnColor.ButtonClickEvent += (sender, e) =>
+            {
+                PanelColor(btnColor, R1, G1, B1);
+            };
+            btnColorLine.ButtonClickEvent += (sender, e) =>
+            {
+                PanelColor(btnColor, R1, G1, B1);
+            };
+            btnRight.ButtonClickEvent += (sender, e) =>
+            {
+                PanelColor(btnColor, R1, G1, B1);
+            };
+        }
+
+        /// <summary>
+        /// PanelColorSelectForm
+        /// </summary>
+        private void PanelColor(NormalViewControl btnColor, int R1, int G1, int B1)
+        {
+            var form = new PanelColorSelectForm();
+            form.AddForm(R1, G1, B1);
+            form.FinishSelectColorEvent += (Rcolor, Gcolor, Bcolor) =>
+            {
+                R1 = Rcolor;
+                G1 = Gcolor;
+                B1 = Bcolor;
+
+                this.keyColorData.OpenColorR = Convert.ToString(Rcolor, 16);
+                this.keyColorData.OpenColorG = Convert.ToString(Gcolor, 16);
+                this.keyColorData.OpenColorB = Convert.ToString(Bcolor, 16);
+
+                btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
+            };
+        }
+
+        #endregion
+
+        #region 鈻� 鑺傝兘妯″紡琛宊________________________ 
+        /// <summary>
+        ///  娣诲姞鑺傝兘妯″紡琛�
+        /// </summary>
+        /// <param name="frameLinght">鍚勭鑳屽厜鐏殑瀹瑰櫒(鎺т欢浼哥缉浣跨敤)</param>
+        private void AddEnergyConservationRow()
+        {
+            //缂╁皬:170  鎵╁ぇ:614
+            var frameBack = new FrameRowControl();
+            frameBack.BackgroundColor = UserCenterColor.Current.White;
+            frameBack.UseClickStatu = false;
+            frameBack.Height = Application.GetRealHeight(170);
+            listview.AddChidren(frameBack);
+
+            //鑺傝兘妯″紡
+            frameBack.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uEnergyConservationMode), 400);
+            //寮�鍏虫帶浠�
+            var btnSwitch = frameBack.AddMostRightSwitchIcon();
+            btnSwitch.ButtonClickEvent += (sender, e) =>
+            {
+                btnSwitch.IsSelected = !btnSwitch.IsSelected;
+                energyModeInfo.enable = btnSwitch.IsSelected;
+                //灞曞紑鎴栬�呯缉灏忕殑楂樺害
+                var value = Application.GetRealHeight(614);
+                if (btnSwitch.IsSelected == true)
+                {
+                    frameBack.Height += value;
+                }
+                else
+                {
+                    frameBack.Height -= value;
+                }
+                this.FinishInitControl(listview, energyModeInfo.enable);
+            };
+            if (energyModeInfo.enable == true)
+            {
+                btnSwitch.IsSelected = true;
+            }
+
+            //褰撳墠浜害
+            var btnProgressView1 = new NormalViewControl(200, 49, true);
+            btnProgressView1.X = ControlCommonResourse.XXLeft;
+            btnProgressView1.Y = Application.GetRealHeight(164);
+            btnProgressView1.TextSize = 12;
+            btnProgressView1.TextColor = UserCenterColor.Current.TextGrayColor1;
+            btnProgressView1.TextID = R.MyInternationalizationString.uNowLuminance;
+            frameBack.AddChidren(btnProgressView1);
+            var btnProgress1 = new NormalViewControl(200, 49, true);
+            btnProgress1.X = Application.GetRealWidth(222);
+            btnProgress1.Y = Application.GetRealHeight(164);
+            btnProgress1.TextSize = 12;
+            btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
+            btnProgress1.Text = energyModeInfo.level + "%";
+            frameBack.AddChidren(btnProgress1);
+
+            //杩涘害鏉�
+            var seekBar1 = new SeekBarControl();
+            seekBar1.Y = Application.GetRealHeight(253);
+            seekBar1.ProgressBarColor = 0xff3e99f4;
+            seekBar1.SeekBarPadding = 25;
+            frameBack.AddChidren(seekBar1);
+            seekBar1.ProgressChangedEvent += (div, value) =>
+            {
+                btnProgress1.Text = value + "%";
+                //鏁版嵁鍙樻洿
+                energyModeInfo.level = value;
+                listview.ScrollEnabled = false;
+            };
+            seekBar1.OnStopTrackingTouchEvent += (sender, e) =>
+            {
+                listview.ScrollEnabled = true;
+            };
+            seekBar1.Progress = energyModeInfo.level;
+
+            var btnTemp1 = new NormalViewControl(200, 49, true);
+            btnTemp1.X = ControlCommonResourse.XXLeft;
+            btnTemp1.Y = Application.GetRealHeight(325);
+            btnTemp1.TextSize = 12;
+            btnTemp1.TextColor = UserCenterColor.Current.TextGrayColor3;
+            btnTemp1.Text = "0%";
+            frameBack.AddChidren(btnTemp1);
+
+            var btnTemp2 = new NormalViewControl(200, 49, true);
+            btnTemp2.X = listview.Width - Application.GetRealWidth(200 + 49);
+            btnTemp2.Y = Application.GetRealHeight(325);
+            btnTemp2.TextAlignment = TextAlignment.CenterRight;
+            btnTemp2.TextSize = 12;
+            btnTemp2.TextColor = UserCenterColor.Current.TextGrayColor3;
+            btnTemp2.Text = "100%";
+            frameBack.AddChidren(btnTemp2);
+
+            if (energyModeInfo.enable == true)
+            {
+                //灞曞紑鎴栬�呯缉灏忕殑楂樺害
+                var value = Application.GetRealHeight(614);
+                frameBack.Height += value;
+            }
+            //娣诲姞鎺ヨ繎鎰熷簲
+            this.AddProximitySensorsRow(frameBack);
+            //搴曠嚎  
+            var btnLine = new NormalViewControl(965, 5, true);
+            btnLine.Height = 1;
+            btnLine.X = Application.GetRealWidth(52);
+            btnLine.Y = Application.GetRealHeight(484 + 127);
+            btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
+            frameBack.AddChidren(btnLine);
+
+            //娣诲姞鐫$湢鏃堕棿
+            this.AddSleepTimeRow(frameBack);
+        }
+
+        #endregion
+
+        #region 鈻� 鎺ヨ繎鎰熷簲___________________________
+
+        /// <summary>
+        /// 鎺ヨ繎鎰熷簲琛�
+        /// </summary>
+        private void AddProximitySensorsRow(FrameRowControl frameRowControl)
+        {
+            //鎺ヨ繎鎰熷簲琛�
+            var frameBack = new FrameRowControl();
+            frameBack.BackgroundColor = UserCenterColor.Current.White;
+            frameBack.UseClickStatu = false;
+            frameBack.Y = Application.GetRealHeight(443);
+            frameBack.Height = Application.GetRealHeight(170);
+            frameRowControl.AddChidren(frameBack);
+
+            //鎺ヨ繎鎰熷簲
+            frameBack.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.ProximitySensors), 400);
+            //寮�鍏虫帶浠�
+            var btnSwitch = frameBack.AddMostRightSwitchIcon();
+
+            btnSwitch.ButtonClickEvent += (sender, e) =>
+            {
+                btnSwitch.IsSelected = !btnSwitch.IsSelected;
+                proximitySensorsInfo.enable = btnSwitch.IsSelected;
+            };
+            if (proximitySensorsInfo.enable == true)
+            {
+                btnSwitch.IsSelected = true;
+            }
+        }
+        #endregion
+
+        #region 鈻� 鐫$湢鏃堕棿___________________________
+
+        /// <summary>
+        /// 鐫$湢鏃堕棿琛�
+        /// </summary>
+        private void AddSleepTimeRow(FrameRowControl frameRowControl)
+        {
+            //鐫$湢鏃堕棿琛�
+            var frameBack = new FrameRowControl();
+            frameBack.BackgroundColor = UserCenterColor.Current.White;
+            frameBack.UseClickStatu = false;
+            frameBack.Y = Application.GetRealHeight(784 - 170);
+            frameBack.Height = Application.GetRealHeight(170);
+            frameRowControl.AddChidren(frameBack);
+
+            //鐫$湢鏃堕棿
+            frameBack.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.SleepTime), 400);
+            //鍙崇澶�
+            frameBack.AddRightArrow();
+            btnSleepTime = new NormalViewControl(700, true);
+            switch (energyModeInfo.time)
+            {
+                case 15:
+                    btnSleepTime.Text = "15s";
+                    nowSelectNo = 0;
+                    break;
+                case 60:
+                    btnSleepTime.Text = "1min";
+                    nowSelectNo = 1;
+                    break;
+                case 300:
+                    btnSleepTime.Text = "5min";
+                    nowSelectNo = 2;
+                    break;
+            }
+            frameBack.AddMostRightView(this.sleepTimeText, 700);
+
+            timeAction = null;
+            timeAction += (nowSelectNo) =>
+            {
+                switch (nowSelectNo)
+                {
+                    case 0:
+                        energyModeInfo.time = 15;
+                        break;
+                    case 1:
+                        energyModeInfo.time = 60;
+                        break;
+                    case 2:
+                        energyModeInfo.time = 300;
+                        break;
+                }
+                AddSleepTimeRow(frameRowControl);
+            };
+            frameBack.ButtonClickEvent += (sender, e) =>
+            {
+                this.ShowSelectDeviceSleepTimeListForm();
+            };
+        }
+
+        #region 鈻� 鏄剧ず閫夋嫨璁惧鐫$湢鏃堕棿_______________ 
+        /// <summary>
+        /// 鏄剧ず閫夋嫨璁惧鐫$湢鏃堕棿鐨勭晫闈�
+        /// </summary>
+        public void ShowSelectDeviceSleepTimeListForm()
+        {
+            //鏄剧ず鍒楄〃
+            var listText = new List<string>();
+            listText.Add("15s");
+            listText.Add("1min");
+            listText.Add("5min");
+            //鏍囬:閫夋嫨鍔熻兘绫诲瀷
+            var title = Language.StringByID(R.MyInternationalizationString.SleepTime);
+
+            var form = new BottomItemSelectForm();
+            form.CancelCallEvent = false;//鍏佽鍙栨秷
+            form.AddForm(title, listText, nowSelectNo);
+            form.FinishSelectEvent += (selectNo) =>
+            {
+                if (selectNo == nowSelectNo)
+                {
+                    //閫夋嫨鐨勬槸鐩稿悓鐨�
+                    return;
+                }
+                //-1:閫夋嫨鍙栨秷
+                this.sleepTimeText = selectNo == -1 ? string.Empty : listText[selectNo];
+                nowSelectNo = selectNo;
+                //璋冪敤鍥炶皟鍑芥暟
+                this.timeAction?.Invoke(nowSelectNo);
+            };
+        }
+        #endregion
+        #endregion
+
+        #region 鈻� 鑾峰彇鍒濆鏁版嵁_______________________
+
+        /// <summary>
+        /// 鑾峰彇璁惧鍒濆鏁版嵁
+        /// </summary>
+        /// <returns></returns>
+        private async Task<bool> GetDeviceDefultData()
+        {
+            //寮�鍚繘搴︽潯
+            this.ShowProgressBar();
+            //浜害璋冭妭(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
+            linghtLevelInfo = HdlDevicePanelLogic.Current.GetDeviceLightSettion(panelDevice);
+            if (linghtLevelInfo == null)
+            {
+                //鍏抽棴杩涘害鏉�
+                this.CloseProgressBar(ShowReLoadMode.YES);
+                return false;
+            }
+            //鎺ヨ繎鎰熷簲(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
+            proximitySensorsInfo = await HdlDevicePanelLogic.Current.GetDeviceProximitySensorsSettion(panelDevice);
+            if (proximitySensorsInfo == null)
+            {
+                //鍏抽棴杩涘害鏉�
+                this.CloseProgressBar(ShowReLoadMode.YES);
+                return false;
+            }
+            //鑺傝兘妯″紡(浠栦滑璇撮殢渚挎嬁涓�璺洖璺氨琛屼簡)
+            energyModeInfo = HdlDevicePanelLogic.Current.GetDeviceEnergyConservationMode(panelDevice);
+            if (energyModeInfo == null)
+            {
+                //鍏抽棴杩涘害鏉�
+                this.CloseProgressBar(ShowReLoadMode.YES);
+                return false;
+            }
+            keyColorData = HdlDevicePanelLogic.Current.GetPanelColorInfo(panelDevice);
+            if (this.keyColorData == null)
+            {
+                //鍏抽棴杩涘害鏉�
+                this.CloseProgressBar(ShowReLoadMode.YES);
+                return false;
+            }
+            //鍏抽棴杩涘害鏉�
+            this.CloseProgressBar();
+
+            return true;
+        }
+
+        #endregion
+
+        #region 鈻� 淇濆瓨鏁版嵁___________________________
+
+        /// <summary>
+        /// 淇濆瓨闈㈡澘鏁版嵁
+        /// </summary>
+        private async void SavePanelData()
+        {
+            this.ShowProgressBar();
+
+            //鑺傝兘妯″紡淇敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
+
+            var result = HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(panelDevice, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
+            if (result == false)
+            {
+                this.CloseProgressBar();
+                return;
+            }
+            //鎺ヨ繎鎰熷簲(鎻愪緵璁惧鐨勫悓浜嬭闅忎究涓�涓洖璺氨琛�)
+            result = await HdlDevicePanelLogic.Current.SetProximitySensorStatus(panelDevice, proximitySensorsInfo.enable);
+            if (result == false)
+            {
+                this.CloseProgressBar();
+                return;
+            }
+
+            //浜害璋冭妭鏇存敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
+            result = HdlDevicePanelLogic.Current.SetDeviceLightSettion(panelDevice, linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);
+            if (result == false)
+            {
+                this.CloseProgressBar();
+                return;
+            }
+
+            //璁剧疆鎸夐敭闈㈡澘棰滆壊鐨勪俊鎭�
+            result = HdlDevicePanelLogic.Current.SetPanelColorInfo(panelDevice, this.keyColorData);
+            this.CloseProgressBar();
+            if (result == false)
+            {
+                return;
+            }
+            //鍏抽棴鑷韩
+            this.CloseForm();
+        }
+        #endregion
+
+        #region 鈻� 琛ュ厖瀹瑰櫒___________________________ 
+        /// <summary>
+        /// 琛屾暟瓒呰繃瀹瑰櫒鏃讹紝琛ヤ竴涓┖鐧紽rameLayout锛屼娇涔嬭兘婊戝姩
+        /// </summary>
+        /// <param name="listview">褰撳墠婊戝姩椤佃寖鍥�</param>
+        /// <param name="enable">鏄惁娣诲姞瀹瑰櫒</param>
+        public void FinishInitControl(VerticalScrolViewLayout listview, bool enable = false)
+        {
+            //淇冧娇琚尅浣忕殑鑿滃崟鑳藉鍚戜笂婊戝姩
+            var frameTemp = new FrameLayout();
+            listview.AddChidren(frameTemp);
+            frameTemp.Tag = "绉婚櫎瀹瑰櫒";
+            if (enable == true)
+            {
+                listview.ScrollEnabled = true;
+                frameTemp.Height = Application.GetRealHeight(2212 - 1921 + 173);
+            }
+            else
+            {
+                listview.RemoveViewByTag("绉婚櫎瀹瑰櫒");
+                listview.ScrollEnabled = false;
+            }
+        }
+        #endregion
+
+        #region 鈻� 涓�鑸柟娉昣__________________________
+
+        /// <summary>
+        /// 灏哛GB杞崲涓洪鑹�
+        /// </summary>
+        /// <param name="R"></param>
+        /// <param name="G"></param>
+        /// <param name="B"></param>
+        /// <returns></returns>
+        private uint GetColorByRGB(byte R, byte G, byte B)
+        {
+            return (uint)(0xFF000000 + R * 256 * 256 + G * 256 + B);
+        }
+
+        #endregion
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
index 45d82b8..9ac4066 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirBackLightSettionForm.cs
@@ -1,4 +1,5 @@
 锘縰sing System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using ZigBee.Device;
 namespace Shared.Phone.UserCenter.DevicePanel
@@ -30,7 +31,28 @@
         /// 鎸夐敭鐨勯鑹叉暟鎹�
         /// </summary>
         private Panel.KeyColorData keyColorData = null;
-
+        /// <summary>
+        /// 閫夋嫨鐫$湢鏃堕棿鐨勪簨浠� value:绱㈠紩(浠�0寮�濮�)  鏂囨湰淇℃伅璇风敤Text鑾峰彇
+        /// </summary>
+        public Action<int> timeAction = null;
+        /// <summary>
+        /// 褰撳墠閫夋嫨鐨勫姛鑳界被鍨嬬储寮�
+        /// </summary>
+        private int nowSelectNo = 0;
+        /// <summary>
+        /// /// <summary>
+        /// 鐫$湢鏃堕棿鐨勫��
+        /// </summary>
+        /// </summary>
+        public string sleepTimeText
+        {
+            get { return btnSleepTime.Text; }
+            set { btnSleepTime.Text = value; }
+        }
+        /// <summary>
+        ///鐫$湢鏃堕棿 
+        /// </summary>
+        public NormalViewControl btnSleepTime = null;
         #endregion
 
         #region 鈻� 鍒濆鍖朹____________________________
@@ -70,7 +92,6 @@
             listview = new VerticalScrolViewLayout();
             listview.Height = Application.GetRealHeight(1981 - 184);
             bodyFrameLayout.AddChidren(listview);
-            listview.ScrollEnabled = false;
 
             HdlThreadLogic.Current.RunMain(() =>
             {
@@ -80,8 +101,15 @@
                 //娣诲姞灞忓箷浜害绾у埆鎺т欢
                 this.AddScreenBrightnesLevelControl();
 
-                //娣诲姞鏂伴闈㈡澘鐨勯鑹�
-                this.AddColorControl();
+                //鑾峰彇璁惧绫诲瀷鐨�
+                var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { panelDevice });
+                if (deviceEnumInfo.ConcreteType != Common.DeviceConcreteType.ButtonPanel_SimpleEnvironment)
+                {
+                    //娣诲姞闈㈡澘鐨勯鑹�
+                    this.AddColorControl();
+                }
+
+                this.FinishInitControl(listview, energyModeInfo.enable);
 
                 //淇濆瓨
                 var btnSave = new BottomClickButton();
@@ -146,6 +174,7 @@
 
             //杩涘害鏉�
             var seekBar1 = new SeekBarControl();
+            seekBar1.SeekBarPadding = 25;
             seekBar1.MaxValue = 5;
             seekBar1.ProgressBarColor = 0xff3e99f4;
             seekBar1.Y = Application.GetRealHeight(253);
@@ -186,8 +215,12 @@
                         btnLevel.Text = "5" + strRank;
                         break;
                 }
+                listview.ScrollEnabled = false;
             };
-
+            seekBar1.OnStopTrackingTouchEvent += (sender, e) =>
+            {
+                listview.ScrollEnabled = true;
+            };
             seekBar1.OnStopTrackingTouchEvent += (div, value) =>
             {
                 if (value == 0)
@@ -396,7 +429,7 @@
                 btnSwitch.IsSelected = !btnSwitch.IsSelected;
                 energyModeInfo.enable = btnSwitch.IsSelected;
                 //灞曞紑鎴栬�呯缉灏忕殑楂樺害
-                var value = Application.GetRealHeight(443);
+                var value = Application.GetRealHeight(614);
                 if (btnSwitch.IsSelected == true)
                 {
                     frameBack.Height += value;
@@ -405,6 +438,7 @@
                 {
                     frameBack.Height -= value;
                 }
+                this.FinishInitControl(listview, energyModeInfo.enable);
             };
             if (energyModeInfo.enable == true)
             {
@@ -431,12 +465,18 @@
             var seekBar1 = new SeekBarControl();
             seekBar1.Y = Application.GetRealHeight(253);
             seekBar1.ProgressBarColor = 0xff3e99f4;
+            seekBar1.SeekBarPadding = 25;
             frameBack.AddChidren(seekBar1);
             seekBar1.ProgressChangedEvent += (div, value) =>
             {
                 btnProgress1.Text = value + "%";
                 //鏁版嵁鍙樻洿
                 energyModeInfo.level = value;
+                listview.ScrollEnabled = false;
+            };
+            seekBar1.OnStopTrackingTouchEvent += (sender, e) =>
+            {
+                listview.ScrollEnabled = true;
             };
             seekBar1.Progress = energyModeInfo.level;
 
@@ -460,11 +500,21 @@
             if (energyModeInfo.enable == true)
             {
                 //灞曞紑鎴栬�呯缉灏忕殑楂樺害
-                var value = Application.GetRealHeight(443);
+                var value = Application.GetRealHeight(614);
                 frameBack.Height += value;
             }
             //娣诲姞鎺ヨ繎鎰熷簲
             this.AddProximitySensorsRow(frameBack);
+            //搴曠嚎  
+            var btnLine = new NormalViewControl(965, 5, true);
+            btnLine.Height = 1;
+            btnLine.X = Application.GetRealWidth(52);
+            btnLine.Y = Application.GetRealHeight(484 + 127);
+            btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
+            frameBack.AddChidren(btnLine);
+
+            //娣诲姞鐫$湢鏃堕棿
+            this.AddSleepTimeRow(frameBack);
         }
 
         #endregion
@@ -499,6 +549,100 @@
                 btnSwitch.IsSelected = true;
             }
         }
+        #endregion
+
+        #region 鈻� 鐫$湢鏃堕棿___________________________
+
+        /// <summary>
+        /// 鐫$湢鏃堕棿琛�
+        /// </summary>
+        private void AddSleepTimeRow(FrameRowControl frameRowControl)
+        {
+            //鐫$湢鏃堕棿琛�
+            var frameBack = new FrameRowControl();
+            frameBack.BackgroundColor = UserCenterColor.Current.White;
+            frameBack.UseClickStatu = false;
+            frameBack.Y = Application.GetRealHeight(784 - 170);
+            frameBack.Height = Application.GetRealHeight(170);
+            frameRowControl.AddChidren(frameBack);
+
+            //鐫$湢鏃堕棿
+            frameBack.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.SleepTime), 400);
+            //鍙崇澶�
+            frameBack.AddRightArrow();
+            btnSleepTime = new NormalViewControl(700, true);
+            switch (energyModeInfo.time)
+            {
+                case 15:
+                    btnSleepTime.Text = "15s";
+                    nowSelectNo = 0;
+                    break;
+                case 60:
+                    btnSleepTime.Text = "1min";
+                    nowSelectNo = 1;
+                    break;
+                case 300:
+                    btnSleepTime.Text = "5min";
+                    nowSelectNo = 2;
+                    break;
+            }
+            frameBack.AddMostRightView(this.sleepTimeText, 700);
+
+            timeAction = null;
+            timeAction += (nowSelectNo) =>
+            {
+                switch (nowSelectNo)
+                {
+                    case 0:
+                        energyModeInfo.time = 15;
+                        break;
+                    case 1:
+                        energyModeInfo.time = 60;
+                        break;
+                    case 2:
+                        energyModeInfo.time = 300;
+                        break;
+                }
+                AddSleepTimeRow(frameRowControl);
+            };
+            frameBack.ButtonClickEvent += (sender, e) =>
+            {
+                this.ShowSelectDeviceSleepTimeListForm();
+            };
+        }
+
+        #region 鈻� 鏄剧ず閫夋嫨璁惧鐫$湢鏃堕棿_______________ 
+        /// <summary>
+        /// 鏄剧ず閫夋嫨璁惧鐫$湢鏃堕棿鐨勭晫闈�
+        /// </summary>
+        public void ShowSelectDeviceSleepTimeListForm()
+        {
+            //鏄剧ず鍒楄〃
+            var listText = new List<string>();
+            listText.Add("15s");
+            listText.Add("1min");
+            listText.Add("5min");
+            //鏍囬:閫夋嫨鍔熻兘绫诲瀷
+            var title = Language.StringByID(R.MyInternationalizationString.SleepTime);
+
+            var form = new BottomItemSelectForm();
+            form.CancelCallEvent = false;//鍏佽鍙栨秷
+            form.AddForm(title, listText, nowSelectNo);
+            form.FinishSelectEvent += (selectNo) =>
+            {
+                if (selectNo == nowSelectNo)
+                {
+                    //閫夋嫨鐨勬槸鐩稿悓鐨�
+                    return;
+                }
+                //-1:閫夋嫨鍙栨秷
+                this.sleepTimeText = selectNo == -1 ? string.Empty : listText[selectNo];
+                nowSelectNo = selectNo;
+                //璋冪敤鍥炶皟鍑芥暟
+                this.timeAction?.Invoke(nowSelectNo);
+            };
+        }
+        #endregion
         #endregion
 
         #region 鈻� 鑾峰彇鍒濆鏁版嵁_______________________
@@ -560,8 +704,7 @@
             this.ShowProgressBar();
 
             //鑺傝兘妯″紡淇敼(浠栦滑璇撮殢渚夸竴涓洖璺氨琛�)
-            //璁惧鍚屼簨璇存柊椋庨潰鏉块粯璁�60绉掓椂闂达紝杩欐牱鎺ヨ繎鎰熷簲鍔熻兘鎵嶅悎鐞�
-            energyModeInfo.time = 60;
+
             var result = HdlDevicePanelLogic.Current.SetDeviceEnergyConservationMode(panelDevice, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
             if (result == false)
             {
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
index 346a4fe..a75e0d8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
@@ -1,6 +1,8 @@
 锘縰sing System;
 using System.Collections.Generic;
 using Shared.Common;
+using Shared.Phone.UserCenter.Device.Bind;
+using Shared.Phone.UserCenter.DeviceBind;
 using ZigBee.Common;
 using ZigBee.Device;
 
@@ -70,7 +72,7 @@
         {
             this.deviceObj = i_device;
             //鑾峰彇鏁版嵁
-            ReadDoorLockUserInfo(deviceObj);
+            InitInfo(deviceObj);
 
             //璁剧疆澶撮儴淇℃伅
             base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uPanelSettion));
@@ -147,7 +149,7 @@
         /// <summary>
         /// 鍒濆鍖栨暟鎹�
         /// </summary>
-        void ReadDoorLockUserInfo(CommonDevice curControlDev)
+        void InitInfo(CommonDevice curControlDev)
         {
             System.Threading.Tasks.Task.Run(async () =>
             {
@@ -182,55 +184,6 @@
                 }
             });
         }
-        #endregion
-
-        #region 鈻� 鏂伴鐩爣_________________________ 
-        /// <summary>
-        ///  鏂伴鐩爣琛�
-        /// </summary>
-        private void AddFreshAirRow()
-        {
-            //鏂伴鐩爣
-            var rowNewWind = new FrameRowControl(listview.rowSpace / 2);
-            listview.AddChidren(rowNewWind);
-            rowNewWind.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uNewWindTarget), 600);
-            //搴曠嚎
-            rowNewWind.AddBottomLine();
-            //鍙崇澶�
-            rowNewWind.AddRightArrow();
-
-            var msg = Language.StringByID(R.MyInternationalizationString.nothing);
-            if (!string.IsNullOrEmpty(bindFreshAirName))
-            {
-                msg = bindFreshAirName;
-            }
-            var btnNewWindStatu = rowNewWind.AddMostRightView(msg, 700);
-
-            rowNewWind.ButtonClickEvent += (sender, e) =>
-            {
-                var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindFreshAirDev, 1);
-                Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
-                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
-                addDevicePage.Show();
-
-                addDevicePage.actionFreshAirTarget += (bindName) =>
-                {
-                    Application.RunOnMainThread(() =>
-                    {
-                        if (string.IsNullOrEmpty(bindName))
-                        {
-                            btnNewWindStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
-                        }
-                        else
-                        {
-                            btnNewWindStatu.Text = bindName;
-                        }
-                    });
-                };
-
-            };
-        }
-        #endregion
 
         /// <summary>
         /// 鑾峰彇缁戝畾鐩爣
@@ -344,6 +297,54 @@
             return result;
         }
 
+        #endregion
+
+        #region 鈻� 鏂伴鐩爣_________________________ 
+        /// <summary>
+        ///  鏂伴鐩爣琛�
+        /// </summary>
+        private void AddFreshAirRow()
+        {
+            //鏂伴鐩爣
+            var rowNewWind = new FrameRowControl(listview.rowSpace / 2);
+            listview.AddChidren(rowNewWind);
+            rowNewWind.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uNewWindTarget), 600);
+            //搴曠嚎
+            rowNewWind.AddBottomLine();
+            //鍙崇澶�
+            rowNewWind.AddRightArrow();
+
+            var msg = Language.StringByID(R.MyInternationalizationString.nothing);
+            if (!string.IsNullOrEmpty(bindFreshAirName))
+            {
+                msg = bindFreshAirName;
+            }
+            var btnNewWindStatu = rowNewWind.AddMostRightView(msg, 700);
+
+            rowNewWind.ButtonClickEvent += (sender, e) =>
+            {
+                var paneTargetsBaseFormp = new PaneTargetsBaseForm(this.deviceObj, bindFreshAirDev, BindInfo.BindType.FreshAir);
+                Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
+                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+                paneTargetsBaseFormp.Show();
+                paneTargetsBaseFormp.actionFreshAirTarget += (bindName) =>
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (string.IsNullOrEmpty(bindName))
+                        {
+                            btnNewWindStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
+                        }
+                        else
+                        {
+                            btnNewWindStatu.Text = bindName;
+                        }
+                    });
+                };
+            };
+        }
+        #endregion
+
         #region 鈻� PM2.5鏉ユ簮_________________________ 
         /// <summary>
         ///  PM2.5鏉ユ簮琛�
@@ -366,12 +367,11 @@
             var btnPMStatu = rowPM.AddMostRightView(msg, 700);
             rowPM.ButtonClickEvent += (sender, e) =>
             {
-                var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindPMDev, 4);
-                Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
+                var paneTargetsBaseFormp = new PaneTargetsBaseForm(this.deviceObj, bindPMDev, BindInfo.BindType.PM);
+                Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
                 Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
-                addDevicePage.Show();
-
-                addDevicePage.actionPMTarget += (bindName) =>
+                paneTargetsBaseFormp.Show();
+                paneTargetsBaseFormp.actionPMTarget += (bindName) =>
                 {
                     Application.RunOnMainThread(() =>
                     {
@@ -411,12 +411,11 @@
             var btnTemperatureStatu = rowTemPerature.AddMostRightView(msg, 700);
             rowTemPerature.ButtonClickEvent += (sender, e) =>
             {
-                var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindTemperatureDev, 2);
-                Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
+                var paneTargetsBaseFormp = new PaneTargetsBaseForm(this.deviceObj, bindTemperatureDev, BindInfo.BindType.Temperature);
+                Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
                 Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
-                addDevicePage.Show();
-
-                addDevicePage.actionTemperatureTarget += (bindName) =>
+                paneTargetsBaseFormp.Show();
+                paneTargetsBaseFormp.actionTemperatureTarget += (bindName) =>
                 {
                     Application.RunOnMainThread(() =>
                     {
@@ -456,12 +455,11 @@
             var btnHumidityStatu = rowHumidity.AddMostRightView(msg, 700);
             rowHumidity.ButtonClickEvent += (sender, e) =>
             {
-                var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(this.deviceObj, bindHumidityDev, 3);
-                Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
+                var paneTargetsBaseFormp = new PaneTargetsBaseForm(this.deviceObj, bindHumidityDev, BindInfo.BindType.Humidity);
+                Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
                 Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
-                addDevicePage.Show();
-
-                addDevicePage.actionHumidityTarget += (bindName) =>
+                paneTargetsBaseFormp.Show();
+                paneTargetsBaseFormp.actionHumidityTarget += (bindName) =>
                 {
                     Application.RunOnMainThread(() =>
                     {
@@ -495,13 +493,8 @@
             rowLight.AddRightArrow();
             rowLight.ButtonClickEvent += (sender, e) =>
             {
-                //缁欐柊椋庨潰鏉垮缓绔嬩竴涓柊鐨勬敮鎸侀潰鏉垮璞★紝鐢�200绔偣璁剧疆
-                var panel = new Panel();
-                panel.DeviceAddr = this.deviceObj.DeviceAddr;
-                panel.DeviceEpoint = 200;
-                panel.CurrentGateWayId = this.deviceObj.CurrentGateWayId;
-                var form = new PanelFangyueFreshAirBackLightSettionForm();
-                form.AddForm(panel);
+                var form = new PanelBrightnessAdjustForm();
+                form.AddForm(this.deviceObj);
             };
         }
         #endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
deleted file mode 100755
index b996092..0000000
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
+++ /dev/null
@@ -1,1889 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-using Shared.Common;
-using Shared.Phone.UserCenter.Safety;
-using ZigBee.Device;
-using static ZigBee.Device.BindObj;
-using static ZigBee.Device.Panel;
-
-namespace Shared.Phone.UserCenter.DeviceBind
-{
-    public class PanelFangyueFreshAirTargetsForm : BindCommonLayout
-    {
-        #region  鏋勯�犲嚱鏁�
-        /// <summary>
-        /// 鏋勯�犲嚱鏁�
-        /// </summary>
-        /// <param name="device"></param>
-        /// <param name="deviceBindType">1:鏂伴;2:娓╁害浼犳劅鍣�;3:婀垮害浼犳劅鍣�;4:PM2.5浼犳劅鍣�</param>
-        /// <param name="bindDev">缁戝畾鐩爣 </param>
-        public PanelFangyueFreshAirTargetsForm(CommonDevice device, CommonDevice bindDev, int deviceBindType)
-        {
-            this.curControlDev = device as FreshAir;
-            this.curBindDevice = bindDev;
-            this.curDeviceBindType = deviceBindType;
-        }
-        #endregion
-
-        #region  鍙橀噺鐢虫槑 
-        /// <summary>
-        /// 褰撳墠鏂伴闈㈡澘銆愭帶鍒惰澶囥��
-        /// </summary>
-        FreshAir curControlDev;
-        /// <summary>
-        /// 褰撳墠琚粦璁惧
-        /// </summary>
-        CommonDevice curBindDevice;
-        /// <summary>
-        /// 鏄剧ず琚粦瀹氳澶囨垨鍦烘櫙鐨剉iew
-        /// </summary>
-        VerticalRefreshLayout midVerticalScrolViewLayout;
-        /// <summary>
-        /// 鏄剧ず鎴块棿鐨剉iew
-        /// </summary>
-        HorizontalScrolViewLayout btnHorizontalScrolViewLayout;
-        /// <summary>
-        /// 鎸夐敭閰嶇疆鐨勭洰鏍囧垪琛�
-        /// </summary>
-        List<CommonDevice> targetList = new List<CommonDevice>();
-        /// <summary>
-        /// 闈㈡澘涓凡缁忓瓨鍦ㄧ殑鐩爣鍒楄〃
-        /// </summary>
-        List<CommonDevice> oldTargetList = new List<CommonDevice>();
-        /// <summary>
-        /// 褰撳墠璁惧缁戝畾绫诲瀷
-        /// 1:鏂伴
-        /// 2:娓╁害浼犳劅鍣�
-        /// 3:婀垮害浼犳劅鍣�
-        /// 4:PM2.5浼犳劅鍣�
-        /// </summary>
-        int curDeviceBindType = 0;
-        /// <summary>
-        /// 鏈湴鎴块棿鍒楄〃
-        /// </summary>
-        List<Room> supportRoomList = new List<Room>();
-        /// <summary>
-        /// 淇濆瓨瀹屾垚鎸夐挳
-        /// </summary>
-        Button btnFinifh;
-        /// <summary>
-        /// 妤煎眰鏂囨湰
-        /// </summary>
-        Button btnFloorText;
-        /// <summary>
-        /// 妤煎眰鍒楄〃
-        /// </summary>
-        Dictionary<string, string> dicFloorList;
-        /// <summary>
-        /// 鎵�鏈夋埧闂翠腑鏀寔琚粦瀹氱殑璁惧鍒楄〃
-        /// </summary>
-        List<CommonDevice> currentPanelSupportBindDeviceList = new List<CommonDevice>();
-        /// <summary>
-        /// 褰撳墠鎴块棿涓敮鎸佽缁戝畾鐨勮澶囧垪琛�
-        /// </summary>
-        List<CommonDevice> currentRoomSupportBindDeviceList = new List<CommonDevice>();
-        /// <summary>
-        /// 闈㈡澘涓瓨鍦ㄧ殑閿��
-        /// </summary>
-        List<String> panelBindListKey = null;
-        /// <summary>
-        /// 鏂伴缁戝畾鐩爣鍥炶皟
-        /// </summary>
-        public Action<string> actionFreshAirTarget = null;
-        /// <summary>
-        /// 娓╁害缁戝畾鐩爣鍥炶皟
-        /// </summary>
-        public Action<string> actionTemperatureTarget = null;
-        /// <summary>
-        /// 婀垮害缁戝畾鐩爣鍥炶皟
-        /// </summary>
-        public Action<string> actionHumidityTarget = null;
-        /// <summary>
-        /// PM缁戝畾鐩爣鍥炶皟
-        /// </summary>
-        public Action<string> actionPMTarget = null;
-
-        #endregion
-
-        #region UI璁捐 
-        /// <summary>
-        /// 鐩爣椤垫樉绀�
-        /// </summary>
-        public void Show()
-        {
-            #region 鏍囬鏍�
-            string titleText = "";
-            switch (curDeviceBindType)
-            {
-                case 1:
-                    titleText = Language.StringByID(R.MyInternationalizationString.BindFreshAirTarget);
-                    break;
-                case 2:
-                    titleText = Language.StringByID(R.MyInternationalizationString.TemperatureSource);
-                    break;
-                case 3:
-                    titleText = Language.StringByID(R.MyInternationalizationString.HumiditySource);
-                    break;
-                case 4:
-                    titleText = Language.StringByID(R.MyInternationalizationString.PM25Source);
-                    break;
-            }
-            this.TopFrameLayout(this, titleText);
-            EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
-            {
-                RemoveFromParent();
-            };
-            this.btnTitle.Width = Application.GetRealWidth(1080 - 161 - 300);
-            this.btnBack.MouseUpEventHandler += eHandlerBack;
-            this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
-            this.MidFrameLayout(this);
-            #endregion
-
-            //娣诲姞妤煎眰UI
-            BindDownFrameLayout();
-            //鏍囬鏍忎笅鐨刄I
-            MidFrameLayoutContent();
-            //鍒濆鍖栬澶囨暟鎹� 
-            InitData();
-        }
-
-        /// <summary>
-        /// 娣诲姞妤煎眰UI
-        /// </summary> 
-        void BindDownFrameLayout()
-        {
-            var btnAddFrameLayout = new FrameLayout
-            {
-                X = Application.GetRealWidth(619),
-            };
-            this.titleFrameLayout.AddChidren(btnAddFrameLayout);
-
-            btnFloorText = new Button
-            {
-                Width = Application.GetRealWidth(300 - 69 - 58),
-                Text = Language.StringByID(R.MyInternationalizationString.FirstFloor),
-                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
-                TextSize = 14,
-                IsBold = true,
-                TextAlignment = TextAlignment.CenterRight,
-            };
-            btnAddFrameLayout.AddChidren(btnFloorText);
-
-            var btnBindDownFrameLayout = new FrameLayout
-            {
-                Width = Application.GetMinReal(69 + 58),
-                X = Application.GetRealWidth(300 - 69 - 58),
-            };
-            btnAddFrameLayout.AddChidren(btnBindDownFrameLayout);
-
-            var btnBindDown = new Button
-            {
-                Height = Application.GetMinReal(69),
-                Width = Application.GetMinReal(69),
-                UnSelectedImagePath = "BindPic/BindDown.png",
-                Gravity = Gravity.CenterVertical,
-            };
-            btnBindDownFrameLayout.AddChidren(btnBindDown);
-
-            EventHandler<MouseEventArgs> eHandlerBindDown = (sender, e) =>
-            {
-                SideslipFramelayout();
-            };
-            btnBindDown.MouseDownEventHandler += eHandlerBindDown;
-            btnBindDownFrameLayout.MouseDownEventHandler += eHandlerBindDown;
-            if (Common.Config.Instance.Home.FloorDics.Count == 0)
-            {
-                btnAddFrameLayout.Width = 0;
-            }
-            else
-            {
-                btnAddFrameLayout.Width = Application.GetRealWidth(300);
-            }
-        }
-
-        /// <summary>
-        /// 涓儴UI銆愭爣棰樻爮涓嬬殑UI銆�
-        /// </summary>
-        async void MidFrameLayoutContent()
-        {
-            var btnMidTopLayout = new FrameLayout
-            {
-                Height = Application.GetRealHeight(389 - 184),
-            };
-            this.midFrameLayout.AddChidren(btnMidTopLayout);
-
-            //鎴块棿鏍�
-            btnHorizontalScrolViewLayout = new HorizontalScrolViewLayout
-            {
-                X = Application.GetRealWidth(58),
-            };
-            btnMidTopLayout.AddChidren(btnHorizontalScrolViewLayout);
-
-            //璁惧鏍�
-            midVerticalScrolViewLayout = new VerticalRefreshLayout()
-            {
-                Y = btnMidTopLayout.Bottom,
-                Height = Application.GetRealHeight(1145),
-            };
-            this.midFrameLayout.AddChidren(midVerticalScrolViewLayout);
-            midVerticalScrolViewLayout.BeginHeaderRefreshingAction += () =>
-            {
-                midVerticalScrolViewLayout.BeginHeaderRefreshing();
-                InitData();
-            };
-
-            //搴曢儴淇濆瓨鏍�
-            var bottomFrameLayout = new FrameLayout()
-            {
-                Width = LayoutParams.MatchParent,
-                Height = Application.GetRealHeight(127),
-                Y = Application.GetRealHeight(1472),
-            };
-            this.midFrameLayout.AddChidren(bottomFrameLayout);
-
-            btnFinifh = new Button()
-            {
-                Width = Application.GetRealWidth(907),
-                Gravity = Gravity.CenterHorizontal,
-                Radius = (uint)Application.GetRealHeight(127) / 2,
-                TextID = R.MyInternationalizationString.Save,
-                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack,
-                TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
-                IsBold = true,
-                TextSize = 16,
-            };
-            bottomFrameLayout.AddChidren(btnFinifh);
-            btnFinifh.MouseUpEventHandler += async (sender, e) =>
-            {
-                SaveTarget();
-            };
-        }
-
-        /// <summary>
-        /// 闈㈡澘缁戝畾鐩爣琛ㄦ樉绀�
-        /// </summary>
-        /// <param name="gateway">Gateway.</param>
-        /// <param name="key">Key.</param>
-        void RefreshRoomList()
-        {
-            Room curRoom = null;
-            if (supportRoomList.Count == 0)
-            {
-                return;
-            }
-            btnHorizontalScrolViewLayout.RemoveAll();
-            Button curentOldRoom = null;
-            FrameLayout curentOldRoomFrameLayout = null;
-            int index = 0;
-            var roomTempList = GetSupportRoomList();
-            Room slectedRoom = null;
-
-            for (int i = 0; i < roomTempList.Count; i++)
-            {
-                var room = roomTempList[i];
-                bool canSelect = false;
-                if (curControlDev.currentSelectRoomId == room.Id)
-                {
-                    slectedRoom = room;
-                    canSelect = true;
-                }
-                //鎴块棿
-                var btnRoomFrameLayout = new FrameLayout
-                {
-                    Height = Application.GetMinReal(159),
-                    Width = Application.GetMinReal(255),
-                    Y = Application.GetRealHeight(23),
-                    X = Application.GetRealWidth(5),
-                    BackgroundImagePath = "Item/RoomIconBackground.png",
-                    BorderWidth = 1,
-                };
-                btnHorizontalScrolViewLayout.AddChidren(btnRoomFrameLayout);
-
-                var btnRoom = new Button
-                {
-                    Height = Application.GetRealHeight(58),
-                    Width = Application.GetRealWidth(127),
-                    Y = Application.GetRealHeight(58),
-                    X = Application.GetRealWidth(14),
-                    Text = room.Name,
-                    TextSize = 12,
-                    TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
-                    Gravity = Gravity.Center,
-                };
-                btnRoomFrameLayout.AddChidren(btnRoom);
-
-                btnRoom.IsSelected = false;
-                if (canSelect)
-                {
-                    btnRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
-                    btnRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
-                    curentOldRoom = btnRoom;
-                    curentOldRoomFrameLayout = btnRoomFrameLayout;
-                }
-
-                //琚粦瀹氱殑鐩爣杩樻湭鍒嗛厤鍖哄煙锛岄粯璁ゆ槸绗竴涓�
-                if (string.IsNullOrEmpty(curControlDev.currentSelectRoomId))
-                {
-                    if (index == 0)
-                    {
-                        btnRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
-                        btnRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
-                        curentOldRoom = btnRoom;
-                        curentOldRoomFrameLayout = btnRoomFrameLayout;
-                    }
-                }
-
-                if (index == roomTempList.Count - 1 && index > 3)
-                {
-                    var btnRoomFrameLayoutEmpty = new FrameLayout
-                    {
-                        Height = Application.GetMinReal(159),
-                        Width = Application.GetMinReal(50),
-                        Y = Application.GetRealHeight(23),
-                        X = Application.GetRealWidth(5),
-                        BorderWidth = 1,
-                    };
-                    btnHorizontalScrolViewLayout.AddChidren(btnRoomFrameLayoutEmpty);
-                }
-
-                EventHandler<MouseEventArgs> eHandlerRoom = (sender, e) =>
-                {
-                    if (!btnRoom.IsSelected)
-                    {
-                        if (curentOldRoom != null)
-                        {
-                            curentOldRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
-                        }
-                        curentOldRoom = btnRoom;
-                        curentOldRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
-                    }
-
-                    if (btnRoomFrameLayout.BorderWidth == 1)
-                    {
-                        if (curentOldRoomFrameLayout != null)
-                        {
-                            curentOldRoomFrameLayout.BorderWidth = 1;
-                            curentOldRoomFrameLayout.BorderColor = Shared.Common.ZigbeeColor.Current.XMOrange;
-                            curentOldRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackground.png";
-                        }
-                        curentOldRoomFrameLayout = btnRoomFrameLayout;
-                        curentOldRoomFrameLayout.BorderWidth = 0;
-                        curentOldRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
-                    }
-                    curRoom = room;
-
-                    //鏂伴闈㈡澘淇濆瓨浣胯兘
-                    btnFinifh.Enable = true;
-                    btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-
-                    RefreshDeviceList(curRoom);
-                };
-                btnRoom.MouseUpEventHandler += eHandlerRoom;
-                btnRoomFrameLayout.MouseUpEventHandler += eHandlerRoom;
-                index++;
-            }
-            BindInfo.FinishDisplay(roomTempList, btnFinifh);
-
-            if (roomTempList.Count == 0)
-            {
-                curRoom = new Shared.Common.Room();
-            }
-            else
-            {
-                if (slectedRoom == null)
-                {
-                    curRoom = roomTempList[0];
-                }
-                else
-                {
-                    curRoom = slectedRoom;
-                }
-            }
-
-            RefreshDeviceList(curRoom);
-        }
-
-        /// <summary>
-        /// 鎸夐敭缁戠洰鏍囪〃鏄剧ず
-        /// </summary>
-        /// <param name="curRoom"></param>
-        void RefreshDeviceList(Room curRoom)
-        {
-            midVerticalScrolViewLayout.RemoveAll();
-            Button oldDevice = null;
-            int curIndex = 0;
-
-            currentRoomSupportBindDeviceList = GetCurRoomSupportDeviceList(curRoom);
-            if (currentRoomSupportBindDeviceList.Count == 0)
-            {
-                btnFinifh.Enable = false;
-                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
-                return;
-            }
-            foreach (var device in currentRoomSupportBindDeviceList)
-            {
-                #region 缁戝畾琛║I鏄撅紙鏃犳暟鎹鐞嗭級
-                var rowLayout = new FrameLayout()
-                {
-                    Height = Application.GetRealHeight(23 + 127),
-                    BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
-                };
-                midVerticalScrolViewLayout.AddChidren(rowLayout);
-
-                var devicePic = new Button()
-                {
-                    X = Application.GetMinRealAverage(58),
-                    Y = Application.GetMinRealAverage(46),
-                    Width = Application.GetMinRealAverage(81),
-                    Height = Application.GetMinRealAverage(81),
-                    UnSelectedImagePath = device.IconPath,
-                };
-                rowLayout.AddChidren(devicePic);
-
-                var btnBindName = new Button()
-                {
-                    Width = Application.GetRealWidth(790),
-                    X = devicePic.Right + Application.GetRealWidth(20),
-                    TextColor = Shared.Common.ZigbeeColor.Current.TextBlack,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    TextSize = 15,
-                    Text = Common.LocalDevice.Current.GetDeviceEpointName(device),
-                };
-                rowLayout.AddChidren(btnBindName);
-
-                var btnChoose = new Button()
-                {
-                    Width = Application.GetMinReal(60),
-                    Height = Application.GetMinReal(60),
-                    X = Application.GetRealWidth(861 + 81),
-                    Y = Application.GetRealHeight(35),
-                    SelectedImagePath = "DoorLock/SelectedIcon.png",
-                    Visible = false,
-                };
-                rowLayout.AddChidren(btnChoose);
-
-                var line2 = new Button()
-                {
-                    Y = rowLayout.Height - 1,
-                    X = devicePic.Right + Application.GetRealWidth(20),
-                    Width = Application.GetRealWidth(965 - 116),
-                    Height = 1,
-                    BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
-                };
-                rowLayout.AddChidren(line2);
-
-                if (curIndex == currentRoomSupportBindDeviceList.Count - 1)
-                {
-                    line2.Visible = false;
-                }
-
-                switch (curDeviceBindType)
-                {
-                    case 1:
-                        devicePic.UnSelectedImagePath = "Device/FreshAirEpoint.png";
-                        break;
-                    case 2:
-                        devicePic.UnSelectedImagePath = "Device/SensorTemperature.png";
-                        if (device.Type == DeviceType.PMSensor)
-                        {
-                            btnBindName.Text = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
-                        }
-                        break;
-                    case 3:
-                        devicePic.UnSelectedImagePath = "Device/SensorHumidity.png";
-                        if (device.Type == DeviceType.PMSensor)
-                        {
-                            btnBindName.Text = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
-                        }
-                        break;
-                    case 4:
-                        devicePic.UnSelectedImagePath = "Device/AirQualitySensorEpoint.png";
-                        break;
-                }
-                #endregion
-
-                string mianKey = device.DeviceAddr + device.DeviceEpoint;
-                if (targetList.Count != 0)
-                {
-                    foreach (var bindedDev in targetList)
-                    {
-                        if (bindedDev.DeviceAddr + bindedDev.DeviceEpoint == mianKey)
-                        {
-                            btnChoose.IsSelected = true;
-                            btnChoose.Visible = true;
-                            oldDevice = btnChoose;
-                        }
-                    }
-                }
-
-                EventHandler<MouseEventArgs> hander = (sender, e) =>
-                {
-                    btnChoose.IsSelected = !btnChoose.IsSelected;
-                    if (!btnChoose.IsSelected)
-                    {
-                        if (oldDevice != null)
-                        {
-                            oldDevice.IsSelected = false;
-                            oldDevice.Visible = false;
-                        }
-                        oldDevice = btnChoose;
-                        oldDevice.IsSelected = false;
-                        oldDevice.Visible = false;
-                        targetList.Clear();
-                    }
-                    else
-                    {
-                        if (oldDevice != null)
-                        {
-                            oldDevice.IsSelected = false;
-                            oldDevice.Visible = false;
-                        }
-                        oldDevice = btnChoose;
-                        oldDevice.IsSelected = true;
-                        oldDevice.Visible = true;
-                        targetList.Clear();
-                        targetList.Add(device);
-                    }
-
-                    //鏂伴闈㈡澘锛氱敱浜庣洰鏍囨病鏈夋彁渚涘垹闄ゆ帴鍙o紝鎵�浠ュ彲浠ュ彇娑堥�変腑鑳戒繚瀛�
-                    btnFinifh.Enable = true;
-                    btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                };
-                rowLayout.MouseUpEventHandler += hander;
-                devicePic.MouseUpEventHandler += hander;
-                btnBindName.MouseUpEventHandler += hander;
-                btnChoose.MouseUpEventHandler += hander;
-                curIndex++;
-            }
-        }
-
-        /// <summary>
-        /// 妤煎眰閫夋嫨鐨勪晶杈规爮
-        /// </summary>
-        void SideslipFramelayout()
-        {
-            var dialog = new Dialog
-            {
-            };
-            dialog.Show();
-
-            var flMain = new FrameLayout { BackgroundColor = 0x00000000 };
-            dialog.AddChidren(flMain);
-            flMain.MouseUpEventHandler += (sender11, e11) =>
-            {
-                dialog.Close();
-            };
-
-            var sidelipFrameLayout = new FrameLayout()
-            {
-                Width = Application.GetMinReal(449),
-                Y = Application.GetRealHeight(161),
-                X = Application.GetRealWidth(596),
-                BackgroundImagePath = "DoorLock/SideslipPic.png",
-            };
-            flMain.AddChidren(sidelipFrameLayout);
-
-            var btnSelectFloor = new Button()
-            {
-                Width = Application.GetRealWidth(200),
-                Height = Application.GetRealHeight(58),
-                X = Application.GetRealWidth(81),
-                Y = Application.GetRealHeight(81),
-                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
-                TextSize = 14,
-                IsBold = true,
-                TextAlignment = TextAlignment.CenterLeft,
-                TextID = R.MyInternationalizationString.SelectFloor,
-            };
-            sidelipFrameLayout.AddChidren(btnSelectFloor);
-
-            var sidelipVerticalScrolViewLayout = new VerticalScrolViewLayout()
-            {
-                Y = btnSelectFloor.Bottom + Application.GetRealHeight(45),
-                Height = Application.GetRealHeight(600),
-            };
-            sidelipFrameLayout.AddChidren(sidelipVerticalScrolViewLayout);
-
-            Button oldbutton = null;
-            Button oldbuttonText = null;
-            int count = 0;
-            foreach (var floorId in dicFloorList.Keys)
-            {
-                var rowFrameLayout = new RowLayout()
-                {
-                    Height = Application.GetRealHeight(152),
-                    LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
-                    X = Application.GetRealWidth(81),
-                };
-                sidelipVerticalScrolViewLayout.AddChidren(rowFrameLayout);
-
-                var btnAllMethod = new Button()
-                {
-                    Width = Application.GetMinReal(81),
-                    Height = Application.GetMinReal(81),
-                    UnSelectedImagePath = "Floor/Floor.png",
-                    SelectedImagePath = "Floor/FloorSelected.png",
-                    Gravity = Gravity.CenterVertical,
-                };
-                rowFrameLayout.AddChidren(btnAllMethod);
-
-                var btnMethodText = new Button()
-                {
-                    Width = Application.GetRealWidth(311),
-                    Height = Application.GetRealHeight(58),
-                    X = Application.GetRealWidth(92),
-                    Gravity = Gravity.CenterVertical,
-                    TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
-                    TextSize = 14,
-                    TextAlignment = TextAlignment.CenterLeft,
-                    Text = dicFloorList[floorId],
-                };
-                rowFrameLayout.AddChidren(btnMethodText);
-
-                if (curControlDev.currentSelectFloorId == floorId)
-                {
-                    btnAllMethod.IsSelected = true;
-                    btnAllMethod.IsBold = true;
-                    btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                }
-
-                string curFloorId = floorId;
-                EventHandler<MouseEventArgs> hander = (sender, e) =>
-                {
-                    if (curControlDev.currentSelectFloorId == curFloorId)
-                    {
-                        return;
-                    }
-                    curControlDev.currentSelectFloorId = curFloorId;
-                    btnFloorText.Text = dicFloorList[floorId];
-
-                    //鑾峰彇妤煎眰涓埧闂村垪琛� 
-                    supportRoomList = GetFloorRoomList();
-                    if (!btnMethodText.IsSelected)
-                    {
-                        if (oldbutton != null)
-                        {
-                            oldbutton.IsSelected = false;
-                        }
-                        if (oldbuttonText != null)
-                        {
-                            oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
-                        }
-                        oldbutton = btnMethodText;
-                        oldbuttonText = btnMethodText;
-                        btnMethodText.IsSelected = true;
-                        oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                        oldbuttonText.IsBold = true;
-                    }
-
-                    int index = 0;
-                    RefreshRoomList();
-                    dialog.Close();
-                };
-                btnAllMethod.MouseUpEventHandler += hander;
-                rowFrameLayout.MouseUpEventHandler += hander;
-                btnMethodText.MouseUpEventHandler += hander;
-                count++;
-            }
-
-            if (count == 0)
-            {
-                sidelipFrameLayout.Height = 0;
-            }
-            else if (count <= 4 && count > 0)
-            {
-                sidelipFrameLayout.Height = Application.GetRealHeight(180) + count * Application.GetRealHeight(150);
-            }
-            else
-            {
-                sidelipFrameLayout.Height = Application.GetMinReal(780);
-            }
-        }
-        #endregion
-
-        #region 鏁版嵁澶勭悊
-        /// <summary>
-        /// 鍒濆鍖栬澶囨暟鎹�
-        /// </summary>
-        void InitData()
-        {
-            System.Threading.Tasks.Task.Run(async () =>
-            {
-                try
-                {
-                    Application.RunOnMainThread(() =>
-                    {
-                        CommonPage.Loading.Start("");
-                    });
-                    //鑾峰彇琚粦鐩爣绛変俊鎭�
-                    BindDevInfo(curBindDevice);
-
-                    //鑾峰彇妤煎眰
-                    dicFloorList = HdlRoomLogic.Current.GetFloorSortList();
-                    //鑾峰彇妤煎眰涓埧闂村垪琛�
-                    supportRoomList = GetFloorRoomList();
-
-                    //鑾峰彇鎵�鏈夋埧闂翠腑鍖归厤鐨勮兘缁戠殑鐩爣
-                    currentPanelSupportBindDeviceList = GetAllRoomSupportDeviceList();
-
-                    //鑾峰彇闈㈡澘涓瓨鍦ㄧ殑缁戝畾鐩爣
-                    var panelBindListRes = HdlDeviceBindLogic.Current.GetDeviceBindAsync(curControlDev);
-                    if (panelBindListRes != null && panelBindListRes.getAllBindResponseData != null)
-                    {
-                        curControlDev.bindList.Clear();
-                        foreach (var bDev in panelBindListRes.getAllBindResponseData.BindList)
-                        {
-                            curControlDev.bindList.Add(bDev);
-                        }
-                    }
-                    else
-                    {
-                        Application.RunOnMainThread(() =>
-                        {
-                            CommonPage.Loading.Hide();
-                            midVerticalScrolViewLayout.EndHeaderRefreshing();
-                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
-                        });
-                    }
-
-                    targetList.Clear();
-                    //閫変腑鐩爣鍒楄〃 targetList
-                    if (currentPanelSupportBindDeviceList.Count != 0 && curControlDev.bindList.Count != 0)
-                    {
-                        foreach (var bindDev in curControlDev.bindList)
-                        {
-                            var mainKey = bindDev.BindMacAddr + bindDev.BindEpoint;
-                            var dev = currentPanelSupportBindDeviceList.Find(obj => (obj != null) && (obj.DeviceAddr + obj.DeviceEpoint == mainKey));
-                            if (dev != null)
-                            {
-                                var device = LocalDevice.Current.GetDevice(dev.DeviceAddr, dev.DeviceEpoint);
-                                if (device != null)
-                                {
-                                    switch (curDeviceBindType)
-                                    {
-                                        case 1:
-                                            //鑾峰彇璁惧绫诲瀷鐨�
-                                            var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
-                                            //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
-                                            if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
-                                            {
-                                                continue;
-                                            }
-                                            if (device.Type == DeviceType.FreshAir)
-                                            {
-                                                targetList.Add(device);
-                                                oldTargetList.Add(device);
-                                            }
-                                            break;
-                                        case 2:
-                                            if (device.Type == DeviceType.TemperatureSensor)
-                                            {
-                                                var bDev = device as TemperatureSensor;
-                                                if (bDev.SensorDiv == 1)
-                                                {
-                                                    targetList.Add(device);
-                                                    oldTargetList.Add(device);
-                                                }
-                                            }
-                                            if (device.Type == DeviceType.PMSensor)
-                                            {
-                                                if (bindDev.BindCluster == 1026)
-                                                {
-                                                    targetList.Add(device);
-                                                    oldTargetList.Add(device);
-                                                }
-                                            }
-                                            break;
-                                        case 3:
-                                            if (device.Type == DeviceType.TemperatureSensor)
-                                            {
-                                                var bDev = device as TemperatureSensor;
-                                                if (bDev.SensorDiv == 2)
-                                                {
-                                                    targetList.Add(device);
-                                                    oldTargetList.Add(device);
-                                                }
-                                            }
-                                            if (device.Type == DeviceType.FreshAirHumiditySensor)
-                                            {
-                                                targetList.Add(device);
-                                                oldTargetList.Add(device);
-                                            }
-                                            if (device.Type == DeviceType.PMSensor)
-                                            {
-                                                if (bindDev.BindCluster == 1029)
-                                                {
-                                                    targetList.Add(device);
-                                                    oldTargetList.Add(device);
-                                                }
-                                            }
-                                            break;
-                                        case 4:
-                                            //PM2.5
-                                            if (device.Type == DeviceType.PMSensor)
-                                            {
-                                                if (bindDev.BindCluster == 1066)
-                                                {
-                                                    targetList.Add(device);
-                                                    oldTargetList.Add(device);
-                                                }
-                                            }
-                                            break;
-                                    }
-
-                                }
-                            }
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    var mess = ex.Message;
-                }
-                finally
-                {
-                    Application.RunOnMainThread(() =>
-                    {
-
-                        //棣栨鏄惁鑳界偣鍑讳繚瀛�
-                        if (targetList.Count == 0)
-                        {
-                            curControlDev.currentSelectFloorId = BindInfo.GetCurrentSelectFloorId();
-                            curControlDev.currentSelectRoomId = null;
-                            if (BindInfo.GetCurrentSelectFloorIdName() != null)
-                            {
-                                Application.RunOnMainThread(() =>
-                                {
-                                    btnFloorText.Text = BindInfo.GetCurrentSelectFloorIdName();
-                                });
-                            }
-                            btnFinifh.Enable = false;
-                            btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
-                        }
-                        else
-                        {
-                            foreach (var dev in targetList)
-                            {
-                                //鑾峰彇鏈湴璁惧鍒楄〃 
-                                var localDeviceList = Shared.Common.LocalDevice.Current.listAllDevice;
-                                var tempDev = localDeviceList.Find(obj => obj.DeviceAddr == dev.DeviceAddr && obj.DeviceEpoint == dev.DeviceEpoint);
-                                if (tempDev != null)
-                                {
-                                    //鑾峰彇璁惧鎵�灞炴埧闂�
-                                    var tempDevRoom = HdlRoomLogic.Current.GetRoomByDevice(tempDev);
-                                    if (tempDevRoom != null)
-                                    {
-                                        curControlDev.currentSelectRoomId = tempDevRoom.Id;
-                                        curControlDev.currentSelectFloorId = tempDevRoom.FloorId;
-                                    }
-                                }
-                            }
-                            if (!string.IsNullOrEmpty(curControlDev.currentSelectFloorId))
-                            {
-                                if (BindInfo.GetBindTargetsFloorIdName(curControlDev.currentSelectFloorId) != null)
-                                {
-                                    btnFloorText.Text = BindInfo.GetBindTargetsFloorIdName(curControlDev.currentSelectFloorId);
-                                }
-                            }
-
-                            btnFinifh.Enable = true;
-                            btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                        }
-
-
-                        //鑾峰彇妤煎眰涓埧闂村垪琛�
-                        if (supportRoomList.Count != 0)
-                        {
-                            RefreshRoomList();
-                        }
-
-                        CommonPage.Loading.Hide();
-                        midVerticalScrolViewLayout.EndHeaderRefreshing();
-                    });
-                }
-            });
-        }
-
-        /// <summary>
-        /// 淇濆瓨鐩爣
-        /// </summary>
-        /// <param name="curControlDev"></param>
-        void SaveTarget()
-        {
-            btnFinifh.Enable = false;
-            if (targetList.Count == 0)
-            {
-                //绌虹洰鏍�
-                System.Threading.Tasks.Task.Run(async () =>
-                {
-                    try
-                    {
-                        Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
-
-                        if (oldTargetList.Count != 0)
-                        {
-                            //鍒犻櫎鍙栨秷鐨勭洰鏍�
-                            foreach (var bd in oldTargetList)
-                            {
-                                var delDevice = new DelDeviceBindData();
-                                delDevice.DeviceAddr = curControlDev.DeviceAddr;
-                                delDevice.Epoint = curControlDev.DeviceEpoint;
-
-                                var removeDevice = new RemoveBindListObj();
-                                removeDevice.BindType = 0;
-                                switch (curDeviceBindType)
-                                {
-                                    case 1:
-                                        removeDevice.BindCluster = 514;
-                                        break;
-                                    case 2:
-                                        removeDevice.BindCluster = 1026;
-                                        break;
-                                    case 3:
-                                        removeDevice.BindCluster = 1029;
-                                        break;
-                                    case 4:
-                                        //PM2.5
-                                        removeDevice.BindCluster = 1066;
-                                        break;
-                                }
-                                removeDevice.BindMacAddr = bd.DeviceAddr;
-                                removeDevice.BindEpoint = bd.DeviceEpoint;
-                                delDevice.RemoveBindList.Add(removeDevice);
-
-                                var delResult = new DelDeviceBindResponseAllData();
-                                delResult = HdlDeviceBindLogic.Current.DelDeviceBindAsync(delDevice);
-                                if (delResult == null)
-                                {
-                                    Application.RunOnMainThread(() =>
-                                    {
-                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
-                                        btnFinifh.Enable = true;
-                                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                                        CommonPage.Loading.Hide();
-                                    });
-                                    return;
-                                }
-                                else
-                                {
-                                    if (delResult.removeBindResultResponseData == null)
-                                    {
-                                        if (delResult.delDeviceBindResponseData != null)
-                                        {
-                                            foreach (var d in delResult.delDeviceBindResponseData.RemoveBindList)
-                                            {
-                                                if (d.Result == 1)
-                                                {
-                                                    switch (curDeviceBindType)
-                                                    {
-                                                        case 1:
-                                                            if (actionFreshAirTarget != null)
-                                                            {
-                                                                actionFreshAirTarget("");
-                                                            }
-                                                            break;
-                                                        case 2:
-                                                            if (actionTemperatureTarget != null)
-                                                            {
-                                                                actionTemperatureTarget("");
-                                                            }
-                                                            break;
-                                                        case 3:
-                                                            if (actionHumidityTarget != null)
-                                                            {
-                                                                actionHumidityTarget("");
-                                                            }
-                                                            break;
-                                                        case 4:
-                                                            if (actionPMTarget != null)
-                                                            {
-                                                                actionPMTarget("");
-                                                            }
-                                                            break;
-                                                    }
-                                                    Application.RunOnMainThread(() =>
-                                                    {
-                                                        CommonPage.Loading.Hide();
-                                                        btnFinifh.Enable = true;
-                                                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                                                        this.RemoveFromParent();
-                                                    });
-                                                }
-                                                else
-                                                {
-                                                    Application.RunOnMainThread(() =>
-                                                    {
-                                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
-                                                        btnFinifh.Enable = true;
-                                                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                                                        CommonPage.Loading.Hide();
-                                                    });
-                                                    return;
-                                                }
-                                            }
-                                        }
-                                    }
-                                    else
-                                    {
-                                        if (delResult.removeBindResultResponseData.Result == 0)
-                                        {
-                                            switch (curDeviceBindType)
-                                            {
-                                                case 1:
-                                                    if (actionFreshAirTarget != null)
-                                                    {
-                                                        actionFreshAirTarget("");
-                                                    }
-                                                    break;
-                                                case 2:
-                                                    if (actionTemperatureTarget != null)
-                                                    {
-                                                        actionTemperatureTarget("");
-                                                    }
-                                                    break;
-                                                case 3:
-                                                    if (actionHumidityTarget != null)
-                                                    {
-                                                        actionHumidityTarget("");
-                                                    }
-                                                    break;
-                                                case 4:
-                                                    if (actionPMTarget != null)
-                                                    {
-                                                        actionPMTarget("");
-                                                    }
-                                                    break;
-                                            }
-                                            Application.RunOnMainThread(() =>
-                                            {
-                                                CommonPage.Loading.Hide();
-                                                btnFinifh.Enable = true;
-                                                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                                                this.RemoveFromParent();
-                                            });
-
-                                        }
-                                        else
-                                        {
-                                            Application.RunOnMainThread(() =>
-                                            {
-                                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
-                                                btnFinifh.Enable = true;
-                                                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                                                CommonPage.Loading.Hide();
-                                            });
-                                            return;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        else
-                        {
-                            //娌℃湁鐩爣鎻愮ず
-                            Application.RunOnMainThread(() =>
-                            {
-                                var myTip = new Tip();
-                                myTip.Direction = AMPopTipDirection.None;
-                                myTip.CloseTime = 2;
-                                myTip.Text = Language.StringByID(R.MyInternationalizationString.BindDeviceTargetIsEmpty);
-                                myTip.Show(Common.CommonPage.Instance);
-                                btnFinifh.Enable = true;
-                                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                                CommonPage.Loading.Hide();
-                            });
-                            return;
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        var mess = ex.Message;
-                        Application.RunOnMainThread(() =>
-                        {
-                            CommonPage.Loading.Hide();
-                        });
-                        btnFinifh.Enable = true;
-                    }
-                });
-            }
-            else
-            {
-                //閫変腑鐩爣
-                //1銆佸凡缁忕粦瀹氳繃鐨勭洰鏍�
-                if (checkExistDevice())
-                {
-                    Application.RunOnMainThread(() =>
-                    {
-                        var myTip = new Tip();
-                        myTip.Direction = AMPopTipDirection.None;
-                        myTip.CloseTime = 2;
-                        myTip.Text = Language.StringByID(R.MyInternationalizationString.BindExist);
-                        myTip.Show(Common.CommonPage.Instance);
-                        btnFinifh.Enable = true;
-                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                    });
-                    return;
-                }
-
-                System.Threading.Tasks.Task.Run(async () =>
-                {
-                    try
-                    {
-                        Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
-
-                        //鍒犻櫎宸茬粡瀛樺湪鐨勭洰鏍�
-                        if (oldTargetList.Count != 0)
-                        {
-                            foreach (var bd in oldTargetList)
-                            {
-                                var delDevice = DelBindDevice(bd);
-                                var delResult = new DelDeviceBindResponseAllData();
-                                delResult = HdlDeviceBindLogic.Current.DelDeviceBindAsync(delDevice);
-
-                                if (delResult == null)
-                                {
-                                    Application.RunOnMainThread(() =>
-                                    {
-                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
-                                        btnFinifh.Enable = true;
-                                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                                        CommonPage.Loading.Hide();
-                                    });
-                                    return;
-                                }
-                                else
-                                {
-                                    if (delResult.removeBindResultResponseData == null)
-                                    {
-                                        if (delResult.delDeviceBindResponseData != null)
-                                        {
-                                            foreach (var d in delResult.delDeviceBindResponseData.RemoveBindList)
-                                            {
-                                                if (d.Result != 1)
-                                                {
-                                                    Application.RunOnMainThread(() =>
-                                                    {
-                                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
-                                                        btnFinifh.Enable = true;
-                                                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                                                        CommonPage.Loading.Hide();
-                                                    });
-                                                    return;
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                                if (delResult != null && delResult.removeBindResultResponseData != null)
-                                {
-                                    if (delResult.removeBindResultResponseData.Result != 0)
-                                    {
-                                        Application.RunOnMainThread(() =>
-                                        {
-                                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
-                                            btnFinifh.Enable = true;
-                                            btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                                            CommonPage.Loading.Hide();
-                                        });
-                                        return;
-                                    }
-                                }
-                            }
-                        }
-                        else
-                        {
-                            //妫�娴嬪凡缁忕粦瀹氱殑鐩爣鏄惁涓嶅湪鏈湴鎴栬�呮病鏈夊垎閰嶅埌浠讳綍鎴块棿涓�
-                            //姝ゆ椂闇�瑕佸垹闄ゅ凡缁忚缁戝畾鍒扮洰鏍囷紝鎵嶈兘缁х画缁戝畾鏂扮洰鏍�
-                            if (curBindDevice != null)
-                            {
-                                var delDevice = DelBindDevice(curBindDevice);
-                                var delResult = new DelDeviceBindResponseAllData();
-                                delResult = HdlDeviceBindLogic.Current.DelDeviceBindAsync(delDevice);
-
-                                if (delResult == null)
-                                {
-                                    Application.RunOnMainThread(() =>
-                                    {
-                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
-                                        btnFinifh.Enable = true;
-                                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                                        CommonPage.Loading.Hide();
-                                    });
-                                    return;
-                                }
-                                else
-                                {
-                                    if (delResult.removeBindResultResponseData == null)
-                                    {
-                                        if (delResult.delDeviceBindResponseData != null)
-                                        {
-                                            foreach (var d in delResult.delDeviceBindResponseData.RemoveBindList)
-                                            {
-                                                if (d.Result != 1)
-                                                {
-                                                    Application.RunOnMainThread(() =>
-                                                    {
-                                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
-                                                        btnFinifh.Enable = true;
-                                                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                                                        CommonPage.Loading.Hide();
-                                                    });
-                                                    return;
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                                if (delResult != null && delResult.removeBindResultResponseData != null)
-                                {
-                                    if (delResult.removeBindResultResponseData.Result != 0)
-                                    {
-                                        Application.RunOnMainThread(() =>
-                                        {
-                                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
-                                            btnFinifh.Enable = true;
-                                            btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                                            CommonPage.Loading.Hide();
-                                        });
-                                        return;
-                                    }
-                                }
-                            }
-                        }
-
-                        //2銆佹坊鍔犳柊鐨勭洰鏍�
-                        string bindName = "";
-                        var addBindeDev = new AddBindData();
-                        addBindeDev.DeviceAddr = curControlDev.DeviceAddr;
-                        addBindeDev.Epoint = curControlDev.DeviceEpoint;
-                        foreach (var de in targetList)
-                        {
-                            var addBindInfo = new AddBindListObj();
-                            switch (curDeviceBindType)
-                            {
-                                case 1:
-                                    addBindInfo.BindCluster = 514;
-                                    break;
-                                case 2:
-                                    addBindInfo.BindCluster = 1026;
-                                    break;
-                                case 3:
-                                    addBindInfo.BindCluster = 1029;
-                                    break;
-                                case 4:
-                                    //PM2.5
-                                    addBindInfo.BindCluster = 1066;
-                                    break;
-                            }
-                            addBindInfo.BindType = 0;
-                            addBindInfo.BindMacAddr = de.DeviceAddr;
-                            addBindInfo.BindEpoint = de.DeviceEpoint;
-                            addBindeDev.BindName = Common.LocalDevice.Current.GetDeviceEpointName(de);
-                            switch (curDeviceBindType)
-                            {
-                                case 2:
-                                    if (de.Type == DeviceType.PMSensor)
-                                    {
-                                        addBindeDev.BindName = Common.LocalDevice.Current.GetDeviceEpointName(de) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
-                                    }
-                                    break;
-                                case 3:
-                                    if (de.Type == DeviceType.PMSensor)
-                                    {
-                                        addBindeDev.BindName = Common.LocalDevice.Current.GetDeviceEpointName(de) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
-                                    }
-                                    break;
-                            }
-                            addBindeDev.BindList.Add(addBindInfo);
-                        }
-
-                        var dev = new AddedDeviceBindResponseAllData();
-                        dev = HdlDeviceBindLogic.Current.AddDeviceBindAsync(addBindeDev);
-                        if (dev == null || dev.addedDeviceBindResponseData == null)
-                        {
-                            Application.RunOnMainThread(() =>
-                            {
-                                CommonPage.Loading.Hide();
-                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
-                                btnFinifh.Enable = true;
-                                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                                return;
-                            });
-                        }
-                        else
-                        {
-                            if (dev.addedDeviceBindResponseData.Result == 0)
-                            {
-                                targetList.Clear();
-                                switch (curDeviceBindType)
-                                {
-                                    case 1:
-                                        if (actionFreshAirTarget != null)
-                                        {
-                                            actionFreshAirTarget(addBindeDev.BindName);
-                                        }
-                                        break;
-                                    case 2:
-                                        if (actionTemperatureTarget != null)
-                                        {
-                                            actionTemperatureTarget(addBindeDev.BindName);
-                                        }
-                                        break;
-                                    case 3:
-                                        if (actionHumidityTarget != null)
-                                        {
-                                            actionHumidityTarget(addBindeDev.BindName);
-                                        }
-                                        break;
-                                    case 4:
-                                        if (actionPMTarget != null)
-                                        {
-                                            actionPMTarget(addBindeDev.BindName);
-                                        }
-                                        break;
-                                }
-
-                                Application.RunOnMainThread(() =>
-                                {
-                                    CommonPage.Loading.Hide();
-                                    btnFinifh.Enable = true;
-                                    btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                                    this.RemoveFromParent();
-                                });
-                            }
-                            else if (dev.addedDeviceBindResponseData.Result == 1)
-                            {
-                                Application.RunOnMainThread(() =>
-                                {
-                                    CommonPage.Loading.Hide();
-                                    new Tip()
-                                    {
-                                        MaxWidth = 150,
-                                        Text = Language.StringByID(R.MyInternationalizationString.BindFailed),
-                                        Direction = AMPopTipDirection.None,
-                                        CloseTime = 1
-                                    }.Show(CommonPage.Instance);
-                                });
-                                btnFinifh.Enable = true;
-                                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                                return;
-                            }
-                            else
-                            {
-                                Application.RunOnMainThread(() =>
-                                {
-                                    CommonPage.Loading.Hide();
-                                    new Tip()
-                                    {
-                                        MaxWidth = 150,
-                                        Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError),
-                                        Direction = AMPopTipDirection.None,
-                                        CloseTime = 1
-                                    }.Show(CommonPage.Instance);
-                                });
-                                btnFinifh.Enable = true;
-                                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                                return;
-                            }
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        Application.RunOnMainThread(() =>
-                        {
-                            CommonPage.Loading.Hide();
-                        });
-                        btnFinifh.Enable = true;
-                        var mess = ex.Message;
-                    }
-                });
-            }
-        }
-
-        /// <summary>
-        /// 褰撳墠琚粦瀹氳澶囨墍灞炴ゼ灞傚拰鎴块棿
-        /// </summary>
-        /// <param name="bindDev"></param>
-        void BindDevInfo(CommonDevice bindDev)
-        {
-            if (bindDev == null)
-            {
-                return;
-            }
-            //鑾峰彇鏈湴璁惧鍒楄〃 
-            var localDeviceList = Shared.Common.LocalDevice.Current.listAllDevice;
-            var tempDev = localDeviceList.Find(obj => obj.DeviceAddr == bindDev.DeviceAddr && obj.DeviceEpoint == bindDev.DeviceEpoint);
-            if (tempDev != null)
-            {
-                //鑾峰彇璁惧鎵�灞炴埧闂�
-                var tempDevRoom = HdlRoomLogic.Current.GetRoomByDevice(tempDev);
-                if (tempDevRoom != null)
-                {
-                    curControlDev.currentSelectRoomId = tempDevRoom.Id;
-                    curControlDev.currentSelectFloorId = tempDevRoom.FloorId;
-                }
-            }
-        }
-
-        /// <summary>
-        /// 妫�娴嬬洰鏍囨槸鍚﹁缁戝畾杩�
-        /// </summary>
-        /// <returns></returns>
-        private bool checkExistDevice()
-        {
-            bool exist = false;
-            foreach (var oldDev in oldTargetList)
-            {
-                var key = oldDev.DeviceAddr + oldDev.DeviceEpoint;
-                var result = targetList.Find(obj => (obj != null) && (obj.DeviceAddr + obj.DeviceEpoint == key));
-                if (result != null)
-                {
-                    exist = true;
-                }
-                else
-                {
-                    exist = false;
-                }
-            }
-            return exist;
-        }
-
-        /// <summary>
-        /// 妫�娴嬪凡缁忕粦瀹氱殑鐩爣鏄惁涓嶅湪鏈湴鎴栬�呮病鏈夊垎閰嶅埌浠讳綍鎴块棿涓�
-        /// </summary>
-        /// <returns></returns>
-        private DelDeviceBindData DelBindDevice(CommonDevice bd)
-        {
-            var delDevice = new DelDeviceBindData();
-            delDevice.DeviceAddr = curControlDev.DeviceAddr;
-            delDevice.Epoint = curControlDev.DeviceEpoint;
-
-            var removeDevice = new RemoveBindListObj();
-            removeDevice.BindType = 0;
-            switch (curDeviceBindType)
-            {
-                case 1:
-                    removeDevice.BindCluster = 514;
-                    break;
-                case 2:
-                    removeDevice.BindCluster = 1026;
-                    break;
-                case 3:
-                    removeDevice.BindCluster = 1029;
-                    break;
-                case 4:
-                    //PM2.5
-                    removeDevice.BindCluster = 1066;
-                    break;
-            }
-            removeDevice.BindMacAddr = bd.DeviceAddr;
-            removeDevice.BindEpoint = bd.DeviceEpoint;
-            delDevice.RemoveBindList.Add(removeDevice);
-            return delDevice;
-        }
-
-        /// <summary>
-        /// 鑳芥樉绀虹殑鎴块棿鍒楄〃
-        /// </summary>
-        private List<Room> GetSupportRoomList()
-        {
-            var roomTempList = new List<Room>();
-            for (int i = 0; i < supportRoomList.Count; i++)
-            {
-                var room = supportRoomList[i];
-                //濡傛灉鎴块棿涓哄枩鐖盵鍚庢潵鏀瑰悕涓哄父鐢ㄦ埧闂碷锛屽垯涓嶆樉绀�
-                if (room.IsLove == true)
-                {
-                    continue;
-                }
-
-                //濡傛灉鎴块棿涓病鏈夎澶囷紝鍒欎笉鏄剧ず
-                if (room.ListDevice.Count == 0)
-                {
-                    continue;
-                }
-                else
-                {
-                    List<CommonDevice> roomIncludeMatchDevice = new List<CommonDevice>();
-
-                    //鎴块棿涓病鏈夊搴旂殑鏀寔缁戝畾鐨勭洰鏍�
-                    switch (curDeviceBindType)
-                    {
-                        case 1:
-                            foreach (var de in room.ListDevice)
-                            {
-                                var device = LocalDevice.Current.GetDevice(de);
-
-                                if (device != null)
-                                {
-                                    //鑾峰彇璁惧绫诲瀷鐨�
-                                    var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
-                                    //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
-                                    if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
-                                    {
-                                        continue;
-                                    }
-                                    if (device.Type == DeviceType.FreshAir)
-                                    {
-                                        roomIncludeMatchDevice.Add(device);
-                                    }
-                                }
-                            }
-                            break;
-                        case 2:
-                            roomIncludeMatchDevice = GetMatchTemperatureSensorDevice(room);
-                            break;
-                        case 3:
-                            roomIncludeMatchDevice = GetMatchHumiditySensorDevice(room);
-                            foreach (var de in room.ListDevice)
-                            {
-                                var device = LocalDevice.Current.GetDevice(de);
-                                if (device != null)
-                                {
-                                    if (device.Type == DeviceType.FreshAirHumiditySensor)
-                                    {
-                                        roomIncludeMatchDevice.Add(device);
-                                    }
-                                }
-                            }
-                            break;
-                        case 4:
-                            foreach (var de in room.ListDevice)
-                            {
-                                var device = LocalDevice.Current.GetDevice(de);
-                                if (device != null)
-                                {
-                                    if (device.Type == DeviceType.PMSensor)
-                                    {
-                                        roomIncludeMatchDevice.Add(device);
-                                    }
-                                }
-                            }
-                            break;
-                    }
-
-                    if (roomIncludeMatchDevice.Count == 0)
-                    {
-                        continue;
-                    }
-
-                    if (!string.IsNullOrEmpty(room.FloorId))
-                    {
-                        //鏈夋ゼ灞�
-                        if (room.FloorId == curControlDev.currentSelectFloorId)
-                        {
-                            roomTempList.Add(room);
-                        }
-                    }
-                    else
-                    {
-                        //娌℃湁妤煎眰
-                        roomTempList.Add(room);
-                    }
-                }
-            }
-            return roomTempList;
-        }
-
-        /// <summary>
-        /// 鍖归厤娓╁害浼犳劅鍣�
-        /// </summary>
-        /// <param name="room"></param>
-        List<CommonDevice> GetMatchTemperatureSensorDevice(Room room)
-        {
-            List<CommonDevice> roomIncludeMatchTempDevice = new List<CommonDevice>();
-            foreach (var de in room.ListDevice)
-            {
-                var device = LocalDevice.Current.GetDevice(de);
-                if (device != null)
-                {
-                    //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
-                    if (device.ZigbeeType != 1)
-                    {
-                        continue;
-                    }
-                    if (device.Type == DeviceType.TemperatureSensor)
-                    {
-                        var dev = device as TemperatureSensor;
-                        if (dev.SensorDiv == 1)
-                        {
-                            roomIncludeMatchTempDevice.Add(device);
-                        }
-                    }
-                    else if (device.Type == DeviceType.PMSensor)
-                    {
-                        var dev = device as PMSensor;
-                        foreach (var clu in dev.InClusterList)
-                        {
-                            if (clu.InCluster == 1026)
-                            {
-                                roomIncludeMatchTempDevice.Add(device);
-                            }
-                        }
-                    }
-                }
-            }
-            return roomIncludeMatchTempDevice;
-        }
-
-        /// <summary>
-        /// 鍖归厤婀垮害浼犳劅鍣�
-        /// </summary>
-        /// <param name="room"></param>
-        List<CommonDevice> GetMatchHumiditySensorDevice(Room room)
-        {
-            List<CommonDevice> roomIncludeMatchHumpDevice = new List<CommonDevice>();
-            foreach (var de in room.ListDevice)
-            {
-                var device = LocalDevice.Current.GetDevice(de);
-                if (device != null)
-                {
-                    //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
-                    if (device.ZigbeeType != 1)
-                    {
-                        continue;
-                    }
-                    if (device.Type == DeviceType.TemperatureSensor)
-                    {
-                        var dev = device as TemperatureSensor;
-                        if (dev.SensorDiv == 2)
-                        {
-                            roomIncludeMatchHumpDevice.Add(device);
-                        }
-                    }
-                    else if (device.Type == DeviceType.PMSensor)
-                    {
-                        var dev = device as PMSensor;
-                        foreach (var clu in dev.InClusterList)
-                        {
-                            if (clu.InCluster == 1029)
-                            {
-                                roomIncludeMatchHumpDevice.Add(device);
-                            }
-                        }
-                    }
-                }
-            }
-            return roomIncludeMatchHumpDevice;
-        }
-
-        /// <summary>
-        /// 鑾峰彇妤煎眰瀵瑰簲鐨勬埧闂村垪琛�
-        /// </summary>
-        /// <returns></returns>
-        private List<Room> GetFloorRoomList()
-        {
-            supportRoomList.Clear();
-            var supportRoomListTemp = new List<Room>();
-            var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
-            if (Common.Config.Instance.Home.FloorDics.Count == 0)
-            {
-                // 鑾峰彇娌℃湁妤煎眰鎴块棿
-                foreach (var room in listAllRoom)
-                {
-                    if (string.IsNullOrEmpty(room.FloorId))
-                    {
-                        if (room.IsLove)
-                        {
-                            continue;
-                        }
-                        supportRoomListTemp.Add(room);
-                    }
-                }
-            }
-            else
-            {
-                // 鑾峰彇鏀寔鐨勬埧闂�
-                foreach (var room in listAllRoom)
-                {
-                    if (room.IsLove)
-                    {
-                        continue;
-                    }
-                    supportRoomListTemp.Add(room);
-                }
-            }
-            return supportRoomListTemp;
-        }
-
-        /// <summary>
-        /// 鎵�鏈夋埧闂翠腑鍖归厤鐨勬敮鎸佺粦瀹氱殑鎵�鏈夌洰鏍囧垪琛�
-        /// </summary>
-        /// <returns></returns>
-        List<CommonDevice> GetAllRoomSupportDeviceList()
-        {
-            currentPanelSupportBindDeviceList.Clear();
-            List<CommonDevice> currentPanelBindSupportDeviceListTemp = new List<CommonDevice>();
-            switch (curDeviceBindType)
-            {
-                case 1:
-                    foreach (var r in supportRoomList)
-                    {
-                        if (r.ListDevice.Count == 0)
-                        {
-                            continue;
-                        }
-                        foreach (var deviceKeys in r.ListDevice)
-                        {
-                            var device = LocalDevice.Current.GetDevice(deviceKeys);
-                            if (device != null)
-                            {
-                                //鑾峰彇璁惧绫诲瀷鐨�
-                                var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
-                                //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
-                                if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
-                                {
-                                    continue;
-                                }
-                                if (device.Type == DeviceType.FreshAir)
-                                {
-                                    currentPanelBindSupportDeviceListTemp.Add(device);
-                                }
-                            }
-                        }
-                    }
-                    break;
-                case 2:
-                    foreach (var r in supportRoomList)
-                    {
-                        if (r.ListDevice.Count == 0)
-                        {
-                            continue;
-                        }
-                        var deviceListTemp = GetMatchTemperatureSensorDevice(r);
-                        foreach (var dev in deviceListTemp)
-                        {
-                            currentPanelBindSupportDeviceListTemp.Add(dev);
-                        }
-                    }
-                    break;
-                case 3:
-                    foreach (var r in supportRoomList)
-                    {
-                        if (r.ListDevice.Count == 0)
-                        {
-                            continue;
-                        }
-                        var deviceListTemp = GetMatchHumiditySensorDevice(r);
-                        foreach (var dev in deviceListTemp)
-                        {
-                            currentPanelBindSupportDeviceListTemp.Add(dev);
-                        }
-                        foreach (var deviceKeys in r.ListDevice)
-                        {
-                            var device = LocalDevice.Current.GetDevice(deviceKeys);
-                            if (device != null)
-                            {
-                                if (device.Type == DeviceType.FreshAirHumiditySensor)
-                                {
-                                    currentPanelBindSupportDeviceListTemp.Add(device);
-                                }
-                            }
-                        }
-                    }
-                    break;
-                case 4:
-                    foreach (var r in supportRoomList)
-                    {
-                        if (r.ListDevice.Count == 0)
-                        {
-                            continue;
-                        }
-                        foreach (var deviceKeys in r.ListDevice)
-                        {
-                            var device = LocalDevice.Current.GetDevice(deviceKeys);
-                            if (device != null)
-                            {
-                                if (device.Type == DeviceType.PMSensor)
-                                {
-                                    currentPanelBindSupportDeviceListTemp.Add(device);
-                                }
-                            }
-                        }
-                    }
-                    break;
-            }
-            return currentPanelBindSupportDeviceListTemp;
-        }
-
-        /// <summary>
-        /// 鑾峰彇褰撳墠鎴块棿涓尮閰嶇殑鏀寔缁戝畾鐨勮澶囧垪琛�
-        /// </summary>
-        /// <returns></returns>
-        List<CommonDevice> GetCurRoomSupportDeviceList(Room curRoom)
-        {
-            currentRoomSupportBindDeviceList.Clear();
-            List<CommonDevice> curRoomDeviceListTemp = new List<CommonDevice>();
-            switch (curDeviceBindType)
-            {
-                case 1:
-                    foreach (var deviceKeys in curRoom.ListDevice)
-                    {
-                        var device = LocalDevice.Current.GetDevice(deviceKeys);
-                        if (device != null)
-                        {
-                            //鑾峰彇璁惧绫诲瀷鐨�
-                            var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
-                            //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
-                            if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
-                            {
-                                continue;
-                            }
-                            if (device.Type == DeviceType.FreshAir)
-                            {
-                                curRoomDeviceListTemp.Add(device);
-                            }
-                        }
-                    }
-                    break;
-                case 2:
-                    curRoomDeviceListTemp = GetMatchTemperatureSensorDevice(curRoom);
-                    break;
-                case 3:
-                    curRoomDeviceListTemp = GetMatchHumiditySensorDevice(curRoom);
-                    foreach (var deviceKeys in curRoom.ListDevice)
-                    {
-                        var device = LocalDevice.Current.GetDevice(deviceKeys);
-                        if (device != null)
-                        {
-                            if (device.Type == DeviceType.FreshAirHumiditySensor)
-                            {
-                                curRoomDeviceListTemp.Add(device);
-                            }
-                        }
-                    }
-                    break;
-                case 4:
-                    foreach (var deviceKeys in curRoom.ListDevice)
-                    {
-                        var device = LocalDevice.Current.GetDevice(deviceKeys);
-                        if (device != null)
-                        {
-                            if (device.Type == DeviceType.PMSensor)
-                            {
-                                curRoomDeviceListTemp.Add(device);
-                            }
-                        }
-                    }
-                    break;
-            }
-            return curRoomDeviceListTemp;
-        }
-        #endregion
-
-        #region 绉婚櫎鏂规硶
-        /// <summary>
-        /// 閲嶅啓绉婚櫎鏂规硶
-        /// </summary>
-        public override void RemoveFromParent()
-        {
-            actionFreshAirTarget = null;
-            actionTemperatureTarget = null;
-            actionHumidityTarget = null;
-            actionPMTarget = null;
-            base.RemoveFromParent();
-        }
-        #endregion
-    }
-}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs
new file mode 100755
index 0000000..e6c53d3
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs
@@ -0,0 +1,545 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Shared.Common;
+using Shared.Phone.UserCenter.Device.Bind;
+using ZigBee.Common;
+using ZigBee.Device;
+
+namespace Shared.Phone.UserCenter.DevicePanel
+{
+    /// <summary>
+    /// 鏂规偊鏂伴闈㈡澘鐨勬寜閿厤缃晫闈�
+    /// </summary>
+    public class PanelSimpleEnvironmentButtonSettionForm : EditorCommonForm
+    {
+        #region 鈻� 鍙橀噺澹版槑___________________________
+
+        /// <summary>
+        /// 鍒楄〃鎺т欢
+        /// </summary>
+        private FrameListControl listview = null;
+        /// <summary>
+        /// 璁惧鐨勬煇涓�鍥炶矾
+        /// </summary>
+        private CommonDevice deviceObj = null;
+        /// <summary>
+        /// 鏂伴鐩爣鍚嶅瓧
+        /// </summary>
+        private string bindFreshAirName = string.Empty;
+        /// <summary>
+        /// 娓╁害鐩爣鍚嶅瓧
+        /// </summary>
+        private string bindTemperatureName = string.Empty;
+        /// <summary>
+        /// 婀垮害鐩爣鍚嶅瓧
+        /// </summary>
+        private string bindHumidityName = string.Empty;
+        /// <summary>
+        /// PM鐩爣鍚嶅瓧
+        /// </summary>
+        private string bindAcName = string.Empty;
+        /// <summary>
+        /// 琚粦鐩爣鏄柊椋�
+        /// </summary>
+        private CommonDevice bindFreshAirDev;
+        /// <summary>
+        /// 琚粦鐩爣鏄俯搴�
+        /// </summary>
+        private CommonDevice bindTemperatureDev;
+        /// <summary>
+        /// 琚粦鐩爣鏄箍搴�
+        /// </summary>
+        private CommonDevice bindHumidityDev;
+        /// <summary>
+        /// 琚粦鐩爣鏄┖璋�
+        /// </summary>
+        private CommonDevice bindAcDev;
+        // <summary>
+        /// 鎸夐敭涓缁戝畾鐨勭洰鏍囧垪琛�
+        /// </summary>
+        public List<BindObj.BindListResponseObj> bindList = new List<BindObj.BindListResponseObj>();
+
+        #endregion
+
+        #region 鈻� 鍒濆鍖朹____________________________
+
+        /// <summary>
+        /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+        /// </summary>
+        /// <param name="i_device">璁惧鐨勬煇涓�鍥炶矾</param>
+        public void ShowForm(CommonDevice i_device)
+        {
+            this.deviceObj = i_device;
+            //鑾峰彇鏁版嵁
+            InitInfo(deviceObj);
+
+            //璁剧疆澶撮儴淇℃伅
+            base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uPanelSettion));
+
+            //鍒濆鍖栦腑閮ㄤ俊鎭�
+            this.InitMiddleFrame();
+
+            //鍒濆鍖栧彸涓婅鑿滃崟
+            this.InitTopRightMenu();
+        }
+
+        /// <summary>
+        /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+        /// </summary>
+        private void InitMiddleFrame()
+        {
+            //娓呯┖bodyFrame
+            this.ClearBodyFrame();
+
+            var listBackControl = new VerticalFrameControl();
+            listBackControl.Height = bodyFrameLayout.Height;
+            bodyFrameLayout.AddChidren(listBackControl);
+
+            //鍥剧墖
+            var btnPic = new PicViewControl(426, 426);
+            btnPic.Y = Application.GetRealHeight(150);
+            btnPic.UnSelectedImagePath = "RealDevice/ButtonPanelSimpleEnvironment.png";
+            btnPic.Gravity = Gravity.CenterHorizontal;
+            listBackControl.frameTable.AddChidren(btnPic);
+
+            //鍒濆鍖栨甯�
+            var tableContr = new InformationEditorControl();
+            this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1028);
+
+            //鍒濆鍖栬彍鍗曡
+            this.InitMenuRow();
+
+            //鍒濆鍖栨甯冨畬鎴�
+            tableContr.FinishInitControl();
+            tableContr = null;
+
+            //淇濆瓨
+            var btnFinish = new BottomClickButton();
+            btnFinish.TextID = R.MyInternationalizationString.uSave;
+            bodyFrameLayout.AddChidren(btnFinish);
+            btnFinish.ButtonClickEvent += (sender, e) =>
+            {
+                //鍏抽棴鑷韩
+                this.CloseForm();
+            };
+        }
+
+        /// <summary>
+        /// 鍒濆鍖栬彍鍗曡
+        /// </summary>
+        private void InitMenuRow()
+        {
+            this.listview.RemoveAll();
+            //Ac鏉ユ簮
+            this.AddAcRow();
+            //娣诲姞鏂伴鐩爣
+            this.AddFreshAirRow();
+            //娣诲姞娓╁害鏉ユ簮
+            this.AddTemperatureSensorRow();
+            //娣诲姞婀垮害鏉ユ簮
+            this.AddHumiditySourceRow();
+            //浜害璋冭妭
+            this.AddLevelRow();
+        }
+        #endregion
+
+        #region 鈻� 鏁版嵁澶勭悊_________________________  
+        /// <summary>
+        /// 鍒濆鍖栨暟鎹�
+        /// </summary>
+        void InitInfo(CommonDevice curControlDev)
+        {
+            System.Threading.Tasks.Task.Run(async () =>
+            {
+                try
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        CommonPage.Loading.Start("");
+                    });
+
+                    var result = await GetBindName(curControlDev);
+                    if (!result)
+                    {
+
+                        Application.RunOnMainThread(() =>
+                        {
+                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+                        });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    var mess = ex.Message;
+                }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        this.InitMenuRow();
+                        CommonPage.Loading.Hide();
+                    });
+                }
+            });
+        }
+
+        /// <summary>
+        /// 鑾峰彇缁戝畾鐩爣
+        /// </summary>
+        /// <param name="curControlDev"></param>
+        /// <returns></returns>
+        private async System.Threading.Tasks.Task<bool> GetBindName(CommonDevice curDev)
+        {
+            bool result = false;
+            //鑾峰彇闈㈡澘涓瓨鍦ㄧ殑缁戝畾鐩爣 
+            var curControlDev = new CommonDevice();
+            curControlDev.DeviceAddr = curDev.DeviceAddr;
+            curControlDev.CurrentGateWayId = curDev.CurrentGateWayId;
+            curControlDev.Type = curDev.Type;
+            int count = 0;
+            for (int i = 1; i < 3; i++)
+            {
+                curControlDev.DeviceEpoint = i;
+
+                var panelBindListRes = HdlDeviceBindLogic.Current.GetDeviceBindAsync(curControlDev);
+                if (panelBindListRes != null && panelBindListRes.getAllBindResponseData != null)
+                {
+                    bindList = panelBindListRes.getAllBindResponseData.BindList;
+                    foreach (var bDev in bindList)
+                    {
+                        var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
+
+                        if (device.Type == DeviceType.FreshAir)
+                        {
+                            //鑾峰彇璁惧绫诲瀷鐨�
+                            var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+                            //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
+                            if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+                            {
+                                continue;
+                            }
+                            if (string.IsNullOrEmpty(bDev.ESName))
+                            {
+                                bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+                            }
+                            else
+                            {
+                                bindFreshAirName = bDev.ESName;
+                            }
+
+                            bindFreshAirDev = device;
+                        }
+                        else if (device.Type == DeviceType.TemperatureSensor)
+                        {
+                            var bD = device as TemperatureSensor;
+                            if (bD.SensorDiv == 1)
+                            {
+                                if (string.IsNullOrEmpty(bDev.ESName))
+                                {
+                                    bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+                                }
+                                else
+                                {
+                                    bindTemperatureName = bDev.ESName;
+                                }
+                                bindTemperatureDev = device;
+                            }
+                            if (bD.SensorDiv == 2)
+                            {
+                                if (string.IsNullOrEmpty(bDev.ESName))
+                                {
+                                    bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+                                }
+                                else
+                                {
+                                    bindHumidityName = bDev.ESName;
+                                }
+
+                                bindHumidityDev = device;
+                            }
+                        }
+                        else if (device.Type == DeviceType.FreshAirHumiditySensor)
+                        {
+                            if (string.IsNullOrEmpty(bDev.ESName))
+                            {
+                                bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+                            }
+                            else
+                            {
+                                bindHumidityName = bDev.ESName;
+                            }
+
+                            bindHumidityDev = device;
+                        }
+                        else if (device.Type == DeviceType.Thermostat)
+                        {
+                            if (string.IsNullOrEmpty(bDev.ESName))
+                            {
+                                bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
+                            }
+                            else
+                            {
+                                bindAcName = bDev.ESName;
+                            }
+
+                            bindAcDev = device;
+                        }
+                    }
+                    count++;
+                    if (count == 2)
+                    {
+                        result = true;
+                    }
+                }
+            }
+
+            return result;
+        }
+        #endregion
+
+        #region 鈻� Ac鏉ユ簮_________________________ 
+        /// <summary>
+        ///  Ac鏉ユ簮琛�
+        /// </summary>
+        private void AddAcRow()
+        {
+            //Ac
+            var rowAc = new FrameRowControl(listview.rowSpace / 2);
+            listview.AddChidren(rowAc);
+            rowAc.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.AcTargets), 600);
+            //搴曠嚎
+            rowAc.AddBottomLine();
+            //鍙崇澶�
+            rowAc.AddRightArrow();
+            var msg = Language.StringByID(R.MyInternationalizationString.nothing);
+            if (!string.IsNullOrEmpty(bindAcName))
+            {
+                msg = bindAcName;
+            }
+            var btnAcStatu = rowAc.AddMostRightView(msg, 700);
+            rowAc.ButtonClickEvent += (sender, e) =>
+            {
+                this.deviceObj.DeviceEpoint = 1;
+                var paneTargetsBaseFormp = new PaneTargetsBaseForm(this.deviceObj, bindAcDev, DeviceBind.BindInfo.BindType.AC);
+                Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
+                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+                paneTargetsBaseFormp.Show();
+
+                paneTargetsBaseFormp.actionAcTarget += (bindName) =>
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (string.IsNullOrEmpty(bindName))
+                        {
+                            btnAcStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
+                        }
+                        else
+                        {
+                            btnAcStatu.Text = bindName;
+                        }
+                    });
+                };
+            };
+        }
+        #endregion
+
+        #region 鈻� 鏂伴鐩爣_________________________ 
+        /// <summary>
+        ///  鏂伴鐩爣琛�
+        /// </summary>
+        private void AddFreshAirRow()
+        {
+            //鏂伴鐩爣
+            var rowNewWind = new FrameRowControl(listview.rowSpace / 2);
+            listview.AddChidren(rowNewWind);
+            rowNewWind.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uNewWindTarget), 600);
+            //搴曠嚎
+            rowNewWind.AddBottomLine();
+            //鍙崇澶�
+            rowNewWind.AddRightArrow();
+
+            var msg = Language.StringByID(R.MyInternationalizationString.nothing);
+            if (!string.IsNullOrEmpty(bindFreshAirName))
+            {
+                msg = bindFreshAirName;
+            }
+            var btnNewWindStatu = rowNewWind.AddMostRightView(msg, 700);
+
+            rowNewWind.ButtonClickEvent += (sender, e) =>
+            {
+                this.deviceObj.DeviceEpoint = 2;
+                var paneTargetsBaseFormp = new PaneTargetsBaseForm(this.deviceObj, bindAcDev, DeviceBind.BindInfo.BindType.FreshAir);
+                Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
+                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+                paneTargetsBaseFormp.Show();
+                paneTargetsBaseFormp.actionFreshAirTarget += (bindName) =>
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (string.IsNullOrEmpty(bindName))
+                        {
+                            btnNewWindStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
+                        }
+                        else
+                        {
+                            btnNewWindStatu.Text = bindName;
+                        }
+                    });
+                };
+
+            };
+        }
+        #endregion
+
+        #region 鈻� 娓╁害鏉ユ簮_________________________ 
+        /// <summary>
+        ///  娓╁害鏉ユ簮琛�
+        /// </summary>
+        private void AddTemperatureSensorRow()
+        {
+            //娓╁害鏉ユ簮
+            var rowTemPerature = new FrameRowControl(listview.rowSpace / 2);
+            listview.AddChidren(rowTemPerature);
+            rowTemPerature.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.TemperatureSource), 600);
+            //搴曠嚎
+            rowTemPerature.AddBottomLine();
+            //鍙崇澶�
+            rowTemPerature.AddRightArrow();
+            var msg = Language.StringByID(R.MyInternationalizationString.nothing);
+            if (!string.IsNullOrEmpty(bindTemperatureName))
+            {
+                msg = bindTemperatureName;
+            }
+            var btnTemperatureStatu = rowTemPerature.AddMostRightView(msg, 700);
+            rowTemPerature.ButtonClickEvent += (sender, e) =>
+            {
+                this.deviceObj.DeviceEpoint = 1;
+                var paneTargetsBaseFormp = new PaneTargetsBaseForm(this.deviceObj, bindAcDev, DeviceBind.BindInfo.BindType.Temperature);
+                Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
+                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+                paneTargetsBaseFormp.Show();
+                paneTargetsBaseFormp.actionTemperatureTarget += (bindName) =>
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (string.IsNullOrEmpty(bindName))
+                        {
+                            btnTemperatureStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
+                        }
+                        else
+                        {
+                            btnTemperatureStatu.Text = bindName;
+                        }
+                    });
+                };
+            };
+        }
+        #endregion
+
+        #region 鈻� 婀垮害鏉ユ簮_________________________ 
+        /// <summary>
+        ///  婀垮害鏉ユ簮琛�
+        /// </summary>
+        private void AddHumiditySourceRow()
+        {
+            //婀垮害
+            var rowHumidity = new FrameRowControl(listview.rowSpace / 2);
+            listview.AddChidren(rowHumidity);
+            rowHumidity.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.HumiditySource), 600);
+            //搴曠嚎
+            rowHumidity.AddBottomLine();
+            //鍙崇澶�
+            rowHumidity.AddRightArrow();
+            var msg = Language.StringByID(R.MyInternationalizationString.nothing);
+            if (!string.IsNullOrEmpty(bindHumidityName))
+            {
+                msg = bindHumidityName;
+            }
+            var btnHumidityStatu = rowHumidity.AddMostRightView(msg, 700);
+            rowHumidity.ButtonClickEvent += (sender, e) =>
+            {
+                this.deviceObj.DeviceEpoint = 2;
+                var paneTargetsBaseFormp = new PaneTargetsBaseForm(this.deviceObj, bindAcDev, DeviceBind.BindInfo.BindType.Humidity);
+                Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
+                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+                paneTargetsBaseFormp.Show();
+                paneTargetsBaseFormp.actionHumidityTarget += (bindName) =>
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (string.IsNullOrEmpty(bindName))
+                        {
+                            btnHumidityStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
+                        }
+                        else
+                        {
+                            btnHumidityStatu.Text = bindName;
+                        }
+                    });
+                };
+            };
+        }
+        #endregion
+
+        #region 鈻� 浜害璋冭妭_________________________ 
+        /// <summary>
+        ///  浜害璋冭妭琛�
+        /// </summary>
+        private void AddLevelRow()
+        {
+            //浜害璋冭妭
+            var rowLight = new FrameRowControl(listview.rowSpace / 2);
+            listview.AddChidren(rowLight);
+            rowLight.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uLightRegulation), 600);
+            //搴曠嚎
+            rowLight.AddBottomLine();
+            //鍙崇澶�
+            rowLight.AddRightArrow();
+            rowLight.ButtonClickEvent += (sender, e) =>
+            {
+                var form = new PanelBrightnessAdjustForm();
+                form.AddForm(this.deviceObj);
+            };
+        }
+        #endregion
+
+        #region 鈻� 鍙充笂瑙掕彍鍗昣________________________ 
+        /// <summary>
+        /// 鍒濆鍖栧彸涓婅鑿滃崟
+        /// </summary>
+        private void InitTopRightMenu()
+        {
+            //妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
+            if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(deviceObj) == false)
+            {
+                return;
+            }
+            var btnIcon = new MostRightIconControl(69, 69);
+            btnIcon.UnSelectedImagePath = "Item/More.png";
+            topFrameLayout.AddChidren(btnIcon);
+            btnIcon.InitControl();
+            btnIcon.ButtonClickEvent += ((sender, e) =>
+            {
+                //鏄剧ず鍙充笂瑙掕彍鍗曠晫闈�
+                this.ShowTopRightMenu();
+            });
+        }
+
+        /// <summary>
+        /// 鏄剧ず鍙充笂瑙掕彍鍗曠晫闈�
+        /// </summary>
+        private void ShowTopRightMenu()
+        {
+            var frame = new TopRightMenuControl(1, 1);
+            //瀹氫綅
+            string deviceMenu = Language.StringByID(R.MyInternationalizationString.uFixedPosition);
+            frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>
+            {
+                //鍙戦�佸畾浣嶅姛鑳�
+                Common.LocalDevice.Current.SetFixedPositionCommand(deviceObj);
+            });
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentTargetsForm.cs
deleted file mode 100755
index 1bd7846..0000000
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentTargetsForm.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-锘縰sing System;
-namespace Shared.Phone.UserCenter.DeviceBind
-{
-    public class PanelSimpleEnvironmentTargetsForm
-    {
-        public PanelSimpleEnvironmentTargetsForm()
-        {
-        }
-    }
-}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs
new file mode 100755
index 0000000..9ae205e
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs
@@ -0,0 +1,1554 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Shared.Common;
+using Shared.Phone.UserCenter.Device.Bind;
+using ZigBee.Device;
+using static ZigBee.Device.BindObj;
+namespace Shared.Phone.UserCenter.DeviceBind
+{
+    public class PanelSimpleMutilfunctionAddTargetsForm : BindCommonLayout
+    {
+        #region  鏋勯�犲嚱鏁�
+        /// <summary>
+        /// 鏋勯�犲嚱鏁�
+        /// </summary>
+        /// <param name="device"></param>
+        /// <param name="deviceBindType">0:鍦烘櫙  1:寮�鍏�  2:鎻掑骇  3:鐏厜  4:閬槼 5:绌鸿皟 6:鏂伴</param>
+        public PanelSimpleMutilfunctionAddTargetsForm(string deviceMac, int deviceBindType)
+        {
+            curControlDev = new Panel();
+            var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+            if (dev != null)
+            {
+                curControlDev.CurrentGateWayId = dev.CurrentGateWayId;
+            }
+            curControlDev.Type = DeviceType.OnOffSwitch;
+            curControlDev.DeviceAddr = deviceMac;
+            curBindType = deviceBindType;
+        }
+        #endregion
+
+        #region  鍙橀噺鐢虫槑 
+        /// <summary>
+        /// 鎺у埗璁惧
+        /// </summary>
+        Panel curControlDev;
+        /// <summary>
+        /// 褰撳墠琚粦璁惧
+        /// </summary>
+        CommonDevice curBindDevice;
+        /// <summary>
+        /// 鏄剧ず琚粦瀹氳澶囨垨鍦烘櫙鐨剉iew
+        /// </summary>
+        VerticalFrameRefreshControl midVerticalScrolViewLayout;
+        /// <summary>
+        /// 鏄剧ず鎴块棿鐨剉iew
+        /// </summary>
+        HorizontalScrolViewLayout btnHorizontalScrolViewLayout;
+        /// <summary>
+        /// 褰撳墠璁惧缁戝畾绫诲瀷 0:鍦烘櫙  1:寮�鍏�  2:鎻掑骇  3:鐏厜  4:閬槼 5:绌鸿皟 6:鏂伴
+        /// </summary>
+        int curBindType = 0;
+        /// <summary>
+        /// 鏈湴鎴块棿鍒楄〃
+        /// </summary>
+        List<Room> supportRoomList = new List<Room>();
+        /// <summary>
+        /// 淇濆瓨瀹屾垚鎸夐挳
+        /// </summary>
+        Button btnFinifh;
+        /// <summary>
+        /// 缁戝畾绫诲瀷鎻愮ず鏂囨湰
+        /// </summary>
+        Button btnTipText;
+        /// <summary>
+        /// 妤煎眰鏂囨湰
+        /// </summary>
+        Button btnFloorText;
+        /// <summary>
+        /// 妤煎眰鍒楄〃
+        /// </summary>
+        Dictionary<string, string> dicFloorList = new Dictionary<string, string>();
+        /// <summary>
+        /// 鎸夐敭閰嶇疆鐨勭洰鏍囧垪琛�
+        /// </summary>
+        List<CommonDevice> targetList = new List<CommonDevice>();
+        /// <summary>
+        /// 鎸夐敭閰嶇疆鐨勭洰鏍囧垪琛�
+        /// </summary>
+        List<SceneUI> targetScList = new List<SceneUI>();
+        /// <summary>
+        /// 鎵�鏈夋埧闂翠腑鏀寔琚粦瀹氱殑璁惧鍒楄〃
+        /// </summary>
+        List<CommonDevice> currentPanelSupportBindDeviceList = new List<CommonDevice>();
+        /// <summary>
+        /// 鎵�鏈夋埧闂翠腑鏀寔琚粦瀹氱殑鍦烘櫙鍒楄〃
+        /// </summary>
+        List<SceneUI> currentPanelSupportBindSceneList = new List<SceneUI>();
+        /// <summary>
+        /// 褰撳墠绫诲瀷鐨勭粦瀹氳〃
+        /// </summary>
+        List<BindListAllInfo> curBindTypeList = new List<BindListAllInfo>();
+        /// <summary>
+        /// 鏈垎閰嶇殑璁惧鍒楄〃
+        /// </summary>
+        List<CommonDevice> undistributeDevList = new List<CommonDevice>();
+        /// <summary>
+        /// 鏈垎閰嶇殑璁惧鍒楄〃
+        /// </summary>
+        List<SceneUI> undistributeScList = new List<SceneUI>();
+        /// <summary>
+        /// 褰撳墠鎴块棿涓敮鎸佽缁戝畾鐨勮澶囧垪琛�
+        /// </summary>
+        List<CommonDevice> currentRoomSupportBindDeviceList = new List<CommonDevice>();
+        /// <summary>
+        /// 褰撳墠鎴块棿涓敮鎸佽缁戝畾鐨勮澶囧垪琛�
+        /// </summary>
+        List<SceneUI> currentRoomSupportBindSceneList = new List<SceneUI>();
+        /// <summary>
+        /// 褰撳墠鏀寔鐨勭鐐圭粦瀹氳〃
+        /// </summary>
+        List<int> curSupportBindEpointList = new List<int>();
+        /// <summary>
+        /// 褰撳墠琚�夋嫨鐩爣鍗冲皢缁戝畾鐨勭鐐�
+        /// </summary>
+        List<int> curSendEpointList = new List<int>();
+        /// <summary>
+        /// 褰撳墠鏀寔鐨勮皟鍏変釜鏁癧瀛樿皟鍏夌伅鍏夌殑璁惧]
+        /// </summary>
+        List<int> curSupportDimmerEpointList = new List<int>();
+        /// <summary>
+        /// 褰撳墠鏀寔鐨勮皟鍏夊紑鍏充釜鏁癧瀛樼户鐢靛櫒鐨勫姛鑳界被鍨嬫槸鐏厜鐨勮澶嘳
+        /// </summary>
+        List<int> curSupportLightEpointList = new List<int>();
+        /// <summary>
+        /// 闈㈡澘涓瓨鍦ㄧ殑閿��
+        /// </summary>
+        List<String> panelBindListKey = null;
+        /// <summary>
+        /// 聽鍒锋柊缁戝畾琛ㄩ〉闈⒙犅�
+        /// </summary>
+        public Action actionRefreshBindList;
+        #endregion
+
+        #region UI璁捐
+        /// <summary>
+        /// 鐩爣椤垫樉绀�
+        /// </summary>
+        public void Show()
+        {
+            TitleUI();
+            MidFrameLayouUI();
+            InitData();
+        }
+
+        /// <summary>
+        /// 鏍囬鏍�
+        /// </summary>
+        void TitleUI()
+        {
+            string titleText = Language.StringByID(R.MyInternationalizationString.Bind);
+            switch (curBindType)
+            {
+                case 0:
+                    titleText += Language.StringByID(R.MyInternationalizationString.scene);
+                    break;
+                case 1:
+                    titleText += Language.StringByID(R.MyInternationalizationString.uDeviceBelongId13);
+                    break;
+                case 2:
+                    titleText += Language.StringByID(R.MyInternationalizationString.uDeviceBelongId14);
+                    break;
+                case 3:
+                    titleText += Language.StringByID(R.MyInternationalizationString.uDeviceBelongId15);
+                    break;
+                case 4:
+                    titleText += Language.StringByID(R.MyInternationalizationString.uDeviceBelongId200);
+                    break;
+                case 5:
+                    titleText += Language.StringByID(R.MyInternationalizationString.uDeviceBelongId3600);
+                    break;
+                case 6:
+                    titleText += Language.StringByID(R.MyInternationalizationString.uDeviceBelongId2310);
+                    break;
+            }
+            this.TopFrameLayout(this, titleText);
+            EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+            this.btnTitle.Width = Application.GetRealWidth(1080 - 161 - 300);
+            this.btnBack.MouseUpEventHandler += eHandlerBack;
+            this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
+            this.MidFrameLayout(this);
+        }
+
+        /// <summary>
+        /// 涓儴UI銆愭爣棰樻爮涓嬬殑UI銆�
+        /// </summary>
+        void MidFrameLayouUI()
+        {
+            var btnMidTopLayout = new FrameLayout
+            {
+                Height = Application.GetRealHeight(389 - 184),
+            };
+            this.midFrameLayout.AddChidren(btnMidTopLayout);
+
+            //鎴块棿鏍�
+            btnHorizontalScrolViewLayout = new HorizontalScrolViewLayout
+            {
+                X = Application.GetRealWidth(58),
+            };
+            btnMidTopLayout.AddChidren(btnHorizontalScrolViewLayout);
+
+            //璁惧鏍�
+            midVerticalScrolViewLayout = new VerticalFrameRefreshControl()
+            {
+                Y = btnMidTopLayout.Bottom,
+                Height = Application.GetRealHeight(1145),
+            };
+            this.midFrameLayout.AddChidren(midVerticalScrolViewLayout);
+            midVerticalScrolViewLayout.BeginHeaderRefreshingAction += () =>
+            {
+                midVerticalScrolViewLayout.BeginHeaderRefreshing();
+                InitData();
+            };
+
+            //搴曢儴淇濆瓨鏍�
+            var bottomFrameLayout = new FrameLayout()
+            {
+                Width = LayoutParams.MatchParent,
+                Height = Application.GetRealHeight(84 * 2 + 127),
+                Y = Application.GetRealHeight(1388),
+            };
+            this.midFrameLayout.AddChidren(bottomFrameLayout);
+
+            btnTipText = new Button()
+            {
+                Height = Application.GetRealHeight(84),
+                TextID = R.MyInternationalizationString.Tip,
+                TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+                TextSize = 12,
+                TextAlignment = TextAlignment.Center,
+            };
+            bottomFrameLayout.AddChidren(btnTipText);
+
+            btnFinifh = new Button()
+            {
+                Width = Application.GetRealWidth(907),
+                Height = Application.GetRealHeight(127),
+                Y = Application.GetRealHeight(49 + 35),
+                Gravity = Gravity.CenterHorizontal,
+                Radius = (uint)Application.GetRealHeight(127) / 2,
+                TextID = R.MyInternationalizationString.Save,
+                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack,
+                TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
+                IsBold = true,
+                TextSize = 16,
+            };
+            bottomFrameLayout.AddChidren(btnFinifh);
+            btnFinifh.MouseUpEventHandler += (sender, e) =>
+            {
+                curSendEpointList.Clear();
+                SaveTarget();
+            };
+        }
+
+        /// <summary>
+        /// 妤煎眰閫夋嫨鐨勪晶杈规爮
+        /// </summary>
+        void SideslipFramelayout()
+        {
+            var dialog = new Dialog
+            {
+            };
+            dialog.Show();
+
+            var flMain = new FrameLayout { BackgroundColor = 0x00000000 };
+            dialog.AddChidren(flMain);
+            flMain.MouseUpEventHandler += (sender11, e11) =>
+            {
+                dialog.Close();
+            };
+
+            var sidelipFrameLayout = new FrameLayout()
+            {
+                Width = Application.GetMinReal(449),
+                Y = Application.GetRealHeight(161),
+                X = Application.GetRealWidth(596),
+                BackgroundImagePath = "DoorLock/SideslipPic.png",
+            };
+            flMain.AddChidren(sidelipFrameLayout);
+
+            var btnSelectFloor = new Button()
+            {
+                Width = Application.GetRealWidth(200),
+                Height = Application.GetRealHeight(58),
+                X = Application.GetRealWidth(81),
+                Y = Application.GetRealHeight(81),
+                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
+                TextSize = 14,
+                IsBold = true,
+                TextAlignment = TextAlignment.CenterLeft,
+                TextID = R.MyInternationalizationString.SelectFloor,
+            };
+            sidelipFrameLayout.AddChidren(btnSelectFloor);
+
+            var sidelipVerticalScrolViewLayout = new VerticalScrolViewLayout()
+            {
+                Y = btnSelectFloor.Bottom + Application.GetRealHeight(45),
+                Height = Application.GetRealHeight(600),
+            };
+            sidelipFrameLayout.AddChidren(sidelipVerticalScrolViewLayout);
+
+            Button oldbutton = null;
+            Button oldbuttonText = null;
+            int count = 0;
+            foreach (var floorId in dicFloorList.Keys)
+            {
+                var rowFrameLayout = new RowLayout()
+                {
+                    Height = Application.GetRealHeight(152),
+                    LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+                    X = Application.GetRealWidth(81),
+                };
+                sidelipVerticalScrolViewLayout.AddChidren(rowFrameLayout);
+
+                var btnAllMethod = new Button()
+                {
+                    Width = Application.GetMinReal(81),
+                    Height = Application.GetMinReal(81),
+                    UnSelectedImagePath = "Floor/Floor.png",
+                    SelectedImagePath = "Floor/FloorSelected.png",
+                    Gravity = Gravity.CenterVertical,
+                };
+                rowFrameLayout.AddChidren(btnAllMethod);
+
+                var btnMethodText = new Button()
+                {
+                    Width = Application.GetRealWidth(311),
+                    Height = Application.GetRealHeight(58),
+                    X = Application.GetRealWidth(92),
+                    Gravity = Gravity.CenterVertical,
+                    TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+                    TextSize = 14,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    Text = dicFloorList[floorId],
+                };
+                rowFrameLayout.AddChidren(btnMethodText);
+
+                if (curControlDev.currentSelectFloorId == floorId)
+                {
+                    btnAllMethod.IsSelected = true;
+                    btnAllMethod.IsBold = true;
+                    btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                }
+
+                string curFloorId = floorId;
+                EventHandler<MouseEventArgs> hander = (sender, e) =>
+                {
+                    if (curControlDev.currentSelectFloorId == curFloorId)
+                    {
+                        return;
+                    }
+                    curControlDev.currentSelectFloorId = curFloorId;
+
+
+
+                    if (!btnMethodText.IsSelected)
+                    {
+                        if (oldbutton != null)
+                        {
+                            oldbutton.IsSelected = false;
+                        }
+                        if (oldbuttonText != null)
+                        {
+                            oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
+                        }
+                        oldbutton = btnMethodText;
+                        oldbuttonText = btnMethodText;
+                        btnMethodText.IsSelected = true;
+                        oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                        oldbuttonText.IsBold = true;
+                    }
+
+                    int index = 0;
+                    RefreshRoomList();
+                    dialog.Close();
+                };
+                btnAllMethod.MouseUpEventHandler += hander;
+                rowFrameLayout.MouseUpEventHandler += hander;
+                btnMethodText.MouseUpEventHandler += hander;
+                count++;
+            }
+
+            if (count == 0)
+            {
+                sidelipFrameLayout.Height = 0;
+            }
+            else if (count <= 4 && count > 0)
+            {
+                sidelipFrameLayout.Height = Application.GetRealHeight(180) + count * Application.GetRealHeight(150);
+            }
+            else
+            {
+                sidelipFrameLayout.Height = Application.GetMinReal(780);
+            }
+        }
+
+        /// <summary>
+        /// 闈㈡澘缁戝畾鐩爣琛ㄦ樉绀�
+        /// </summary>
+        /// <param name="gateway">Gateway.</param>
+        /// <param name="key">Key.</param>
+        void RefreshRoomList()
+        {
+            Room curRoom = null;
+            if (supportRoomList.Count == 0)
+            {
+                return;
+            }
+            btnHorizontalScrolViewLayout.RemoveAll();
+            Button curentOldRoom = null;
+            FrameLayout curentOldRoomFrameLayout = null;
+            int index = 0;
+            curBindTypeList = MutilfunctionPanelMethod.GetMatchBindList(curBindType);
+            var roomTempList = MutilfunctionPanelMethod.GetSupportRoomList(curControlDev, supportRoomList, curBindTypeList, curBindType);
+            Room slectedRoom = null;
+            var roomUn = new Room();
+            roomUn.Name = Language.StringByID(R.MyInternationalizationString.Undistributed);
+            roomUn.Id = "UndistributedId";
+            if (curBindType == 0)
+            {
+                if (undistributeScList != null && undistributeScList.Count != 0)
+                {
+                    roomTempList.Add(roomUn);
+                }
+            }
+            else
+            {
+                if (undistributeDevList.Count != 0)
+                {
+                    roomTempList.Add(roomUn);
+                }
+            }
+
+            for (int i = 0; i < roomTempList.Count; i++)
+            {
+                var room = roomTempList[i];
+                bool canSelect = false;
+                if (curControlDev.currentSelectRoomId == room.Id)
+                {
+                    slectedRoom = room;
+                    canSelect = true;
+                }
+                //鎴块棿
+                var btnRoomFrameLayout = new FrameLayout
+                {
+                    Height = Application.GetMinReal(159),
+                    Width = Application.GetMinReal(255),
+                    Y = Application.GetRealHeight(23),
+                    X = Application.GetRealWidth(5),
+                    BackgroundImagePath = "Item/RoomIconBackground.png",
+                    BorderWidth = 1,
+                };
+                btnHorizontalScrolViewLayout.AddChidren(btnRoomFrameLayout);
+
+                var btnRoom = new Button
+                {
+                    Height = Application.GetRealHeight(66),
+                    Width = Application.GetRealWidth(250),
+                    Y = Application.GetRealHeight(58),
+                    X = Application.GetRealWidth(14),
+                    Text = room.Name,
+                    TextSize = 12,
+                    TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+                    Gravity = Gravity.Center,
+                };
+                btnRoomFrameLayout.AddChidren(btnRoom);
+
+                btnRoom.IsSelected = false;
+                if (canSelect)
+                {
+                    btnRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
+                    btnRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
+                    curentOldRoom = btnRoom;
+                    curentOldRoomFrameLayout = btnRoomFrameLayout;
+                }
+
+                //琚粦瀹氱殑鐩爣杩樻湭鍒嗛厤鍖哄煙锛岄粯璁ゆ槸鏈�鍚庝竴涓紝鏈垎閰嶆埧闂�
+                if (string.IsNullOrEmpty(curControlDev.currentSelectRoomId))
+                {
+                    if (index == roomTempList.Count - 1)
+                    {
+                        btnRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
+                        btnRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
+                        curentOldRoom = btnRoom;
+                        curentOldRoomFrameLayout = btnRoomFrameLayout;
+                    }
+                }
+
+                if (index == roomTempList.Count - 1 && index > 3)
+                {
+                    var btnRoomFrameLayoutEmpty = new FrameLayout
+                    {
+                        Height = Application.GetMinReal(159),
+                        Width = Application.GetMinReal(50),
+                        Y = Application.GetRealHeight(23),
+                        X = Application.GetRealWidth(5),
+                        //BorderWidth = 1,
+                    };
+                    btnHorizontalScrolViewLayout.AddChidren(btnRoomFrameLayoutEmpty);
+                }
+
+                EventHandler<MouseEventArgs> eHandlerRoom = (sender, e) =>
+                {
+                    if (!btnRoom.IsSelected)
+                    {
+                        if (curentOldRoom != null)
+                        {
+                            curentOldRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
+                        }
+                        curentOldRoom = btnRoom;
+                        curentOldRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
+                    }
+
+                    if (btnRoomFrameLayout.BorderWidth == 1)
+                    {
+                        if (curentOldRoomFrameLayout != null)
+                        {
+                            curentOldRoomFrameLayout.BorderWidth = 1;
+                            curentOldRoomFrameLayout.BorderColor = Shared.Common.ZigbeeColor.Current.XMOrange;
+                            curentOldRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackground.png";
+                        }
+                        curentOldRoomFrameLayout = btnRoomFrameLayout;
+                        curentOldRoomFrameLayout.BorderWidth = 0;
+                        curentOldRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
+                    }
+                    curRoom = room;
+
+                    //鏂伴闈㈡澘淇濆瓨浣胯兘
+                    btnFinifh.Enable = true;
+                    btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                    if (curBindType == 0)
+                    {
+                        RefreshSceneList(curRoom);
+                    }
+                    else
+                    {
+                        RefreshDeviceList(curRoom);
+                    }
+                };
+                btnRoom.MouseUpEventHandler += eHandlerRoom;
+                btnRoomFrameLayout.MouseUpEventHandler += eHandlerRoom;
+                index++;
+            }
+            BindInfo.FinishDisplay(roomTempList, btnFinifh);
+
+            if (roomTempList.Count == 0)
+            {
+                curRoom = new Shared.Common.Room();
+            }
+            else
+            {
+                if (slectedRoom == null)
+                {
+                    //鏈�変腑榛樿鏈�鍚庝竴涓�滄湭鍒嗛厤閫変腑鈥�
+                    curRoom = roomTempList[index - 1];
+                    var view = btnHorizontalScrolViewLayout.GetChildren(index - 1);
+                    var frame = (FrameLayout)view;
+                    var btn = (Button)frame.GetChildren(0);
+                    frame.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
+                    btn.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
+                }
+                else
+                {
+                    curRoom = slectedRoom;
+                }
+            }
+
+            if (curBindType == 0)
+            {
+                RefreshSceneList(curRoom);
+            }
+            else
+            {
+                RefreshDeviceList(curRoom);
+            }
+
+            switch (curBindType)
+            {
+                case 1:
+                    btnTipText.Text = MutilfunctionPanelMethod.MatchTypeBindTextTip(curBindType, MutilfunctionPanelMethod.curSwitchCount + MutilfunctionPanelMethod.curSocketCount + MutilfunctionPanelMethod.curLightFromRelayCount);
+                    break;
+                case 2:
+                    btnTipText.Text = MutilfunctionPanelMethod.MatchTypeBindTextTip(curBindType, MutilfunctionPanelMethod.curSwitchCount + MutilfunctionPanelMethod.curSocketCount + MutilfunctionPanelMethod.curLightFromRelayCount);
+                    break;
+                case 3:
+                    btnTipText.Text = MutilfunctionPanelMethod.MatchTypeBindTextTip(curBindType, MutilfunctionPanelMethod.curSwitchCount + MutilfunctionPanelMethod.curSocketCount + MutilfunctionPanelMethod.curLightFromRelayCount + MutilfunctionPanelMethod.curLightCount);
+                    break;
+                default:
+                    btnTipText.Text = MutilfunctionPanelMethod.MatchTypeBindTextTip(curBindType, curBindTypeList.Count);
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// 鎸夐敭缁戠洰鏍囪〃鏄剧ず
+        /// </summary>
+        /// <param name="curRoom"></param>
+        void RefreshDeviceList(Room curRoom)
+        {
+            midVerticalScrolViewLayout.RemoveAll();
+            Button oldDevice = null;
+            int curIndex = 0;
+
+            if (curRoom.Id == "UndistributedId")
+            {
+                currentRoomSupportBindDeviceList = MutilfunctionPanelMethod.GetUndistributeDeviceList(undistributeDevList, curBindTypeList, curBindType);
+            }
+            else
+            {
+                currentRoomSupportBindDeviceList = MutilfunctionPanelMethod.GetCurRoomSupportDeviceList(curRoom, currentRoomSupportBindDeviceList, curBindTypeList, curBindType);
+            }
+
+            if (currentRoomSupportBindDeviceList.Count == 0)
+            {
+                btnFinifh.Enable = false;
+                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+                return;
+            }
+            foreach (var device in currentRoomSupportBindDeviceList)
+            {
+                #region 缁戝畾琛║I鏄撅紙鏃犳暟鎹鐞嗭級
+                var rowLayout = new FrameLayout()
+                {
+                    Height = Application.GetRealHeight(23 + 127),
+                    BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
+                };
+                midVerticalScrolViewLayout.AddChidren(rowLayout);
+
+                var devicePic = new Button()
+                {
+                    X = Application.GetMinRealAverage(58),
+                    Y = Application.GetMinRealAverage(46),
+                    Width = Application.GetMinRealAverage(81),
+                    Height = Application.GetMinRealAverage(81),
+                    UnSelectedImagePath = device.IconPath,
+                };
+                rowLayout.AddChidren(devicePic);
+
+                var btnBindName = new Button()
+                {
+                    Width = Application.GetRealWidth(790),
+                    X = devicePic.Right + Application.GetRealWidth(20),
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextSize = 15,
+                    Text = Common.LocalDevice.Current.GetDeviceEpointName(device),
+                };
+                rowLayout.AddChidren(btnBindName);
+
+                var btnChoose = new Button()
+                {
+                    Width = Application.GetMinReal(60),
+                    Height = Application.GetMinReal(60),
+                    X = Application.GetRealWidth(861 + 81),
+                    Y = Application.GetRealHeight(35),
+                    SelectedImagePath = "DoorLock/SelectedIcon.png",
+                    Visible = false,
+                };
+                rowLayout.AddChidren(btnChoose);
+
+                var line2 = new Button()
+                {
+                    Y = rowLayout.Height - 1,
+                    X = devicePic.Right + Application.GetRealWidth(20),
+                    Width = Application.GetRealWidth(965 - 116),
+                    Height = 1,
+                    BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+                };
+                rowLayout.AddChidren(line2);
+
+                if (curIndex == currentRoomSupportBindDeviceList.Count - 1)
+                {
+                    line2.Visible = false;
+                }
+                if (Common.LocalDevice.Current.CheckDeviceIsOnline(device) == true)
+                {
+                    btnBindName.TextColor = Shared.Common.ZigbeeColor.Current.TextBlack;
+                }
+                else
+                {
+                    btnBindName.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
+                }
+                switch (curBindType)
+                {
+                    case 1:
+                        devicePic.UnSelectedImagePath = "BindPic/Switch.png";
+                        break;
+                    case 2:
+                        devicePic.UnSelectedImagePath = "Device/Socket1.png";
+                        break;
+                    case 3:
+                        if (device.Type == DeviceType.DimmableLight)
+                        {
+                            devicePic.UnSelectedImagePath = "Device/Light.png";
+                        }
+                        if (device.Type == DeviceType.OnOffOutput)
+                        {
+                            devicePic.UnSelectedImagePath = "Device/RelayEpoint.png";
+                        }
+                        break;
+                    case 4:
+                        devicePic.UnSelectedImagePath = "Device/AirQualitySensorEpoint.png";
+                        if (device.Type == DeviceType.WindowCoveringDevice)
+                        {
+                            var tempDev = device as Rollershade;
+                            if (tempDev.WcdType == 4)
+                            {
+                                devicePic.UnSelectedImagePath = "BindPic/Curtain.png";
+                            }
+                            else
+                            {
+                                devicePic.UnSelectedImagePath = "BindPic/Roller.png";
+                            }
+                        }
+                        break;
+                    case 5:
+                        devicePic.UnSelectedImagePath = "Device/AirConditionerEpoint.png";
+                        break;
+                    case 6:
+                        devicePic.UnSelectedImagePath = "Device/FreshAirEpoint.png";
+                        break;
+                }
+                #endregion
+
+                string mianKey = device.DeviceAddr + device.DeviceEpoint;
+                if (targetList.Count != 0)
+                {
+                    foreach (var bindedDev in targetList)
+                    {
+                        if (bindedDev.DeviceAddr + bindedDev.DeviceEpoint == mianKey)
+                        {
+                            btnChoose.IsSelected = true;
+                            btnChoose.Visible = true;
+                            oldDevice = btnChoose;
+                        }
+                    }
+                }
+
+                EventHandler<MouseEventArgs> hander = (sender, e) =>
+                {
+                    btnChoose.IsSelected = !btnChoose.IsSelected;
+                    if (curBindType != 6)
+                    {
+                        if (curSupportBindEpointList.Count == 0)
+                        {
+                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFull), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+                            return;
+                        }
+                        if (curBindType == 3)
+                        {
+                            if (device.Type == DeviceType.DimmableLight)
+                            {
+                                if (curSupportDimmerEpointList.Count == 0)
+                                {
+                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CanSelectRelay), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+                                    return;
+                                }
+                            }
+                            if (device.Type == DeviceType.OnOffOutput)
+                            {
+                                if (curSupportLightEpointList.Count == 0)
+                                {
+                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CanSelectDimmer), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+                                    return;
+                                }
+                            }
+                        }
+                        if (!btnChoose.IsSelected)
+                        {
+                            targetList.Remove(device);
+                            btnChoose.IsSelected = false;
+                            btnChoose.Visible = false;
+                        }
+                        else
+                        {
+                            if (targetList.Count >= curSupportBindEpointList.Count)
+                            {
+                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFull), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+                            }
+                            else
+                            {
+                                if (curBindType == 3)
+                                {
+                                    //涓存椂璁板綍鐏厜绫诲瀷涓皟鍏変釜鏁板拰寮�鍏充釜鏁�
+                                    var tList1 = new List<CommonDevice> { };
+                                    var tList2 = new List<CommonDevice> { };
+                                    foreach (var tD in targetList)
+                                    {
+                                        if (tD.Type == DeviceType.DimmableLight)
+                                        {
+                                            tList1.Add(tD);
+                                        }
+                                        if (tD.Type == DeviceType.OnOffOutput)
+                                        {
+                                            tList2.Add(tD);
+                                        }
+                                    }
+                                    if (device.Type == DeviceType.DimmableLight)
+                                    {
+                                        if (tList1.Count >= curSupportDimmerEpointList.Count)
+                                        {
+                                            new Tip() { MaxWidth = 310, Text = Language.StringByID(R.MyInternationalizationString.CanSelectRelay), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(Common.CommonPage.Instance);
+                                            return;
+                                        }
+                                    }
+                                    if (device.Type == DeviceType.OnOffOutput)
+                                    {
+                                        if (tList2.Count >= curSupportLightEpointList.Count)
+                                        {
+                                            new Tip() { MaxWidth = 310, Text = Language.StringByID(R.MyInternationalizationString.CanSelectDimmer), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(Common.CommonPage.Instance);
+                                            return;
+                                        }
+                                    }
+                                }
+
+                                targetList.Add(device);
+                                btnChoose.IsSelected = true;
+                                btnChoose.Visible = true;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        if (curSupportBindEpointList.Count == 0)
+                        {
+                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFull), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+                            return;
+                        }
+                        if (!btnChoose.IsSelected)
+                        {
+                            if (oldDevice != null)
+                            {
+                                oldDevice.IsSelected = false;
+                                oldDevice.Visible = false;
+                            }
+                            oldDevice = btnChoose;
+                            oldDevice.IsSelected = false;
+                            oldDevice.Visible = false;
+                            targetList.Clear();
+                        }
+                        else
+                        {
+                            if (oldDevice != null)
+                            {
+                                oldDevice.IsSelected = false;
+                                oldDevice.Visible = false;
+                            }
+                            oldDevice = btnChoose;
+                            oldDevice.IsSelected = true;
+                            oldDevice.Visible = true;
+                            targetList.Clear();
+                            targetList.Add(device);
+                        }
+                    }
+                    if (targetList.Count == 0)
+                    {
+                        btnFinifh.Enable = false;
+                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+                    }
+                    else
+                    {
+                        btnFinifh.Enable = true;
+                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                    }
+                };
+                rowLayout.MouseUpEventHandler += hander;
+                devicePic.MouseUpEventHandler += hander;
+                btnBindName.MouseUpEventHandler += hander;
+                btnChoose.MouseUpEventHandler += hander;
+                curIndex++;
+            }
+        }
+
+        /// <summary>
+        /// 鎸夐敭缁戠洰鏍囪〃鏄剧ず
+        /// </summary>
+        /// <param name="curRoom"></param>
+        void RefreshSceneList(Room curRoom)
+        {
+            midVerticalScrolViewLayout.RemoveAll();
+            Button oldScene = null;
+            int curIndex = 0;
+
+            if (curRoom.Id == "UndistributedId")
+            {
+                currentRoomSupportBindSceneList = HdlSceneLogic.Current.GetUnalloctedScenes();
+            }
+            else
+            {
+                currentRoomSupportBindSceneList = MutilfunctionPanelMethod.GetCurRoomSupportSceneList(curRoom, currentRoomSupportBindSceneList, curBindTypeList);
+            }
+
+            if (currentRoomSupportBindSceneList.Count == 0)
+            {
+                btnFinifh.Enable = false;
+                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+                return;
+            }
+            foreach (var scene in currentRoomSupportBindSceneList)
+            {
+                #region 缁戝畾琛║I鏄撅紙鏃犳暟鎹鐞嗭級
+                var rowLayout = new FrameLayout()
+                {
+                    Height = Application.GetRealHeight(23 + 127),
+                    BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
+                };
+                midVerticalScrolViewLayout.AddChidren(rowLayout);
+
+                var devicePic = new Button()
+                {
+                    X = Application.GetMinRealAverage(58),
+                    Y = Application.GetMinRealAverage(46),
+                    Width = Application.GetMinRealAverage(81),
+                    Height = Application.GetMinRealAverage(81),
+                    UnSelectedImagePath = "Scene/SceneIcon.png",
+                };
+                rowLayout.AddChidren(devicePic);
+
+                var btnBindName = new Button()
+                {
+                    Width = Application.GetRealWidth(790),
+                    X = devicePic.Right + Application.GetRealWidth(20),
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextSize = 15,
+                    TextColor = Shared.Common.ZigbeeColor.Current.TextBlack,
+                    Text = scene.Name,
+                };
+                rowLayout.AddChidren(btnBindName);
+
+                var btnChoose = new Button()
+                {
+                    Width = Application.GetMinReal(60),
+                    Height = Application.GetMinReal(60),
+                    X = Application.GetRealWidth(861 + 81),
+                    Y = Application.GetRealHeight(35),
+                    SelectedImagePath = "DoorLock/SelectedIcon.png",
+                    Visible = false,
+                };
+                rowLayout.AddChidren(btnChoose);
+
+                var line2 = new Button()
+                {
+                    Y = rowLayout.Height - 1,
+                    X = devicePic.Right + Application.GetRealWidth(20),
+                    Width = Application.GetRealWidth(965 - 116),
+                    Height = 1,
+                    BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+                };
+                rowLayout.AddChidren(line2);
+
+                if (curIndex == currentRoomSupportBindDeviceList.Count - 1)
+                {
+                    line2.Visible = false;
+                }
+                #endregion
+
+                if (targetScList.Count != 0)
+                {
+                    foreach (var bindedDev in targetScList)
+                    {
+                        if (bindedDev.Id == scene.Id)
+                        {
+                            btnChoose.IsSelected = true;
+                            btnChoose.Visible = true;
+                            oldScene = btnChoose;
+                        }
+                    }
+                }
+
+                EventHandler<MouseEventArgs> hander = (sender, e) =>
+                {
+                    if (curSupportBindEpointList.Count == 0 || curSupportBindEpointList.Count == targetScList.Count)
+                    {
+                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFull), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+                        return;
+                    }
+
+                    btnChoose.IsSelected = !btnChoose.IsSelected;
+                    if (!btnChoose.IsSelected)
+                    {
+                        targetScList.Remove(scene);
+                        btnChoose.IsSelected = false;
+                        btnChoose.Visible = false;
+                    }
+                    else
+                    {
+                        if (targetScList.Count >= curSupportBindEpointList.Count)
+                        {
+                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFull), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+                        }
+                        else
+                        {
+                            targetScList.Add(scene);
+                            btnChoose.IsSelected = true;
+                            btnChoose.Visible = true;
+                        }
+                    }
+
+                    if (targetScList.Count == 0)
+                    {
+                        btnFinifh.Enable = false;
+                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+                    }
+                    else
+                    {
+                        btnFinifh.Enable = true;
+                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                    }
+                };
+                rowLayout.MouseUpEventHandler += hander;
+                devicePic.MouseUpEventHandler += hander;
+                btnBindName.MouseUpEventHandler += hander;
+                btnChoose.MouseUpEventHandler += hander;
+                curIndex++;
+            }
+        }
+        #endregion
+
+        #region 鏁版嵁澶勭悊 
+        /// <summary>
+        /// 鍒濆鍖栬澶囨暟鎹�
+        /// </summary>
+        void InitData()
+        {
+            System.Threading.Tasks.Task.Run(async () =>
+            {
+                try
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        CommonPage.Loading.Start("");
+                    });
+
+                    //鑾峰彇妤煎眰
+                    dicFloorList = HdlRoomLogic.Current.GetFloorSortList();
+                    curControlDev.currentSelectFloorId = BindInfo.GetCurrentSelectFloorId();
+
+                    //鑾峰彇妤煎眰涓埧闂村垪琛�
+                    supportRoomList = BindInfo.GetFloorRoomList();
+
+                    if (curBindType == 0)
+                    {
+                        currentPanelSupportBindSceneList = MutilfunctionPanelMethod.GetAllRoomSupportSceneList(currentPanelSupportBindSceneList, supportRoomList, curBindTypeList);
+                        // 鑾峰彇鏈湴鏈垎閰嶇殑鏀寔褰撳墠绫诲瀷鐨勭粦瀹氬満鏅垪琛�
+                        undistributeScList = HdlSceneLogic.Current.GetUnalloctedScenes();
+                    }
+                    else
+                    {
+                        //鑾峰彇鎵�鏈夋埧闂翠腑鍖归厤鐨勮兘缁戠殑鐩�
+                        currentPanelSupportBindDeviceList = MutilfunctionPanelMethod.GetAllRoomSupportDeviceList(currentPanelSupportBindDeviceList, supportRoomList, curBindTypeList, curBindType);
+                        //鑾峰彇鏈湴鏈垎閰嶇殑鏀寔褰撳墠绫诲瀷鐨勭粦瀹氳澶囧垪琛�
+                        undistributeDevList = MutilfunctionPanelMethod.GetUndistributeDeviceList(undistributeDevList, curBindTypeList, curBindType);
+                    }
+                    //鑾峰彇褰撳墠鏀寔鐨勭鐐圭粦瀹氳〃
+                    curSupportBindEpointList = MutilfunctionPanelMethod.GetMatchEpointList(curBindType);
+                    if (curBindType == 3)
+                    {
+                        foreach (var ep in curSupportBindEpointList)
+                        {
+                            if (ep >= 22 && ep <= 28)
+                            {
+                                curSupportDimmerEpointList.Add(ep);
+                            }
+                            if (ep >= 52 && ep <= 61)
+                            {
+                                curSupportLightEpointList.Add(ep);
+                            }
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    var mess = ex.Message;
+                }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        BindDownFrameLayout(this.midFrameLayout, curControlDev, dicFloorList, ref btnFloorText);
+                        ChooseFloorAction += (floorId, btnMethodText) =>
+                        {
+                            btnFloorText.Text = dicFloorList[floorId];
+
+                            //鑾峰彇妤煎眰涓埧闂村垪琛�
+                            supportRoomList.Clear();
+                            supportRoomList = BindInfo.GetFloorRoomList();
+                            if (curBindType == 0)
+                            {
+                                // 鑾峰彇鏈湴鏈垎閰嶇殑鏀寔褰撳墠绫诲瀷鐨勭粦瀹氬満鏅垪琛�
+                                undistributeScList = HdlSceneLogic.Current.GetUnalloctedScenes();
+                            }
+                            else
+                            {
+                                //鑾峰彇鏈湴鏈垎閰嶇殑鏀寔褰撳墠绫诲瀷鐨勭粦瀹氳澶囧垪琛�
+                                undistributeDevList = MutilfunctionPanelMethod.GetUndistributeDeviceList(undistributeDevList, curBindTypeList, curBindType);
+                            }
+                            RefreshRoomList();
+                        };
+
+                        btnFloorText.Text = BindInfo.GetCurrentSelectFloorIdName();
+                        //鑾峰彇妤煎眰涓埧闂村垪琛�
+                        if (supportRoomList.Count != 0)
+                        {
+                            RefreshRoomList();
+                        }
+
+                        CommonPage.Loading.Hide();
+                        midVerticalScrolViewLayout.EndHeaderRefreshing();
+                    });
+                }
+            });
+        }
+
+        /// <summary>
+        /// 淇濆瓨鐩爣
+        /// </summary>
+        /// <param name="curControlDev"></param>
+        void SaveTarget()
+        {
+            btnFinifh.Enable = false;
+            btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+            System.Threading.Tasks.Task.Run(() =>
+            {
+                try
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        CommonPage.Loading.Start("");
+                    });
+                    int tempBindCluster = -1;
+                    int targetSendCount = 0;
+                    int targetRecCount = 0;
+                    if (curBindType == 0)
+                    {
+                        targetSendCount = targetScList.Count;
+                        if (targetScList.Count == 0)
+                        {
+                            //娌℃湁鐩爣鎻愮ず
+                            Application.RunOnMainThread(() =>
+                            {
+                                var myTip = new Tip();
+                                myTip.Direction = AMPopTipDirection.None;
+                                myTip.CloseTime = 2;
+                                myTip.Text = Language.StringByID(R.MyInternationalizationString.BindDeviceTargetIsEmpty);
+                                myTip.Show(Common.CommonPage.Instance);
+                                btnFinifh.Enable = true;
+                                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                                CommonPage.Loading.Hide();
+                            });
+                            return;
+                        }
+                        for (int i = 0; i < targetScList.Count; i++)
+                        {
+                            //缁戝畾鏂扮殑鏁版嵁
+                            var addBindeDev = new AddBindData();
+                            addBindeDev.DeviceAddr = curControlDev.DeviceAddr;
+                            for (int j = 0; j < curSupportBindEpointList.Count; j++)
+                            {
+                                curSendEpointList.Add(curSupportBindEpointList[0]);
+                                addBindeDev.Epoint = curControlDev.DeviceEpoint = curSupportBindEpointList[0];
+                                break;
+                            }
+                            var de = targetScList[i];
+                            var addBindInfo = new AddBindListObj();
+                            addBindInfo.BindType = 1;
+                            addBindInfo.BindCluster = 6;
+                            addBindInfo.BindScenesId = de.Id;
+                            addBindeDev.BindList.Add(addBindInfo);
+
+                            var resT = AddDeviceBind(addBindeDev, targetSendCount, ref targetRecCount);
+                            if (!resT)
+                            {
+                                break;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        targetSendCount = targetList.Count;
+                        if (targetList.Count == 0)
+                        {
+                            //娌℃湁鐩爣鎻愮ず
+                            Application.RunOnMainThread(() =>
+                            {
+                                var myTip = new Tip();
+                                myTip.Direction = AMPopTipDirection.None;
+                                myTip.CloseTime = 2;
+                                myTip.Text = Language.StringByID(R.MyInternationalizationString.BindDeviceTargetIsEmpty);
+                                myTip.Show(Common.CommonPage.Instance);
+                                btnFinifh.Enable = true;
+                                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                                CommonPage.Loading.Hide();
+                            });
+                            return;
+                        }
+                        foreach (var de in targetList)
+                        {
+                            //缁戝畾鏂扮殑鏁版嵁
+                            var addBindeDev = new AddBindData();
+                            addBindeDev.DeviceAddr = curControlDev.DeviceAddr;
+
+                            if (curBindType == 3)
+                            {
+                                if (de.Type == DeviceType.DimmableLight)
+                                {
+                                    for (int j = 0; j < curSupportDimmerEpointList.Count; j++)
+                                    {
+                                        curSendEpointList.Add(curSupportDimmerEpointList[0]);
+                                        addBindeDev.Epoint = curControlDev.DeviceEpoint = curSupportDimmerEpointList[0];
+                                        break;
+                                    }
+                                }
+
+                                if (de.Type == DeviceType.OnOffOutput)
+                                {
+                                    for (int j = 0; j < curSupportLightEpointList.Count; j++)
+                                    {
+                                        curSendEpointList.Add(curSupportLightEpointList[0]);
+                                        addBindeDev.Epoint = curControlDev.DeviceEpoint = curSupportLightEpointList[0];
+                                        break;
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                for (int j = 0; j < curSupportBindEpointList.Count; j++)
+                                {
+                                    curSendEpointList.Add(curSupportBindEpointList[0]);
+                                    addBindeDev.Epoint = curControlDev.DeviceEpoint = curSupportBindEpointList[0];
+                                    break;
+                                }
+                            }
+
+                            var addBindInfo = new AddBindListObj();
+                            addBindInfo.BindType = 0;
+                            addBindInfo.BindMacAddr = de.DeviceAddr;
+                            addBindInfo.BindEpoint = de.DeviceEpoint;
+                            switch (curBindType)
+                            {
+                                case 0:
+                                    addBindInfo.BindCluster = 6;
+                                    break;
+                                case 1:
+                                    addBindInfo.BindCluster = 6;
+                                    break;
+                                case 2:
+                                    addBindInfo.BindCluster = 6;
+                                    break;
+                                case 3:
+                                    addBindInfo.BindCluster = 6;
+                                    break;
+                                case 4:
+                                    addBindInfo.BindCluster = 258;
+                                    break;
+                                case 5:
+                                    addBindInfo.BindCluster = 513;
+                                    break;
+                                case 6:
+                                    addBindInfo.BindCluster = 514;
+                                    break;
+                            }
+                            addBindeDev.BindList.Add(addBindInfo);
+
+                            //閮ㄥ垎鐩爣闇�瑕佷簩娆$粦瀹氱浜岀鍔熻兘
+                            var addBindInfo2 = new AddBindListObj();
+                            addBindInfo2.BindType = 0;
+                            addBindInfo2.BindMacAddr = de.DeviceAddr;
+                            addBindInfo2.BindEpoint = de.DeviceEpoint;
+                            switch (curBindType)
+                            {
+                                case 3:
+                                    var device = LocalDevice.Current.GetDevice(de.DeviceAddr, de.DeviceEpoint);
+                                    if (device != null)
+                                    {
+                                        if (device.Type == DeviceType.DimmableLight)
+                                        {
+                                            //鐏厜涓鸿皟鍏夋椂闇�瑕佺粦瀹�6锛�8
+                                            addBindInfo2.BindCluster = 8;
+                                            addBindeDev.BindList.Add(addBindInfo2);
+                                        }
+                                    }
+                                    break;
+                                case 5:
+                                    //瑕佺粦瀹氱┖璋冿細闇�瑕佺粦瀹�513锛�514
+                                    addBindInfo2.BindCluster = 514;
+                                    addBindeDev.BindList.Add(addBindInfo2);
+                                    break;
+                            }
+
+                            var resT = AddDeviceBind(addBindeDev, targetSendCount, ref targetRecCount);
+                            if (!resT)
+                            {
+                                break;
+                            }
+                        }
+                    }
+                }
+                catch
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        btnFinifh.Enable = true;
+                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                        CommonPage.Loading.Hide();
+                    });
+                }
+
+            });
+        }
+
+        /// <summary>
+        /// AddDeviceBind
+        /// </summary>
+        /// <param name="addBindeDev"></param>
+        /// <param name="targetSendCount"></param>
+        /// <param name="targetRecCount"></param>
+        /// <returns></returns>
+        private bool AddDeviceBind(AddBindData addBindeDev, int targetSendCount, ref int targetRecCount)
+        {
+            var addSuccess = false;
+            var dev = HdlDeviceBindLogic.Current.AddDeviceBindAsync(addBindeDev);
+            if (dev != null && dev.addedDeviceBindResponseData != null)
+            {
+                addSuccess = true;
+                targetRecCount++;
+                if (dev.addedDeviceBindResponseData.Result == 0)
+                {
+                    var countTotal = targetRecCount;
+
+                    var bList = new List<BindListAllInfo>();
+                    foreach (var devB in dev.addedDeviceBindResponseData.BindList)
+                    {
+                        var curD = new BindListAllInfo();
+                        curD.KeyMacAddr = curControlDev.DeviceAddr;
+                        curD.KeyEpoint = curControlDev.DeviceEpoint;
+                        curD.BindCluster = devB.BindCluster;
+                        curD.BindScenesId = devB.BindScenesId;
+                        curD.BindMacAddr = devB.BindMacAddr;
+                        curD.BindEpoint = devB.BindEpoint;
+                        curD.ESName = devB.ESName;
+                        curD.BindType = devB.BindType;
+                        bList.Add(curD);
+                    }
+                    if (MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.ContainsKey(curControlDev.DeviceAddr + curControlDev.DeviceEpoint))
+                    {
+                        MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList[curControlDev.DeviceAddr + curControlDev.DeviceEpoint] = bList;
+                    }
+                    else
+                    {
+                        MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.Add(curControlDev.DeviceAddr + curControlDev.DeviceEpoint, bList);
+                    }
+
+                    if (curBindType == 3)
+                    {
+                        if (addBindeDev.Epoint >= 22 && addBindeDev.Epoint <= 28)
+                        {
+                            curSupportDimmerEpointList.RemoveAt(0);
+
+                        }
+                        if (addBindeDev.Epoint >= 52 && addBindeDev.Epoint <= 61)
+                        {
+                            curSupportLightEpointList.RemoveAt(0);
+                        }
+                    }
+                    else
+                    {
+                        curSupportBindEpointList.RemoveAt(0);
+                    }
+                    Application.RunOnMainThread(() =>
+                    {
+                        if (countTotal == targetSendCount)
+                        {
+                            if (actionRefreshBindList != null)
+                            {
+                                actionRefreshBindList();
+                            }
+                            targetList.Clear();
+                            this.RemoveFromParent();
+                            btnFinifh.Enable = true;
+                            btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                            CommonPage.Loading.Hide();
+                        }
+                    });
+                }
+                else if (dev.addedDeviceBindResponseData.Result == 1)
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        btnFinifh.Enable = true;
+                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                        RefreshRoomList();
+                        CommonPage.Loading.Hide();
+                        new Tip()
+                        {
+                            MaxWidth = 150,
+                            Text = Language.StringByID(R.MyInternationalizationString.BindFailed),
+                            Direction = AMPopTipDirection.Up,
+                            CloseTime = 1
+                        }.Show(btnFinifh);
+                    });
+                }
+                else
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        btnFinifh.Enable = true;
+                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                        RefreshRoomList();
+                        CommonPage.Loading.Hide();
+                        new Tip()
+                        {
+                            MaxWidth = 150,
+                            Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError),
+                            Direction = AMPopTipDirection.Up,
+                            CloseTime = 1
+                        }.Show(btnFinifh);
+                    });
+                }
+            }
+            else
+            {
+                Application.RunOnMainThread(() =>
+                {
+                    btnFinifh.Enable = true;
+                    btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                    RefreshRoomList();
+                    CommonPage.Loading.Hide();
+                    GetEpointData();
+                });
+            }
+            return addSuccess;
+        }
+
+        /// <summary>
+        /// 鍒濆鍖栬澶囨暟鎹�
+        /// </summary>
+        void GetEpointData()
+        {
+            System.Threading.Tasks.Task.Run(() =>
+            {
+                try
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        CommonPage.Loading.Start("");
+                    });
+                    int count1 = curSendEpointList.Count;
+                    int count2 = 0;
+                    foreach (var epoint in curSendEpointList)
+                    {
+                        curControlDev.DeviceEpoint = epoint;
+                        var getBindList = HdlDeviceBindLogic.Current.GetDeviceBindAsync(curControlDev);
+                        if (getBindList != null && getBindList.getAllBindResponseData != null)
+                        {
+                            count2++;
+                            var bList = new List<BindListAllInfo>();
+                            foreach (var dev in getBindList.getAllBindResponseData.BindList)
+                            {
+                                var curD = new BindListAllInfo();
+                                curD.KeyMacAddr = curControlDev.DeviceAddr;
+                                curD.KeyEpoint = epoint;
+                                curD.BindCluster = dev.BindCluster;
+                                curD.BindScenesId = dev.BindScenesId;
+                                curD.BindMacAddr = dev.BindMacAddr;
+                                curD.BindEpoint = dev.BindEpoint;
+                                curD.ESName = dev.ESName;
+                                curD.BindType = dev.BindType;
+                                bList.Add(curD);
+
+                                //鏇存柊targetScListj or targetList 
+                                if (curBindType == 0)
+                                {
+                                    for (int i = 0; i < targetScList.Count; i++)
+                                    {
+                                        if (targetScList[i].Id == dev.BindScenesId)
+                                        {
+                                            targetScList.RemoveAt(i);
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    for (int i = 0; i < targetList.Count; i++)
+                                    {
+                                        if (targetList[i].DeviceAddr + targetList[i].DeviceEpoint == dev.BindMacAddr + dev.BindEpoint)
+                                        {
+                                            targetList.RemoveAt(i);
+                                        }
+                                    }
+                                }
+                            }
+
+                            //鏇存柊bindTargetsFromMutilfunctionPanelList
+                            if (MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.ContainsKey(curControlDev.DeviceAddr + curControlDev.DeviceEpoint))
+                            {
+                                MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList[curControlDev.DeviceAddr + curControlDev.DeviceEpoint] = bList;
+                            }
+                            else
+                            {
+                                MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.Add(curControlDev.DeviceAddr + curControlDev.DeviceEpoint, bList);
+                            }
+
+                            //鏇存柊褰撳墠鏀寔鐨勭鐐圭粦瀹氳〃
+                            curSupportBindEpointList = MutilfunctionPanelMethod.GetMatchEpointList(curBindType);
+                            if (curBindType == 3)
+                            {
+                                foreach (var ep in curSupportBindEpointList)
+                                {
+                                    if (ep >= 22 && ep <= 28)
+                                    {
+                                        curSupportDimmerEpointList.Remove(ep);
+                                    }
+                                    if (ep >= 52 && ep <= 61)
+                                    {
+                                        curSupportLightEpointList.Remove(ep);
+                                    }
+                                }
+                            }
+
+                            if (count1 == count2)
+                            {
+                                Application.RunOnMainThread(() =>
+                                {
+                                    if (actionRefreshBindList != null)
+                                    {
+                                        actionRefreshBindList();
+                                    }
+                                    RefreshRoomList();
+                                    CommonPage.Loading.Hide();
+                                });
+                            }
+                        }
+                        else
+                        {
+                            Application.RunOnMainThread(() =>
+                            {
+                                targetList.Clear();
+                                new Tip() { MaxWidth = 300, Text = Language.StringByID(R.MyInternationalizationString.UpdateBindList), Direction = AMPopTipDirection.None, CloseTime = 3 }.Show(Common.CommonPage.Instance);
+                                btnFinifh.Enable = true;
+                                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                                CommonPage.Loading.Hide();
+                                this.RemoveFromParent();
+                            });
+                            break;
+                        }
+                    }
+                }
+                catch { }
+            });
+        }
+        #endregion
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
index ddcca6f..58ce04e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
@@ -1,10 +1,1006 @@
 锘縰sing System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using Newtonsoft.Json.Linq;
+using Shared.Common;
+using Shared.Phone.UserCenter.Device.Bind;
+using Shared.Phone.UserCenter.Safety;
+using ZigBee.Device;
+using static ZigBee.Device.BindObj;
+using static ZigBee.Device.Panel;
 namespace Shared.Phone.UserCenter.DeviceBind
 {
+    /// <summary>
+    /// 绠�绾﹀鍔熻兘闈㈡澘
+    /// 褰撳墠鐣岄潰榛樿閫夋嫨绗竴涓ゼ灞傦紝绗竴涓被鍨�
+    /// </summary>
     public class PanelSimpleMutilfunctionTargetsForm : BindCommonLayout
     {
-        public PanelSimpleMutilfunctionTargetsForm()
+        #region  鏋勯�犲嚱鏁�
+        /// <summary>
+        /// 鏋勯�犲嚱鏁�
+        /// </summary>
+        /// <param name="deviceMac">绠�绾﹀鍔熻兘闈㈡澘Mac</param> 
+        public PanelSimpleMutilfunctionTargetsForm(string deviceMac)
         {
+            curControlDev = new Panel();
+            var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//绠�绾﹂潰鏉块殢渚夸竴涓洖璺潵鑾峰彇璁惧
+            if (dev != null)
+            {
+                curControlDev.CurrentGateWayId = dev.CurrentGateWayId;
+            }
+            curControlDev.Type = DeviceType.OnOffSwitch;
+            curControlDev.DeviceAddr = deviceMac;
         }
+        #endregion
+
+        #region  鍙橀噺鐢虫槑 
+        /// <summary>
+        /// 鎺у埗璁惧
+        /// </summary>
+        Panel curControlDev;
+        /// <summary>
+        /// 鏄剧ず琚粦瀹氳澶囨垨鍦烘櫙鐨剉iew
+        /// </summary>
+        VerticalFrameRefreshControl midVerticalScrolViewLayout;
+        /// <summary>
+        /// 鏄剧ず缁戝畾绫诲瀷 
+        /// </summary>
+        FrameLayout typeFrameLayout;
+        /// <summary>
+        /// 缁戝畾绫诲瀷鎻愮ず鏂囨湰
+        /// </summary>
+        Button btnTipText;
+        /// <summary>
+        /// 淇濆瓨瀹屾垚鎸夐挳
+        /// </summary>
+        Button btnFinifh;
+        /// <summary>
+        /// 鏈湴璁惧鍒楄〃
+        /// </summary>
+        private System.Collections.Generic.List<CommonDevice> localDeviceList = new System.Collections.Generic.List<CommonDevice>();
+        /// <summary>
+        /// 鏈湴鍦烘櫙鍒楄〃 
+        /// </summary>
+        private System.Collections.Generic.List<SceneUI> scList = new System.Collections.Generic.List<SceneUI> { };
+        /// <summary>
+        /// 褰撳墠绫诲瀷鐨勭粦瀹氳〃
+        /// </summary>
+        public List<BindListAllInfo> curBindTypeList = new List<BindListAllInfo>();
+        /// <summary>
+        /// 褰撳墠绫诲瀷
+        /// 0:鍦烘櫙  1:寮�鍏�  2:鎻掑骇  3:鐏厜  4:閬槼 5:绌鸿皟 6:鏂伴
+        /// </summary>
+        int curBindType = 0;
+        /// <summary>
+        /// 鏄惁鏀寔璇诲彇
+        /// </summary>
+        bool IsRead = false;
+        /// <summary>
+        /// 鏄惁鏀寔鍐嶆璇诲彇銆愬綋鐩爣璇诲彇涓嶅叏鎯呭喌涓嬮噸鏂拌鍙栥��
+        /// </summary>
+        bool IsAgain = false;
+        /// <summary>
+        /// 涓婁竴娆¤鍙栫鐐孤�
+        /// </summary>
+        private int oldReadEpoint = 2;
+        /// <summary>
+        /// 鐗规畩绫诲瀷鐨勪釜鏁般�愬紑鍏�/鎻掑骇/鐏厜銆戦渶瑕佽绠楁樉绀虹殑涓暟聽
+        /// </summary>
+        int specialTypeCount = 0;
+
+        private Action bindReceiveAction = null;
+        /// <summary>
+        /// 鍥炶皟缁戝畾鐩爣椤甸潰鍒锋柊
+        /// </summary>
+        public Action<List<BindListResponseObj>> action;
+        #endregion
+
+        #region UI璁捐 
+        /// <summary>
+        /// 鐩爣椤垫樉绀�
+        /// </summary>
+        public void Show()
+        {
+            //鏍囬鏍�
+            TitleUI();
+            //涓儴UI銆愭爣棰樻爮涓嬬殑UI銆�
+            MidFrameLayouUI();
+            //绫诲瀷鏍廢I
+            BindTypeUI();
+
+            CommonPage.Loading.Start("");
+            InitLocalDeviceList();
+            if (MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.Count == 0)
+            {
+                IsRead = true;
+            }
+            else
+            {
+                IsRead = false;
+            }
+            InitData();
+        }
+
+        /// <summary>
+        /// 鏍囬鏍�
+        /// </summary>
+        void TitleUI()
+        {
+            string titleText = "";
+            titleText = Language.StringByID(R.MyInternationalizationString.uBindTargets);
+
+            this.TopFrameLayout(this, titleText);
+            EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
+            {
+                RemoveFromParent();
+            };
+            this.btnTitle.Width = Application.GetRealWidth(1080 - 161 - 300);
+            this.btnBack.MouseUpEventHandler += eHandlerBack;
+            this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
+            this.MidFrameLayout(this);
+
+            var btnAddFrameLayout = new FrameLayout()
+            {
+                X = Application.GetRealWidth(772 - 58),
+                Width = Application.GetRealWidth(192),
+            };
+            this.titleFrameLayout.AddChidren(btnAddFrameLayout);
+
+            var btnBindAdd = new Button
+            {
+                X = Application.GetRealWidth(62),
+                Height = Application.GetMinReal(72),
+                Width = Application.GetMinReal(72),
+                UnSelectedImagePath = "BindPic/BindAdd.png",
+            };
+            btnAddFrameLayout.AddChidren(btnBindAdd);
+            EventHandler<MouseEventArgs> eHandlerAdd = (sender, e) =>
+            {
+                var simpleMutilfunctionBindTargetsForm = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionAddTargetsForm(curControlDev.DeviceAddr, curBindType);
+                Shared.Phone.UserView.HomePage.Instance.AddChidren(simpleMutilfunctionBindTargetsForm);
+                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+                simpleMutilfunctionBindTargetsForm.Show();
+                Action action = () =>
+                {
+                    RefreshBindListUI();
+                };
+                simpleMutilfunctionBindTargetsForm.actionRefreshBindList += action;
+            };
+            btnBindAdd.MouseDownEventHandler += eHandlerAdd;
+            btnAddFrameLayout.MouseDownEventHandler += eHandlerAdd;
+        }
+
+        /// <summary>
+        /// 涓儴UI銆愭爣棰樻爮涓嬬殑UI銆�
+        /// </summary>
+        void MidFrameLayouUI()
+        {
+            //绫诲瀷鏍�1
+            typeFrameLayout = new FrameLayout
+            {
+                X = Application.GetRealWidth(58 / 2),
+                Height = Application.GetRealHeight(323),
+            };
+            this.midFrameLayout.AddChidren(typeFrameLayout);
+
+            //璁惧鏍�
+            midVerticalScrolViewLayout = new VerticalFrameRefreshControl()
+            {
+                Y = Application.GetRealHeight(323),
+                Height = Application.GetRealHeight(1065),
+            };
+            this.midFrameLayout.AddChidren(midVerticalScrolViewLayout);
+            midVerticalScrolViewLayout.BeginHeaderRefreshingAction += () =>
+            {
+                midVerticalScrolViewLayout.BeginHeaderRefreshing();
+                IsRead = true;
+                InitData();
+            };
+
+            //搴曢儴淇濆瓨鏍�
+            var bottomFrameLayout = new FrameLayout()
+            {
+                Width = LayoutParams.MatchParent,
+                Height = Application.GetRealHeight(84 * 2 + 127),
+                Y = Application.GetRealHeight(1388),
+            };
+            this.midFrameLayout.AddChidren(bottomFrameLayout);
+
+            btnTipText = new Button()
+            {
+                Height = Application.GetRealHeight(84),
+                TextID = R.MyInternationalizationString.Tip,
+                TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+                TextSize = 12,
+                Text = MutilfunctionPanelMethod.MatchTypeBindTextTip(curBindType),
+                TextAlignment = TextAlignment.Center,
+            };
+            bottomFrameLayout.AddChidren(btnTipText);
+
+            btnFinifh = new Button()
+            {
+                Width = Application.GetRealWidth(907),
+                Height = Application.GetRealHeight(127),
+                Y = Application.GetRealHeight(49 + 35),
+                Gravity = Gravity.CenterHorizontal,
+                Radius = (uint)Application.GetRealHeight(127) / 2,
+                TextID = R.MyInternationalizationString.Save,
+                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack,
+                TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
+                IsBold = true,
+                TextSize = 16,
+            };
+            bottomFrameLayout.AddChidren(btnFinifh);
+            btnFinifh.MouseUpEventHandler += (sender, e) =>
+            {
+                SaveTarget();
+            };
+        }
+
+        /// <summary>
+        /// 绫诲瀷鏍廢I
+        /// </summary>
+        void BindTypeUI()
+        {
+            //鍖归厤鐨勭被鍨嬪垪琛�
+            var typeList = GetTypeList();
+            int index = 0;
+            Button curentOldType = null;
+            FrameLayout curentOldTypeLayout = null;
+            foreach (var typeText in typeList)
+            {
+                var btnTypeLayout = new FrameLayout
+                {
+                    Height = Application.GetMinRealAverage(159),
+                    Width = Application.GetMinRealAverage(255),
+                    Y = Application.GetRealHeight(23),
+                    BackgroundImagePath = "Item/RoomIconBackground.png",
+                    BorderWidth = 1,
+                };
+                typeFrameLayout.AddChidren(btnTypeLayout);
+
+                var btnType = new Button
+                {
+                    Height = Application.GetRealHeight(58),
+                    Width = Application.GetRealWidth(127),
+                    Y = Application.GetRealHeight(58),
+                    X = Application.GetRealWidth(14),
+                    Text = typeText,
+                    TextSize = 12,
+                    TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+                    Gravity = Gravity.Center,
+                };
+                btnTypeLayout.AddChidren(btnType);
+
+                btnType.IsSelected = false;
+
+                if (index == 0)
+                {
+                    btnTypeLayout.Y = Application.GetRealHeight(0);
+                    btnTypeLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
+                    btnType.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
+                    curentOldType = btnType;
+                    curentOldTypeLayout = btnTypeLayout;
+                }
+                else
+                {
+                    btnTypeLayout.Y = Application.GetRealHeight(0);
+                    btnTypeLayout.X = index * Application.GetRealWidth(260);
+                    if (index > 3)
+                    {
+                        btnTypeLayout.Y = Application.GetRealHeight(58 + 78);
+                        if (index == 4)
+                        {
+                            btnTypeLayout.X = Application.GetRealWidth(0);
+                        }
+                        else
+                        {
+                            btnTypeLayout.X = (index - 4) * Application.GetRealWidth(260);
+                        }
+                    }
+                }
+
+                EventHandler<MouseEventArgs> eHandlerRoom = (sender, e) =>
+                {
+                    if (!curentOldType.IsSelected)
+                    {
+                        if (curentOldType != null)
+                        {
+                            curentOldType.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
+                        }
+                        curentOldType = btnType;
+                        curentOldType.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
+                    }
+
+                    if (btnTypeLayout.BorderWidth == 1)
+                    {
+                        if (curentOldTypeLayout != null)
+                        {
+                            curentOldTypeLayout.BorderWidth = 1;
+                            curentOldTypeLayout.BorderColor = Shared.Common.ZigbeeColor.Current.XMOrange;
+                            curentOldTypeLayout.BackgroundImagePath = "Item/RoomIconBackground.png";
+                        }
+                        curentOldTypeLayout = btnTypeLayout;
+                        curentOldTypeLayout.BorderWidth = 0;
+                        curentOldTypeLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
+                    }
+
+                    if (curentOldType.Text == Language.StringByID(R.MyInternationalizationString.scene))
+                    {
+                        curBindType = 0;
+                        RefreshBindListUI();
+                    }
+                    else if (curentOldType.Text == Language.StringByID(R.MyInternationalizationString.uDeviceBelongId13))
+                    {
+                        curBindType = 1;
+                        RefreshBindListUI();
+                    }
+                    else if (curentOldType.Text == Language.StringByID(R.MyInternationalizationString.uDeviceBelongId14))
+                    {
+                        curBindType = 2;
+                        RefreshBindListUI();
+                    }
+                    else if (curentOldType.Text == Language.StringByID(R.MyInternationalizationString.uDeviceBelongId15))
+                    {
+                        curBindType = 3;
+                        RefreshBindListUI();
+                    }
+                    else if (curentOldType.Text == Language.StringByID(R.MyInternationalizationString.uDeviceBelongId100))
+                    {
+                        curBindType = 4;
+                        RefreshBindListUI();
+                    }
+                    else if (curentOldType.Text == Language.StringByID(R.MyInternationalizationString.uDeviceBelongId3600))
+                    {
+                        curBindType = 5;
+                        RefreshBindListUI();
+                    }
+                    else if (curentOldType.Text == Language.StringByID(R.MyInternationalizationString.uDeviceBelongId2310))
+                    {
+                        curBindType = 6;
+                        RefreshBindListUI();
+                    }
+                };
+                btnType.MouseUpEventHandler += eHandlerRoom;
+                btnTypeLayout.MouseUpEventHandler += eHandlerRoom;
+                index++;
+            }
+        }
+
+        /// <summary>
+        /// 缁戝畾琛ㄦ樉绀�
+        /// </summary> 
+        void RefreshBindListUI()
+        {
+            midVerticalScrolViewLayout.RemoveAll();
+            curBindTypeList = MutilfunctionPanelMethod.GetMatchBindList(curBindType);
+            int curIndex = 0;
+            for (int i = 0; i < curBindTypeList.Count; i++)
+            {
+                curIndex = i;
+                var bindObj = curBindTypeList[i];
+                SceneUI curSceneUI = null;
+
+                var rowLayout = new RowLayoutControl(midVerticalScrolViewLayout.rowSpace / 2);
+                rowLayout.BackgroundColor = ZigbeeColor.Current.XMWhite;
+                midVerticalScrolViewLayout.AddChidren(rowLayout);
+                rowLayout.frameTable.UseClickStatu = false;
+                var devicePic = rowLayout.frameTable.AddLeftIcon();
+                devicePic.Y = Application.GetRealHeight(25);//49
+                devicePic.UnSelectedImagePath = "DoorLock/DoorLockUserPic.png";
+
+                #region 缁戝畾鏁版嵁澶勭悊
+                int currentIndex = i;
+                var btnBindNameText = "";
+                var btnFloorRoomNameText = "";
+                if (currentIndex == curBindTypeList.Count - 1)
+                {
+                    rowLayout.LineColor = Shared.Common.ZigbeeColor.Current.XMWhite;
+                }
+
+                if (curBindType == 0)
+                {
+                    //Scene
+                    curSceneUI = HdlSceneLogic.Current.GetSceneUIBySceneId(bindObj.BindScenesId);
+                    devicePic.UnSelectedImagePath = "Scene/SceneIcon.png";
+                    if (curSceneUI == null)
+                    {
+                        if (string.IsNullOrEmpty(bindObj.ESName))
+                        {
+                            btnBindNameText = Language.StringByID(R.MyInternationalizationString.OffLineScene) + "_" + "ID" + "_" + bindObj.BindScenesId.ToString();
+                        }
+                        else
+                        {
+                            btnBindNameText = Language.StringByID(R.MyInternationalizationString.OffLineScene) + "_" + bindObj.ESName;
+                        }
+                        btnFloorRoomNameText = Language.StringByID(R.MyInternationalizationString.Undistributed);
+                    }
+                    else
+                    {
+                        btnBindNameText = curSceneUI.Name;
+                        string myName = HdlSceneLogic.Current.GetZoneById(curSceneUI.Id);
+                        if (myName != null)
+                        {
+                            btnFloorRoomNameText = myName;
+                        }
+                        else
+                        {
+                            btnFloorRoomNameText = Language.StringByID(R.MyInternationalizationString.Undistributed);
+                        }
+                    }
+                }
+                else
+                {
+                    //琚粦瀹氳澶囧浘鐗囥�愬彲鑳藉拰澶栭潰璁惧绛夊浘鐗囦笉鍚岋紝鍥犱负杩欓噷鏄互鍔熻兘鏉ョ粦瀹氱殑銆�
+                    //devicePic.UnSelectedImagePath = tempDev.IconPath;
+                    var device = LocalDevice.Current.GetDevice(bindObj.BindMacAddr, bindObj.BindEpoint);
+                    switch (curBindType)
+                    {
+                        case 1:
+                            devicePic.UnSelectedImagePath = "BindPic/Switch.png";
+                            break;
+                        case 2:
+                            devicePic.UnSelectedImagePath = "Device/Socket1.png";
+                            break;
+                        case 3:
+                            devicePic.UnSelectedImagePath = "Device/Light.png";
+                            break;
+                        case 4:
+                            if (device != null)
+                            {
+                                if (device.Type == DeviceType.WindowCoveringDevice)
+                                {
+                                    var tempCur = device as Rollershade;
+                                    if (tempCur.WcdType == 4)
+                                    {
+                                        devicePic.UnSelectedImagePath = "BindPic/Curtain.png";
+                                    }
+                                    else
+                                    {
+                                        devicePic.UnSelectedImagePath = "BindPic/Roller.png";
+                                    }
+                                }
+                            }
+                            break;
+                        case 5:
+                            devicePic.UnSelectedImagePath = "Device/AirConditionerEpoint.png";
+                            break;
+                        case 6:
+                            devicePic.UnSelectedImagePath = "Device/FreshAirEpoint.png";
+                            break;
+                    }
+
+                    if (device != null)
+                    {
+                        //璁惧鍚嶅瓧
+                        btnBindNameText = Common.LocalDevice.Current.GetDeviceEpointName(device);
+
+                        //鑾峰彇璁惧鎵�灞炴埧闂�
+                        var tempDevRoom = HdlRoomLogic.Current.GetRoomByDevice(device);
+
+                        if (tempDevRoom != null)
+                        {
+                            var tempDevFloorId = tempDevRoom.FloorId;
+                            //鑾峰彇鎴块棿鐨勫悕瀛�
+                            var tempDevRoomName = tempDevRoom.Name;
+                            //鑾峰彇妤煎眰鐨勫悕瀛�
+                            var tempDevFloorName = HdlResidenceLogic.Current.GetFloorNameById(tempDevFloorId);
+                            if (string.IsNullOrEmpty(tempDevFloorName))
+                            {
+                                if (string.IsNullOrEmpty(tempDevRoomName))
+                                {
+                                    btnFloorRoomNameText = Language.StringByID(R.MyInternationalizationString.Undistributed);
+                                }
+                                else
+                                {
+                                    btnFloorRoomNameText = tempDevRoomName;
+                                }
+                            }
+                            else
+                            {
+                                if (string.IsNullOrEmpty(tempDevRoomName))
+                                {
+                                    btnFloorRoomNameText = Language.StringByID(R.MyInternationalizationString.Undistributed);
+                                }
+                                else
+                                {
+                                    btnFloorRoomNameText = tempDevFloorName + "," + tempDevRoomName;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            btnFloorRoomNameText = Language.StringByID(R.MyInternationalizationString.Undistributed);
+                        }
+                    }
+                    else
+                    {
+                        devicePic.TextAlignment = TextAlignment.CenterLeft;
+                        devicePic.TextColor = UserCenterColor.Current.Gray;
+                        devicePic.Text = Language.StringByID(R.MyInternationalizationString.uOffLine);
+                    }
+                }
+
+                var btnBindName = rowLayout.frameTable.AddTopView(btnBindNameText, 800);
+                var btnFloorRoomName = rowLayout.frameTable.AddBottomView(btnFloorRoomNameText, 800);
+                rowLayout.frameTable.AddBottomLine();
+                var btnDel = rowLayout.AddDeleteControl();
+                btnDel.ButtonClickEvent += (sender, e) =>
+                {
+                    RemoveTargets(bindObj, btnDel);
+                };
+                #endregion
+            }
+
+            switch (curBindType)
+            {
+                case 1:
+                    btnTipText.Text = MutilfunctionPanelMethod.MatchTypeBindTextTip(curBindType, MutilfunctionPanelMethod.curSwitchCount + MutilfunctionPanelMethod.curSocketCount + MutilfunctionPanelMethod.curLightFromRelayCount);
+                    break;
+                case 2:
+                    btnTipText.Text = MutilfunctionPanelMethod.MatchTypeBindTextTip(curBindType, MutilfunctionPanelMethod.curSwitchCount + MutilfunctionPanelMethod.curSocketCount + MutilfunctionPanelMethod.curLightFromRelayCount);
+                    break;
+                case 3:
+                    btnTipText.Text = MutilfunctionPanelMethod.MatchTypeBindTextTip(curBindType, MutilfunctionPanelMethod.curSwitchCount + MutilfunctionPanelMethod.curSocketCount + MutilfunctionPanelMethod.curLightFromRelayCount + MutilfunctionPanelMethod.curLightCount);
+                    break;
+                default:
+                    btnTipText.Text = MutilfunctionPanelMethod.MatchTypeBindTextTip(curBindType, curBindTypeList.Count);
+                    break;
+            }
+            midVerticalScrolViewLayout.AdjustTableHeight(Application.GetRealHeight(23));
+        }
+
+        #endregion
+
+        #region 鏁版嵁澶勭悊
+        /// <summary>
+        /// 鑾峰彇鏈湴鍒楄〃
+        /// </summary>
+        void InitLocalDeviceList()
+        {
+            localDeviceList.Clear();
+            scList.Clear();
+            //璁惧
+            foreach (var dev in Shared.Common.LocalDevice.Current.listAllDevice)
+            {
+                localDeviceList.Add(dev);
+            }
+            //鍦烘櫙
+            scList = HdlSceneLogic.Current.GetAllRoomSceneList();
+        }
+        /// <summary>
+        /// 鍒濆鍖栬澶囨暟鎹�
+        /// </summary>
+        void InitData()
+        {
+            System.Threading.Tasks.Task.Run(async () =>
+            {
+                try
+                {
+                    //璇诲彇鎸夐敭褰撳墠缁戝畾鐩爣  澶氬姛鑳介潰鏉跨洰鏍囨�诲叡闇�瑕佽鍙栨湰椤电殑鐩爣60涓紝3绉掑乏鍙筹紙3绉�+200姣锛�
+                    GetDeviceBindResponseAllData getBindList = null;
+                    if (IsRead)
+                    {
+                        MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.Clear();
+                        var epointList = new List<int>();
+                        for (int i = 2; i < 62; i++)
+                        {
+                            epointList.Add(i);
+                        }
+                        //璇诲彇涓婃娌¤鍏ㄨ鐩爣
+                        if (IsAgain)
+                        {
+                            epointList.Clear();
+                            for (int i = oldReadEpoint; i < 62; i++)
+                            {
+                                epointList.Add(i);
+                            }
+                        }
+
+                        foreach (var epoint in epointList)
+                        {
+                            curControlDev.DeviceEpoint = epoint;
+                            getBindList = HdlDeviceBindLogic.Current.GetDeviceBindAsync(curControlDev);
+                            if (getBindList != null && getBindList.getAllBindResponseData != null)
+                            {
+                                var bList = new List<BindListAllInfo>();
+                                foreach (var dev in getBindList.getAllBindResponseData.BindList)
+                                {
+                                    var curD = new BindListAllInfo();
+                                    curD.KeyMacAddr = curControlDev.DeviceAddr;
+                                    curD.KeyEpoint = epoint;
+                                    curD.BindCluster = dev.BindCluster;
+                                    curD.BindScenesId = dev.BindScenesId;
+                                    curD.BindMacAddr = dev.BindMacAddr;
+                                    curD.BindEpoint = dev.BindEpoint;
+                                    curD.ESName = dev.ESName;
+                                    curD.BindType = dev.BindType;
+                                    bList.Add(curD);
+                                }
+                                MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.Add(curControlDev.DeviceAddr + curControlDev.DeviceEpoint, bList);
+
+                                oldReadEpoint++;
+                            }
+                            else
+                            {
+                                if (oldReadEpoint < 62)
+                                {
+                                    IsAgain = true;
+                                }
+                                Application.RunOnMainThread(() =>
+                                {
+                                    RefreshBindListUI();
+                                    midVerticalScrolViewLayout.EndHeaderRefreshing();
+                                    CommonPage.Loading.Hide();
+                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+                                });
+                                break;
+                            }
+                        }
+                        if (oldReadEpoint >= 61)
+                        {
+                            IsAgain = false;
+                            oldReadEpoint = 2;
+                        }
+
+                        //鑾峰彇鎵�鏈夌被鍨嬬殑缁戝畾鐩爣涓暟
+                        for (int i = 0; i < 7; i++)
+                        {
+                            curBindTypeList = MutilfunctionPanelMethod.GetMatchBindList(i);
+                        }
+
+                        Application.RunOnMainThread(() =>
+                        {
+                            RefreshBindListUI();
+                            midVerticalScrolViewLayout.EndHeaderRefreshing();
+                            CommonPage.Loading.Hide();
+                        });
+                    }
+                    else
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            RefreshBindListUI();
+                            CommonPage.Loading.Hide();
+                        });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    var mess = ex.Message;
+                }
+            });
+        }
+
+        /// <summary>
+        /// 淇濆瓨鐩爣
+        /// </summary>
+        /// <param name="curControlDev"></param>
+        void SaveTarget()
+        {
+            RemoveFromParent();
+        }
+
+        /// <summary>
+        /// 鍒犻櫎澶氬姛鑳介潰鏉跨殑鐩爣
+        /// </summary>
+        /// <param name="bindDevice"></param>
+        /// <param name="btnDel"></param>
+        /// <returns></returns>
+        private void RemoveTargets(BindListAllInfo bindDevice, Button btnDel)
+        {
+            var delDevice = new DelDeviceBindData();
+            delDevice.DeviceAddr = bindDevice.KeyMacAddr;
+            delDevice.Epoint = bindDevice.KeyEpoint;
+
+            if (bindDevice.BindType == 0 || bindDevice.BindType == 1)
+            {
+                var removeDevice = new RemoveBindListObj();
+                removeDevice.BindCluster = bindDevice.BindCluster;
+                removeDevice.BindType = 0;
+                removeDevice.BindMacAddr = bindDevice.BindMacAddr;
+                removeDevice.BindEpoint = bindDevice.BindEpoint;
+                delDevice.RemoveBindList.Add(removeDevice);
+
+                //閮ㄥ垎鐩爣闇�瑕佷簩娆$粦瀹氱浜岀鍔熻兘 
+                switch (curBindType)
+                {
+                    case 3:
+                        var device = LocalDevice.Current.GetDevice(bindDevice.BindMacAddr, bindDevice.BindEpoint);
+                        if (device != null)
+                        {
+                            if (device.Type == DeviceType.DimmableLight)
+                            {
+                                //鐏厜涓鸿皟鍏夋椂闇�瑕佺Щ闄�6锛�8
+                                var removeDevice2 = new RemoveBindListObj();
+                                removeDevice2.BindCluster = 6;
+                                removeDevice2.BindType = 0;
+                                removeDevice2.BindMacAddr = bindDevice.BindMacAddr;
+                                removeDevice2.BindEpoint = bindDevice.BindEpoint;
+                                delDevice.RemoveBindList.Add(removeDevice2);
+                            }
+                        }
+                        break;
+                    case 5:
+                        //瑕佺Щ闄ょ┖璋冿細闇�瑕佺Щ闄�513锛�514
+                        var removeDevice3 = new RemoveBindListObj();
+                        removeDevice3.BindCluster = 514;
+                        removeDevice3.BindType = 0;
+                        removeDevice3.BindMacAddr = bindDevice.BindMacAddr;
+                        removeDevice3.BindEpoint = bindDevice.BindEpoint;
+                        delDevice.RemoveBindList.Add(removeDevice3);
+                        break;
+                }
+            }
+            else if (bindDevice.BindType == 2)
+            {
+                var removeDevice = new RemoveBindListObj();
+                removeDevice.BindCluster = bindDevice.BindCluster;
+                removeDevice.BindType = 1;
+                removeDevice.BindScenesId = bindDevice.BindScenesId;
+                delDevice.RemoveBindList.Add(removeDevice);
+            }
+
+            System.Threading.Tasks.Task.Run(() =>
+            {
+                try
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        CommonPage.Loading.Start("");
+                    });
+                    var delResult = new DelDeviceBindResponseAllData();
+                    delResult = HdlDeviceBindLogic.Current.DelDeviceBindAsync(delDevice);
+                    if (delResult == null)
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
+                            CommonPage.Loading.Hide();
+                        });
+                        return;
+                    }
+                    else
+                    {
+                        if (delResult.removeBindResultResponseData == null)
+                        {
+                            if (delResult.delDeviceBindResponseData != null)
+                            {
+                                foreach (var d in delResult.delDeviceBindResponseData.RemoveBindList)
+                                {
+                                    if (d.Result == 0 || d.Result == 1)
+                                    {
+                                        if (MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.ContainsKey(bindDevice.KeyMacAddr + bindDevice.KeyEpoint))
+                                        {
+                                            MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.Remove(bindDevice.KeyMacAddr + bindDevice.KeyEpoint);
+                                        }
+                                        Application.RunOnMainThread(() =>
+                                        {
+                                            RefreshBindListUI();
+                                            CommonPage.Loading.Hide();
+                                        });
+                                    }
+                                    else
+                                    {
+                                        Application.RunOnMainThread(() =>
+                                        {
+                                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
+                                            CommonPage.Loading.Hide();
+                                        });
+                                        return;
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                Application.RunOnMainThread(() =>
+                                {
+                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
+                                    CommonPage.Loading.Hide();
+                                });
+                                return;
+                            }
+                        }
+                        else
+                        {
+                            if (delResult.removeBindResultResponseData.Result == 0)
+                            {
+                                if (MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.ContainsKey(bindDevice.KeyMacAddr + bindDevice.KeyEpoint))
+                                {
+                                    MutilfunctionPanelMethod.bindTargetsFromMutilfunctionPanelList.Remove(bindDevice.KeyMacAddr + bindDevice.KeyEpoint);
+                                }
+                                Application.RunOnMainThread(() =>
+                                {
+                                    RefreshBindListUI();
+                                    CommonPage.Loading.Hide();
+                                });
+                            }
+                            else
+                            {
+                                Application.RunOnMainThread(() =>
+                                {
+                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+                                    CommonPage.Loading.Hide();
+                                });
+                                return;
+                            }
+                        }
+                    }
+                }
+                catch { }
+                finally
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        CommonPage.Loading.Hide();
+                    });
+                }
+            });
+        }
+
+
+
+        /// <summary>
+        /// 鍖归厤鐨勭被鍨嬪垪琛�
+        /// </summary>
+        /// <returns></returns>
+        private List<string> GetTypeList()
+        {
+            List<string> textTypelist = new List<string> { };
+            textTypelist.Add(Language.StringByID(R.MyInternationalizationString.scene));
+            textTypelist.Add(Language.StringByID(R.MyInternationalizationString.uDeviceBelongId13));
+            textTypelist.Add(Language.StringByID(R.MyInternationalizationString.uDeviceBelongId14));
+            textTypelist.Add(Language.StringByID(R.MyInternationalizationString.uDeviceBelongId15));
+            textTypelist.Add(Language.StringByID(R.MyInternationalizationString.uDeviceBelongId100));
+            textTypelist.Add(Language.StringByID(R.MyInternationalizationString.uDeviceBelongId3600));
+            textTypelist.Add(Language.StringByID(R.MyInternationalizationString.uDeviceBelongId2310));
+            return textTypelist;
+        }
+
+        #endregion
+
+        #region 鍏朵粬鏂规硶
+        /// <summary>
+        /// 鏄剧ず缁戝畾璁惧绾跨▼鏄惁宸茬粡寮�鍚�
+        /// </summary>
+        private bool isDeviceThreadStart = false;
+        /// <summary>
+        /// 涓婚瓒呮椂鐨勭嚎绋嬫槸鍚﹀紑鍚�
+        /// </summary>
+        private bool isTopicTimeOutThreadStart = false;
+        /// <summary>
+        /// 绛夊緟璁惧鐨勫洖棣堢殑瓒呮椂鏃堕棿(鍗曚綅锛氱櫨姣)
+        /// </summary>
+        private int waitDeviceTimeOut = 20;
+        /// <summary>
+        /// 缃戝叧ID
+        /// </summary>
+        private string gatewayId = string.Empty;
+        /// <summary>
+        /// 鎺ユ敹涓暟
+        /// </summary>
+        private int countBind = 0;
+        /// <summary>
+        /// 鏂颁笂鎶ョ殑璁惧
+        /// </summary>
+        private Dictionary<int, GetPanelBindResponseDataByMac> dicPanelResInfo = new Dictionary<int, GetPanelBindResponseDataByMac>();
+
+        ///<summary >
+        /// 鍙戦�佽幏鍙栭潰鏉垮懡浠閫氳繃DeviceAddr鑾峰彇]
+        /// </summary>
+        private void SendPanelCommand()
+        {
+            var jObject = new JObject { { "DeviceAddr", curControlDev.DeviceAddr }, { "Cluster_ID", 0 }, { "Command", 5009 } };
+            curControlDev.Gateway.Send(("SearchNewDevice"), jObject.ToString());
+        }
+
+        /// <summary>
+        /// 妫�娴嬭澶囩粦瀹氱殑涓婚
+        /// </summary>
+        /// <param name="topic"></param>
+        /// <param name="resultData"></param>
+        /// <returns></returns>
+        public bool CheckIsDeviceBindTopic(string topic)
+        {
+            if (topic == gatewayId + "Bind/GetDeviceLocalBind_Respon")
+            {
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 澶勭悊闈㈡澘缁戝畾鐨勮澶囷紝鍜岀鐐规病鏈夊叧绯�
+        /// </summary>
+        /// <param name="topic">涓婚</param>
+        /// <param name="resultData">涓婃姤鏁版嵁</param>
+        private void AdjustGatewayResultData(string topic, string resultData)
+        {
+
+            //鎺ユ敹缁戝畾璁惧锛屽紑鍚帴鏀剁粦瀹氳澶囦俊鎭殑绾跨▼(閲岄潰浼氱瓑寰呬笁绉掕繖鏍�)
+            this.ReceiveSuccessFormThread();
+
+            var result = this.CheckIsDeviceBindTopic(topic);
+            if (result)
+            {
+                lock (dicPanelResInfo)
+                {
+                    var jobject = Newtonsoft.Json.Linq.JObject.Parse(resultData);
+                    var info = Newtonsoft.Json.JsonConvert.DeserializeObject<GetPanelBindResponseDataByMac>(jobject["Data"].ToString());
+                    countBind = info.MaxNumItems;
+                    if (info != null)
+                    {
+                        foreach (var bDev in info.BindList)
+                        {
+                            if (this.dicPanelResInfo.ContainsKey(bDev.ControllerEpoint) == false)
+                            {
+                                this.dicPanelResInfo[bDev.ControllerEpoint] = info;
+                            }
+                        }
+                    }
+
+                    if (this.dicPanelResInfo.Count == countBind)
+                    {
+                        //鍋滄鎺ユ敹
+                        curControlDev.Gateway.GwResDataAction -= this.AdjustGatewayResultData;
+                        //鍒锋柊瓒呮椂鏃堕棿
+                        this.waitDeviceTimeOut = -1;
+                    }
+                    else
+                    {
+                        //鍒锋柊瓒呮椂鏃堕棿
+                        this.waitDeviceTimeOut = 20;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// 寮�鍚帴鏀剁粦瀹氳澶囩殑瓒呮椂绾跨▼  
+        /// </summary>
+        private void ReceiveSuccessFormThread()
+        {
+            if (this.isDeviceThreadStart == true)
+            {
+                //绾跨▼宸茬粡寮�鍚�
+                return;
+            }
+            this.isDeviceThreadStart = true;
+
+            HdlThreadLogic.Current.RunThread(() =>
+            {
+                System.Console.WriteLine($"1AAAAA");
+                while (this.waitDeviceTimeOut >= 0)
+                {
+                    //绛夊緟涓嬩竴涓洖璺�
+                    System.Threading.Thread.Sleep(100);
+                    this.waitDeviceTimeOut--;
+                    System.Console.WriteLine($"2AAAAA");
+                }
+                System.Console.WriteLine($"3AAAAA");
+                //鍋滄鎺ユ敹
+                bindReceiveAction.Invoke();
+                curControlDev.Gateway.GwResDataAction -= this.AdjustGatewayResultData;
+                System.Console.WriteLine($"4AAAAA");
+                System.Threading.Thread.Sleep(200);
+                System.Console.WriteLine($"5AAAAA");
+
+                //鐩墠灏卞紕涓�涓�
+                Application.RunOnMainThread(() =>
+                {
+                    if (this.dicPanelResInfo.Count < countBind)
+                    {
+                        //鍝嶅簲瓒呮椂,璇烽噸鏂颁笅鎷夊埛鏂拌幏鍙栫粦瀹氫俊鎭�
+                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.uResponseTimeoutsAndReAccessNetwork), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+                        //鍋滄鎺ユ敹
+                        curControlDev.Gateway.GwResDataAction -= this.AdjustGatewayResultData;
+                    }
+                    System.Console.WriteLine($"6AAAAA");
+                });
+            });
+        }
+        #endregion
+
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs
index a919248..068bec2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs
@@ -22,7 +22,7 @@
         /// <summary>
         /// 妗屽竷鎺т欢
         /// </summary>
-        private FrameLayout frameTable = null;
+        private NormalFrameLayout frameTable = null;
         /// <summary>
         /// 鎴块棿瀵硅薄
         /// </summary>
@@ -68,7 +68,7 @@
             bodyFrameLayout.AddChidren(frameBack);
 
             //妗屽竷鎺т欢
-            this.frameTable = new FrameLayout();
+            this.frameTable = new NormalFrameLayout();
             frameTable.Y = frameBack.Bottom;
             frameTable.Height = bodyFrameLayout.Height - frameBack.Height;
             bodyFrameLayout.AddChidren(frameTable);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs
index 7102037..a2268ae 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs
@@ -26,9 +26,9 @@
         /// </summary>
         private bool newGatewayGetting = false;
         /// <summary>
-        /// 缃戝叧妫�娴嬩腑
+        /// 缃戝叧鎼滅储涓�
         /// </summary>
-        private string isGatewayChecking = "0";
+        private bool isGatewaySearching = true;
 
         #endregion
 
@@ -70,6 +70,8 @@
 
             //鍒濆鍖栬繛鎺ョ殑鍋囨兂鍔ㄧ敾鏁堟灉
             this.InitConcetionAnimete();
+            //寮�鍚綉鍏虫娴嬬殑绾跨▼
+            this.StartCheckGatewayThread();
         }
 
         /// <summary>
@@ -254,25 +256,6 @@
                         HdlGatewayLogic.Current.ClearAllRealGateway();
                         ZigBee.Common.Application.IsSearchingGateway = true;
                     }
-                    if (timeCount % 4 == 0 && timeCount >= 10)
-                    {
-                        lock (isGatewayChecking)
-                        {
-                            if (isGatewayChecking != "1")
-                            {
-                                isGatewayChecking = "1";
-                                HdlThreadLogic.Current.RunThread(async () =>
-                                {
-                                    //姣�2绉掓娴嬫悳绱㈠埌鐨勭綉鍏�
-                                    await this.CheckZbGatewayAndSetRow();
-                                    lock (isGatewayChecking)
-                                    {
-                                        isGatewayChecking = "0";
-                                    }
-                                });
-                            }
-                        }
-                    }
                     if (timeCount % 2 == 0)
                     {
                         timeOut--;
@@ -297,6 +280,9 @@
 
                     System.Threading.Thread.Sleep(500);
                 }
+                //鎼滅储缁撴潫
+                this.isGatewaySearching = false;
+
                 if (timeOut <= 0)
                 {
                     HdlThreadLogic.Current.RunMain(() =>
@@ -322,6 +308,38 @@
         #endregion
 
         #region 鈻� 缃戝叧妫�娴媉__________________________
+
+        /// <summary>
+        /// 寮�鍚綉鍏虫娴嬬殑绾跨▼
+        /// </summary>
+        private void StartCheckGatewayThread()
+        {
+            this.isGatewaySearching = true;
+            HdlThreadLogic.Current.RunThread(async () =>
+            {
+                int count = 0;
+                while (this.Parent != null && this.isGatewaySearching == true)
+                {
+                    //姣�2绉掓娴嬫悳绱㈠埌鐨勭綉鍏�
+                    System.Threading.Thread.Sleep(500);
+                    count++;
+                    if (count < 4)
+                    {
+                        //涓昏涓轰簡蹇竴鐐硅兘澶熶腑鏂繖涓嚎绋�
+                        continue;
+                    }
+                    count = 0;
+
+                    await this.CheckZbGatewayAndSetRow();
+
+                    if (this.newGatewayGetting == true)
+                    {
+                        //鑾峰彇寰楀埌鏂扮綉鍏�,鍒欎腑鏂嚎绋�
+                        break;
+                    }
+                }
+            });
+        }
 
         /// <summary>
         /// 妫�娴嬫悳绱㈠埌鐨勭綉鍏�
@@ -385,7 +403,7 @@
                     this.newGatewayGetting = true;
                 }
 
-                if (mode == GatewayBindMode.First)
+                if (mode == GatewayBindMode.First|| mode == GatewayBindMode.Binded)
                 {
                     //鎴戣寰楄繖閲岄渶瑕佽幏鍙栦竴涓嬫柊缃戝叧鐨勮澶囧垪琛�
                     Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(way);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
index 74d9ccb..448ff57 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
@@ -30,9 +30,9 @@
         /// </summary>
         private bool newGatewayGetting = false;
         /// <summary>
-        /// 缃戝叧妫�娴嬩腑
+        /// 缃戝叧鎼滅储涓�
         /// </summary>
-        private string isGatewayChecking = "0";
+        private bool isGatewaySearching = true;
 
         #endregion
 
@@ -77,6 +77,8 @@
 
             //鍒濆鍖栬繛鎺ョ殑鍋囨兂鍔ㄧ敾鏁堟灉
             this.InitConcetionAnimete(picGwImage, btnMsg);
+            //寮�鍚綉鍏虫娴嬬殑绾跨▼
+            this.StartCheckGatewayThread();
         }
 
         /// <summary>
@@ -226,10 +228,6 @@
             string strMsg = btnMsg.Text;
             HdlThreadLogic.Current.RunThread(() =>
             {
-                //娓呯┖鍏ㄩ儴鍒楄〃
-                HdlGatewayLogic.Current.ClearAllRealGateway();
-                ZigBee.Common.Application.IsSearchingGateway = true;
-
                 int index = 1;
                 int maxCount = 120 * 2;
                 int timeCount = 120;
@@ -237,36 +235,13 @@
                 {
                     System.Threading.Thread.Sleep(500);
                     maxCount--;
-                    if (maxCount % 4 == 0)
-                    {
-                        lock(isGatewayChecking)
-                        {
-                            if (isGatewayChecking != "1")
-                            {
-                                isGatewayChecking = "1";
-                                HdlThreadLogic.Current.RunThread(async () =>
-                                {
-                                    //姣�2绉掓娴嬫悳绱㈠埌鐨勭綉鍏�
-                                    await this.CheckZbGatewayAndSetRow();
-                                    lock (isGatewayChecking)
-                                    {
-                                        isGatewayChecking = "0";
-                                    }
-                                });
-                            }
-                        }
-                    }
-                    if (this.newGatewayGetting == true)
-                    {
-                        //鑾峰彇寰楀埌鏂扮綉鍏�,鍒欎腑鏂嚎绋�
-                        break;
-                    }
                     if (maxCount % 2 == 0)
                     {
                         timeCount--;
                     }
-                    if (maxCount <= 0)
+                    if (maxCount <= 0 || this.newGatewayGetting == true)
                     {
+                        //鑾峰彇寰楀埌鏂扮綉鍏�,鍒欎腑鏂嚎绋�
                         break;
                     }
                     Application.RunOnMainThread(() =>
@@ -281,6 +256,9 @@
                         btnMsg.Text = strMsg + timeCount + "s";
                     });
                 }
+                //鎼滅储缁撴潫
+                this.isGatewaySearching = false;
+
                 if (maxCount <= 0)
                 {
                     HdlThreadLogic.Current.RunMain(() =>
@@ -306,6 +284,42 @@
         #endregion
 
         #region 鈻� 缃戝叧妫�娴媉__________________________
+
+        /// <summary>
+        /// 寮�鍚綉鍏虫娴嬬殑绾跨▼
+        /// </summary>
+        private void StartCheckGatewayThread()
+        {
+            this.isGatewaySearching = true;
+            HdlThreadLogic.Current.RunThread(async () =>
+            {
+                //娓呯┖鍏ㄩ儴鍒楄〃
+                HdlGatewayLogic.Current.ClearAllRealGateway();
+                ZigBee.Common.Application.IsSearchingGateway = true;
+
+                int count = 0;
+                while (this.Parent != null && this.isGatewaySearching == true)
+                {
+                    //姣�2绉掓娴嬫悳绱㈠埌鐨勭綉鍏�
+                    System.Threading.Thread.Sleep(500);
+                    count++;
+                    if (count < 4)
+                    {
+                        //涓昏涓轰簡蹇竴鐐硅兘澶熶腑鏂繖涓嚎绋�
+                        continue;
+                    }
+                    count = 0;
+
+                    await this.CheckZbGatewayAndSetRow();
+
+                    if (this.newGatewayGetting == true)
+                    {
+                        //鑾峰彇寰楀埌鏂扮綉鍏�,鍒欎腑鏂嚎绋�
+                        break;
+                    }
+                }
+            });
+        }
 
         /// <summary>
         /// 妫�娴嬫悳绱㈠埌鐨勭綉鍏筹紝鐒跺悗娣诲姞鍒扮敾闈㈢殑琛岄噷闈�
@@ -399,7 +413,7 @@
                     this.newGatewayGetting = true;
                 }
 
-                if (mode == GatewayBindMode.First)
+                if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
                 {
                     //鎴戣寰楄繖閲岄渶瑕佽幏鍙栦竴涓嬫柊缃戝叧鐨勮澶囧垪琛�
                     Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(way);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
index a4ba623..6e36d1d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
@@ -26,9 +26,9 @@
         /// </summary>
         private bool newGatewayGetting = false;
         /// <summary>
-        /// 缃戝叧妫�娴嬩腑
+        /// 缃戝叧鎼滅储涓�
         /// </summary>
-        private string isGatewayChecking = "0";
+        private bool isGatewaySearching = true;
 
         #endregion
 
@@ -70,6 +70,8 @@
 
             //鍒濆鍖栬繛鎺ョ殑鍋囨兂鍔ㄧ敾鏁堟灉
             this.InitConcetionAnimete();
+            //寮�鍚綉鍏虫娴嬬殑绾跨▼
+            this.StartCheckGatewayThread();
         }
 
         /// <summary>
@@ -236,10 +238,6 @@
             string strMsg = btnMsg.Text;
             HdlThreadLogic.Current.RunThread(() =>
             {
-                //娓呯┖鍏ㄩ儴鍒楄〃
-                HdlGatewayLogic.Current.ClearAllRealGateway();
-                ZigBee.Common.Application.IsSearchingGateway = true;
-
                 int index = 1;
                 //璁℃椂鏃堕棿
                 int timeCount = 0;
@@ -253,25 +251,6 @@
                         //5绉掑悗娓呯┖缃戝叧鍒楄〃
                         HdlGatewayLogic.Current.ClearAllRealGateway();
                         ZigBee.Common.Application.IsSearchingGateway = true;
-                    }
-                    if (timeCount % 4 == 0 && timeCount >= 10)
-                    {
-                        lock (isGatewayChecking)
-                        {
-                            if (isGatewayChecking != "1")
-                            {
-                                isGatewayChecking = "1";
-                                HdlThreadLogic.Current.RunThread(async () =>
-                                {
-                                    //姣�2绉掓娴嬫悳绱㈠埌鐨勭綉鍏�
-                                    await this.CheckZbGatewayAndSetRow();
-                                    lock (isGatewayChecking)
-                                    {
-                                        isGatewayChecking = "0";
-                                    }
-                                });
-                            }
-                        }
                     }
                     if (timeCount % 2 == 0)
                     {
@@ -297,6 +276,9 @@
 
                     System.Threading.Thread.Sleep(500);
                 }
+                //鎼滅储缁撴潫
+                this.isGatewaySearching = false;
+
                 if (timeOut <= 0)
                 {
                     HdlThreadLogic.Current.RunMain(() =>
@@ -324,11 +306,42 @@
         #region 鈻� 缃戝叧妫�娴媉__________________________
 
         /// <summary>
+        /// 寮�鍚綉鍏虫娴嬬殑绾跨▼
+        /// </summary>
+        private void StartCheckGatewayThread()
+        {
+            this.isGatewaySearching = true;
+            HdlThreadLogic.Current.RunThread(async () =>
+            {
+                int count = 0;
+                while (this.Parent != null && this.isGatewaySearching == true)
+                {
+                    //姣�2绉掓娴嬫悳绱㈠埌鐨勭綉鍏�
+                    System.Threading.Thread.Sleep(500);
+                    count++;
+                    if (count < 4)
+                    {
+                        //涓昏涓轰簡蹇竴鐐硅兘澶熶腑鏂繖涓嚎绋�
+                        continue;
+                    }
+                    count = 0;
+
+                    await this.CheckZbGatewayAndSetRow();
+
+                    if (this.newGatewayGetting == true)
+                    {
+                        //鑾峰彇寰楀埌鏂扮綉鍏�,鍒欎腑鏂嚎绋�
+                        break;
+                    }
+                }
+            });
+        }
+
+        /// <summary>
         /// 妫�娴嬫悳绱㈠埌鐨勭綉鍏�
         /// </summary>
         private async Task<bool> CheckZbGatewayAndSetRow()
         {
-            var listCheck = new HashSet<string>();
             for (int i = 0; i < ZbGateway.GateWayList.Count; i++)
             {
                 var way = ZbGateway.GateWayList[i];
@@ -386,7 +399,7 @@
                     this.newGatewayGetting = true;
                 }
 
-                if (mode == GatewayBindMode.First)
+                if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
                 {
                     //鎴戣寰楄繖閲岄渶瑕佽幏鍙栦竴涓嬫柊缃戝叧鐨勮澶囧垪琛�
                     Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(way);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
index a54bbe8..bb2cbff 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
@@ -26,9 +26,9 @@
         /// </summary>
         private bool newGatewayGetting = false;
         /// <summary>
-        /// 缃戝叧妫�娴嬩腑
+        /// 缃戝叧鎼滅储涓�
         /// </summary>
-        private string isGatewayChecking = "0";
+        private bool isGatewaySearching = true;
 
         #endregion
 
@@ -70,6 +70,8 @@
 
             //鍒濆鍖栬繛鎺ョ殑鍋囨兂鍔ㄧ敾鏁堟灉
             this.InitConcetionAnimete();
+            //寮�鍚綉鍏虫娴嬬殑绾跨▼
+            this.StartCheckGatewayThread();
         }
 
         /// <summary>
@@ -236,10 +238,6 @@
             string strMsg = btnMsg.Text;
             HdlThreadLogic.Current.RunThread(() =>
             {
-                //娓呯┖鍏ㄩ儴鍒楄〃
-                HdlGatewayLogic.Current.ClearAllRealGateway();
-                ZigBee.Common.Application.IsSearchingGateway = true;
-
                 int index = 1;
                 //璁℃椂鏃堕棿
                 int timeCount = 0;
@@ -253,25 +251,6 @@
                         //5绉掑悗娓呯┖缃戝叧鍒楄〃
                         HdlGatewayLogic.Current.ClearAllRealGateway();
                         ZigBee.Common.Application.IsSearchingGateway = true;
-                    }
-                    if (timeCount % 4 == 0 && timeCount >= 10)
-                    {
-                        lock (isGatewayChecking)
-                        {
-                            if (isGatewayChecking != "1")
-                            {
-                                isGatewayChecking = "1";
-                                HdlThreadLogic.Current.RunThread(async () =>
-                                {
-                                    //姣�2绉掓娴嬫悳绱㈠埌鐨勭綉鍏�
-                                    await this.CheckZbGatewayAndSetRow();
-                                    lock (isGatewayChecking)
-                                    {
-                                        isGatewayChecking = "0";
-                                    }
-                                });
-                            }
-                        }
                     }
                     if (timeCount % 2 == 0)
                     {
@@ -297,6 +276,9 @@
 
                     System.Threading.Thread.Sleep(500);
                 }
+                //鎼滅储缁撴潫
+                this.isGatewaySearching = false;
+
                 if (timeOut <= 0)
                 {
                     HdlThreadLogic.Current.RunMain(() =>
@@ -324,11 +306,42 @@
         #region 鈻� 缃戝叧妫�娴媉__________________________
 
         /// <summary>
+        /// 寮�鍚綉鍏虫娴嬬殑绾跨▼
+        /// </summary>
+        private void StartCheckGatewayThread()
+        {
+            this.isGatewaySearching = true;
+            HdlThreadLogic.Current.RunThread(async () =>
+            {
+                int count = 0;
+                while (this.Parent != null && this.isGatewaySearching == true)
+                {
+                    //姣�2绉掓娴嬫悳绱㈠埌鐨勭綉鍏�
+                    System.Threading.Thread.Sleep(500);
+                    count++;
+                    if (count < 4)
+                    {
+                        //涓昏涓轰簡蹇竴鐐硅兘澶熶腑鏂繖涓嚎绋�
+                        continue;
+                    }
+                    count = 0;
+
+                    await this.CheckZbGatewayAndSetRow();
+
+                    if (this.newGatewayGetting == true)
+                    {
+                        //鑾峰彇寰楀埌鏂扮綉鍏�,鍒欎腑鏂嚎绋�
+                        break;
+                    }
+                }
+            });
+        }
+
+        /// <summary>
         /// 妫�娴嬫悳绱㈠埌鐨勭綉鍏�
         /// </summary>
         private async Task<bool> CheckZbGatewayAndSetRow()
         {
-            var listCheck = new HashSet<string>();
             for (int i = 0; i < ZbGateway.GateWayList.Count; i++)
             {
                 var way = ZbGateway.GateWayList[i];
@@ -386,7 +399,7 @@
                     this.newGatewayGetting = true;
                 }
 
-                if (mode == GatewayBindMode.First)
+                if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
                 {
                     //鎴戣寰楄繖閲岄渶瑕佽幏鍙栦竴涓嬫柊缃戝叧鐨勮澶囧垪琛�
                     Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(way);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
index dc07bcb..2aadc19 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
@@ -19,7 +19,7 @@
         /// <summary>
         /// 妗屽竷鎺т欢
         /// </summary>
-        private FrameLayout frameTable = null;
+        private NormalFrameLayout frameTable = null;
 
         #endregion
 
@@ -49,7 +49,7 @@
             this.ClearBodyFrame();
 
             //鍒濆鍖栨甯冩帶浠�
-            this.frameTable = new FrameLayout();
+            this.frameTable = new NormalFrameLayout();
             frameTable.Y = Application.GetRealHeight(187);
             frameTable.Height = bodyFrameLayout.Height - Application.GetRealHeight(187);
             bodyFrameLayout.AddChidren(frameTable);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
index 1fdf829..ab1221b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
@@ -14,7 +14,7 @@
         /// <summary>
         /// 妗屽竷鎺т欢
         /// </summary>
-        private FrameLayout frameTable = null;
+        private NormalFrameLayout frameTable = null;
         /// <summary>
         /// 鍒楄〃鎺т欢(鐧借壊鑳屾櫙)
         /// </summary>
@@ -154,7 +154,7 @@
                 };
             }
             //鍒濆鍖栨甯�
-            this.frameTable = new FrameLayout();
+            this.frameTable = new NormalFrameLayout();
             frameTable.Y = rowHome.Bottom + Application.GetRealHeight(23);
             frameTable.Height = listBackContr.frameTable.Height - rowHome.Bottom - Application.GetRealHeight(23);
             listBackContr.frameTable.AddChidren(frameTable);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
index 777464d..c470209 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
@@ -15,7 +15,7 @@
         /// <summary>
         /// 妗屽竷鎺т欢锛岀敤浜庡瓨鏀炬垨鑰呯Щ闄ゅ姛鑳藉潡鎺т欢(Tab鎺т欢涓撶敤)
         /// </summary>
-        private FrameLayout frameLayoutDraw = null;
+        private NormalFrameLayout frameLayoutDraw = null;
         /// <summary>
         /// 瀹夐槻鎺т欢
         /// </summary>
@@ -73,7 +73,7 @@
             bodyFrameLayout.AddChidren(frameBack);
 
             //妗屽竷鎺т欢
-            frameLayoutDraw = new FrameLayout();
+            frameLayoutDraw = new NormalFrameLayout();
             frameLayoutDraw.Y = Application.GetRealHeight(181);
             frameLayoutDraw.Height = frameBack.Height - Application.GetRealHeight(181);
             frameBack.AddChidren(frameLayoutDraw);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
index 4cb2bab..8e7a9d2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/AddNewSharedContentForm.cs
@@ -23,11 +23,11 @@
         /// <summary>
         /// 璁惧妗屽竷鎺т欢
         /// </summary>
-        private FrameLayout frameDeviceTable = null;
+        private NormalFrameLayout frameDeviceTable = null;
         /// <summary>
         /// 璁惧妗屽竷鎺т欢
         /// </summary>
-        private FrameLayout frameSceneTable = null;
+        private NormalFrameLayout frameSceneTable = null;
         /// <summary>
         /// 鍔熻兘鎸夐挳
         /// </summary>
@@ -81,12 +81,12 @@
             this.dicSelectScene = new Dictionary<int, Common.SceneUI>();
 
             //鍒濆鍖栨甯冩帶浠�
-            this.frameSceneTable = new FrameLayout();
+            this.frameSceneTable = new NormalFrameLayout();
             frameSceneTable.Y = Application.GetRealHeight(132);
             frameSceneTable.Height = bodyFrameLayout.Height - Application.GetRealHeight(132);
             bodyFrameLayout.AddChidren(frameSceneTable);
 
-            this.frameDeviceTable = new FrameLayout();
+            this.frameDeviceTable = new NormalFrameLayout();
             frameDeviceTable.Y = frameSceneTable.Y;
             frameDeviceTable.Height = frameSceneTable.Height;
             bodyFrameLayout.AddChidren(frameDeviceTable);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
index bb545c2..5c1287b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedContentForm.cs
@@ -23,11 +23,11 @@
         /// <summary>
         /// 璁惧妗屽竷鎺т欢
         /// </summary>
-        private FrameLayout frameDeviceTable = null;
+        private NormalFrameLayout frameDeviceTable = null;
         /// <summary>
         /// 璁惧妗屽竷鎺т欢
         /// </summary>
-        private FrameLayout frameSceneTable = null;
+        private NormalFrameLayout frameSceneTable = null;
         /// <summary>
         /// 鍒犻櫎鎸夐挳
         /// </summary>
@@ -81,12 +81,12 @@
             this.dicSelectScene = new Dictionary<int, Common.SceneUI>();
 
             //鍒濆鍖栨甯冩帶浠�
-            this.frameSceneTable = new FrameLayout();
+            this.frameSceneTable = new NormalFrameLayout();
             frameSceneTable.Y = Application.GetRealHeight(132);
             frameSceneTable.Height = bodyFrameLayout.Height - Application.GetRealHeight(132);
             bodyFrameLayout.AddChidren(frameSceneTable);
 
-            this.frameDeviceTable = new FrameLayout();
+            this.frameDeviceTable = new NormalFrameLayout();
             frameDeviceTable.Y = frameSceneTable.Y;
             frameDeviceTable.Height = frameSceneTable.Height;
             bodyFrameLayout.AddChidren(frameDeviceTable);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
index 881b00b..7b002f1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
@@ -11,7 +11,7 @@
         /// <summary>
         /// 涓儴妗屽竷鎺т欢
         /// </summary>
-        private FrameLayout frameMiddleBack = null;
+        private NormalFrameLayout frameMiddleBack = null;
 
         #region 鈻� 鍒濆鍖朹____________________________
 
@@ -80,7 +80,7 @@
         {
             if (this.frameMiddleBack == null)
             {
-                frameMiddleBack = new FrameLayout();
+                frameMiddleBack = new NormalFrameLayout();
                 frameMiddleBack.Y = Application.GetRealHeight(363);
                 frameMiddleBack.Height = Application.GetRealHeight(1008);
                 frameMiddleBack.BackgroundColor = UserCenterColor.Current.White;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
index f8976bc..db897ce 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
@@ -13,7 +13,7 @@
         /// <summary>
         /// 涓昏彍鍗曡儗鏅
         /// </summary>
-        private FrameLayout frameMainMenuBack = null;
+        private NormalFrameLayout frameMainMenuBack = null;
         /// <summary>
         /// 鍏朵粬鑿滃崟鐨勫鍣ㄦ帶浠�
         /// </summary>
@@ -218,7 +218,7 @@
             else
             {
                 //鑳屾櫙妗�
-                frameMainMenuBack = new FrameLayout();
+                frameMainMenuBack = new NormalFrameLayout();
                 frameMainMenuBack.Y = Application.GetRealHeight(288);
                 frameMainMenuBack.Gravity = Gravity.CenterHorizontal;
                 frameMainMenuBack.Height = Application.GetRealHeight(371);
diff --git a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
index 908cda3..86a34af 100755
--- a/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/UserPage.cs
@@ -40,7 +40,7 @@
         /// <summary>
         /// 鐢ㄦ埛涓讳綋鐣岄潰锛堜腑闂撮儴鍒嗭級
         /// </summary>
-        private FrameLayout bodyFrameView = null;
+        private NormalFrameLayout bodyFrameView = null;
         /// <summary>
         /// 鐣岄潰缂撳瓨(2020.05.07:鍒囨崲鏃朵笉绉婚櫎鐣岄潰,鐩存帴闅愯棌)
         /// </summary>
@@ -80,14 +80,14 @@
                 return;
             }
 #if iOS
-            if (Shared.Application.PhoneType >= 10)
+            if (Shared.Application.IsFullScreen == true)
             {
                 //楂樼増鏈殑鑻规灉鏈哄瀷锛屽睆骞曞簳閮ㄤ細鏈変竴涓粦鑹茬殑鏉�
                 ControlCommonResourse.BottomFrameHeight = Application.GetRealHeight(242);
             }
 #endif
             //鐢ㄦ埛涓讳綋鐣岄潰锛堜腑闂撮儴鍒嗭級
-            this.bodyFrameView = new FrameLayout();
+            this.bodyFrameView = new NormalFrameLayout();
             bodyFrameView.Height = this.Height - UserCenter.ControlCommonResourse.BottomFrameHeight;
             bodyFrameView.BackgroundColor = Shared.Common.ZigbeeColor.Current.MainColor;
             this.AddChidren(bodyFrameView);
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
index 5b956bf..ae26b71 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
@@ -311,9 +311,9 @@
         {
             /// <summary>
             /// 缁戝畾绫诲瀷
-            ///<para>0锛氱Щ闄よ澶囷紝鍚岀綉鍏宠澶囬棿鐨勭Щ闄�</para>
-            ///<para>1锛氱Щ闄よ澶囷紝璺ㄧ綉鍏宠澶囬棿鐨勭Щ闄�</para>
-            ///<para>2锛氱Щ闄ょ粦瀹氬満鏅�</para>
+            ///<para>0锛氬悓缃戝叧璁惧</para>
+            ///<para>1锛氳法缃戝叧璁惧闂�</para>
+            ///<para>2锛氬満鏅�</para>
             /// </summary>
             public int BindType;
             /// <summary>
@@ -337,6 +337,104 @@
             /// </summary>
             public string ESName;
         }
+
+        /// <summary>
+        /// 鑾峰彇鎵�鏈夌粦瀹氱殑淇℃伅
+        /// </summary>
+        public class BindListAllInfo
+        {
+            /// <summary>
+            /// 鎺у埗婧愯澶嘙ac鍦板潃
+            /// </summary>
+            public string KeyMacAddr;
+            /// <summary>
+            /// 鎺у埗婧愯澶囩殑绔彛鍙�
+            /// </summary>
+            public int KeyEpoint;
+            /// <summary>
+            /// 缁戝畾绫诲瀷
+            ///<para>0锛氬悓缃戝叧璁惧</para>
+            ///<para>1锛氳法缃戝叧璁惧闂�</para>
+            ///<para>2锛氬満鏅�</para>
+            /// </summary>
+            public int BindType;
+            /// <summary>
+            /// 缁戝畾鐨刢luster
+            /// </summary>
+            public int BindCluster;
+            /// <summary>
+            /// 缁戝畾璁惧Mac鍦板潃锛� 褰揃indType=0鏃跺瓨鍦�
+            /// </summary>
+            public string BindMacAddr;
+            /// <summary>
+            /// 缁戝畾璁惧鐨勭鍙e彿锛屽綋BindType=0鏃跺瓨鍦�
+            /// </summary>
+            public int BindEpoint;
+            /// <summary>
+            /// 缁戝畾鍦烘櫙锛屽綋BindType=1鏃跺瓨鍦�
+            /// </summary>
+            public int BindScenesId;
+            /// <summary>
+            /// 缁戝畾鐨勮澶囨垨鍦烘櫙鍚嶇О
+            /// </summary>
+            public string ESName;
+        }
+
+        /// <summary>
+        /// 鑾峰彇闈㈡澘缁戝畾鍥炲鐨勬暟鎹�愰�氳繃mac鑾峰彇鐨勫洖澶峕
+        /// </summary>
+        [System.Serializable]
+        public class GetPanelBindResponseDataByMac
+        {
+            /// <summary>
+            /// 0锛氭垚鍔�
+            ///<para>1锛氱粦瀹氫笉瀛樺湪</para>
+            /// </summary>
+            public int Result;
+            /// <summary>
+            /// MaxNumItems
+            /// </summary>
+            public int MaxNumItems;
+            /// <summary>
+            /// StartIndex
+            /// </summary>
+            public int StartIndex;
+            /// <summary>
+            /// ReturnBindNum
+            /// </summary>
+            public int ReturnBindNum;
+            /// <summary>
+            /// 缁戝畾鍒楄〃 锛屽綋Status=0鏃跺瓨鍦ㄣ��
+            /// </summary>
+            public List<BindDeviceByMacObj> BindList = new List<BindDeviceByMacObj>();
+        }
+
+        /// <summary>
+        /// 鑾峰彇闈㈡澘缁戝畾鍥炲鐨勬暟鎹�愰�氳繃mac鑾峰彇鐨勫洖澶峕
+        /// </summary>
+        public class BindDeviceByMacObj
+        {
+            /// <summary>
+            /// ControllerEpoint
+            /// </summary>
+            public int ControllerEpoint;
+            /// <summary>
+            /// 缁戝畾鐨刢luster
+            /// </summary>
+            public int BindCluster;
+            /// <summary>
+            /// 缁戝畾璁惧Mac鍦板潃锛� 褰揃indType=0鏃跺瓨鍦�
+            /// </summary>
+            public string BindMacAddr;
+            /// <summary>
+            /// 缁戝畾璁惧鐨勭鍙e彿锛屽綋BindType=0鏃跺瓨鍦�
+            /// </summary>
+            public int BindEpoint;
+            /// <summary>
+            /// BindMode
+            /// </summary>
+            public int BindMode;
+        }
         #endregion
 
         #region 浠庤妭鐐硅澶囨湰鍦拌褰曡鍙栫粦瀹氬垪琛ㄤ俊鎭�
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ColorDimmerSwitch.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ColorDimmerSwitch.cs
new file mode 100755
index 0000000..8f677ff
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ColorDimmerSwitch.cs
@@ -0,0 +1,13 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+namespace ZigBee.Device
+{
+    public class ColorDimmerSwitch : LightBase
+	{
+        public ColorDimmerSwitch()
+        {
+            this.Type = DeviceType.ColorDimmerSwitch;
+        } 
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ColorTemperatureLight.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ColorTemperatureLight.cs
index 7645945..1f2a4b8 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ColorTemperatureLight.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ColorTemperatureLight.cs
@@ -22,7 +22,7 @@
         public int Level = 0;
 
         /// <summary>
-        ///鑹叉俯锛屽彇鍊艰寖鍥达細3400~6000
+        ///鑹叉俯锛屽彇鍊艰寖鍥达細3000~6000(杩欓噷璁板綍鐨勫�肩殑鍗曚綅鏄� 鍗�)
         /// </summary>
         [Newtonsoft.Json.JsonIgnore]
         public int ColorTemperature = 0;
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
index da81728..1d991f4 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
@@ -248,9 +248,21 @@
             {
                 device = Newtonsoft.Json.JsonConvert.DeserializeObject<ToggleLight>(strDeviceByte);
             }
+            else if (strDeviceType == ZigBee.Device.DeviceType.ColorDimmerSwitch.ToString())
+            {
+                device = Newtonsoft.Json.JsonConvert.DeserializeObject<ColorDimmerSwitch>(strDeviceByte);
+            }
+            else if (strDeviceType == ZigBee.Device.DeviceType.LevelControlSwitch.ToString())
+            {
+                device = Newtonsoft.Json.JsonConvert.DeserializeObject<LevelControlSwitch>(strDeviceByte);
+            }
             else if (strDeviceType == ZigBee.Device.DeviceType.WindowCoveringDevice.ToString())
             {
                 device = Newtonsoft.Json.JsonConvert.DeserializeObject<Rollershade>(strDeviceByte);
+            }
+            else if (strDeviceType == ZigBee.Device.DeviceType.WindowCoveringController.ToString())
+            {
+                device = Newtonsoft.Json.JsonConvert.DeserializeObject<WindowCoveringController>(strDeviceByte);
             }
             else if (strDeviceType == ZigBee.Device.DeviceType.OnOffSwitch.ToString())
             {
@@ -675,6 +687,10 @@
             /// 濂藉儚鏄簭鍒楀彿
             /// </summary>
             public string ProductCode = string.Empty;
+            /// <summary>
+            /// 璁惧鍔熻兘绫诲瀷(绌烘皵寮�鍏冲拰缁х數鍣ㄤ笓鐢�)
+            /// </summary>
+            public int FunctionType = -1;
             /// <summary>
             /// 杈撳叆绨囧垪琛�
             /// </summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
index 2d60163..be1ae91 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
@@ -12,6 +12,12 @@
         /// </summary>
         OnOffSwitch = 0,
         /// <summary>
+        /// 浜害鎺у埗寮�鍏�
+        /// <para>璁惧ID涓�2</para>
+        /// <para>瀹氫箟瀵硅薄 LevelControlSwitch</para>
+        /// </summary>
+        LevelControlSwitch = 1,
+        /// <summary>
         /// 缁х數鍣�
         /// <para>璁惧ID涓�2</para>
         /// <para>瀹氫箟瀵硅薄锛歍oggleLight</para>
@@ -36,11 +42,22 @@
         /// </summary>
         ColorTemperatureLight = 258,
         /// <summary>
+        /// 棰滆壊璋冨厜鐏紑鍏�
+        /// <para>璁惧ID涓�2</para>
+        /// <para>瀹氫箟瀵硅薄 LevelControlSwitch</para>
+        /// </summary>
+        ColorDimmerSwitch = 261,
+        /// <summary>
         /// 绐楀笜璁惧ID
         /// <para>Rollershade:鍗峰笜</para>
         /// </summary>
         WindowCoveringDevice = 514,
         /// <summary>
+        /// 绐楀笜鎺у埗鍣ㄨ澶嘔D
+        /// <para>CurtainController:绐楀笜鎺у埗鍣�</para>
+        /// </summary>
+        WindowCoveringController = 515,
+        /// <summary>
         /// 璁惧ID涓�528鐨勮澶�
         /// <para>棰滆壊璋冨厜鐏細鏀寔浜害/鑹插害/楗卞拰搴�</para>
         /// <para>璋冨厜璁惧</para>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs
index 25d2391..15d44e8 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs
@@ -4,7 +4,7 @@
 namespace ZigBee.Device
 {
     [System.Serializable]
-    public class FreshAir : Panel
+    public class FreshAir : CommonDevice
     {
         /// <summary>
         /// 璇ョ被锛堟柊椋庡璞★級鍖呭惈鏂伴璁惧鍜屾柊椋庨潰鏉� 
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/LevelControlSwitch.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/LevelControlSwitch.cs
new file mode 100755
index 0000000..b280b9d
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/LevelControlSwitch.cs
@@ -0,0 +1,13 @@
+锘縰sing System;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+namespace ZigBee.Device
+{
+    public class LevelControlSwitch : LightBase
+    {
+        public LevelControlSwitch()
+        {
+            this.Type = DeviceType.LevelControlSwitch;
+        }
+    }
+}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
index b408bbd..bd75dce 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
@@ -18,7 +18,12 @@
         /// 鎸夐敭妯″紡锛堢鏈夊姛鑳斤級
         /// </summary>
         public int panelMode = 65535;
-
+        /// <summary>
+        ///褰撳墠閫夋嫨鐨勭畝绾﹀鍔熻兘闈㈡澘鐨勭被鍨嬨�愮畝绾﹀鍔熻兘闈㈡澘銆�
+        /// 0:鍦烘櫙  1:寮�鍏�  2:鎻掑骇  3:鐏厜  4:閬槼 5:绌鸿皟 6:鏂伴
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public int currentMutilfunctionBindType = 0;
         /// <summary>
         /// 褰撳墠閫夋嫨妯″紡
         /// </summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/WindowCoveringController.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/WindowCoveringController.cs
new file mode 100755
index 0000000..4ed8566
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/WindowCoveringController.cs
@@ -0,0 +1,14 @@
+锘縰sing System;
+using Newtonsoft.Json.Linq;
+
+namespace ZigBee.Device
+{
+    [System.Serializable]
+    public class WindowCoveringController : CurtainBase
+    {
+        public WindowCoveringController()
+        {
+            this.Type = DeviceType.WindowCoveringController;
+        }
+   }
+}
\ No newline at end of file
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index de1dffb..1ecc9a8 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -350,7 +350,7 @@
         /// </summary>
         public const int AddFreshAirModulPanelMsg = 239;
         /// <summary>
-        /// 璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵 
+        /// 璁剧疆甯稿紑妯″紡鍚庯紝鎮ㄧ殑闂ㄩ攣灏嗗缁坽0}澶勪簬鎵撳紑鐘舵�侊紝纭寮�鍚紵
         /// </summary>
         public const int SetDoorLockNomallyOpen = 241;
         /// <summary>
@@ -622,6 +622,38 @@
         /// 闀挎寜鈥滃紑鍏斥�濇寜閿�5绉�
         /// </summary>
         public const int LongPressButtonSwitch = 327;
+        /// <summary>
+        /// 鏈�澶氬彲娣诲姞{0}涓�
+        /// </summary>
+        public const int AddMoreTip = 328;
+        /// <summary>
+        /// 缁戝畾
+        /// </summary>
+        public const int Bind = 329;
+        /// <summary>
+        /// 330=璇ヨ澶囨槸缁х數鍣紝褰撳墠鍙敮鎸佸甫鏈夎皟鍏夌殑鐏厜缁戝畾
+        /// </summary>
+        public readonly static int CanSelectDimmer = 330;
+        /// <summary>
+        /// 璇ヨ澶囨槸璋冨厜鐏紝褰撳墠鍙敮鎸佷笉甯︽湁璋冨厜鐨勭伅鍏夌粦瀹�
+        /// </summary>
+        public readonly static int CanSelectRelay = 331;
+        /// <summary>
+        /// 绌鸿皟鐩爣
+        /// </summary>
+        public const int AcTargets = 332;
+        /// <summary>
+        /// 涓嶇粦瀹氫换浣曠洰鏍�
+        /// </summary>
+        public const int BindEmptyTargets = 333;
+        /// <summary>
+        /// /鐫$湢鏃堕棿
+        /// </summary>
+        public const int SleepTime = 334;
+        /// <summary>
+        /// 璀﹀憡锛佹暟鎹嚭閿欙紝蹇呴』鍒锋柊鍒楄〃锛屽惁鍒欐帶鍒剁幇璞¢敊涔�
+        /// </summary>
+        public const int UpdateBindList = 335;
 
         public readonly static int cancel = 5097;
         public readonly static int confrim = 5098;
@@ -902,6 +934,10 @@
         public readonly static int executeSone = 5403;
         public readonly static int hour1 = 5404;
         public readonly static int mi = 5405;
+        public readonly static int nightLightSwitch = 5406;
+        public readonly static int colorTemperature = 5407;
+        public readonly static int buzzer = 5408;
+     
 
 
         /// <summary>
@@ -5753,6 +5789,10 @@
         /// 灏忓鐏紑鍏�
         /// </summary>
         public const int uMiniLightSwitch = 16133;
+        /// <summary>
+        /// 璁剧疆璁惧鍔熻兘绫诲瀷澶辫触
+        /// </summary>
+        public const int uSetDeviceFunctionTypeFail = 16134;
 
 
 
diff --git a/ZigbeeApp/Shared/Shared.projitems b/ZigbeeApp/Shared/Shared.projitems
index 9d8236b..ff57551 100755
--- a/ZigbeeApp/Shared/Shared.projitems
+++ b/ZigbeeApp/Shared/Shared.projitems
@@ -41,6 +41,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\CompleteView.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\FunView.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\IfString.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\LightView.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\mFunView.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\SaveView.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\SelectedDeviceView.cs" />
@@ -48,6 +49,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\TopView.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\TypeView.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\Method.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\Nightlight.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\OneLogic.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\OneTimePoint.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\RoomAndDeviceView.cs" />
@@ -194,6 +196,8 @@
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Bind\BindCommonLayout.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Bind\BindTargetsPage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Bind\ChooseKeyModePage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Bind\MutilfunctionPanelMethod.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Bind\PaneTargetsBaseForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Curtain\AutoOpenDirectionAndLimitSettionForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Curtain\SiphonateDirectionAndLimitSettionForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\AirConditionerZbGatewayDirectionForm.cs" />
@@ -222,16 +226,16 @@
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorWaterDirectionForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Light\MiniNightLightFunctionSettionForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelBackLighWithSensorForm.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelBrightnessAdjustForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueButtonSettionForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueEnvironmentButtonSettionForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueEnvironmentLightSettionForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueEnvironmentTargetForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueFreshAirBackLightSettionForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueFreshAirButtonSettionForm.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueFreshAirTargetsForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueFunctionSettionForm.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelSimpleEnvironmentTargetsForm.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelSimpleMutilfunctionBindSensorForm.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelSimpleEnvironmentButtonSettionForm.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelSimpleMutilfunctionAddTargetsForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelSimpleMutilfunctionTargetsForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\PirSensor\PirSensorDimmingModeForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\PirSensor\PirSensorTargetSelectForm.cs" />
@@ -431,14 +435,17 @@
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserView\LoginLoading.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\AC.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\Buzzer.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\ColorDimmerSwitch.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\ColorTemperatureLight.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\DimmableLight.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\DoorLock.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\FreshAir.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\HumiditySensor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\LevelControlSwitch.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\PMSensor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\Repeater.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\Transverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\WindowCoveringController.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)R.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserView\HomePage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Phone\UserView\UserPage.cs" />

--
Gitblit v1.8.0