From 136b9e2fc48249a5ff89874f1080ba94130e7a9e Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 19 五月 2020 11:12:29 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm

---
 ZigbeeApp/GateWay.Droid/Assets/Language.ini                                                                 |    5 
 ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs                                                      | 14514 +++++++++++++++++++++++++-------------------------
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs                                |   24 
 ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs                                  |   28 
 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs                                         |    2 
 ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs                                                             |   82 
 ZigbeeApp/Home.Ios/Resources/Phone/Logo/StartBackGroud.png                                                  |    0 
 ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs                                                         |   74 
 ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs                                                           |   14 
 ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGatewaySelected2.png                            |    0 
 ZigbeeApp/GateWay.Droid/Assets/Phone/Logo/Logo.png                                                          |    0 
 ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerZbGatewaySelected.png                               |    0 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs                               |   54 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs                  |    3 
 ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs                                            |    5 
 ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceRelayRowControl.cs                                 |    6 
 ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs                          |    6 
 ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs                                                |    2 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs                                          |   49 
 ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs                                      |   10 
 ZigbeeApp/Home.Ios/mono_crash.115869ea88.0.json                                                             |  775 ++
 ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs                                    |    6 
 ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/AirConditionerZbGateway.png                                   |    0 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs                                       |    8 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueButtonSettionForm.cs                             |   17 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs                              |    4 
 ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs                                                         |   50 
 ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditioner.png                                                |    0 
 ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerZbGatewaySelected2.png                              |    0 
 ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerSelected.png                                      |    0 
 ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs                                                      |    2 
 ZigbeeApp/Home.Ios/Resources/Phone/Instruct/AirConditionerZbGateway.png                                     |    0 
 ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAirSwitchCardControl.cs                           |    6 
 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs                                              |   11 
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs                                              |   72 
 ZigbeeApp/Shared/Phone/UserView/LoginLoading.cs                                                             |   33 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs                  |   35 
 ZigbeeApp/GateWay.Droid/Assets/Phone/Logo/StartBackGroud.png                                                |    0 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs |    7 
 ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceFreshAirRowControl.cs                              |    6 
 ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs                                                      |    4 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFunctionSettionForm.cs                           |   64 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs        |    7 
 ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs                              |   43 
 ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceFreshAirCardControl.cs                            |   10 
 ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditioner.png                                              |    0 
 ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs                                                            |    5 
 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs                                          |   66 
 ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/AirConditionerZbGateway.png                                 |    0 
 ZigbeeApp/Shared/Phone/Device/Logic/Method.cs                                                               |    2 
 ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj                                                                |   10 
 ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAirSwitchRowControl.cs                             |    6 
 ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs                            |    6 
 ZigbeeApp/Shared/Common/CommonPage.cs                                                                       |   65 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs         |    7 
 ZigbeeApp/Shared/Phone/Device/Logic/Send.cs                                                                 |   22 
 ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs                                                       |   76 
 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs                                                         |   17 
 ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs                                                |   27 
 ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs                                                        |  199 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs           |   15 
 ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml                                                      |    2 
 ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAcCardControl.cs                                  |    6 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs                                   |   72 
 ZigbeeApp/Home.Ios/Resources/Phone/Logo/Logo.png                                                            |    0 
 ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs                                |   17 
 ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerSelected2.png                                     |    0 
 ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerZbGateway.png                                       |    0 
 ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceDoorLockRowControl.cs                              |    6 
 ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs                                                     |   10 
 ZigbeeApp/Shared/Phone/UserView/HomePage.cs                                                                 |   16 
 ZigbeeApp/Home.Ios/MainViewController.cs                                                                    |    6 
 ZigbeeApp/Home.Ios/Resources/Language.ini                                                                   |  183 
 ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs                             |    6 
 ZigbeeApp/Home.Ios/Home.IOS.csproj                                                                          |    2 
 ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceCurtainRowControl.cs                               |    6 
 ZigbeeApp/Shared/R.cs                                                                                       |   15 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs                             |    2 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListRefreshControl.cs  |    7 
 ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerSelected.png                                        |    0 
 ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGateway.png                                     |    0 
 ZigbeeApp/Shared/Common/Device.cs                                                                           |  122 
 ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs                                                         |    1 
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs                                            |    8 
 ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DevicePmSensorRowControl.cs                              |    6 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs                                       |   25 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs                               |   51 
 ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs                                 |   16 
 ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceRelayCardControl.cs                               |    6 
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs                                         |   99 
 ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerSelected2.png                                       |    0 
 /dev/null                                                                                                   |    0 
 ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs                                          |   79 
 ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs                                                        |    6 
 ZigbeeApp/Home.Ios/Resources/Phone/RealDevice/AirConditionerZbGateway.png                                   |    0 
 ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGatewaySelected.png                             |    0 
 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs                           |   36 
 ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceDoorLockCardControl.cs                            |    6 
 98 files changed, 9,322 insertions(+), 8,056 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index 4b50e52..3fd7c1f 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -1846,6 +1846,9 @@
 16114=鐏叏鍏�
 16115=甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
 16116=娓稿浣撻獙
+16117=鏅鸿兘鏀瑰彉鐢熸椿 | Enjoy smart life
+16118=缃戠粶涓嶇ǔ瀹氾紝鍦烘櫙鍒楄〃淇℃伅缂烘崯
+16119=DATA缁胯壊鎸囩ず鐏棯鐑�
 
 ;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
 18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
@@ -1915,7 +1918,7 @@
 ;涓户鍣ㄥ叆缃戞搷浣滄寚绀�
 21014=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁块棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欏叆缃戞垚鍔�
 ;绌鸿皟鍏ョ綉鎿嶄綔鎸囩ず
-21015=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊,杩涘叆閰嶇綉鐘舵�亄0}缁跨伅姣�5绉掗棯鐑佷竴娆″垯鍏ョ綉鎴愬姛
+21015=闀挎寜缂栫▼鎸夐敭5绉�,DATA缁胯壊LED闂儊,{0}棰戠巼涓轰寒0.5绉�,鐏�0.5绉�
 ;pir浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
 21016=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�亄0}闂儊杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
 ;娓╂箍搴︿紶鎰熷櫒鍏ョ綉鎿嶄綔鎸囩ず
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditioner.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditioner.png
index b084aab..306e789 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditioner.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditioner.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerSelected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerSelected.png
index 4d303e2..8a74f8d 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerSelected.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerSelected.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerSelected2.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerSelected2.png
index 0915084..6a4f978 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerSelected2.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerSelected2.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGateway.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGateway.png
index b084aab..306e789 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGateway.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGateway.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGatewaySelected.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGatewaySelected.png
index 4d303e2..8a74f8d 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGatewaySelected.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGatewaySelected.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGatewaySelected2.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGatewaySelected2.png
index 0915084..6a4f978 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGatewaySelected2.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Device/AirConditionerZbGatewaySelected2.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/AirConditionerZbGateway.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/AirConditionerZbGateway.png
index 48792d0..96a1e16 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/AirConditionerZbGateway.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/AirConditionerZbGateway.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Logo/2.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Logo/2.png
deleted file mode 100755
index 7a07804..0000000
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Logo/2.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Logo/Logo.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Logo/Logo.png
index 232eeea..30b57f2 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Logo/Logo.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Logo/Logo.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Logo/StartBackGroud.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Logo/StartBackGroud.png
new file mode 100755
index 0000000..43956d1
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Logo/StartBackGroud.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/AirConditionerZbGateway.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/AirConditionerZbGateway.png
index 510b39b..bd9c682 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/AirConditionerZbGateway.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/RealDevice/AirConditionerZbGateway.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index f74407e..15159bf 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -507,7 +507,6 @@
     <AndroidAsset Include="Assets\Phone\Item\UpperTriangle.png" />
     <AndroidAsset Include="Assets\Phone\Item\VirtualFrame.png" />
     <AndroidAsset Include="Assets\Phone\Item\WrongIcon.png" />
-    <AndroidAsset Include="Assets\Phone\Logo\Logo.png" />
     <AndroidAsset Include="Assets\Phone\Navigation\Category.png" />
     <AndroidAsset Include="Assets\Phone\Navigation\CategorySelected.png" />
     <AndroidAsset Include="Assets\Phone\Navigation\Home.png" />
@@ -2087,9 +2086,6 @@
     <AndroidAsset Include="Assets\Phone\Item\NormallyOpen.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidAsset Include="Assets\Phone\Logo\2.png" />
-  </ItemGroup>
-  <ItemGroup>
     <AndroidAsset Include="Assets\Phone\Item\Check1.png" />
   </ItemGroup>
   <ItemGroup>
@@ -2161,6 +2157,12 @@
   <ItemGroup>
     <AndroidAsset Include="Assets\Phone\PM2.5Sensor\TemperaturePic.png" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidAsset Include="Assets\Phone\Logo\StartBackGroud.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidAsset Include="Assets\Phone\Logo\Logo.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 06662d7..be6eda8 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="2020050901" android:installLocation="auto" android:versionName="1.0.20050901">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="2020051301" android:installLocation="auto" android:versionName="1.0.20051301">
 	<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..3c90fc0 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -13,5704 +13,5763 @@
 
 namespace GateWay.Droid
 {
-	
-	
+
+
 	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
 	public partial class Resource
 	{
-		
+
 		static Resource()
 		{
 			global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 		}
-		
+
 		public static void UpdateIdValues()
 		{
 			global::ZXing.Mobile.Resource.Id.contentFrame = global::GateWay.Droid.Resource.Id.contentFrame;
 			global::ZXing.Mobile.Resource.Layout.zxingscanneractivitylayout = global::GateWay.Droid.Resource.Layout.zxingscanneractivitylayout;
 			global::ZXing.Mobile.Resource.Layout.zxingscannerfragmentlayout = global::GateWay.Droid.Resource.Layout.zxingscannerfragmentlayout;
 		}
-		
+
 		public partial class Animation
 		{
-			
-			// aapt resource value: 0x7F010000
-			public const int abc_fade_in = 2130771968;
-			
-			// aapt resource value: 0x7F010001
-			public const int abc_fade_out = 2130771969;
-			
-			// aapt resource value: 0x7F010002
-			public const int abc_grow_fade_in_from_bottom = 2130771970;
-			
-			// aapt resource value: 0x7F010003
-			public const int abc_popup_enter = 2130771971;
-			
-			// aapt resource value: 0x7F010004
-			public const int abc_popup_exit = 2130771972;
-			
-			// aapt resource value: 0x7F010005
-			public const int abc_shrink_fade_out_from_bottom = 2130771973;
-			
-			// aapt resource value: 0x7F010006
-			public const int abc_slide_in_bottom = 2130771974;
-			
-			// aapt resource value: 0x7F010007
-			public const int abc_slide_in_top = 2130771975;
-			
-			// aapt resource value: 0x7F010008
-			public const int abc_slide_out_bottom = 2130771976;
-			
-			// aapt resource value: 0x7F010009
-			public const int abc_slide_out_top = 2130771977;
-			
-			// aapt resource value: 0x7F01000A
-			public const int design_bottom_sheet_slide_in = 2130771978;
-			
-			// aapt resource value: 0x7F01000B
-			public const int design_bottom_sheet_slide_out = 2130771979;
-			
-			// aapt resource value: 0x7F01000C
-			public const int design_snackbar_in = 2130771980;
-			
-			// aapt resource value: 0x7F01000D
-			public const int design_snackbar_out = 2130771981;
-			
-			// aapt resource value: 0x7F01000E
-			public const int fingerprint_draw_off_animation_interpolator_0 = 2130771982;
-			
-			// aapt resource value: 0x7F01000F
-			public const int fingerprint_draw_off_animation_interpolator_1 = 2130771983;
-			
-			// aapt resource value: 0x7F010010
-			public const int fingerprint_draw_off_ridge_1_path_animation = 2130771984;
-			
-			// aapt resource value: 0x7F010011
-			public const int fingerprint_draw_off_ridge_2_path_animation = 2130771985;
-			
-			// aapt resource value: 0x7F010012
-			public const int fingerprint_draw_off_ridge_5_path_animation = 2130771986;
-			
-			// aapt resource value: 0x7F010013
-			public const int fingerprint_draw_off_ridge_6_path_animation = 2130771987;
-			
-			// aapt resource value: 0x7F010014
-			public const int fingerprint_draw_off_ridge_7_path_animation = 2130771988;
-			
-			// aapt resource value: 0x7F010015
-			public const int fingerprint_draw_on_animation_interpolator_0 = 2130771989;
-			
-			// aapt resource value: 0x7F010016
-			public const int fingerprint_draw_on_animation_interpolator_1 = 2130771990;
-			
-			// aapt resource value: 0x7F010017
-			public const int fingerprint_draw_on_ridge_1_path_animation = 2130771991;
-			
-			// aapt resource value: 0x7F010018
-			public const int fingerprint_draw_on_ridge_2_path_animation = 2130771992;
-			
-			// aapt resource value: 0x7F010019
-			public const int fingerprint_draw_on_ridge_5_path_animation = 2130771993;
-			
-			// aapt resource value: 0x7F01001A
-			public const int fingerprint_draw_on_ridge_6_path_animation = 2130771994;
-			
-			// aapt resource value: 0x7F01001B
-			public const int fingerprint_draw_on_ridge_7_path_animation = 2130771995;
-			
-			// aapt resource value: 0x7F01001C
-			public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2130771996;
-			
-			// aapt resource value: 0x7F01001D
-			public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2130771997;
-			
-			// aapt resource value: 0x7F01001E
-			public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2130771998;
-			
-			// aapt resource value: 0x7F01001F
-			public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2130771999;
-			
-			// aapt resource value: 0x7F010020
-			public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2130772000;
-			
-			// aapt resource value: 0x7F010021
-			public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2130772001;
-			
-			// aapt resource value: 0x7F010022
-			public const int fingerprint_error_state_to_fp_group_1_animation = 2130772002;
-			
-			// aapt resource value: 0x7F010023
-			public const int fingerprint_error_state_to_fp_group_2_animation = 2130772003;
-			
-			// aapt resource value: 0x7F010024
-			public const int fingerprint_error_state_to_fp_path_1_animation = 2130772004;
-			
-			// aapt resource value: 0x7F010025
-			public const int fingerprint_error_state_to_fp_path_2_animation = 2130772005;
-			
-			// aapt resource value: 0x7F010026
-			public const int fingerprint_error_state_to_fp_path_3_animation = 2130772006;
-			
-			// aapt resource value: 0x7F010027
-			public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2130772007;
-			
-			// aapt resource value: 0x7F010028
-			public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2130772008;
-			
-			// aapt resource value: 0x7F010029
-			public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2130772009;
-			
-			// aapt resource value: 0x7F01002A
-			public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2130772010;
-			
-			// aapt resource value: 0x7F01002B
-			public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2130772011;
-			
-			// aapt resource value: 0x7F01002C
-			public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2130772012;
-			
-			// aapt resource value: 0x7F01002D
-			public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2130772013;
-			
-			// aapt resource value: 0x7F01002E
-			public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2130772014;
-			
-			// aapt resource value: 0x7F01002F
-			public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2130772015;
-			
-			// aapt resource value: 0x7F010030
-			public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2130772016;
-			
-			// aapt resource value: 0x7F010031
-			public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2130772017;
-			
-			// aapt resource value: 0x7F010032
-			public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2130772018;
-			
-			// aapt resource value: 0x7F010033
-			public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2130772019;
-			
-			// aapt resource value: 0x7F010034
-			public const int fingerprint_fp_to_error_state_group_1_animation = 2130772020;
-			
-			// aapt resource value: 0x7F010035
-			public const int fingerprint_fp_to_error_state_group_2_animation = 2130772021;
-			
-			// aapt resource value: 0x7F010036
-			public const int fingerprint_fp_to_error_state_path_1_animation = 2130772022;
-			
-			// aapt resource value: 0x7F010037
-			public const int fingerprint_fp_to_error_state_path_2_animation = 2130772023;
-			
-			// aapt resource value: 0x7F010038
-			public const int fingerprint_fp_to_error_state_path_3_animation = 2130772024;
-			
-			// aapt resource value: 0x7F010039
-			public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2130772025;
-			
-			// aapt resource value: 0x7F01003A
-			public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2130772026;
-			
-			// aapt resource value: 0x7F01003B
-			public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2130772027;
-			
-			// aapt resource value: 0x7F01003C
-			public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2130772028;
-			
-			// aapt resource value: 0x7F01003D
-			public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2130772029;
-			
-			// aapt resource value: 0x7F01003E
-			public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2130772030;
-			
-			// aapt resource value: 0x7F01003F
-			public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2130772031;
-			
-			// aapt resource value: 0x7F010040
-			public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2130772032;
-			
-			// aapt resource value: 0x7F010041
-			public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2130772033;
-			
-			// aapt resource value: 0x7F010042
-			public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2130772034;
-			
-			// aapt resource value: 0x7F010043
-			public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2130772035;
-			
-			// aapt resource value: 0x7F010044
-			public const int move_in = 2130772036;
-			
-			// aapt resource value: 0x7F010045
-			public const int move_out = 2130772037;
-			
-			// aapt resource value: 0x7F010046
-			public const int pickerview_dialog_scale_in = 2130772038;
-			
-			// aapt resource value: 0x7F010047
-			public const int pickerview_dialog_scale_out = 2130772039;
-			
-			// aapt resource value: 0x7F010048
-			public const int pickerview_slide_in_bottom = 2130772040;
-			
-			// aapt resource value: 0x7F010049
-			public const int pickerview_slide_out_bottom = 2130772041;
-			
-			// aapt resource value: 0x7F01004A
-			public const int tooltip_enter = 2130772042;
-			
-			// aapt resource value: 0x7F01004B
-			public const int tooltip_exit = 2130772043;
-			
+
+			// aapt resource value: 0x7f050000
+			public const int abc_fade_in = 2131034112;
+
+			// aapt resource value: 0x7f050001
+			public const int abc_fade_out = 2131034113;
+
+			// aapt resource value: 0x7f050002
+			public const int abc_grow_fade_in_from_bottom = 2131034114;
+
+			// aapt resource value: 0x7f050003
+			public const int abc_popup_enter = 2131034115;
+
+			// aapt resource value: 0x7f050004
+			public const int abc_popup_exit = 2131034116;
+
+			// aapt resource value: 0x7f050005
+			public const int abc_shrink_fade_out_from_bottom = 2131034117;
+
+			// aapt resource value: 0x7f050006
+			public const int abc_slide_in_bottom = 2131034118;
+
+			// aapt resource value: 0x7f050007
+			public const int abc_slide_in_top = 2131034119;
+
+			// aapt resource value: 0x7f050008
+			public const int abc_slide_out_bottom = 2131034120;
+
+			// aapt resource value: 0x7f050009
+			public const int abc_slide_out_top = 2131034121;
+
+			// aapt resource value: 0x7f05000a
+			public const int design_bottom_sheet_slide_in = 2131034122;
+
+			// aapt resource value: 0x7f05000b
+			public const int design_bottom_sheet_slide_out = 2131034123;
+
+			// aapt resource value: 0x7f05000c
+			public const int design_snackbar_in = 2131034124;
+
+			// aapt resource value: 0x7f05000d
+			public const int design_snackbar_out = 2131034125;
+
+			// aapt resource value: 0x7f05000e
+			public const int fingerprint_draw_off_animation_interpolator_0 = 2131034126;
+
+			// aapt resource value: 0x7f05000f
+			public const int fingerprint_draw_off_animation_interpolator_1 = 2131034127;
+
+			// aapt resource value: 0x7f050010
+			public const int fingerprint_draw_off_ridge_1_path_animation = 2131034128;
+
+			// aapt resource value: 0x7f050011
+			public const int fingerprint_draw_off_ridge_2_path_animation = 2131034129;
+
+			// aapt resource value: 0x7f050012
+			public const int fingerprint_draw_off_ridge_5_path_animation = 2131034130;
+
+			// aapt resource value: 0x7f050013
+			public const int fingerprint_draw_off_ridge_6_path_animation = 2131034131;
+
+			// aapt resource value: 0x7f050014
+			public const int fingerprint_draw_off_ridge_7_path_animation = 2131034132;
+
+			// aapt resource value: 0x7f050015
+			public const int fingerprint_draw_on_animation_interpolator_0 = 2131034133;
+
+			// aapt resource value: 0x7f050016
+			public const int fingerprint_draw_on_animation_interpolator_1 = 2131034134;
+
+			// aapt resource value: 0x7f050017
+			public const int fingerprint_draw_on_ridge_1_path_animation = 2131034135;
+
+			// aapt resource value: 0x7f050018
+			public const int fingerprint_draw_on_ridge_2_path_animation = 2131034136;
+
+			// aapt resource value: 0x7f050019
+			public const int fingerprint_draw_on_ridge_5_path_animation = 2131034137;
+
+			// aapt resource value: 0x7f05001a
+			public const int fingerprint_draw_on_ridge_6_path_animation = 2131034138;
+
+			// aapt resource value: 0x7f05001b
+			public const int fingerprint_draw_on_ridge_7_path_animation = 2131034139;
+
+			// aapt resource value: 0x7f05001c
+			public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2131034140;
+
+			// aapt resource value: 0x7f05001d
+			public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2131034141;
+
+			// aapt resource value: 0x7f05001e
+			public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2131034142;
+
+			// aapt resource value: 0x7f05001f
+			public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2131034143;
+
+			// aapt resource value: 0x7f050020
+			public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2131034144;
+
+			// aapt resource value: 0x7f050021
+			public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2131034145;
+
+			// aapt resource value: 0x7f050022
+			public const int fingerprint_error_state_to_fp_group_1_animation = 2131034146;
+
+			// aapt resource value: 0x7f050023
+			public const int fingerprint_error_state_to_fp_group_2_animation = 2131034147;
+
+			// aapt resource value: 0x7f050024
+			public const int fingerprint_error_state_to_fp_path_1_animation = 2131034148;
+
+			// aapt resource value: 0x7f050025
+			public const int fingerprint_error_state_to_fp_path_2_animation = 2131034149;
+
+			// aapt resource value: 0x7f050026
+			public const int fingerprint_error_state_to_fp_path_3_animation = 2131034150;
+
+			// aapt resource value: 0x7f050027
+			public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2131034151;
+
+			// aapt resource value: 0x7f050028
+			public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2131034152;
+
+			// aapt resource value: 0x7f050029
+			public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2131034153;
+
+			// aapt resource value: 0x7f05002a
+			public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2131034154;
+
+			// aapt resource value: 0x7f05002b
+			public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2131034155;
+
+			// aapt resource value: 0x7f05002c
+			public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2131034156;
+
+			// aapt resource value: 0x7f05002d
+			public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2131034157;
+
+			// aapt resource value: 0x7f05002e
+			public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2131034158;
+
+			// aapt resource value: 0x7f05002f
+			public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2131034159;
+
+			// aapt resource value: 0x7f050030
+			public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2131034160;
+
+			// aapt resource value: 0x7f050031
+			public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2131034161;
+
+			// aapt resource value: 0x7f050032
+			public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2131034162;
+
+			// aapt resource value: 0x7f050033
+			public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2131034163;
+
+			// aapt resource value: 0x7f050034
+			public const int fingerprint_fp_to_error_state_group_1_animation = 2131034164;
+
+			// aapt resource value: 0x7f050035
+			public const int fingerprint_fp_to_error_state_group_2_animation = 2131034165;
+
+			// aapt resource value: 0x7f050036
+			public const int fingerprint_fp_to_error_state_path_1_animation = 2131034166;
+
+			// aapt resource value: 0x7f050037
+			public const int fingerprint_fp_to_error_state_path_2_animation = 2131034167;
+
+			// aapt resource value: 0x7f050038
+			public const int fingerprint_fp_to_error_state_path_3_animation = 2131034168;
+
+			// aapt resource value: 0x7f050039
+			public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2131034169;
+
+			// aapt resource value: 0x7f05003a
+			public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2131034170;
+
+			// aapt resource value: 0x7f05003b
+			public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2131034171;
+
+			// aapt resource value: 0x7f05003c
+			public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2131034172;
+
+			// aapt resource value: 0x7f05003d
+			public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2131034173;
+
+			// aapt resource value: 0x7f05003e
+			public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2131034174;
+
+			// aapt resource value: 0x7f05003f
+			public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2131034175;
+
+			// aapt resource value: 0x7f050040
+			public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2131034176;
+
+			// aapt resource value: 0x7f050041
+			public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2131034177;
+
+			// aapt resource value: 0x7f050042
+			public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2131034178;
+
+			// aapt resource value: 0x7f050043
+			public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2131034179;
+
+			// aapt resource value: 0x7f050044
+			public const int move_in = 2131034180;
+
+			// aapt resource value: 0x7f050045
+			public const int move_out = 2131034181;
+
+			// aapt resource value: 0x7f050046
+			public const int pickerview_dialog_scale_in = 2131034182;
+
+			// aapt resource value: 0x7f050047
+			public const int pickerview_dialog_scale_out = 2131034183;
+
+			// aapt resource value: 0x7f050048
+			public const int pickerview_slide_in_bottom = 2131034184;
+
+			// aapt resource value: 0x7f050049
+			public const int pickerview_slide_out_bottom = 2131034185;
+
+			// aapt resource value: 0x7f05004a
+			public const int tooltip_enter = 2131034186;
+
+			// aapt resource value: 0x7f05004b
+			public const int tooltip_exit = 2131034187;
+
 			static Animation()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Animation()
 			{
 			}
 		}
-		
+
 		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()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Animator()
 			{
 			}
 		}
-		
+
 		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()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Array()
 			{
 			}
 		}
-		
+
 		public partial class Attribute
 		{
-			
-			// aapt resource value: 0x7F040000
-			public const int actionBarDivider = 2130968576;
-			
-			// aapt resource value: 0x7F040001
-			public const int actionBarItemBackground = 2130968577;
-			
-			// aapt resource value: 0x7F040002
-			public const int actionBarPopupTheme = 2130968578;
-			
-			// aapt resource value: 0x7F040003
-			public const int actionBarSize = 2130968579;
-			
-			// aapt resource value: 0x7F040004
-			public const int actionBarSplitStyle = 2130968580;
-			
-			// aapt resource value: 0x7F040005
-			public const int actionBarStyle = 2130968581;
-			
-			// aapt resource value: 0x7F040006
-			public const int actionBarTabBarStyle = 2130968582;
-			
-			// aapt resource value: 0x7F040007
-			public const int actionBarTabStyle = 2130968583;
-			
-			// aapt resource value: 0x7F040008
-			public const int actionBarTabTextStyle = 2130968584;
-			
-			// aapt resource value: 0x7F040009
-			public const int actionBarTheme = 2130968585;
-			
-			// aapt resource value: 0x7F04000A
-			public const int actionBarWidgetTheme = 2130968586;
-			
-			// aapt resource value: 0x7F04000B
-			public const int actionButtonStyle = 2130968587;
-			
-			// aapt resource value: 0x7F04000C
-			public const int actionDropDownStyle = 2130968588;
-			
-			// aapt resource value: 0x7F04000D
-			public const int actionLayout = 2130968589;
-			
-			// aapt resource value: 0x7F04000E
-			public const int actionMenuTextAppearance = 2130968590;
-			
-			// aapt resource value: 0x7F04000F
-			public const int actionMenuTextColor = 2130968591;
-			
-			// aapt resource value: 0x7F040010
-			public const int actionModeBackground = 2130968592;
-			
-			// aapt resource value: 0x7F040011
-			public const int actionModeCloseButtonStyle = 2130968593;
-			
-			// aapt resource value: 0x7F040012
-			public const int actionModeCloseDrawable = 2130968594;
-			
-			// aapt resource value: 0x7F040013
-			public const int actionModeCopyDrawable = 2130968595;
-			
-			// aapt resource value: 0x7F040014
-			public const int actionModeCutDrawable = 2130968596;
-			
-			// aapt resource value: 0x7F040015
-			public const int actionModeFindDrawable = 2130968597;
-			
-			// aapt resource value: 0x7F040016
-			public const int actionModePasteDrawable = 2130968598;
-			
-			// aapt resource value: 0x7F040017
-			public const int actionModePopupWindowStyle = 2130968599;
-			
-			// aapt resource value: 0x7F040018
-			public const int actionModeSelectAllDrawable = 2130968600;
-			
-			// aapt resource value: 0x7F040019
-			public const int actionModeShareDrawable = 2130968601;
-			
-			// aapt resource value: 0x7F04001A
-			public const int actionModeSplitBackground = 2130968602;
-			
-			// aapt resource value: 0x7F04001B
-			public const int actionModeStyle = 2130968603;
-			
-			// aapt resource value: 0x7F04001C
-			public const int actionModeWebSearchDrawable = 2130968604;
-			
-			// aapt resource value: 0x7F04001D
-			public const int actionOverflowButtonStyle = 2130968605;
-			
-			// aapt resource value: 0x7F04001E
-			public const int actionOverflowMenuStyle = 2130968606;
-			
-			// aapt resource value: 0x7F04001F
-			public const int actionProviderClass = 2130968607;
-			
-			// aapt resource value: 0x7F040020
-			public const int actionViewClass = 2130968608;
-			
-			// aapt resource value: 0x7F040021
-			public const int activityChooserViewStyle = 2130968609;
-			
-			// aapt resource value: 0x7F040022
-			public const int alertDialogButtonGroupStyle = 2130968610;
-			
-			// aapt resource value: 0x7F040023
-			public const int alertDialogCenterButtons = 2130968611;
-			
-			// aapt resource value: 0x7F040024
-			public const int alertDialogStyle = 2130968612;
-			
-			// aapt resource value: 0x7F040025
-			public const int alertDialogTheme = 2130968613;
-			
-			// aapt resource value: 0x7F040026
-			public const int allowStacking = 2130968614;
-			
-			// aapt resource value: 0x7F040027
-			public const int alpha = 2130968615;
-			
-			// aapt resource value: 0x7F040028
-			public const int alphabeticModifiers = 2130968616;
-			
-			// aapt resource value: 0x7F040029
-			public const int arc_border_color = 2130968617;
-			
-			// aapt resource value: 0x7F04002A
-			public const int arc_border_width = 2130968618;
-			
-			// aapt resource value: 0x7F04002B
-			public const int arc_colors = 2130968619;
-			
-			// aapt resource value: 0x7F04002C
-			public const int arc_max = 2130968620;
-			
-			// aapt resource value: 0x7F04002D
-			public const int arc_min = 2130968621;
-			
-			// aapt resource value: 0x7F04002E
-			public const int arc_open_angle = 2130968622;
-			
-			// aapt resource value: 0x7F04002F
-			public const int arc_progress = 2130968623;
-			
-			// aapt resource value: 0x7F040030
-			public const int arc_progress_bar_color = 2130968624;
-			
-			// aapt resource value: 0x7F040031
-			public const int arc_progress_bar_text_unit = 2130968625;
-			
-			// aapt resource value: 0x7F040032
-			public const int arc_rotate_angle = 2130968626;
-			
-			// aapt resource value: 0x7F040033
-			public const int arc_shadow_radius = 2130968627;
-			
-			// aapt resource value: 0x7F040034
-			public const int arc_thumb_color = 2130968628;
-			
-			// aapt resource value: 0x7F040035
-			public const int arc_thumb_radius = 2130968629;
-			
-			// aapt resource value: 0x7F040036
-			public const int arc_thumb_shadow_color = 2130968630;
-			
-			// aapt resource value: 0x7F040037
-			public const int arc_thumb_shadow_radius = 2130968631;
-			
-			// aapt resource value: 0x7F040038
-			public const int arc_thumb_width = 2130968632;
-			
-			// aapt resource value: 0x7F040039
-			public const int arc_width = 2130968633;
-			
-			// aapt resource value: 0x7F04003A
-			public const int arrowHeadLength = 2130968634;
-			
-			// aapt resource value: 0x7F04003B
-			public const int arrowShaftLength = 2130968635;
-			
-			// aapt resource value: 0x7F04003C
-			public const int autoCompleteTextViewStyle = 2130968636;
-			
-			// aapt resource value: 0x7F04003D
-			public const int autoSizeMaxTextSize = 2130968637;
-			
-			// aapt resource value: 0x7F04003E
-			public const int autoSizeMinTextSize = 2130968638;
-			
-			// aapt resource value: 0x7F04003F
-			public const int autoSizePresetSizes = 2130968639;
-			
-			// aapt resource value: 0x7F040040
-			public const int autoSizeStepGranularity = 2130968640;
-			
-			// aapt resource value: 0x7F040041
-			public const int autoSizeTextType = 2130968641;
-			
-			// aapt resource value: 0x7F040042
-			public const int background = 2130968642;
-			
-			// aapt resource value: 0x7F040043
-			public const int backgroundSplit = 2130968643;
-			
-			// aapt resource value: 0x7F040044
-			public const int backgroundStacked = 2130968644;
-			
-			// aapt resource value: 0x7F040045
-			public const int backgroundTint = 2130968645;
-			
-			// aapt resource value: 0x7F040046
-			public const int backgroundTintMode = 2130968646;
-			
-			// aapt resource value: 0x7F040047
-			public const int barLength = 2130968647;
-			
-			// aapt resource value: 0x7F040048
-			public const int behavior_autoHide = 2130968648;
-			
-			// aapt resource value: 0x7F040049
-			public const int behavior_hideable = 2130968649;
-			
-			// aapt resource value: 0x7F04004A
-			public const int behavior_overlapTop = 2130968650;
-			
-			// aapt resource value: 0x7F04004B
-			public const int behavior_peekHeight = 2130968651;
-			
-			// aapt resource value: 0x7F04004C
-			public const int behavior_skipCollapsed = 2130968652;
-			
-			// aapt resource value: 0x7F04004D
-			public const int biometricPromptDialogTheme = 2130968653;
-			
-			// aapt resource value: 0x7F04004F
-			public const int borderlessButtonStyle = 2130968655;
-			
-			// aapt resource value: 0x7F04004E
-			public const int borderWidth = 2130968654;
-			
-			// aapt resource value: 0x7F040050
-			public const int bottomSheetDialogTheme = 2130968656;
-			
-			// aapt resource value: 0x7F040051
-			public const int bottomSheetStyle = 2130968657;
-			
-			// aapt resource value: 0x7F040052
-			public const int buttonBarButtonStyle = 2130968658;
-			
-			// aapt resource value: 0x7F040053
-			public const int buttonBarNegativeButtonStyle = 2130968659;
-			
-			// aapt resource value: 0x7F040054
-			public const int buttonBarNeutralButtonStyle = 2130968660;
-			
-			// aapt resource value: 0x7F040055
-			public const int buttonBarPositiveButtonStyle = 2130968661;
-			
-			// aapt resource value: 0x7F040056
-			public const int buttonBarStyle = 2130968662;
-			
-			// aapt resource value: 0x7F040057
-			public const int buttonGravity = 2130968663;
-			
-			// aapt resource value: 0x7F040058
-			public const int buttonPanelSideLayout = 2130968664;
-			
-			// aapt resource value: 0x7F040059
-			public const int buttonStyle = 2130968665;
-			
-			// aapt resource value: 0x7F04005A
-			public const int buttonStyleSmall = 2130968666;
-			
-			// aapt resource value: 0x7F04005B
-			public const int buttonTint = 2130968667;
-			
-			// aapt resource value: 0x7F04005C
-			public const int buttonTintMode = 2130968668;
-			
-			// aapt resource value: 0x7F04005D
-			public const int checkboxStyle = 2130968669;
-			
-			// aapt resource value: 0x7F04005E
-			public const int checkedTextViewStyle = 2130968670;
-			
-			// aapt resource value: 0x7F04005F
-			public const int closeIcon = 2130968671;
-			
-			// aapt resource value: 0x7F040060
-			public const int closeItemLayout = 2130968672;
-			
-			// aapt resource value: 0x7F040061
-			public const int collapseContentDescription = 2130968673;
-			
-			// aapt resource value: 0x7F040063
-			public const int collapsedTitleGravity = 2130968675;
-			
-			// aapt resource value: 0x7F040064
-			public const int collapsedTitleTextAppearance = 2130968676;
-			
-			// aapt resource value: 0x7F040062
-			public const int collapseIcon = 2130968674;
-			
-			// aapt resource value: 0x7F040065
-			public const int color = 2130968677;
-			
-			// aapt resource value: 0x7F040066
-			public const int colorAccent = 2130968678;
-			
-			// aapt resource value: 0x7F040067
-			public const int colorBackgroundFloating = 2130968679;
-			
-			// aapt resource value: 0x7F040068
-			public const int colorButtonNormal = 2130968680;
-			
-			// aapt resource value: 0x7F040069
-			public const int colorControlActivated = 2130968681;
-			
-			// aapt resource value: 0x7F04006A
-			public const int colorControlHighlight = 2130968682;
-			
-			// aapt resource value: 0x7F04006B
-			public const int colorControlNormal = 2130968683;
-			
-			// aapt resource value: 0x7F04006C
-			public const int colorError = 2130968684;
-			
-			// aapt resource value: 0x7F04006D
-			public const int colorPrimary = 2130968685;
-			
-			// aapt resource value: 0x7F04006E
-			public const int colorPrimaryDark = 2130968686;
-			
-			// aapt resource value: 0x7F04006F
-			public const int colorSwitchThumbNormal = 2130968687;
-			
-			// aapt resource value: 0x7F040070
-			public const int commitIcon = 2130968688;
-			
-			// aapt resource value: 0x7F040071
-			public const int contentDescription = 2130968689;
-			
-			// aapt resource value: 0x7F040072
-			public const int contentInsetEnd = 2130968690;
-			
-			// aapt resource value: 0x7F040073
-			public const int contentInsetEndWithActions = 2130968691;
-			
-			// aapt resource value: 0x7F040074
-			public const int contentInsetLeft = 2130968692;
-			
-			// aapt resource value: 0x7F040075
-			public const int contentInsetRight = 2130968693;
-			
-			// aapt resource value: 0x7F040076
-			public const int contentInsetStart = 2130968694;
-			
-			// aapt resource value: 0x7F040077
-			public const int contentInsetStartWithNavigation = 2130968695;
-			
-			// aapt resource value: 0x7F040078
-			public const int contentScrim = 2130968696;
-			
-			// aapt resource value: 0x7F040079
-			public const int controlBackground = 2130968697;
-			
-			// aapt resource value: 0x7F04007A
-			public const int counterEnabled = 2130968698;
-			
-			// aapt resource value: 0x7F04007B
-			public const int counterMaxLength = 2130968699;
-			
-			// aapt resource value: 0x7F04007C
-			public const int counterOverflowTextAppearance = 2130968700;
-			
-			// aapt resource value: 0x7F04007D
-			public const int counterTextAppearance = 2130968701;
-			
-			// aapt resource value: 0x7F04007E
-			public const int curtain_bar_bg_color = 2130968702;
-			
-			// aapt resource value: 0x7F04007F
-			public const int curtain_bar_border_color = 2130968703;
-			
-			// aapt resource value: 0x7F040080
-			public const int curtain_bar_color = 2130968704;
-			
-			// aapt resource value: 0x7F040081
-			public const int curtain_bar_height = 2130968705;
-			
-			// aapt resource value: 0x7F040082
-			public const int curtain_bar_width = 2130968706;
-			
-			// aapt resource value: 0x7F040083
-			public const int customNavigationLayout = 2130968707;
-			
-			// aapt resource value: 0x7F040084
-			public const int defaultQueryHint = 2130968708;
-			
-			// aapt resource value: 0x7F040085
-			public const int dialogPreferredPadding = 2130968709;
-			
-			// aapt resource value: 0x7F040086
-			public const int dialogTheme = 2130968710;
-			
-			// aapt resource value: 0x7F040087
-			public const int displayOptions = 2130968711;
-			
-			// aapt resource value: 0x7F040088
-			public const int divider = 2130968712;
-			
-			// aapt resource value: 0x7F040089
-			public const int dividerHorizontal = 2130968713;
-			
-			// aapt resource value: 0x7F04008A
-			public const int dividerPadding = 2130968714;
-			
-			// aapt resource value: 0x7F04008B
-			public const int dividerVertical = 2130968715;
-			
-			// aapt resource value: 0x7F04008C
-			public const int drawableSize = 2130968716;
-			
-			// aapt resource value: 0x7F04008D
-			public const int drawerArrowStyle = 2130968717;
-			
-			// aapt resource value: 0x7F04008F
-			public const int dropdownListPreferredItemHeight = 2130968719;
-			
-			// aapt resource value: 0x7F04008E
-			public const int dropDownListViewStyle = 2130968718;
-			
-			// aapt resource value: 0x7F040090
-			public const int editTextBackground = 2130968720;
-			
-			// aapt resource value: 0x7F040091
-			public const int editTextColor = 2130968721;
-			
-			// aapt resource value: 0x7F040092
-			public const int editTextStyle = 2130968722;
-			
-			// aapt resource value: 0x7F040093
-			public const int elevation = 2130968723;
-			
-			// aapt resource value: 0x7F040094
-			public const int errorEnabled = 2130968724;
-			
-			// aapt resource value: 0x7F040095
-			public const int errorTextAppearance = 2130968725;
-			
-			// aapt resource value: 0x7F040096
-			public const int expandActivityOverflowButtonDrawable = 2130968726;
-			
-			// aapt resource value: 0x7F040097
-			public const int expanded = 2130968727;
-			
-			// aapt resource value: 0x7F040098
-			public const int expandedTitleGravity = 2130968728;
-			
-			// aapt resource value: 0x7F040099
-			public const int expandedTitleMargin = 2130968729;
-			
-			// aapt resource value: 0x7F04009A
-			public const int expandedTitleMarginBottom = 2130968730;
-			
-			// aapt resource value: 0x7F04009B
-			public const int expandedTitleMarginEnd = 2130968731;
-			
-			// aapt resource value: 0x7F04009C
-			public const int expandedTitleMarginStart = 2130968732;
-			
-			// aapt resource value: 0x7F04009D
-			public const int expandedTitleMarginTop = 2130968733;
-			
-			// aapt resource value: 0x7F04009E
-			public const int expandedTitleTextAppearance = 2130968734;
-			
-			// aapt resource value: 0x7F04009F
-			public const int fabSize = 2130968735;
-			
-			// aapt resource value: 0x7F0400A0
-			public const int fastScrollEnabled = 2130968736;
-			
-			// aapt resource value: 0x7F0400A1
-			public const int fastScrollHorizontalThumbDrawable = 2130968737;
-			
-			// aapt resource value: 0x7F0400A2
-			public const int fastScrollHorizontalTrackDrawable = 2130968738;
-			
-			// aapt resource value: 0x7F0400A3
-			public const int fastScrollVerticalThumbDrawable = 2130968739;
-			
-			// aapt resource value: 0x7F0400A4
-			public const int fastScrollVerticalTrackDrawable = 2130968740;
-			
-			// aapt resource value: 0x7F0400A5
-			public const int font = 2130968741;
-			
-			// aapt resource value: 0x7F0400A6
-			public const int fontFamily = 2130968742;
-			
-			// aapt resource value: 0x7F0400A7
-			public const int fontProviderAuthority = 2130968743;
-			
-			// aapt resource value: 0x7F0400A8
-			public const int fontProviderCerts = 2130968744;
-			
-			// aapt resource value: 0x7F0400A9
-			public const int fontProviderFetchStrategy = 2130968745;
-			
-			// aapt resource value: 0x7F0400AA
-			public const int fontProviderFetchTimeout = 2130968746;
-			
-			// aapt resource value: 0x7F0400AB
-			public const int fontProviderPackage = 2130968747;
-			
-			// aapt resource value: 0x7F0400AC
-			public const int fontProviderQuery = 2130968748;
-			
-			// aapt resource value: 0x7F0400AD
-			public const int fontStyle = 2130968749;
-			
-			// aapt resource value: 0x7F0400AE
-			public const int fontWeight = 2130968750;
-			
-			// aapt resource value: 0x7F0400AF
-			public const int foregroundInsidePadding = 2130968751;
-			
-			// aapt resource value: 0x7F0400B0
-			public const int gapBetweenBars = 2130968752;
-			
-			// aapt resource value: 0x7F0400B1
-			public const int goIcon = 2130968753;
-			
-			// aapt resource value: 0x7F0400B2
-			public const int hdl_arc_thumb_mode = 2130968754;
-			
-			// aapt resource value: 0x7F0400B3
-			public const int headerLayout = 2130968755;
-			
-			// aapt resource value: 0x7F0400B4
-			public const int height = 2130968756;
-			
-			// aapt resource value: 0x7F0400B5
-			public const int hideOnContentScroll = 2130968757;
-			
-			// aapt resource value: 0x7F0400B6
-			public const int hintAnimationEnabled = 2130968758;
-			
-			// aapt resource value: 0x7F0400B7
-			public const int hintEnabled = 2130968759;
-			
-			// aapt resource value: 0x7F0400B8
-			public const int hintTextAppearance = 2130968760;
-			
-			// aapt resource value: 0x7F0400B9
-			public const int homeAsUpIndicator = 2130968761;
-			
-			// aapt resource value: 0x7F0400BA
-			public const int homeLayout = 2130968762;
-			
-			// aapt resource value: 0x7F0400BB
-			public const int icon = 2130968763;
-			
-			// aapt resource value: 0x7F0400BE
-			public const int iconifiedByDefault = 2130968766;
-			
-			// aapt resource value: 0x7F0400BC
-			public const int iconTint = 2130968764;
-			
-			// aapt resource value: 0x7F0400BD
-			public const int iconTintMode = 2130968765;
-			
-			// aapt resource value: 0x7F0400BF
-			public const int imageButtonStyle = 2130968767;
-			
-			// aapt resource value: 0x7F0400C0
-			public const int indeterminateProgressStyle = 2130968768;
-			
-			// aapt resource value: 0x7F0400C1
-			public const int initialActivityCount = 2130968769;
-			
-			// aapt resource value: 0x7F0400C2
-			public const int insetForeground = 2130968770;
-			
-			// aapt resource value: 0x7F0400C3
-			public const int isLightTheme = 2130968771;
-			
-			// aapt resource value: 0x7F0400C4
-			public const int itemBackground = 2130968772;
-			
-			// aapt resource value: 0x7F0400C5
-			public const int itemIconTint = 2130968773;
-			
-			// aapt resource value: 0x7F0400C6
-			public const int itemPadding = 2130968774;
-			
-			// aapt resource value: 0x7F0400C7
-			public const int itemTextAppearance = 2130968775;
-			
-			// aapt resource value: 0x7F0400C8
-			public const int itemTextColor = 2130968776;
-			
-			// aapt resource value: 0x7F0400C9
-			public const int keylines = 2130968777;
-			
-			// aapt resource value: 0x7F0400CA
-			public const int layout = 2130968778;
-			
-			// aapt resource value: 0x7F0400CB
-			public const int layoutManager = 2130968779;
-			
-			// aapt resource value: 0x7F0400CC
-			public const int layout_anchor = 2130968780;
-			
-			// aapt resource value: 0x7F0400CD
-			public const int layout_anchorGravity = 2130968781;
-			
-			// aapt resource value: 0x7F0400CE
-			public const int layout_behavior = 2130968782;
-			
-			// aapt resource value: 0x7F0400CF
-			public const int layout_collapseMode = 2130968783;
-			
-			// aapt resource value: 0x7F0400D0
-			public const int layout_collapseParallaxMultiplier = 2130968784;
-			
-			// aapt resource value: 0x7F0400D1
-			public const int layout_dodgeInsetEdges = 2130968785;
-			
-			// aapt resource value: 0x7F0400D2
-			public const int layout_insetEdge = 2130968786;
-			
-			// aapt resource value: 0x7F0400D3
-			public const int layout_keyline = 2130968787;
-			
-			// aapt resource value: 0x7F0400D4
-			public const int layout_scrollFlags = 2130968788;
-			
-			// aapt resource value: 0x7F0400D5
-			public const int layout_scrollInterpolator = 2130968789;
-			
-			// aapt resource value: 0x7F0400D6
-			public const int layout_srlBackgroundColor = 2130968790;
-			
-			// aapt resource value: 0x7F0400D7
-			public const int layout_srlSpinnerStyle = 2130968791;
-			
-			// aapt resource value: 0x7F0400D8
-			public const int listChoiceBackgroundIndicator = 2130968792;
-			
-			// aapt resource value: 0x7F0400D9
-			public const int listDividerAlertDialog = 2130968793;
-			
-			// aapt resource value: 0x7F0400DA
-			public const int listItemLayout = 2130968794;
-			
-			// aapt resource value: 0x7F0400DB
-			public const int listLayout = 2130968795;
-			
-			// aapt resource value: 0x7F0400DC
-			public const int listMenuViewStyle = 2130968796;
-			
-			// aapt resource value: 0x7F0400DD
-			public const int listPopupWindowStyle = 2130968797;
-			
-			// aapt resource value: 0x7F0400DE
-			public const int listPreferredItemHeight = 2130968798;
-			
-			// aapt resource value: 0x7F0400DF
-			public const int listPreferredItemHeightLarge = 2130968799;
-			
-			// aapt resource value: 0x7F0400E0
-			public const int listPreferredItemHeightSmall = 2130968800;
-			
-			// aapt resource value: 0x7F0400E1
-			public const int listPreferredItemPaddingLeft = 2130968801;
-			
-			// aapt resource value: 0x7F0400E2
-			public const int listPreferredItemPaddingRight = 2130968802;
-			
-			// aapt resource value: 0x7F0400E3
-			public const int logo = 2130968803;
-			
-			// aapt resource value: 0x7F0400E4
-			public const int logoDescription = 2130968804;
-			
-			// aapt resource value: 0x7F0400E5
-			public const int maxActionInlineWidth = 2130968805;
-			
-			// aapt resource value: 0x7F0400E6
-			public const int maxButtonHeight = 2130968806;
-			
-			// aapt resource value: 0x7F0400E7
-			public const int measureWithLargestChild = 2130968807;
-			
-			// aapt resource value: 0x7F0400E8
-			public const int menu = 2130968808;
-			
-			// aapt resource value: 0x7F0400E9
-			public const int multiChoiceItemLayout = 2130968809;
-			
-			// aapt resource value: 0x7F0400EA
-			public const int navigationContentDescription = 2130968810;
-			
-			// aapt resource value: 0x7F0400EB
-			public const int navigationIcon = 2130968811;
-			
-			// aapt resource value: 0x7F0400EC
-			public const int navigationMode = 2130968812;
-			
-			// aapt resource value: 0x7F0400ED
-			public const int numericModifiers = 2130968813;
-			
-			// aapt resource value: 0x7F0400EE
-			public const int overlapAnchor = 2130968814;
-			
-			// aapt resource value: 0x7F0400EF
-			public const int paddingBottomNoButtons = 2130968815;
-			
-			// aapt resource value: 0x7F0400F0
-			public const int paddingEnd = 2130968816;
-			
-			// aapt resource value: 0x7F0400F1
-			public const int paddingStart = 2130968817;
-			
-			// aapt resource value: 0x7F0400F2
-			public const int paddingTopNoTitle = 2130968818;
-			
-			// aapt resource value: 0x7F0400F3
-			public const int panelBackground = 2130968819;
-			
-			// aapt resource value: 0x7F0400F4
-			public const int panelMenuListTheme = 2130968820;
-			
-			// aapt resource value: 0x7F0400F5
-			public const int panelMenuListWidth = 2130968821;
-			
-			// aapt resource value: 0x7F0400F6
-			public const int passwordToggleContentDescription = 2130968822;
-			
-			// aapt resource value: 0x7F0400F7
-			public const int passwordToggleDrawable = 2130968823;
-			
-			// aapt resource value: 0x7F0400F8
-			public const int passwordToggleEnabled = 2130968824;
-			
-			// aapt resource value: 0x7F0400F9
-			public const int passwordToggleTint = 2130968825;
-			
-			// aapt resource value: 0x7F0400FA
-			public const int passwordToggleTintMode = 2130968826;
-			
-			// aapt resource value: 0x7F0400FB
-			public const int popupMenuStyle = 2130968827;
-			
-			// aapt resource value: 0x7F0400FC
-			public const int popupTheme = 2130968828;
-			
-			// aapt resource value: 0x7F0400FD
-			public const int popupWindowStyle = 2130968829;
-			
-			// aapt resource value: 0x7F0400FE
-			public const int preserveIconSpacing = 2130968830;
-			
-			// aapt resource value: 0x7F0400FF
-			public const int pressedTranslationZ = 2130968831;
-			
-			// aapt resource value: 0x7F040100
-			public const int progressBarPadding = 2130968832;
-			
-			// aapt resource value: 0x7F040101
-			public const int progressBarStyle = 2130968833;
-			
-			// aapt resource value: 0x7F040102
-			public const int queryBackground = 2130968834;
-			
-			// aapt resource value: 0x7F040103
-			public const int queryHint = 2130968835;
-			
-			// aapt resource value: 0x7F040104
-			public const int radioButtonStyle = 2130968836;
-			
-			// aapt resource value: 0x7F040105
-			public const int ratingBarStyle = 2130968837;
-			
-			// aapt resource value: 0x7F040106
-			public const int ratingBarStyleIndicator = 2130968838;
-			
-			// aapt resource value: 0x7F040107
-			public const int ratingBarStyleSmall = 2130968839;
-			
-			// aapt resource value: 0x7F040108
-			public const int reverseLayout = 2130968840;
-			
-			// aapt resource value: 0x7F040109
-			public const int rippleColor = 2130968841;
-			
-			// aapt resource value: 0x7F04010A
-			public const int scrimAnimationDuration = 2130968842;
-			
-			// aapt resource value: 0x7F04010B
-			public const int scrimVisibleHeightTrigger = 2130968843;
-			
-			// aapt resource value: 0x7F04010C
-			public const int searchHintIcon = 2130968844;
-			
-			// aapt resource value: 0x7F04010D
-			public const int searchIcon = 2130968845;
-			
-			// aapt resource value: 0x7F04010E
-			public const int searchViewStyle = 2130968846;
-			
-			// aapt resource value: 0x7F04010F
-			public const int second_curtain_bar_color = 2130968847;
-			
-			// aapt resource value: 0x7F040110
-			public const int second_wave_color = 2130968848;
-			
-			// aapt resource value: 0x7F040111
-			public const int seekBarStyle = 2130968849;
-			
-			// aapt resource value: 0x7F040112
-			public const int selectableItemBackground = 2130968850;
-			
-			// aapt resource value: 0x7F040113
-			public const int selectableItemBackgroundBorderless = 2130968851;
-			
-			// aapt resource value: 0x7F040114
-			public const int showAsAction = 2130968852;
-			
-			// aapt resource value: 0x7F040115
-			public const int showDividers = 2130968853;
-			
-			// aapt resource value: 0x7F040116
-			public const int showText = 2130968854;
-			
-			// aapt resource value: 0x7F040117
-			public const int showTitle = 2130968855;
-			
-			// aapt resource value: 0x7F040118
-			public const int singleChoiceItemLayout = 2130968856;
-			
-			// aapt resource value: 0x7F040119
-			public const int spanCount = 2130968857;
-			
-			// aapt resource value: 0x7F04011A
-			public const int spinBars = 2130968858;
-			
-			// aapt resource value: 0x7F04011B
-			public const int spinnerDropDownItemStyle = 2130968859;
-			
-			// aapt resource value: 0x7F04011C
-			public const int spinnerStyle = 2130968860;
-			
-			// aapt resource value: 0x7F04011D
-			public const int splitTrack = 2130968861;
-			
-			// aapt resource value: 0x7F04011E
-			public const int srcCompat = 2130968862;
-			
-			// aapt resource value: 0x7F04011F
-			public const int srlAccentColor = 2130968863;
-			
-			// aapt resource value: 0x7F040120
-			public const int srlAnimatingColor = 2130968864;
-			
-			// aapt resource value: 0x7F040121
-			public const int srlClassicsSpinnerStyle = 2130968865;
-			
-			// aapt resource value: 0x7F040122
-			public const int srlDisableContentWhenLoading = 2130968866;
-			
-			// aapt resource value: 0x7F040123
-			public const int srlDisableContentWhenRefresh = 2130968867;
-			
-			// aapt resource value: 0x7F040124
-			public const int srlDragRate = 2130968868;
-			
-			// aapt resource value: 0x7F040125
-			public const int srlDrawableArrow = 2130968869;
-			
-			// aapt resource value: 0x7F040126
-			public const int srlDrawableArrowSize = 2130968870;
-			
-			// aapt resource value: 0x7F040127
-			public const int srlDrawableMarginRight = 2130968871;
-			
-			// aapt resource value: 0x7F040128
-			public const int srlDrawableProgress = 2130968872;
-			
-			// aapt resource value: 0x7F040129
-			public const int srlDrawableProgressSize = 2130968873;
-			
-			// aapt resource value: 0x7F04012A
-			public const int srlDrawableSize = 2130968874;
-			
-			// aapt resource value: 0x7F04012B
-			public const int srlEnableAutoLoadMore = 2130968875;
-			
-			// aapt resource value: 0x7F04012C
-			public const int srlEnableClipFooterWhenFixedBehind = 2130968876;
-			
-			// aapt resource value: 0x7F04012D
-			public const int srlEnableClipHeaderWhenFixedBehind = 2130968877;
-			
-			// aapt resource value: 0x7F04012E
-			public const int srlEnableFooterFollowWhenLoadFinished = 2130968878;
-			
-			// aapt resource value: 0x7F04012F
-			public const int srlEnableFooterFollowWhenNoMoreData = 2130968879;
-			
-			// aapt resource value: 0x7F040130
-			public const int srlEnableFooterTranslationContent = 2130968880;
-			
-			// aapt resource value: 0x7F040131
-			public const int srlEnableHeaderTranslationContent = 2130968881;
-			
-			// aapt resource value: 0x7F040132
-			public const int srlEnableHorizontalDrag = 2130968882;
-			
-			// aapt resource value: 0x7F040133
-			public const int srlEnableLastTime = 2130968883;
-			
-			// aapt resource value: 0x7F040134
-			public const int srlEnableLoadMore = 2130968884;
-			
-			// aapt resource value: 0x7F040135
-			public const int srlEnableLoadMoreWhenContentNotFull = 2130968885;
-			
-			// aapt resource value: 0x7F040136
-			public const int srlEnableNestedScrolling = 2130968886;
-			
-			// aapt resource value: 0x7F040137
-			public const int srlEnableOverScrollBounce = 2130968887;
-			
-			// aapt resource value: 0x7F040138
-			public const int srlEnableOverScrollDrag = 2130968888;
-			
-			// aapt resource value: 0x7F040139
-			public const int srlEnablePreviewInEditMode = 2130968889;
-			
-			// aapt resource value: 0x7F04013A
-			public const int srlEnablePullToCloseTwoLevel = 2130968890;
-			
-			// aapt resource value: 0x7F04013B
-			public const int srlEnablePureScrollMode = 2130968891;
-			
-			// aapt resource value: 0x7F04013C
-			public const int srlEnableRefresh = 2130968892;
-			
-			// aapt resource value: 0x7F04013D
-			public const int srlEnableScrollContentWhenLoaded = 2130968893;
-			
-			// aapt resource value: 0x7F04013E
-			public const int srlEnableScrollContentWhenRefreshed = 2130968894;
-			
-			// aapt resource value: 0x7F04013F
-			public const int srlEnableTwoLevel = 2130968895;
-			
-			// aapt resource value: 0x7F040140
-			public const int srlFinishDuration = 2130968896;
-			
-			// aapt resource value: 0x7F040141
-			public const int srlFixedFooterViewId = 2130968897;
-			
-			// aapt resource value: 0x7F040142
-			public const int srlFixedHeaderViewId = 2130968898;
-			
-			// aapt resource value: 0x7F040143
-			public const int srlFloorDuration = 2130968899;
-			
-			// aapt resource value: 0x7F040144
-			public const int srlFloorRage = 2130968900;
-			
-			// aapt resource value: 0x7F040145
-			public const int srlFooterHeight = 2130968901;
-			
-			// aapt resource value: 0x7F040146
-			public const int srlFooterInsetStart = 2130968902;
-			
-			// aapt resource value: 0x7F040147
-			public const int srlFooterMaxDragRate = 2130968903;
-			
-			// aapt resource value: 0x7F040148
-			public const int srlFooterTranslationViewId = 2130968904;
-			
-			// aapt resource value: 0x7F040149
-			public const int srlFooterTriggerRate = 2130968905;
-			
-			// aapt resource value: 0x7F04014A
-			public const int srlHeaderHeight = 2130968906;
-			
-			// aapt resource value: 0x7F04014B
-			public const int srlHeaderInsetStart = 2130968907;
-			
-			// aapt resource value: 0x7F04014C
-			public const int srlHeaderMaxDragRate = 2130968908;
-			
-			// aapt resource value: 0x7F04014D
-			public const int srlHeaderTranslationViewId = 2130968909;
-			
-			// aapt resource value: 0x7F04014E
-			public const int srlHeaderTriggerRate = 2130968910;
-			
-			// aapt resource value: 0x7F04014F
-			public const int srlMaxRage = 2130968911;
-			
-			// aapt resource value: 0x7F040150
-			public const int srlNormalColor = 2130968912;
-			
-			// aapt resource value: 0x7F040151
-			public const int srlPrimaryColor = 2130968913;
-			
-			// aapt resource value: 0x7F040152
-			public const int srlReboundDuration = 2130968914;
-			
-			// aapt resource value: 0x7F040153
-			public const int srlRefreshRage = 2130968915;
-			
-			// aapt resource value: 0x7F040154
-			public const int srlTextFailed = 2130968916;
-			
-			// aapt resource value: 0x7F040155
-			public const int srlTextFinish = 2130968917;
-			
-			// aapt resource value: 0x7F040156
-			public const int srlTextLoading = 2130968918;
-			
-			// aapt resource value: 0x7F040157
-			public const int srlTextNothing = 2130968919;
-			
-			// aapt resource value: 0x7F040158
-			public const int srlTextPulling = 2130968920;
-			
-			// aapt resource value: 0x7F040159
-			public const int srlTextRefreshing = 2130968921;
-			
-			// aapt resource value: 0x7F04015A
-			public const int srlTextRelease = 2130968922;
-			
-			// aapt resource value: 0x7F04015B
-			public const int srlTextSecondary = 2130968923;
-			
-			// aapt resource value: 0x7F04015C
-			public const int srlTextSizeTime = 2130968924;
-			
-			// aapt resource value: 0x7F04015D
-			public const int srlTextSizeTitle = 2130968925;
-			
-			// aapt resource value: 0x7F04015E
-			public const int srlTextTimeMarginTop = 2130968926;
-			
-			// aapt resource value: 0x7F04015F
-			public const int srlTextUpdate = 2130968927;
-			
-			// aapt resource value: 0x7F040160
-			public const int stackFromEnd = 2130968928;
-			
-			// aapt resource value: 0x7F040161
-			public const int state_above_anchor = 2130968929;
-			
-			// aapt resource value: 0x7F040162
-			public const int state_collapsed = 2130968930;
-			
-			// aapt resource value: 0x7F040163
-			public const int state_collapsible = 2130968931;
-			
-			// aapt resource value: 0x7F040164
-			public const int statusBarBackground = 2130968932;
-			
-			// aapt resource value: 0x7F040165
-			public const int statusBarScrim = 2130968933;
-			
-			// aapt resource value: 0x7F040166
-			public const int subMenuArrow = 2130968934;
-			
-			// aapt resource value: 0x7F040167
-			public const int submitBackground = 2130968935;
-			
-			// aapt resource value: 0x7F040168
-			public const int subtitle = 2130968936;
-			
-			// aapt resource value: 0x7F040169
-			public const int subtitleTextAppearance = 2130968937;
-			
-			// aapt resource value: 0x7F04016A
-			public const int subtitleTextColor = 2130968938;
-			
-			// aapt resource value: 0x7F04016B
-			public const int subtitleTextStyle = 2130968939;
-			
-			// aapt resource value: 0x7F04016C
-			public const int suggestionRowLayout = 2130968940;
-			
-			// aapt resource value: 0x7F04016D
-			public const int switchMinWidth = 2130968941;
-			
-			// aapt resource value: 0x7F04016E
-			public const int switchPadding = 2130968942;
-			
-			// aapt resource value: 0x7F04016F
-			public const int switchStyle = 2130968943;
-			
-			// aapt resource value: 0x7F040170
-			public const int switchTextAppearance = 2130968944;
-			
-			// aapt resource value: 0x7F040171
-			public const int tabBackground = 2130968945;
-			
-			// aapt resource value: 0x7F040172
-			public const int tabContentStart = 2130968946;
-			
-			// aapt resource value: 0x7F040173
-			public const int tabGravity = 2130968947;
-			
-			// aapt resource value: 0x7F040174
-			public const int tabIndicatorColor = 2130968948;
-			
-			// aapt resource value: 0x7F040175
-			public const int tabIndicatorHeight = 2130968949;
-			
-			// aapt resource value: 0x7F040176
-			public const int tabMaxWidth = 2130968950;
-			
-			// aapt resource value: 0x7F040177
-			public const int tabMinWidth = 2130968951;
-			
-			// aapt resource value: 0x7F040178
-			public const int tabMode = 2130968952;
-			
-			// aapt resource value: 0x7F040179
-			public const int tabPadding = 2130968953;
-			
-			// aapt resource value: 0x7F04017A
-			public const int tabPaddingBottom = 2130968954;
-			
-			// aapt resource value: 0x7F04017B
-			public const int tabPaddingEnd = 2130968955;
-			
-			// aapt resource value: 0x7F04017C
-			public const int tabPaddingStart = 2130968956;
-			
-			// aapt resource value: 0x7F04017D
-			public const int tabPaddingTop = 2130968957;
-			
-			// aapt resource value: 0x7F04017E
-			public const int tabSelectedTextColor = 2130968958;
-			
-			// aapt resource value: 0x7F04017F
-			public const int tabTextAppearance = 2130968959;
-			
-			// aapt resource value: 0x7F040180
-			public const int tabTextColor = 2130968960;
-			
-			// aapt resource value: 0x7F040181
-			public const int textAllCaps = 2130968961;
-			
-			// aapt resource value: 0x7F040182
-			public const int textAppearanceLargePopupMenu = 2130968962;
-			
-			// aapt resource value: 0x7F040183
-			public const int textAppearanceListItem = 2130968963;
-			
-			// aapt resource value: 0x7F040184
-			public const int textAppearanceListItemSecondary = 2130968964;
-			
-			// aapt resource value: 0x7F040185
-			public const int textAppearanceListItemSmall = 2130968965;
-			
-			// aapt resource value: 0x7F040186
-			public const int textAppearancePopupMenuHeader = 2130968966;
-			
-			// aapt resource value: 0x7F040187
-			public const int textAppearanceSearchResultSubtitle = 2130968967;
-			
-			// aapt resource value: 0x7F040188
-			public const int textAppearanceSearchResultTitle = 2130968968;
-			
-			// aapt resource value: 0x7F040189
-			public const int textAppearanceSmallPopupMenu = 2130968969;
-			
-			// aapt resource value: 0x7F04018A
-			public const int textColorAlertDialogListItem = 2130968970;
-			
-			// aapt resource value: 0x7F04018B
-			public const int textColorError = 2130968971;
-			
-			// aapt resource value: 0x7F04018C
-			public const int textColorSearchUrl = 2130968972;
-			
-			// aapt resource value: 0x7F04018D
-			public const int theme = 2130968973;
-			
-			// aapt resource value: 0x7F04018E
-			public const int thickness = 2130968974;
-			
-			// aapt resource value: 0x7F04018F
-			public const int thumbTextPadding = 2130968975;
-			
-			// aapt resource value: 0x7F040190
-			public const int thumbTint = 2130968976;
-			
-			// aapt resource value: 0x7F040191
-			public const int thumbTintMode = 2130968977;
-			
-			// aapt resource value: 0x7F040192
-			public const int tickMark = 2130968978;
-			
-			// aapt resource value: 0x7F040193
-			public const int tickMarkTint = 2130968979;
-			
-			// aapt resource value: 0x7F040194
-			public const int tickMarkTintMode = 2130968980;
-			
-			// aapt resource value: 0x7F040195
-			public const int tint = 2130968981;
-			
-			// aapt resource value: 0x7F040196
-			public const int tintMode = 2130968982;
-			
-			// aapt resource value: 0x7F040197
-			public const int title = 2130968983;
-			
-			// aapt resource value: 0x7F040198
-			public const int titleEnabled = 2130968984;
-			
-			// aapt resource value: 0x7F040199
-			public const int titleMargin = 2130968985;
-			
-			// aapt resource value: 0x7F04019A
-			public const int titleMarginBottom = 2130968986;
-			
-			// aapt resource value: 0x7F04019B
-			public const int titleMarginEnd = 2130968987;
-			
-			// aapt resource value: 0x7F04019E
-			public const int titleMargins = 2130968990;
-			
-			// aapt resource value: 0x7F04019C
-			public const int titleMarginStart = 2130968988;
-			
-			// aapt resource value: 0x7F04019D
-			public const int titleMarginTop = 2130968989;
-			
-			// aapt resource value: 0x7F04019F
-			public const int titleTextAppearance = 2130968991;
-			
-			// aapt resource value: 0x7F0401A0
-			public const int titleTextColor = 2130968992;
-			
-			// aapt resource value: 0x7F0401A1
-			public const int titleTextStyle = 2130968993;
-			
-			// aapt resource value: 0x7F0401A2
-			public const int toolbarId = 2130968994;
-			
-			// aapt resource value: 0x7F0401A3
-			public const int toolbarNavigationButtonStyle = 2130968995;
-			
-			// aapt resource value: 0x7F0401A4
-			public const int toolbarStyle = 2130968996;
-			
-			// aapt resource value: 0x7F0401A5
-			public const int tooltipForegroundColor = 2130968997;
-			
-			// aapt resource value: 0x7F0401A6
-			public const int tooltipFrameBackground = 2130968998;
-			
-			// aapt resource value: 0x7F0401A7
-			public const int tooltipText = 2130968999;
-			
-			// aapt resource value: 0x7F0401A8
-			public const int track = 2130969000;
-			
-			// aapt resource value: 0x7F0401A9
-			public const int trackTint = 2130969001;
-			
-			// aapt resource value: 0x7F0401AA
-			public const int trackTintMode = 2130969002;
-			
-			// aapt resource value: 0x7F0401AB
-			public const int useCompatPadding = 2130969003;
-			
-			// aapt resource value: 0x7F0401AC
-			public const int voiceIcon = 2130969004;
-			
-			// aapt resource value: 0x7F0401AD
-			public const int wave_bg_color = 2130969005;
-			
-			// aapt resource value: 0x7F0401AE
-			public const int wave_border_color = 2130969006;
-			
-			// aapt resource value: 0x7F0401AF
-			public const int wave_color = 2130969007;
-			
-			// aapt resource value: 0x7F0401B0
-			public const int wave_height = 2130969008;
-			
-			// aapt resource value: 0x7F0401B1
-			public const int wave_width = 2130969009;
-			
-			// aapt resource value: 0x7F0401B2
-			public const int wheelview_dividerColor = 2130969010;
-			
-			// aapt resource value: 0x7F0401B3
-			public const int wheelview_gravity = 2130969011;
-			
-			// aapt resource value: 0x7F0401B4
-			public const int wheelview_lineSpacingMultiplier = 2130969012;
-			
-			// aapt resource value: 0x7F0401B5
-			public const int wheelview_textColorCenter = 2130969013;
-			
-			// aapt resource value: 0x7F0401B6
-			public const int wheelview_textColorOut = 2130969014;
-			
-			// aapt resource value: 0x7F0401B7
-			public const int wheelview_textSize = 2130969015;
-			
-			// aapt resource value: 0x7F0401B8
-			public const int windowActionBar = 2130969016;
-			
-			// aapt resource value: 0x7F0401B9
-			public const int windowActionBarOverlay = 2130969017;
-			
-			// aapt resource value: 0x7F0401BA
-			public const int windowActionModeOverlay = 2130969018;
-			
-			// aapt resource value: 0x7F0401BB
-			public const int windowFixedHeightMajor = 2130969019;
-			
-			// aapt resource value: 0x7F0401BC
-			public const int windowFixedHeightMinor = 2130969020;
-			
-			// aapt resource value: 0x7F0401BD
-			public const int windowFixedWidthMajor = 2130969021;
-			
-			// aapt resource value: 0x7F0401BE
-			public const int windowFixedWidthMinor = 2130969022;
-			
-			// aapt resource value: 0x7F0401BF
-			public const int windowMinWidthMajor = 2130969023;
-			
-			// aapt resource value: 0x7F0401C0
-			public const int windowMinWidthMinor = 2130969024;
-			
-			// aapt resource value: 0x7F0401C1
-			public const int windowNoTitle = 2130969025;
-			
+
+			// aapt resource value: 0x7f010052
+			public const int actionBarDivider = 2130772050;
+
+			// aapt resource value: 0x7f010053
+			public const int actionBarItemBackground = 2130772051;
+
+			// aapt resource value: 0x7f01004c
+			public const int actionBarPopupTheme = 2130772044;
+
+			// aapt resource value: 0x7f010051
+			public const int actionBarSize = 2130772049;
+
+			// aapt resource value: 0x7f01004e
+			public const int actionBarSplitStyle = 2130772046;
+
+			// aapt resource value: 0x7f01004d
+			public const int actionBarStyle = 2130772045;
+
+			// aapt resource value: 0x7f010048
+			public const int actionBarTabBarStyle = 2130772040;
+
+			// aapt resource value: 0x7f010047
+			public const int actionBarTabStyle = 2130772039;
+
+			// aapt resource value: 0x7f010049
+			public const int actionBarTabTextStyle = 2130772041;
+
+			// aapt resource value: 0x7f01004f
+			public const int actionBarTheme = 2130772047;
+
+			// aapt resource value: 0x7f010050
+			public const int actionBarWidgetTheme = 2130772048;
+
+			// aapt resource value: 0x7f01006d
+			public const int actionButtonStyle = 2130772077;
+
+			// aapt resource value: 0x7f010069
+			public const int actionDropDownStyle = 2130772073;
+
+			// aapt resource value: 0x7f0100c4
+			public const int actionLayout = 2130772164;
+
+			// aapt resource value: 0x7f010054
+			public const int actionMenuTextAppearance = 2130772052;
+
+			// aapt resource value: 0x7f010055
+			public const int actionMenuTextColor = 2130772053;
+
+			// aapt resource value: 0x7f010058
+			public const int actionModeBackground = 2130772056;
+
+			// aapt resource value: 0x7f010057
+			public const int actionModeCloseButtonStyle = 2130772055;
+
+			// aapt resource value: 0x7f01005a
+			public const int actionModeCloseDrawable = 2130772058;
+
+			// aapt resource value: 0x7f01005c
+			public const int actionModeCopyDrawable = 2130772060;
+
+			// aapt resource value: 0x7f01005b
+			public const int actionModeCutDrawable = 2130772059;
+
+			// aapt resource value: 0x7f010060
+			public const int actionModeFindDrawable = 2130772064;
+
+			// aapt resource value: 0x7f01005d
+			public const int actionModePasteDrawable = 2130772061;
+
+			// aapt resource value: 0x7f010062
+			public const int actionModePopupWindowStyle = 2130772066;
+
+			// aapt resource value: 0x7f01005e
+			public const int actionModeSelectAllDrawable = 2130772062;
+
+			// aapt resource value: 0x7f01005f
+			public const int actionModeShareDrawable = 2130772063;
+
+			// aapt resource value: 0x7f010059
+			public const int actionModeSplitBackground = 2130772057;
+
+			// aapt resource value: 0x7f010056
+			public const int actionModeStyle = 2130772054;
+
+			// aapt resource value: 0x7f010061
+			public const int actionModeWebSearchDrawable = 2130772065;
+
+			// aapt resource value: 0x7f01004a
+			public const int actionOverflowButtonStyle = 2130772042;
+
+			// aapt resource value: 0x7f01004b
+			public const int actionOverflowMenuStyle = 2130772043;
+
+			// aapt resource value: 0x7f0100c6
+			public const int actionProviderClass = 2130772166;
+
+			// aapt resource value: 0x7f0100c5
+			public const int actionViewClass = 2130772165;
+
+			// aapt resource value: 0x7f010075
+			public const int activityChooserViewStyle = 2130772085;
+
+			// aapt resource value: 0x7f01009a
+			public const int alertDialogButtonGroupStyle = 2130772122;
+
+			// aapt resource value: 0x7f01009b
+			public const int alertDialogCenterButtons = 2130772123;
+
+			// aapt resource value: 0x7f010099
+			public const int alertDialogStyle = 2130772121;
+
+			// aapt resource value: 0x7f01009c
+			public const int alertDialogTheme = 2130772124;
+
+			// aapt resource value: 0x7f0100b2
+			public const int allowStacking = 2130772146;
+
+			// aapt resource value: 0x7f0100b3
+			public const int alpha = 2130772147;
+
+			// aapt resource value: 0x7f0100c1
+			public const int alphabeticModifiers = 2130772161;
+
+			// aapt resource value: 0x7f0101a3
+			public const int arc_border_color = 2130772387;
+
+			// aapt resource value: 0x7f0101a2
+			public const int arc_border_width = 2130772386;
+
+			// aapt resource value: 0x7f0101a1
+			public const int arc_colors = 2130772385;
+
+			// aapt resource value: 0x7f0101a4
+			public const int arc_max = 2130772388;
+
+			// aapt resource value: 0x7f0101a5
+			public const int arc_min = 2130772389;
+
+			// aapt resource value: 0x7f01019f
+			public const int arc_open_angle = 2130772383;
+
+			// aapt resource value: 0x7f0101a6
+			public const int arc_progress = 2130772390;
+
+			// aapt resource value: 0x7f0101ae
+			public const int arc_progress_bar_color = 2130772398;
+
+			// aapt resource value: 0x7f0101af
+			public const int arc_progress_bar_text_unit = 2130772399;
+
+			// aapt resource value: 0x7f0101a0
+			public const int arc_rotate_angle = 2130772384;
+
+			// aapt resource value: 0x7f0101ad
+			public const int arc_shadow_radius = 2130772397;
+
+			// aapt resource value: 0x7f0101a8
+			public const int arc_thumb_color = 2130772392;
+
+			// aapt resource value: 0x7f0101a9
+			public const int arc_thumb_radius = 2130772393;
+
+			// aapt resource value: 0x7f0101ab
+			public const int arc_thumb_shadow_color = 2130772395;
+
+			// aapt resource value: 0x7f0101aa
+			public const int arc_thumb_shadow_radius = 2130772394;
+
+			// aapt resource value: 0x7f0101a7
+			public const int arc_thumb_width = 2130772391;
+
+			// aapt resource value: 0x7f01019e
+			public const int arc_width = 2130772382;
+
+			// aapt resource value: 0x7f0100ba
+			public const int arrowHeadLength = 2130772154;
+
+			// aapt resource value: 0x7f0100bb
+			public const int arrowShaftLength = 2130772155;
+
+			// aapt resource value: 0x7f0100a1
+			public const int autoCompleteTextViewStyle = 2130772129;
+
+			// aapt resource value: 0x7f01003b
+			public const int autoSizeMaxTextSize = 2130772027;
+
+			// aapt resource value: 0x7f01003a
+			public const int autoSizeMinTextSize = 2130772026;
+
+			// aapt resource value: 0x7f010039
+			public const int autoSizePresetSizes = 2130772025;
+
+			// aapt resource value: 0x7f010038
+			public const int autoSizeStepGranularity = 2130772024;
+
+			// aapt resource value: 0x7f010037
+			public const int autoSizeTextType = 2130772023;
+
+			// aapt resource value: 0x7f010015
+			public const int background = 2130771989;
+
+			// aapt resource value: 0x7f010017
+			public const int backgroundSplit = 2130771991;
+
+			// aapt resource value: 0x7f010016
+			public const int backgroundStacked = 2130771990;
+
+			// aapt resource value: 0x7f0100fd
+			public const int backgroundTint = 2130772221;
+
+			// aapt resource value: 0x7f0100fe
+			public const int backgroundTintMode = 2130772222;
+
+			// aapt resource value: 0x7f0100bc
+			public const int barLength = 2130772156;
+
+			// aapt resource value: 0x7f010128
+			public const int behavior_autoHide = 2130772264;
+
+			// aapt resource value: 0x7f010105
+			public const int behavior_hideable = 2130772229;
+
+			// aapt resource value: 0x7f010131
+			public const int behavior_overlapTop = 2130772273;
+
+			// aapt resource value: 0x7f010104
+			public const int behavior_peekHeight = 2130772228;
+
+			// aapt resource value: 0x7f010106
+			public const int behavior_skipCollapsed = 2130772230;
+
+			// aapt resource value: 0x7f01015a
+			public const int biometricPromptDialogTheme = 2130772314;
+
+			// aapt resource value: 0x7f010126
+			public const int borderWidth = 2130772262;
+
+			// aapt resource value: 0x7f010072
+			public const int borderlessButtonStyle = 2130772082;
+
+			// aapt resource value: 0x7f010120
+			public const int bottomSheetDialogTheme = 2130772256;
+
+			// aapt resource value: 0x7f010121
+			public const int bottomSheetStyle = 2130772257;
+
+			// aapt resource value: 0x7f01006f
+			public const int buttonBarButtonStyle = 2130772079;
+
+			// aapt resource value: 0x7f01009f
+			public const int buttonBarNegativeButtonStyle = 2130772127;
+
+			// aapt resource value: 0x7f0100a0
+			public const int buttonBarNeutralButtonStyle = 2130772128;
+
+			// aapt resource value: 0x7f01009e
+			public const int buttonBarPositiveButtonStyle = 2130772126;
+
+			// aapt resource value: 0x7f01006e
+			public const int buttonBarStyle = 2130772078;
+
+			// aapt resource value: 0x7f0100f2
+			public const int buttonGravity = 2130772210;
+
+			// aapt resource value: 0x7f01002a
+			public const int buttonPanelSideLayout = 2130772010;
+
+			// aapt resource value: 0x7f0100a2
+			public const int buttonStyle = 2130772130;
+
+			// aapt resource value: 0x7f0100a3
+			public const int buttonStyleSmall = 2130772131;
+
+			// aapt resource value: 0x7f0100b4
+			public const int buttonTint = 2130772148;
+
+			// aapt resource value: 0x7f0100b5
+			public const int buttonTintMode = 2130772149;
+
+			// aapt resource value: 0x7f0100a4
+			public const int checkboxStyle = 2130772132;
+
+			// aapt resource value: 0x7f0100a5
+			public const int checkedTextViewStyle = 2130772133;
+
+			// aapt resource value: 0x7f0100d5
+			public const int closeIcon = 2130772181;
+
+			// aapt resource value: 0x7f010027
+			public const int closeItemLayout = 2130772007;
+
+			// aapt resource value: 0x7f0100f4
+			public const int collapseContentDescription = 2130772212;
+
+			// aapt resource value: 0x7f0100f3
+			public const int collapseIcon = 2130772211;
+
+			// aapt resource value: 0x7f010113
+			public const int collapsedTitleGravity = 2130772243;
+
+			// aapt resource value: 0x7f01010d
+			public const int collapsedTitleTextAppearance = 2130772237;
+
+			// aapt resource value: 0x7f0100b6
+			public const int color = 2130772150;
+
+			// aapt resource value: 0x7f010091
+			public const int colorAccent = 2130772113;
+
+			// aapt resource value: 0x7f010098
+			public const int colorBackgroundFloating = 2130772120;
+
+			// aapt resource value: 0x7f010095
+			public const int colorButtonNormal = 2130772117;
+
+			// aapt resource value: 0x7f010093
+			public const int colorControlActivated = 2130772115;
+
+			// aapt resource value: 0x7f010094
+			public const int colorControlHighlight = 2130772116;
+
+			// aapt resource value: 0x7f010092
+			public const int colorControlNormal = 2130772114;
+
+			// aapt resource value: 0x7f0100b1
+			public const int colorError = 2130772145;
+
+			// aapt resource value: 0x7f01008f
+			public const int colorPrimary = 2130772111;
+
+			// aapt resource value: 0x7f010090
+			public const int colorPrimaryDark = 2130772112;
+
+			// aapt resource value: 0x7f010096
+			public const int colorSwitchThumbNormal = 2130772118;
+
+			// aapt resource value: 0x7f0100da
+			public const int commitIcon = 2130772186;
+
+			// aapt resource value: 0x7f0100c7
+			public const int contentDescription = 2130772167;
+
+			// aapt resource value: 0x7f010020
+			public const int contentInsetEnd = 2130772000;
+
+			// aapt resource value: 0x7f010024
+			public const int contentInsetEndWithActions = 2130772004;
+
+			// aapt resource value: 0x7f010021
+			public const int contentInsetLeft = 2130772001;
+
+			// aapt resource value: 0x7f010022
+			public const int contentInsetRight = 2130772002;
+
+			// aapt resource value: 0x7f01001f
+			public const int contentInsetStart = 2130771999;
+
+			// aapt resource value: 0x7f010023
+			public const int contentInsetStartWithNavigation = 2130772003;
+
+			// aapt resource value: 0x7f01010e
+			public const int contentScrim = 2130772238;
+
+			// aapt resource value: 0x7f010097
+			public const int controlBackground = 2130772119;
+
+			// aapt resource value: 0x7f010147
+			public const int counterEnabled = 2130772295;
+
+			// aapt resource value: 0x7f010148
+			public const int counterMaxLength = 2130772296;
+
+			// aapt resource value: 0x7f01014a
+			public const int counterOverflowTextAppearance = 2130772298;
+
+			// aapt resource value: 0x7f010149
+			public const int counterTextAppearance = 2130772297;
+
+			// aapt resource value: 0x7f0101b2
+			public const int curtain_bar_bg_color = 2130772402;
+
+			// aapt resource value: 0x7f0101b3
+			public const int curtain_bar_border_color = 2130772403;
+
+			// aapt resource value: 0x7f0101b0
+			public const int curtain_bar_color = 2130772400;
+
+			// aapt resource value: 0x7f0101b5
+			public const int curtain_bar_height = 2130772405;
+
+			// aapt resource value: 0x7f0101b4
+			public const int curtain_bar_width = 2130772404;
+
+			// aapt resource value: 0x7f010018
+			public const int customNavigationLayout = 2130771992;
+
+			// aapt resource value: 0x7f0100d4
+			public const int defaultQueryHint = 2130772180;
+
+			// aapt resource value: 0x7f010067
+			public const int dialogPreferredPadding = 2130772071;
+
+			// aapt resource value: 0x7f010066
+			public const int dialogTheme = 2130772070;
+
+			// aapt resource value: 0x7f01000e
+			public const int displayOptions = 2130771982;
+
+			// aapt resource value: 0x7f010014
+			public const int divider = 2130771988;
+
+			// aapt resource value: 0x7f010074
+			public const int dividerHorizontal = 2130772084;
+
+			// aapt resource value: 0x7f0100c0
+			public const int dividerPadding = 2130772160;
+
+			// aapt resource value: 0x7f010073
+			public const int dividerVertical = 2130772083;
+
+			// aapt resource value: 0x7f0100b8
+			public const int drawableSize = 2130772152;
+
+			// aapt resource value: 0x7f010009
+			public const int drawerArrowStyle = 2130771977;
+
+			// aapt resource value: 0x7f010086
+			public const int dropDownListViewStyle = 2130772102;
+
+			// aapt resource value: 0x7f01006a
+			public const int dropdownListPreferredItemHeight = 2130772074;
+
+			// aapt resource value: 0x7f01007b
+			public const int editTextBackground = 2130772091;
+
+			// aapt resource value: 0x7f01007a
+			public const int editTextColor = 2130772090;
+
+			// aapt resource value: 0x7f0100a6
+			public const int editTextStyle = 2130772134;
+
+			// aapt resource value: 0x7f010025
+			public const int elevation = 2130772005;
+
+			// aapt resource value: 0x7f010145
+			public const int errorEnabled = 2130772293;
+
+			// aapt resource value: 0x7f010146
+			public const int errorTextAppearance = 2130772294;
+
+			// aapt resource value: 0x7f010029
+			public const int expandActivityOverflowButtonDrawable = 2130772009;
+
+			// aapt resource value: 0x7f0100ff
+			public const int expanded = 2130772223;
+
+			// aapt resource value: 0x7f010114
+			public const int expandedTitleGravity = 2130772244;
+
+			// aapt resource value: 0x7f010107
+			public const int expandedTitleMargin = 2130772231;
+
+			// aapt resource value: 0x7f01010b
+			public const int expandedTitleMarginBottom = 2130772235;
+
+			// aapt resource value: 0x7f01010a
+			public const int expandedTitleMarginEnd = 2130772234;
+
+			// aapt resource value: 0x7f010108
+			public const int expandedTitleMarginStart = 2130772232;
+
+			// aapt resource value: 0x7f010109
+			public const int expandedTitleMarginTop = 2130772233;
+
+			// aapt resource value: 0x7f01010c
+			public const int expandedTitleTextAppearance = 2130772236;
+
+			// aapt resource value: 0x7f010124
+			public const int fabSize = 2130772260;
+
+			// aapt resource value: 0x7f010004
+			public const int fastScrollEnabled = 2130771972;
+
+			// aapt resource value: 0x7f010007
+			public const int fastScrollHorizontalThumbDrawable = 2130771975;
+
+			// aapt resource value: 0x7f010008
+			public const int fastScrollHorizontalTrackDrawable = 2130771976;
+
+			// aapt resource value: 0x7f010005
+			public const int fastScrollVerticalThumbDrawable = 2130771973;
+
+			// aapt resource value: 0x7f010006
+			public const int fastScrollVerticalTrackDrawable = 2130771974;
+
+			// aapt resource value: 0x7f010158
+			public const int font = 2130772312;
+
+			// aapt resource value: 0x7f01003c
+			public const int fontFamily = 2130772028;
+
+			// aapt resource value: 0x7f010151
+			public const int fontProviderAuthority = 2130772305;
+
+			// aapt resource value: 0x7f010154
+			public const int fontProviderCerts = 2130772308;
+
+			// aapt resource value: 0x7f010155
+			public const int fontProviderFetchStrategy = 2130772309;
+
+			// aapt resource value: 0x7f010156
+			public const int fontProviderFetchTimeout = 2130772310;
+
+			// aapt resource value: 0x7f010152
+			public const int fontProviderPackage = 2130772306;
+
+			// aapt resource value: 0x7f010153
+			public const int fontProviderQuery = 2130772307;
+
+			// aapt resource value: 0x7f010157
+			public const int fontStyle = 2130772311;
+
+			// aapt resource value: 0x7f010159
+			public const int fontWeight = 2130772313;
+
+			// aapt resource value: 0x7f010129
+			public const int foregroundInsidePadding = 2130772265;
+
+			// aapt resource value: 0x7f0100b9
+			public const int gapBetweenBars = 2130772153;
+
+			// aapt resource value: 0x7f0100d6
+			public const int goIcon = 2130772182;
+
+			// aapt resource value: 0x7f0101ac
+			public const int hdl_arc_thumb_mode = 2130772396;
+
+			// aapt resource value: 0x7f01012f
+			public const int headerLayout = 2130772271;
+
+			// aapt resource value: 0x7f01000a
+			public const int height = 2130771978;
+
+			// aapt resource value: 0x7f01001e
+			public const int hideOnContentScroll = 2130771998;
+
+			// aapt resource value: 0x7f01014b
+			public const int hintAnimationEnabled = 2130772299;
+
+			// aapt resource value: 0x7f010144
+			public const int hintEnabled = 2130772292;
+
+			// aapt resource value: 0x7f010143
+			public const int hintTextAppearance = 2130772291;
+
+			// aapt resource value: 0x7f01006c
+			public const int homeAsUpIndicator = 2130772076;
+
+			// aapt resource value: 0x7f010019
+			public const int homeLayout = 2130771993;
+
+			// aapt resource value: 0x7f010012
+			public const int icon = 2130771986;
+
+			// aapt resource value: 0x7f0100c9
+			public const int iconTint = 2130772169;
+
+			// aapt resource value: 0x7f0100ca
+			public const int iconTintMode = 2130772170;
+
+			// aapt resource value: 0x7f0100d2
+			public const int iconifiedByDefault = 2130772178;
+
+			// aapt resource value: 0x7f01007c
+			public const int imageButtonStyle = 2130772092;
+
+			// aapt resource value: 0x7f01001b
+			public const int indeterminateProgressStyle = 2130771995;
+
+			// aapt resource value: 0x7f010028
+			public const int initialActivityCount = 2130772008;
+
+			// aapt resource value: 0x7f010130
+			public const int insetForeground = 2130772272;
+
+			// aapt resource value: 0x7f01000b
+			public const int isLightTheme = 2130771979;
+
+			// aapt resource value: 0x7f01012d
+			public const int itemBackground = 2130772269;
+
+			// aapt resource value: 0x7f01012b
+			public const int itemIconTint = 2130772267;
+
+			// aapt resource value: 0x7f01001d
+			public const int itemPadding = 2130771997;
+
+			// aapt resource value: 0x7f01012e
+			public const int itemTextAppearance = 2130772270;
+
+			// aapt resource value: 0x7f01012c
+			public const int itemTextColor = 2130772268;
+
+			// aapt resource value: 0x7f010118
+			public const int keylines = 2130772248;
+
+			// aapt resource value: 0x7f0100d1
+			public const int layout = 2130772177;
+
+			// aapt resource value: 0x7f010000
+			public const int layoutManager = 2130771968;
+
+			// aapt resource value: 0x7f01011b
+			public const int layout_anchor = 2130772251;
+
+			// aapt resource value: 0x7f01011d
+			public const int layout_anchorGravity = 2130772253;
+
+			// aapt resource value: 0x7f01011a
+			public const int layout_behavior = 2130772250;
+
+			// aapt resource value: 0x7f010116
+			public const int layout_collapseMode = 2130772246;
+
+			// aapt resource value: 0x7f010117
+			public const int layout_collapseParallaxMultiplier = 2130772247;
+
+			// aapt resource value: 0x7f01011f
+			public const int layout_dodgeInsetEdges = 2130772255;
+
+			// aapt resource value: 0x7f01011e
+			public const int layout_insetEdge = 2130772254;
+
+			// aapt resource value: 0x7f01011c
+			public const int layout_keyline = 2130772252;
+
+			// aapt resource value: 0x7f010102
+			public const int layout_scrollFlags = 2130772226;
+
+			// aapt resource value: 0x7f010103
+			public const int layout_scrollInterpolator = 2130772227;
+
+			// aapt resource value: 0x7f010197
+			public const int layout_srlBackgroundColor = 2130772375;
+
+			// aapt resource value: 0x7f01015b
+			public const int layout_srlSpinnerStyle = 2130772315;
+
+			// aapt resource value: 0x7f01008e
+			public const int listChoiceBackgroundIndicator = 2130772110;
+
+			// aapt resource value: 0x7f010068
+			public const int listDividerAlertDialog = 2130772072;
+
+			// aapt resource value: 0x7f01002e
+			public const int listItemLayout = 2130772014;
+
+			// aapt resource value: 0x7f01002b
+			public const int listLayout = 2130772011;
+
+			// aapt resource value: 0x7f0100ae
+			public const int listMenuViewStyle = 2130772142;
+
+			// aapt resource value: 0x7f010087
+			public const int listPopupWindowStyle = 2130772103;
+
+			// aapt resource value: 0x7f010081
+			public const int listPreferredItemHeight = 2130772097;
+
+			// aapt resource value: 0x7f010083
+			public const int listPreferredItemHeightLarge = 2130772099;
+
+			// aapt resource value: 0x7f010082
+			public const int listPreferredItemHeightSmall = 2130772098;
+
+			// aapt resource value: 0x7f010084
+			public const int listPreferredItemPaddingLeft = 2130772100;
+
+			// aapt resource value: 0x7f010085
+			public const int listPreferredItemPaddingRight = 2130772101;
+
+			// aapt resource value: 0x7f010013
+			public const int logo = 2130771987;
+
+			// aapt resource value: 0x7f0100f7
+			public const int logoDescription = 2130772215;
+
+			// aapt resource value: 0x7f010132
+			public const int maxActionInlineWidth = 2130772274;
+
+			// aapt resource value: 0x7f0100f1
+			public const int maxButtonHeight = 2130772209;
+
+			// aapt resource value: 0x7f0100be
+			public const int measureWithLargestChild = 2130772158;
+
+			// aapt resource value: 0x7f01012a
+			public const int menu = 2130772266;
+
+			// aapt resource value: 0x7f01002c
+			public const int multiChoiceItemLayout = 2130772012;
+
+			// aapt resource value: 0x7f0100f6
+			public const int navigationContentDescription = 2130772214;
+
+			// aapt resource value: 0x7f0100f5
+			public const int navigationIcon = 2130772213;
+
+			// aapt resource value: 0x7f01000d
+			public const int navigationMode = 2130771981;
+
+			// aapt resource value: 0x7f0100c2
+			public const int numericModifiers = 2130772162;
+
+			// aapt resource value: 0x7f0100cd
+			public const int overlapAnchor = 2130772173;
+
+			// aapt resource value: 0x7f0100cf
+			public const int paddingBottomNoButtons = 2130772175;
+
+			// aapt resource value: 0x7f0100fb
+			public const int paddingEnd = 2130772219;
+
+			// aapt resource value: 0x7f0100fa
+			public const int paddingStart = 2130772218;
+
+			// aapt resource value: 0x7f0100d0
+			public const int paddingTopNoTitle = 2130772176;
+
+			// aapt resource value: 0x7f01008b
+			public const int panelBackground = 2130772107;
+
+			// aapt resource value: 0x7f01008d
+			public const int panelMenuListTheme = 2130772109;
+
+			// aapt resource value: 0x7f01008c
+			public const int panelMenuListWidth = 2130772108;
+
+			// aapt resource value: 0x7f01014e
+			public const int passwordToggleContentDescription = 2130772302;
+
+			// aapt resource value: 0x7f01014d
+			public const int passwordToggleDrawable = 2130772301;
+
+			// aapt resource value: 0x7f01014c
+			public const int passwordToggleEnabled = 2130772300;
+
+			// aapt resource value: 0x7f01014f
+			public const int passwordToggleTint = 2130772303;
+
+			// aapt resource value: 0x7f010150
+			public const int passwordToggleTintMode = 2130772304;
+
+			// aapt resource value: 0x7f010078
+			public const int popupMenuStyle = 2130772088;
+
+			// aapt resource value: 0x7f010026
+			public const int popupTheme = 2130772006;
+
+			// aapt resource value: 0x7f010079
+			public const int popupWindowStyle = 2130772089;
+
+			// aapt resource value: 0x7f0100cb
+			public const int preserveIconSpacing = 2130772171;
+
+			// aapt resource value: 0x7f010125
+			public const int pressedTranslationZ = 2130772261;
+
+			// aapt resource value: 0x7f01001c
+			public const int progressBarPadding = 2130771996;
+
+			// aapt resource value: 0x7f01001a
+			public const int progressBarStyle = 2130771994;
+
+			// aapt resource value: 0x7f0100dc
+			public const int queryBackground = 2130772188;
+
+			// aapt resource value: 0x7f0100d3
+			public const int queryHint = 2130772179;
+
+			// aapt resource value: 0x7f0100a7
+			public const int radioButtonStyle = 2130772135;
+
+			// aapt resource value: 0x7f0100a8
+			public const int ratingBarStyle = 2130772136;
+
+			// aapt resource value: 0x7f0100a9
+			public const int ratingBarStyleIndicator = 2130772137;
+
+			// aapt resource value: 0x7f0100aa
+			public const int ratingBarStyleSmall = 2130772138;
+
+			// aapt resource value: 0x7f010002
+			public const int reverseLayout = 2130771970;
+
+			// aapt resource value: 0x7f010123
+			public const int rippleColor = 2130772259;
+
+			// aapt resource value: 0x7f010112
+			public const int scrimAnimationDuration = 2130772242;
+
+			// aapt resource value: 0x7f010111
+			public const int scrimVisibleHeightTrigger = 2130772241;
+
+			// aapt resource value: 0x7f0100d8
+			public const int searchHintIcon = 2130772184;
+
+			// aapt resource value: 0x7f0100d7
+			public const int searchIcon = 2130772183;
+
+			// aapt resource value: 0x7f010080
+			public const int searchViewStyle = 2130772096;
+
+			// aapt resource value: 0x7f0101b1
+			public const int second_curtain_bar_color = 2130772401;
+
+			// aapt resource value: 0x7f0101b7
+			public const int second_wave_color = 2130772407;
+
+			// aapt resource value: 0x7f0100ab
+			public const int seekBarStyle = 2130772139;
+
+			// aapt resource value: 0x7f010070
+			public const int selectableItemBackground = 2130772080;
+
+			// aapt resource value: 0x7f010071
+			public const int selectableItemBackgroundBorderless = 2130772081;
+
+			// aapt resource value: 0x7f0100c3
+			public const int showAsAction = 2130772163;
+
+			// aapt resource value: 0x7f0100bf
+			public const int showDividers = 2130772159;
+
+			// aapt resource value: 0x7f0100e8
+			public const int showText = 2130772200;
+
+			// aapt resource value: 0x7f01002f
+			public const int showTitle = 2130772015;
+
+			// aapt resource value: 0x7f01002d
+			public const int singleChoiceItemLayout = 2130772013;
+
+			// aapt resource value: 0x7f010001
+			public const int spanCount = 2130771969;
+
+			// aapt resource value: 0x7f0100b7
+			public const int spinBars = 2130772151;
+
+			// aapt resource value: 0x7f01006b
+			public const int spinnerDropDownItemStyle = 2130772075;
+
+			// aapt resource value: 0x7f0100ac
+			public const int spinnerStyle = 2130772140;
+
+			// aapt resource value: 0x7f0100e7
+			public const int splitTrack = 2130772199;
+
+			// aapt resource value: 0x7f010030
+			public const int srcCompat = 2130772016;
+
+			// aapt resource value: 0x7f01015c
+			public const int srlAccentColor = 2130772316;
+
+			// aapt resource value: 0x7f010172
+			public const int srlAnimatingColor = 2130772338;
+
+			// aapt resource value: 0x7f01015d
+			public const int srlClassicsSpinnerStyle = 2130772317;
+
+			// aapt resource value: 0x7f010194
+			public const int srlDisableContentWhenLoading = 2130772372;
+
+			// aapt resource value: 0x7f010193
+			public const int srlDisableContentWhenRefresh = 2130772371;
+
+			// aapt resource value: 0x7f01017b
+			public const int srlDragRate = 2130772347;
+
+			// aapt resource value: 0x7f01015e
+			public const int srlDrawableArrow = 2130772318;
+
+			// aapt resource value: 0x7f01015f
+			public const int srlDrawableArrowSize = 2130772319;
+
+			// aapt resource value: 0x7f010160
+			public const int srlDrawableMarginRight = 2130772320;
+
+			// aapt resource value: 0x7f010161
+			public const int srlDrawableProgress = 2130772321;
+
+			// aapt resource value: 0x7f010162
+			public const int srlDrawableProgressSize = 2130772322;
+
+			// aapt resource value: 0x7f010163
+			public const int srlDrawableSize = 2130772323;
+
+			// aapt resource value: 0x7f010187
+			public const int srlEnableAutoLoadMore = 2130772359;
+
+			// aapt resource value: 0x7f010191
+			public const int srlEnableClipFooterWhenFixedBehind = 2130772369;
+
+			// aapt resource value: 0x7f010190
+			public const int srlEnableClipHeaderWhenFixedBehind = 2130772368;
+
+			// aapt resource value: 0x7f01018e
+			public const int srlEnableFooterFollowWhenLoadFinished = 2130772366;
+
+			// aapt resource value: 0x7f01018f
+			public const int srlEnableFooterFollowWhenNoMoreData = 2130772367;
+
+			// aapt resource value: 0x7f010183
+			public const int srlEnableFooterTranslationContent = 2130772355;
+
+			// aapt resource value: 0x7f010182
+			public const int srlEnableHeaderTranslationContent = 2130772354;
+
+			// aapt resource value: 0x7f010164
+			public const int srlEnableHorizontalDrag = 2130772324;
+
+			// aapt resource value: 0x7f010175
+			public const int srlEnableLastTime = 2130772341;
+
+			// aapt resource value: 0x7f010181
+			public const int srlEnableLoadMore = 2130772353;
+
+			// aapt resource value: 0x7f01018d
+			public const int srlEnableLoadMoreWhenContentNotFull = 2130772365;
+
+			// aapt resource value: 0x7f01018a
+			public const int srlEnableNestedScrolling = 2130772362;
+
+			// aapt resource value: 0x7f010188
+			public const int srlEnableOverScrollBounce = 2130772360;
+
+			// aapt resource value: 0x7f010192
+			public const int srlEnableOverScrollDrag = 2130772370;
+
+			// aapt resource value: 0x7f010186
+			public const int srlEnablePreviewInEditMode = 2130772358;
+
+			// aapt resource value: 0x7f01019d
+			public const int srlEnablePullToCloseTwoLevel = 2130772381;
+
+			// aapt resource value: 0x7f010189
+			public const int srlEnablePureScrollMode = 2130772361;
+
+			// aapt resource value: 0x7f010180
+			public const int srlEnableRefresh = 2130772352;
+
+			// aapt resource value: 0x7f01018b
+			public const int srlEnableScrollContentWhenLoaded = 2130772363;
+
+			// aapt resource value: 0x7f01018c
+			public const int srlEnableScrollContentWhenRefreshed = 2130772364;
+
+			// aapt resource value: 0x7f01019c
+			public const int srlEnableTwoLevel = 2130772380;
+
+			// aapt resource value: 0x7f010165
+			public const int srlFinishDuration = 2130772325;
+
+			// aapt resource value: 0x7f010196
+			public const int srlFixedFooterViewId = 2130772374;
+
+			// aapt resource value: 0x7f010195
+			public const int srlFixedHeaderViewId = 2130772373;
+
+			// aapt resource value: 0x7f01019b
+			public const int srlFloorDuration = 2130772379;
+
+			// aapt resource value: 0x7f010199
+			public const int srlFloorRage = 2130772377;
+
+			// aapt resource value: 0x7f010178
+			public const int srlFooterHeight = 2130772344;
+
+			// aapt resource value: 0x7f01017a
+			public const int srlFooterInsetStart = 2130772346;
+
+			// aapt resource value: 0x7f01017d
+			public const int srlFooterMaxDragRate = 2130772349;
+
+			// aapt resource value: 0x7f010185
+			public const int srlFooterTranslationViewId = 2130772357;
+
+			// aapt resource value: 0x7f01017f
+			public const int srlFooterTriggerRate = 2130772351;
+
+			// aapt resource value: 0x7f010177
+			public const int srlHeaderHeight = 2130772343;
+
+			// aapt resource value: 0x7f010179
+			public const int srlHeaderInsetStart = 2130772345;
+
+			// aapt resource value: 0x7f01017c
+			public const int srlHeaderMaxDragRate = 2130772348;
+
+			// aapt resource value: 0x7f010184
+			public const int srlHeaderTranslationViewId = 2130772356;
+
+			// aapt resource value: 0x7f01017e
+			public const int srlHeaderTriggerRate = 2130772350;
+
+			// aapt resource value: 0x7f010198
+			public const int srlMaxRage = 2130772376;
+
+			// aapt resource value: 0x7f010173
+			public const int srlNormalColor = 2130772339;
+
+			// aapt resource value: 0x7f010166
+			public const int srlPrimaryColor = 2130772326;
+
+			// aapt resource value: 0x7f010176
+			public const int srlReboundDuration = 2130772342;
+
+			// aapt resource value: 0x7f01019a
+			public const int srlRefreshRage = 2130772378;
+
+			// aapt resource value: 0x7f010167
+			public const int srlTextFailed = 2130772327;
+
+			// aapt resource value: 0x7f010168
+			public const int srlTextFinish = 2130772328;
+
+			// aapt resource value: 0x7f010169
+			public const int srlTextLoading = 2130772329;
+
+			// aapt resource value: 0x7f01016a
+			public const int srlTextNothing = 2130772330;
+
+			// aapt resource value: 0x7f01016b
+			public const int srlTextPulling = 2130772331;
+
+			// aapt resource value: 0x7f01016c
+			public const int srlTextRefreshing = 2130772332;
+
+			// aapt resource value: 0x7f01016d
+			public const int srlTextRelease = 2130772333;
+
+			// aapt resource value: 0x7f01016e
+			public const int srlTextSecondary = 2130772334;
+
+			// aapt resource value: 0x7f01016f
+			public const int srlTextSizeTime = 2130772335;
+
+			// aapt resource value: 0x7f010170
+			public const int srlTextSizeTitle = 2130772336;
+
+			// aapt resource value: 0x7f010174
+			public const int srlTextTimeMarginTop = 2130772340;
+
+			// aapt resource value: 0x7f010171
+			public const int srlTextUpdate = 2130772337;
+
+			// aapt resource value: 0x7f010003
+			public const int stackFromEnd = 2130771971;
+
+			// aapt resource value: 0x7f0100ce
+			public const int state_above_anchor = 2130772174;
+
+			// aapt resource value: 0x7f010100
+			public const int state_collapsed = 2130772224;
+
+			// aapt resource value: 0x7f010101
+			public const int state_collapsible = 2130772225;
+
+			// aapt resource value: 0x7f010119
+			public const int statusBarBackground = 2130772249;
+
+			// aapt resource value: 0x7f01010f
+			public const int statusBarScrim = 2130772239;
+
+			// aapt resource value: 0x7f0100cc
+			public const int subMenuArrow = 2130772172;
+
+			// aapt resource value: 0x7f0100dd
+			public const int submitBackground = 2130772189;
+
+			// aapt resource value: 0x7f01000f
+			public const int subtitle = 2130771983;
+
+			// aapt resource value: 0x7f0100ea
+			public const int subtitleTextAppearance = 2130772202;
+
+			// aapt resource value: 0x7f0100f9
+			public const int subtitleTextColor = 2130772217;
+
+			// aapt resource value: 0x7f010011
+			public const int subtitleTextStyle = 2130771985;
+
+			// aapt resource value: 0x7f0100db
+			public const int suggestionRowLayout = 2130772187;
+
+			// aapt resource value: 0x7f0100e5
+			public const int switchMinWidth = 2130772197;
+
+			// aapt resource value: 0x7f0100e6
+			public const int switchPadding = 2130772198;
+
+			// aapt resource value: 0x7f0100ad
+			public const int switchStyle = 2130772141;
+
+			// aapt resource value: 0x7f0100e4
+			public const int switchTextAppearance = 2130772196;
+
+			// aapt resource value: 0x7f010136
+			public const int tabBackground = 2130772278;
+
+			// aapt resource value: 0x7f010135
+			public const int tabContentStart = 2130772277;
+
+			// aapt resource value: 0x7f010138
+			public const int tabGravity = 2130772280;
+
+			// aapt resource value: 0x7f010133
+			public const int tabIndicatorColor = 2130772275;
+
+			// aapt resource value: 0x7f010134
+			public const int tabIndicatorHeight = 2130772276;
+
+			// aapt resource value: 0x7f01013a
+			public const int tabMaxWidth = 2130772282;
+
+			// aapt resource value: 0x7f010139
+			public const int tabMinWidth = 2130772281;
+
+			// aapt resource value: 0x7f010137
+			public const int tabMode = 2130772279;
+
+			// aapt resource value: 0x7f010142
+			public const int tabPadding = 2130772290;
+
+			// aapt resource value: 0x7f010141
+			public const int tabPaddingBottom = 2130772289;
+
+			// aapt resource value: 0x7f010140
+			public const int tabPaddingEnd = 2130772288;
+
+			// aapt resource value: 0x7f01013e
+			public const int tabPaddingStart = 2130772286;
+
+			// aapt resource value: 0x7f01013f
+			public const int tabPaddingTop = 2130772287;
+
+			// aapt resource value: 0x7f01013d
+			public const int tabSelectedTextColor = 2130772285;
+
+			// aapt resource value: 0x7f01013b
+			public const int tabTextAppearance = 2130772283;
+
+			// aapt resource value: 0x7f01013c
+			public const int tabTextColor = 2130772284;
+
+			// aapt resource value: 0x7f010036
+			public const int textAllCaps = 2130772022;
+
+			// aapt resource value: 0x7f010063
+			public const int textAppearanceLargePopupMenu = 2130772067;
+
+			// aapt resource value: 0x7f010088
+			public const int textAppearanceListItem = 2130772104;
+
+			// aapt resource value: 0x7f010089
+			public const int textAppearanceListItemSecondary = 2130772105;
+
+			// aapt resource value: 0x7f01008a
+			public const int textAppearanceListItemSmall = 2130772106;
+
+			// aapt resource value: 0x7f010065
+			public const int textAppearancePopupMenuHeader = 2130772069;
+
+			// aapt resource value: 0x7f01007e
+			public const int textAppearanceSearchResultSubtitle = 2130772094;
+
+			// aapt resource value: 0x7f01007d
+			public const int textAppearanceSearchResultTitle = 2130772093;
+
+			// aapt resource value: 0x7f010064
+			public const int textAppearanceSmallPopupMenu = 2130772068;
+
+			// aapt resource value: 0x7f01009d
+			public const int textColorAlertDialogListItem = 2130772125;
+
+			// aapt resource value: 0x7f010122
+			public const int textColorError = 2130772258;
+
+			// aapt resource value: 0x7f01007f
+			public const int textColorSearchUrl = 2130772095;
+
+			// aapt resource value: 0x7f0100fc
+			public const int theme = 2130772220;
+
+			// aapt resource value: 0x7f0100bd
+			public const int thickness = 2130772157;
+
+			// aapt resource value: 0x7f0100e3
+			public const int thumbTextPadding = 2130772195;
+
+			// aapt resource value: 0x7f0100de
+			public const int thumbTint = 2130772190;
+
+			// aapt resource value: 0x7f0100df
+			public const int thumbTintMode = 2130772191;
+
+			// aapt resource value: 0x7f010033
+			public const int tickMark = 2130772019;
+
+			// aapt resource value: 0x7f010034
+			public const int tickMarkTint = 2130772020;
+
+			// aapt resource value: 0x7f010035
+			public const int tickMarkTintMode = 2130772021;
+
+			// aapt resource value: 0x7f010031
+			public const int tint = 2130772017;
+
+			// aapt resource value: 0x7f010032
+			public const int tintMode = 2130772018;
+
+			// aapt resource value: 0x7f01000c
+			public const int title = 2130771980;
+
+			// aapt resource value: 0x7f010115
+			public const int titleEnabled = 2130772245;
+
+			// aapt resource value: 0x7f0100eb
+			public const int titleMargin = 2130772203;
+
+			// aapt resource value: 0x7f0100ef
+			public const int titleMarginBottom = 2130772207;
+
+			// aapt resource value: 0x7f0100ed
+			public const int titleMarginEnd = 2130772205;
+
+			// aapt resource value: 0x7f0100ec
+			public const int titleMarginStart = 2130772204;
+
+			// aapt resource value: 0x7f0100ee
+			public const int titleMarginTop = 2130772206;
+
+			// aapt resource value: 0x7f0100f0
+			public const int titleMargins = 2130772208;
+
+			// aapt resource value: 0x7f0100e9
+			public const int titleTextAppearance = 2130772201;
+
+			// aapt resource value: 0x7f0100f8
+			public const int titleTextColor = 2130772216;
+
+			// aapt resource value: 0x7f010010
+			public const int titleTextStyle = 2130771984;
+
+			// aapt resource value: 0x7f010110
+			public const int toolbarId = 2130772240;
+
+			// aapt resource value: 0x7f010077
+			public const int toolbarNavigationButtonStyle = 2130772087;
+
+			// aapt resource value: 0x7f010076
+			public const int toolbarStyle = 2130772086;
+
+			// aapt resource value: 0x7f0100b0
+			public const int tooltipForegroundColor = 2130772144;
+
+			// aapt resource value: 0x7f0100af
+			public const int tooltipFrameBackground = 2130772143;
+
+			// aapt resource value: 0x7f0100c8
+			public const int tooltipText = 2130772168;
+
+			// aapt resource value: 0x7f0100e0
+			public const int track = 2130772192;
+
+			// aapt resource value: 0x7f0100e1
+			public const int trackTint = 2130772193;
+
+			// aapt resource value: 0x7f0100e2
+			public const int trackTintMode = 2130772194;
+
+			// aapt resource value: 0x7f010127
+			public const int useCompatPadding = 2130772263;
+
+			// aapt resource value: 0x7f0100d9
+			public const int voiceIcon = 2130772185;
+
+			// aapt resource value: 0x7f0101b8
+			public const int wave_bg_color = 2130772408;
+
+			// aapt resource value: 0x7f0101b9
+			public const int wave_border_color = 2130772409;
+
+			// aapt resource value: 0x7f0101b6
+			public const int wave_color = 2130772406;
+
+			// aapt resource value: 0x7f0101bb
+			public const int wave_height = 2130772411;
+
+			// aapt resource value: 0x7f0101ba
+			public const int wave_width = 2130772410;
+
+			// aapt resource value: 0x7f0101c0
+			public const int wheelview_dividerColor = 2130772416;
+
+			// aapt resource value: 0x7f0101bc
+			public const int wheelview_gravity = 2130772412;
+
+			// aapt resource value: 0x7f0101c1
+			public const int wheelview_lineSpacingMultiplier = 2130772417;
+
+			// aapt resource value: 0x7f0101bf
+			public const int wheelview_textColorCenter = 2130772415;
+
+			// aapt resource value: 0x7f0101be
+			public const int wheelview_textColorOut = 2130772414;
+
+			// aapt resource value: 0x7f0101bd
+			public const int wheelview_textSize = 2130772413;
+
+			// aapt resource value: 0x7f01003d
+			public const int windowActionBar = 2130772029;
+
+			// aapt resource value: 0x7f01003f
+			public const int windowActionBarOverlay = 2130772031;
+
+			// aapt resource value: 0x7f010040
+			public const int windowActionModeOverlay = 2130772032;
+
+			// aapt resource value: 0x7f010044
+			public const int windowFixedHeightMajor = 2130772036;
+
+			// aapt resource value: 0x7f010042
+			public const int windowFixedHeightMinor = 2130772034;
+
+			// aapt resource value: 0x7f010041
+			public const int windowFixedWidthMajor = 2130772033;
+
+			// aapt resource value: 0x7f010043
+			public const int windowFixedWidthMinor = 2130772035;
+
+			// aapt resource value: 0x7f010045
+			public const int windowMinWidthMajor = 2130772037;
+
+			// aapt resource value: 0x7f010046
+			public const int windowMinWidthMinor = 2130772038;
+
+			// aapt resource value: 0x7f01003e
+			public const int windowNoTitle = 2130772030;
+
 			static Attribute()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Attribute()
 			{
 			}
 		}
-		
+
 		public partial class Boolean
 		{
-			
-			// aapt resource value: 0x7F050000
-			public const int abc_action_bar_embed_tabs = 2131034112;
-			
-			// aapt resource value: 0x7F050001
-			public const int abc_allow_stacked_button_bar = 2131034113;
-			
-			// aapt resource value: 0x7F050002
-			public const int abc_config_actionMenuItemAllCaps = 2131034114;
-			
-			// aapt resource value: 0x7F050003
-			public const int abc_config_closeDialogWhenTouchOutside = 2131034115;
-			
-			// aapt resource value: 0x7F050004
-			public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131034116;
-			
+
+			// aapt resource value: 0x7f0c0000
+			public const int abc_action_bar_embed_tabs = 2131492864;
+
+			// aapt resource value: 0x7f0c0001
+			public const int abc_allow_stacked_button_bar = 2131492865;
+
+			// aapt resource value: 0x7f0c0002
+			public const int abc_config_actionMenuItemAllCaps = 2131492866;
+
+			// aapt resource value: 0x7f0c0003
+			public const int abc_config_closeDialogWhenTouchOutside = 2131492867;
+
+			// aapt resource value: 0x7f0c0004
+			public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131492868;
+
 			static Boolean()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Boolean()
 			{
 			}
 		}
-		
+
 		public partial class Color
 		{
-			
-			// aapt resource value: 0x7F060000
-			public const int abc_background_cache_hint_selector_material_dark = 2131099648;
-			
-			// aapt resource value: 0x7F060001
-			public const int abc_background_cache_hint_selector_material_light = 2131099649;
-			
-			// aapt resource value: 0x7F060002
-			public const int abc_btn_colored_borderless_text_material = 2131099650;
-			
-			// aapt resource value: 0x7F060003
-			public const int abc_btn_colored_text_material = 2131099651;
-			
-			// aapt resource value: 0x7F060004
-			public const int abc_color_highlight_material = 2131099652;
-			
-			// aapt resource value: 0x7F060005
-			public const int abc_hint_foreground_material_dark = 2131099653;
-			
-			// aapt resource value: 0x7F060006
-			public const int abc_hint_foreground_material_light = 2131099654;
-			
-			// aapt resource value: 0x7F060007
-			public const int abc_input_method_navigation_guard = 2131099655;
-			
-			// aapt resource value: 0x7F060008
-			public const int abc_primary_text_disable_only_material_dark = 2131099656;
-			
-			// aapt resource value: 0x7F060009
-			public const int abc_primary_text_disable_only_material_light = 2131099657;
-			
-			// aapt resource value: 0x7F06000A
-			public const int abc_primary_text_material_dark = 2131099658;
-			
-			// aapt resource value: 0x7F06000B
-			public const int abc_primary_text_material_light = 2131099659;
-			
-			// aapt resource value: 0x7F06000C
-			public const int abc_search_url_text = 2131099660;
-			
-			// aapt resource value: 0x7F06000D
-			public const int abc_search_url_text_normal = 2131099661;
-			
-			// aapt resource value: 0x7F06000E
-			public const int abc_search_url_text_pressed = 2131099662;
-			
-			// aapt resource value: 0x7F06000F
-			public const int abc_search_url_text_selected = 2131099663;
-			
-			// aapt resource value: 0x7F060010
-			public const int abc_secondary_text_material_dark = 2131099664;
-			
-			// aapt resource value: 0x7F060011
-			public const int abc_secondary_text_material_light = 2131099665;
-			
-			// aapt resource value: 0x7F060012
-			public const int abc_tint_btn_checkable = 2131099666;
-			
-			// aapt resource value: 0x7F060013
-			public const int abc_tint_default = 2131099667;
-			
-			// aapt resource value: 0x7F060014
-			public const int abc_tint_edittext = 2131099668;
-			
-			// aapt resource value: 0x7F060015
-			public const int abc_tint_seek_thumb = 2131099669;
-			
-			// aapt resource value: 0x7F060016
-			public const int abc_tint_spinner = 2131099670;
-			
-			// aapt resource value: 0x7F060017
-			public const int abc_tint_switch_track = 2131099671;
-			
-			// aapt resource value: 0x7F060018
-			public const int accent_material_dark = 2131099672;
-			
-			// aapt resource value: 0x7F060019
-			public const int accent_material_light = 2131099673;
-			
-			// aapt resource value: 0x7F06001A
-			public const int background_floating_material_dark = 2131099674;
-			
-			// aapt resource value: 0x7F06001B
-			public const int background_floating_material_light = 2131099675;
-			
-			// aapt resource value: 0x7F06001C
-			public const int background_material_dark = 2131099676;
-			
-			// aapt resource value: 0x7F06001D
-			public const int background_material_light = 2131099677;
-			
-			// aapt resource value: 0x7F06001E
-			public const int bright_foreground_disabled_material_dark = 2131099678;
-			
-			// aapt resource value: 0x7F06001F
-			public const int bright_foreground_disabled_material_light = 2131099679;
-			
-			// aapt resource value: 0x7F060020
-			public const int bright_foreground_inverse_material_dark = 2131099680;
-			
-			// aapt resource value: 0x7F060021
-			public const int bright_foreground_inverse_material_light = 2131099681;
-			
-			// aapt resource value: 0x7F060022
-			public const int bright_foreground_material_dark = 2131099682;
-			
-			// aapt resource value: 0x7F060023
-			public const int bright_foreground_material_light = 2131099683;
-			
-			// aapt resource value: 0x7F060024
-			public const int button_material_dark = 2131099684;
-			
-			// aapt resource value: 0x7F060025
-			public const int button_material_light = 2131099685;
-			
-			// aapt resource value: 0x7F060026
-			public const int design_bottom_navigation_shadow_color = 2131099686;
-			
-			// aapt resource value: 0x7F060027
-			public const int design_error = 2131099687;
-			
-			// aapt resource value: 0x7F060028
-			public const int design_fab_shadow_end_color = 2131099688;
-			
-			// aapt resource value: 0x7F060029
-			public const int design_fab_shadow_mid_color = 2131099689;
-			
-			// aapt resource value: 0x7F06002A
-			public const int design_fab_shadow_start_color = 2131099690;
-			
-			// aapt resource value: 0x7F06002B
-			public const int design_fab_stroke_end_inner_color = 2131099691;
-			
-			// aapt resource value: 0x7F06002C
-			public const int design_fab_stroke_end_outer_color = 2131099692;
-			
-			// aapt resource value: 0x7F06002D
-			public const int design_fab_stroke_top_inner_color = 2131099693;
-			
-			// aapt resource value: 0x7F06002E
-			public const int design_fab_stroke_top_outer_color = 2131099694;
-			
-			// aapt resource value: 0x7F06002F
-			public const int design_snackbar_background_color = 2131099695;
-			
-			// aapt resource value: 0x7F060030
-			public const int design_tint_password_toggle = 2131099696;
-			
-			// aapt resource value: 0x7F060031
-			public const int dim_foreground_disabled_material_dark = 2131099697;
-			
-			// aapt resource value: 0x7F060032
-			public const int dim_foreground_disabled_material_light = 2131099698;
-			
-			// aapt resource value: 0x7F060033
-			public const int dim_foreground_material_dark = 2131099699;
-			
-			// aapt resource value: 0x7F060034
-			public const int dim_foreground_material_light = 2131099700;
-			
-			// aapt resource value: 0x7F060035
-			public const int error_color_material = 2131099701;
-			
-			// aapt resource value: 0x7F060036
-			public const int foreground_material_dark = 2131099702;
-			
-			// aapt resource value: 0x7F060037
-			public const int foreground_material_light = 2131099703;
-			
-			// aapt resource value: 0x7F060038
-			public const int gd_top_view = 2131099704;
-			
-			// aapt resource value: 0x7F060039
-			public const int highlighted_text_material_dark = 2131099705;
-			
-			// aapt resource value: 0x7F06003A
-			public const int highlighted_text_material_light = 2131099706;
-			
-			// aapt resource value: 0x7F06003B
-			public const int material_blue_grey_800 = 2131099707;
-			
-			// aapt resource value: 0x7F06003C
-			public const int material_blue_grey_900 = 2131099708;
-			
-			// aapt resource value: 0x7F06003D
-			public const int material_blue_grey_950 = 2131099709;
-			
-			// aapt resource value: 0x7F06003E
-			public const int material_deep_teal_200 = 2131099710;
-			
-			// aapt resource value: 0x7F06003F
-			public const int material_deep_teal_500 = 2131099711;
-			
-			// aapt resource value: 0x7F060040
-			public const int material_grey_100 = 2131099712;
-			
-			// aapt resource value: 0x7F060041
-			public const int material_grey_300 = 2131099713;
-			
-			// aapt resource value: 0x7F060042
-			public const int material_grey_50 = 2131099714;
-			
-			// aapt resource value: 0x7F060043
-			public const int material_grey_600 = 2131099715;
-			
-			// aapt resource value: 0x7F060044
-			public const int material_grey_800 = 2131099716;
-			
-			// aapt resource value: 0x7F060045
-			public const int material_grey_850 = 2131099717;
-			
-			// aapt resource value: 0x7F060046
-			public const int material_grey_900 = 2131099718;
-			
-			// aapt resource value: 0x7F060047
-			public const int material_red_500 = 2131099719;
-			
-			// aapt resource value: 0x7F060048
-			public const int notification_action_color_filter = 2131099720;
-			
-			// aapt resource value: 0x7F060049
-			public const int notification_icon_bg_color = 2131099721;
-			
-			// aapt resource value: 0x7F06004A
-			public const int notification_material_background_media_default_color = 2131099722;
-			
-			// aapt resource value: 0x7F06004B
-			public const int pickerview_bgColor_default = 2131099723;
-			
-			// aapt resource value: 0x7F06004C
-			public const int pickerview_bgColor_overlay = 2131099724;
-			
-			// aapt resource value: 0x7F06004D
-			public const int pickerview_bg_topbar = 2131099725;
-			
-			// aapt resource value: 0x7F06004E
-			public const int pickerview_timebtn_nor = 2131099726;
-			
-			// aapt resource value: 0x7F06004F
-			public const int pickerview_timebtn_pre = 2131099727;
-			
-			// aapt resource value: 0x7F060050
-			public const int pickerview_topbar_title = 2131099728;
-			
-			// aapt resource value: 0x7F060051
-			public const int pickerview_wheelview_textcolor_center = 2131099729;
-			
-			// aapt resource value: 0x7F060052
-			public const int pickerview_wheelview_textcolor_divider = 2131099730;
-			
-			// aapt resource value: 0x7F060053
-			public const int pickerview_wheelview_textcolor_out = 2131099731;
-			
-			// aapt resource value: 0x7F060054
-			public const int primary_dark_material_dark = 2131099732;
-			
-			// aapt resource value: 0x7F060055
-			public const int primary_dark_material_light = 2131099733;
-			
-			// aapt resource value: 0x7F060056
-			public const int primary_material_dark = 2131099734;
-			
-			// aapt resource value: 0x7F060057
-			public const int primary_material_light = 2131099735;
-			
-			// aapt resource value: 0x7F060058
-			public const int primary_text_default_material_dark = 2131099736;
-			
-			// aapt resource value: 0x7F060059
-			public const int primary_text_default_material_light = 2131099737;
-			
-			// aapt resource value: 0x7F06005A
-			public const int primary_text_disabled_material_dark = 2131099738;
-			
-			// aapt resource value: 0x7F06005B
-			public const int primary_text_disabled_material_light = 2131099739;
-			
-			// aapt resource value: 0x7F06005C
-			public const int ripple_material_dark = 2131099740;
-			
-			// aapt resource value: 0x7F06005D
-			public const int ripple_material_light = 2131099741;
-			
-			// aapt resource value: 0x7F06005E
-			public const int secondary_text_default_material_dark = 2131099742;
-			
-			// aapt resource value: 0x7F06005F
-			public const int secondary_text_default_material_light = 2131099743;
-			
-			// aapt resource value: 0x7F060060
-			public const int secondary_text_disabled_material_dark = 2131099744;
-			
-			// aapt resource value: 0x7F060061
-			public const int secondary_text_disabled_material_light = 2131099745;
-			
-			// aapt resource value: 0x7F060062
-			public const int switch_thumb_disabled_material_dark = 2131099746;
-			
-			// aapt resource value: 0x7F060063
-			public const int switch_thumb_disabled_material_light = 2131099747;
-			
-			// aapt resource value: 0x7F060064
-			public const int switch_thumb_material_dark = 2131099748;
-			
-			// aapt resource value: 0x7F060065
-			public const int switch_thumb_material_light = 2131099749;
-			
-			// aapt resource value: 0x7F060066
-			public const int switch_thumb_normal_material_dark = 2131099750;
-			
-			// aapt resource value: 0x7F060067
-			public const int switch_thumb_normal_material_light = 2131099751;
-			
-			// aapt resource value: 0x7F060068
-			public const int tooltip_background_dark = 2131099752;
-			
-			// aapt resource value: 0x7F060069
-			public const int tooltip_background_light = 2131099753;
-			
+
+			// aapt resource value: 0x7f0d0052
+			public const int abc_background_cache_hint_selector_material_dark = 2131558482;
+
+			// aapt resource value: 0x7f0d0053
+			public const int abc_background_cache_hint_selector_material_light = 2131558483;
+
+			// aapt resource value: 0x7f0d0054
+			public const int abc_btn_colored_borderless_text_material = 2131558484;
+
+			// aapt resource value: 0x7f0d0055
+			public const int abc_btn_colored_text_material = 2131558485;
+
+			// aapt resource value: 0x7f0d0056
+			public const int abc_color_highlight_material = 2131558486;
+
+			// aapt resource value: 0x7f0d0057
+			public const int abc_hint_foreground_material_dark = 2131558487;
+
+			// aapt resource value: 0x7f0d0058
+			public const int abc_hint_foreground_material_light = 2131558488;
+
+			// aapt resource value: 0x7f0d0000
+			public const int abc_input_method_navigation_guard = 2131558400;
+
+			// aapt resource value: 0x7f0d0059
+			public const int abc_primary_text_disable_only_material_dark = 2131558489;
+
+			// aapt resource value: 0x7f0d005a
+			public const int abc_primary_text_disable_only_material_light = 2131558490;
+
+			// aapt resource value: 0x7f0d005b
+			public const int abc_primary_text_material_dark = 2131558491;
+
+			// aapt resource value: 0x7f0d005c
+			public const int abc_primary_text_material_light = 2131558492;
+
+			// aapt resource value: 0x7f0d005d
+			public const int abc_search_url_text = 2131558493;
+
+			// aapt resource value: 0x7f0d0001
+			public const int abc_search_url_text_normal = 2131558401;
+
+			// aapt resource value: 0x7f0d0002
+			public const int abc_search_url_text_pressed = 2131558402;
+
+			// aapt resource value: 0x7f0d0003
+			public const int abc_search_url_text_selected = 2131558403;
+
+			// aapt resource value: 0x7f0d005e
+			public const int abc_secondary_text_material_dark = 2131558494;
+
+			// aapt resource value: 0x7f0d005f
+			public const int abc_secondary_text_material_light = 2131558495;
+
+			// aapt resource value: 0x7f0d0060
+			public const int abc_tint_btn_checkable = 2131558496;
+
+			// aapt resource value: 0x7f0d0061
+			public const int abc_tint_default = 2131558497;
+
+			// aapt resource value: 0x7f0d0062
+			public const int abc_tint_edittext = 2131558498;
+
+			// aapt resource value: 0x7f0d0063
+			public const int abc_tint_seek_thumb = 2131558499;
+
+			// aapt resource value: 0x7f0d0064
+			public const int abc_tint_spinner = 2131558500;
+
+			// aapt resource value: 0x7f0d0065
+			public const int abc_tint_switch_track = 2131558501;
+
+			// aapt resource value: 0x7f0d0004
+			public const int accent_material_dark = 2131558404;
+
+			// aapt resource value: 0x7f0d0005
+			public const int accent_material_light = 2131558405;
+
+			// aapt resource value: 0x7f0d0006
+			public const int background_floating_material_dark = 2131558406;
+
+			// aapt resource value: 0x7f0d0007
+			public const int background_floating_material_light = 2131558407;
+
+			// aapt resource value: 0x7f0d0008
+			public const int background_material_dark = 2131558408;
+
+			// aapt resource value: 0x7f0d0009
+			public const int background_material_light = 2131558409;
+
+			// aapt resource value: 0x7f0d000a
+			public const int bright_foreground_disabled_material_dark = 2131558410;
+
+			// aapt resource value: 0x7f0d000b
+			public const int bright_foreground_disabled_material_light = 2131558411;
+
+			// aapt resource value: 0x7f0d000c
+			public const int bright_foreground_inverse_material_dark = 2131558412;
+
+			// aapt resource value: 0x7f0d000d
+			public const int bright_foreground_inverse_material_light = 2131558413;
+
+			// aapt resource value: 0x7f0d000e
+			public const int bright_foreground_material_dark = 2131558414;
+
+			// aapt resource value: 0x7f0d000f
+			public const int bright_foreground_material_light = 2131558415;
+
+			// aapt resource value: 0x7f0d0010
+			public const int button_material_dark = 2131558416;
+
+			// aapt resource value: 0x7f0d0011
+			public const int button_material_light = 2131558417;
+
+			// aapt resource value: 0x7f0d003c
+			public const int design_bottom_navigation_shadow_color = 2131558460;
+
+			// aapt resource value: 0x7f0d0066
+			public const int design_error = 2131558502;
+
+			// aapt resource value: 0x7f0d003d
+			public const int design_fab_shadow_end_color = 2131558461;
+
+			// aapt resource value: 0x7f0d003e
+			public const int design_fab_shadow_mid_color = 2131558462;
+
+			// aapt resource value: 0x7f0d003f
+			public const int design_fab_shadow_start_color = 2131558463;
+
+			// aapt resource value: 0x7f0d0040
+			public const int design_fab_stroke_end_inner_color = 2131558464;
+
+			// aapt resource value: 0x7f0d0041
+			public const int design_fab_stroke_end_outer_color = 2131558465;
+
+			// aapt resource value: 0x7f0d0042
+			public const int design_fab_stroke_top_inner_color = 2131558466;
+
+			// aapt resource value: 0x7f0d0043
+			public const int design_fab_stroke_top_outer_color = 2131558467;
+
+			// aapt resource value: 0x7f0d0044
+			public const int design_snackbar_background_color = 2131558468;
+
+			// aapt resource value: 0x7f0d0067
+			public const int design_tint_password_toggle = 2131558503;
+
+			// aapt resource value: 0x7f0d0012
+			public const int dim_foreground_disabled_material_dark = 2131558418;
+
+			// aapt resource value: 0x7f0d0013
+			public const int dim_foreground_disabled_material_light = 2131558419;
+
+			// aapt resource value: 0x7f0d0014
+			public const int dim_foreground_material_dark = 2131558420;
+
+			// aapt resource value: 0x7f0d0015
+			public const int dim_foreground_material_light = 2131558421;
+
+			// aapt resource value: 0x7f0d0016
+			public const int error_color_material = 2131558422;
+
+			// aapt resource value: 0x7f0d0017
+			public const int foreground_material_dark = 2131558423;
+
+			// aapt resource value: 0x7f0d0018
+			public const int foreground_material_light = 2131558424;
+
+			// aapt resource value: 0x7f0d0048
+			public const int gd_top_view = 2131558472;
+
+			// aapt resource value: 0x7f0d0019
+			public const int highlighted_text_material_dark = 2131558425;
+
+			// aapt resource value: 0x7f0d001a
+			public const int highlighted_text_material_light = 2131558426;
+
+			// aapt resource value: 0x7f0d001b
+			public const int material_blue_grey_800 = 2131558427;
+
+			// aapt resource value: 0x7f0d001c
+			public const int material_blue_grey_900 = 2131558428;
+
+			// aapt resource value: 0x7f0d001d
+			public const int material_blue_grey_950 = 2131558429;
+
+			// aapt resource value: 0x7f0d001e
+			public const int material_deep_teal_200 = 2131558430;
+
+			// aapt resource value: 0x7f0d001f
+			public const int material_deep_teal_500 = 2131558431;
+
+			// aapt resource value: 0x7f0d0020
+			public const int material_grey_100 = 2131558432;
+
+			// aapt resource value: 0x7f0d0021
+			public const int material_grey_300 = 2131558433;
+
+			// aapt resource value: 0x7f0d0022
+			public const int material_grey_50 = 2131558434;
+
+			// aapt resource value: 0x7f0d0023
+			public const int material_grey_600 = 2131558435;
+
+			// aapt resource value: 0x7f0d0024
+			public const int material_grey_800 = 2131558436;
+
+			// aapt resource value: 0x7f0d0025
+			public const int material_grey_850 = 2131558437;
+
+			// aapt resource value: 0x7f0d0026
+			public const int material_grey_900 = 2131558438;
+
+			// aapt resource value: 0x7f0d0047
+			public const int material_red_500 = 2131558471;
+
+			// aapt resource value: 0x7f0d0045
+			public const int notification_action_color_filter = 2131558469;
+
+			// aapt resource value: 0x7f0d0046
+			public const int notification_icon_bg_color = 2131558470;
+
+			// aapt resource value: 0x7f0d003b
+			public const int notification_material_background_media_default_color = 2131558459;
+
+			// aapt resource value: 0x7f0d0049
+			public const int pickerview_bgColor_default = 2131558473;
+
+			// aapt resource value: 0x7f0d004a
+			public const int pickerview_bgColor_overlay = 2131558474;
+
+			// aapt resource value: 0x7f0d004b
+			public const int pickerview_bg_topbar = 2131558475;
+
+			// aapt resource value: 0x7f0d004c
+			public const int pickerview_timebtn_nor = 2131558476;
+
+			// aapt resource value: 0x7f0d004d
+			public const int pickerview_timebtn_pre = 2131558477;
+
+			// aapt resource value: 0x7f0d004e
+			public const int pickerview_topbar_title = 2131558478;
+
+			// aapt resource value: 0x7f0d004f
+			public const int pickerview_wheelview_textcolor_center = 2131558479;
+
+			// aapt resource value: 0x7f0d0050
+			public const int pickerview_wheelview_textcolor_divider = 2131558480;
+
+			// aapt resource value: 0x7f0d0051
+			public const int pickerview_wheelview_textcolor_out = 2131558481;
+
+			// aapt resource value: 0x7f0d0027
+			public const int primary_dark_material_dark = 2131558439;
+
+			// aapt resource value: 0x7f0d0028
+			public const int primary_dark_material_light = 2131558440;
+
+			// aapt resource value: 0x7f0d0029
+			public const int primary_material_dark = 2131558441;
+
+			// aapt resource value: 0x7f0d002a
+			public const int primary_material_light = 2131558442;
+
+			// aapt resource value: 0x7f0d002b
+			public const int primary_text_default_material_dark = 2131558443;
+
+			// aapt resource value: 0x7f0d002c
+			public const int primary_text_default_material_light = 2131558444;
+
+			// aapt resource value: 0x7f0d002d
+			public const int primary_text_disabled_material_dark = 2131558445;
+
+			// aapt resource value: 0x7f0d002e
+			public const int primary_text_disabled_material_light = 2131558446;
+
+			// aapt resource value: 0x7f0d002f
+			public const int ripple_material_dark = 2131558447;
+
+			// aapt resource value: 0x7f0d0030
+			public const int ripple_material_light = 2131558448;
+
+			// aapt resource value: 0x7f0d0031
+			public const int secondary_text_default_material_dark = 2131558449;
+
+			// aapt resource value: 0x7f0d0032
+			public const int secondary_text_default_material_light = 2131558450;
+
+			// aapt resource value: 0x7f0d0033
+			public const int secondary_text_disabled_material_dark = 2131558451;
+
+			// aapt resource value: 0x7f0d0034
+			public const int secondary_text_disabled_material_light = 2131558452;
+
+			// aapt resource value: 0x7f0d0035
+			public const int switch_thumb_disabled_material_dark = 2131558453;
+
+			// aapt resource value: 0x7f0d0036
+			public const int switch_thumb_disabled_material_light = 2131558454;
+
+			// aapt resource value: 0x7f0d0068
+			public const int switch_thumb_material_dark = 2131558504;
+
+			// aapt resource value: 0x7f0d0069
+			public const int switch_thumb_material_light = 2131558505;
+
+			// aapt resource value: 0x7f0d0037
+			public const int switch_thumb_normal_material_dark = 2131558455;
+
+			// aapt resource value: 0x7f0d0038
+			public const int switch_thumb_normal_material_light = 2131558456;
+
+			// aapt resource value: 0x7f0d0039
+			public const int tooltip_background_dark = 2131558457;
+
+			// aapt resource value: 0x7f0d003a
+			public const int tooltip_background_light = 2131558458;
+
 			static Color()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Color()
 			{
 			}
 		}
-		
+
 		public partial class Dimension
 		{
-			
-			// aapt resource value: 0x7F070000
-			public const int abc_action_bar_content_inset_material = 2131165184;
-			
-			// aapt resource value: 0x7F070001
-			public const int abc_action_bar_content_inset_with_nav = 2131165185;
-			
-			// aapt resource value: 0x7F070002
-			public const int abc_action_bar_default_height_material = 2131165186;
-			
-			// aapt resource value: 0x7F070003
-			public const int abc_action_bar_default_padding_end_material = 2131165187;
-			
-			// aapt resource value: 0x7F070004
-			public const int abc_action_bar_default_padding_start_material = 2131165188;
-			
-			// aapt resource value: 0x7F070005
-			public const int abc_action_bar_elevation_material = 2131165189;
-			
-			// aapt resource value: 0x7F070006
-			public const int abc_action_bar_icon_vertical_padding_material = 2131165190;
-			
-			// aapt resource value: 0x7F070007
-			public const int abc_action_bar_overflow_padding_end_material = 2131165191;
-			
-			// aapt resource value: 0x7F070008
-			public const int abc_action_bar_overflow_padding_start_material = 2131165192;
-			
-			// aapt resource value: 0x7F070009
-			public const int abc_action_bar_progress_bar_size = 2131165193;
-			
-			// aapt resource value: 0x7F07000A
-			public const int abc_action_bar_stacked_max_height = 2131165194;
-			
-			// aapt resource value: 0x7F07000B
-			public const int abc_action_bar_stacked_tab_max_width = 2131165195;
-			
-			// aapt resource value: 0x7F07000C
-			public const int abc_action_bar_subtitle_bottom_margin_material = 2131165196;
-			
-			// aapt resource value: 0x7F07000D
-			public const int abc_action_bar_subtitle_top_margin_material = 2131165197;
-			
-			// aapt resource value: 0x7F07000E
-			public const int abc_action_button_min_height_material = 2131165198;
-			
-			// aapt resource value: 0x7F07000F
-			public const int abc_action_button_min_width_material = 2131165199;
-			
-			// aapt resource value: 0x7F070010
-			public const int abc_action_button_min_width_overflow_material = 2131165200;
-			
-			// aapt resource value: 0x7F070011
-			public const int abc_alert_dialog_button_bar_height = 2131165201;
-			
-			// aapt resource value: 0x7F070012
-			public const int abc_button_inset_horizontal_material = 2131165202;
-			
-			// aapt resource value: 0x7F070013
-			public const int abc_button_inset_vertical_material = 2131165203;
-			
-			// aapt resource value: 0x7F070014
-			public const int abc_button_padding_horizontal_material = 2131165204;
-			
-			// aapt resource value: 0x7F070015
-			public const int abc_button_padding_vertical_material = 2131165205;
-			
-			// aapt resource value: 0x7F070016
-			public const int abc_cascading_menus_min_smallest_width = 2131165206;
-			
-			// aapt resource value: 0x7F070017
-			public const int abc_config_prefDialogWidth = 2131165207;
-			
-			// aapt resource value: 0x7F070018
-			public const int abc_control_corner_material = 2131165208;
-			
-			// aapt resource value: 0x7F070019
-			public const int abc_control_inset_material = 2131165209;
-			
-			// aapt resource value: 0x7F07001A
-			public const int abc_control_padding_material = 2131165210;
-			
-			// aapt resource value: 0x7F07001B
-			public const int abc_dialog_fixed_height_major = 2131165211;
-			
-			// aapt resource value: 0x7F07001C
-			public const int abc_dialog_fixed_height_minor = 2131165212;
-			
-			// aapt resource value: 0x7F07001D
-			public const int abc_dialog_fixed_width_major = 2131165213;
-			
-			// aapt resource value: 0x7F07001E
-			public const int abc_dialog_fixed_width_minor = 2131165214;
-			
-			// aapt resource value: 0x7F07001F
-			public const int abc_dialog_list_padding_bottom_no_buttons = 2131165215;
-			
-			// aapt resource value: 0x7F070020
-			public const int abc_dialog_list_padding_top_no_title = 2131165216;
-			
-			// aapt resource value: 0x7F070021
-			public const int abc_dialog_min_width_major = 2131165217;
-			
-			// aapt resource value: 0x7F070022
-			public const int abc_dialog_min_width_minor = 2131165218;
-			
-			// aapt resource value: 0x7F070023
-			public const int abc_dialog_padding_material = 2131165219;
-			
-			// aapt resource value: 0x7F070024
-			public const int abc_dialog_padding_top_material = 2131165220;
-			
-			// aapt resource value: 0x7F070025
-			public const int abc_dialog_title_divider_material = 2131165221;
-			
-			// aapt resource value: 0x7F070026
-			public const int abc_disabled_alpha_material_dark = 2131165222;
-			
-			// aapt resource value: 0x7F070027
-			public const int abc_disabled_alpha_material_light = 2131165223;
-			
-			// aapt resource value: 0x7F070028
-			public const int abc_dropdownitem_icon_width = 2131165224;
-			
-			// aapt resource value: 0x7F070029
-			public const int abc_dropdownitem_text_padding_left = 2131165225;
-			
-			// aapt resource value: 0x7F07002A
-			public const int abc_dropdownitem_text_padding_right = 2131165226;
-			
-			// aapt resource value: 0x7F07002B
-			public const int abc_edit_text_inset_bottom_material = 2131165227;
-			
-			// aapt resource value: 0x7F07002C
-			public const int abc_edit_text_inset_horizontal_material = 2131165228;
-			
-			// aapt resource value: 0x7F07002D
-			public const int abc_edit_text_inset_top_material = 2131165229;
-			
-			// aapt resource value: 0x7F07002E
-			public const int abc_floating_window_z = 2131165230;
-			
-			// aapt resource value: 0x7F07002F
-			public const int abc_list_item_padding_horizontal_material = 2131165231;
-			
-			// aapt resource value: 0x7F070030
-			public const int abc_panel_menu_list_width = 2131165232;
-			
-			// aapt resource value: 0x7F070031
-			public const int abc_progress_bar_height_material = 2131165233;
-			
-			// aapt resource value: 0x7F070032
-			public const int abc_search_view_preferred_height = 2131165234;
-			
-			// aapt resource value: 0x7F070033
-			public const int abc_search_view_preferred_width = 2131165235;
-			
-			// aapt resource value: 0x7F070034
-			public const int abc_seekbar_track_background_height_material = 2131165236;
-			
-			// aapt resource value: 0x7F070035
-			public const int abc_seekbar_track_progress_height_material = 2131165237;
-			
-			// aapt resource value: 0x7F070036
-			public const int abc_select_dialog_padding_start_material = 2131165238;
-			
-			// aapt resource value: 0x7F070037
-			public const int abc_switch_padding = 2131165239;
-			
-			// aapt resource value: 0x7F070038
-			public const int abc_text_size_body_1_material = 2131165240;
-			
-			// aapt resource value: 0x7F070039
-			public const int abc_text_size_body_2_material = 2131165241;
-			
-			// aapt resource value: 0x7F07003A
-			public const int abc_text_size_button_material = 2131165242;
-			
-			// aapt resource value: 0x7F07003B
-			public const int abc_text_size_caption_material = 2131165243;
-			
-			// aapt resource value: 0x7F07003C
-			public const int abc_text_size_display_1_material = 2131165244;
-			
-			// aapt resource value: 0x7F07003D
-			public const int abc_text_size_display_2_material = 2131165245;
-			
-			// aapt resource value: 0x7F07003E
-			public const int abc_text_size_display_3_material = 2131165246;
-			
-			// aapt resource value: 0x7F07003F
-			public const int abc_text_size_display_4_material = 2131165247;
-			
-			// aapt resource value: 0x7F070040
-			public const int abc_text_size_headline_material = 2131165248;
-			
-			// aapt resource value: 0x7F070041
-			public const int abc_text_size_large_material = 2131165249;
-			
-			// aapt resource value: 0x7F070042
-			public const int abc_text_size_medium_material = 2131165250;
-			
-			// aapt resource value: 0x7F070043
-			public const int abc_text_size_menu_header_material = 2131165251;
-			
-			// aapt resource value: 0x7F070044
-			public const int abc_text_size_menu_material = 2131165252;
-			
-			// aapt resource value: 0x7F070045
-			public const int abc_text_size_small_material = 2131165253;
-			
-			// aapt resource value: 0x7F070046
-			public const int abc_text_size_subhead_material = 2131165254;
-			
-			// aapt resource value: 0x7F070047
-			public const int abc_text_size_subtitle_material_toolbar = 2131165255;
-			
-			// aapt resource value: 0x7F070048
-			public const int abc_text_size_title_material = 2131165256;
-			
-			// aapt resource value: 0x7F070049
-			public const int abc_text_size_title_material_toolbar = 2131165257;
-			
-			// aapt resource value: 0x7F07004A
-			public const int compat_button_inset_horizontal_material = 2131165258;
-			
-			// aapt resource value: 0x7F07004B
-			public const int compat_button_inset_vertical_material = 2131165259;
-			
-			// aapt resource value: 0x7F07004C
-			public const int compat_button_padding_horizontal_material = 2131165260;
-			
-			// aapt resource value: 0x7F07004D
-			public const int compat_button_padding_vertical_material = 2131165261;
-			
-			// aapt resource value: 0x7F07004E
-			public const int compat_control_corner_material = 2131165262;
-			
-			// aapt resource value: 0x7F07004F
-			public const int design_appbar_elevation = 2131165263;
-			
-			// aapt resource value: 0x7F070050
-			public const int design_bottom_navigation_active_item_max_width = 2131165264;
-			
-			// aapt resource value: 0x7F070051
-			public const int design_bottom_navigation_active_text_size = 2131165265;
-			
-			// aapt resource value: 0x7F070052
-			public const int design_bottom_navigation_elevation = 2131165266;
-			
-			// aapt resource value: 0x7F070053
-			public const int design_bottom_navigation_height = 2131165267;
-			
-			// aapt resource value: 0x7F070054
-			public const int design_bottom_navigation_item_max_width = 2131165268;
-			
-			// aapt resource value: 0x7F070055
-			public const int design_bottom_navigation_item_min_width = 2131165269;
-			
-			// aapt resource value: 0x7F070056
-			public const int design_bottom_navigation_margin = 2131165270;
-			
-			// aapt resource value: 0x7F070057
-			public const int design_bottom_navigation_shadow_height = 2131165271;
-			
-			// aapt resource value: 0x7F070058
-			public const int design_bottom_navigation_text_size = 2131165272;
-			
-			// aapt resource value: 0x7F070059
-			public const int design_bottom_sheet_modal_elevation = 2131165273;
-			
-			// aapt resource value: 0x7F07005A
-			public const int design_bottom_sheet_peek_height_min = 2131165274;
-			
-			// aapt resource value: 0x7F07005B
-			public const int design_fab_border_width = 2131165275;
-			
-			// aapt resource value: 0x7F07005C
-			public const int design_fab_elevation = 2131165276;
-			
-			// aapt resource value: 0x7F07005D
-			public const int design_fab_image_size = 2131165277;
-			
-			// aapt resource value: 0x7F07005E
-			public const int design_fab_size_mini = 2131165278;
-			
-			// aapt resource value: 0x7F07005F
-			public const int design_fab_size_normal = 2131165279;
-			
-			// aapt resource value: 0x7F070060
-			public const int design_fab_translation_z_pressed = 2131165280;
-			
-			// aapt resource value: 0x7F070061
-			public const int design_navigation_elevation = 2131165281;
-			
-			// aapt resource value: 0x7F070062
-			public const int design_navigation_icon_padding = 2131165282;
-			
-			// aapt resource value: 0x7F070063
-			public const int design_navigation_icon_size = 2131165283;
-			
-			// aapt resource value: 0x7F070064
-			public const int design_navigation_max_width = 2131165284;
-			
-			// aapt resource value: 0x7F070065
-			public const int design_navigation_padding_bottom = 2131165285;
-			
-			// aapt resource value: 0x7F070066
-			public const int design_navigation_separator_vertical_padding = 2131165286;
-			
-			// aapt resource value: 0x7F070067
-			public const int design_snackbar_action_inline_max_width = 2131165287;
-			
-			// aapt resource value: 0x7F070068
-			public const int design_snackbar_background_corner_radius = 2131165288;
-			
-			// aapt resource value: 0x7F070069
-			public const int design_snackbar_elevation = 2131165289;
-			
-			// aapt resource value: 0x7F07006A
-			public const int design_snackbar_extra_spacing_horizontal = 2131165290;
-			
-			// aapt resource value: 0x7F07006B
-			public const int design_snackbar_max_width = 2131165291;
-			
-			// aapt resource value: 0x7F07006C
-			public const int design_snackbar_min_width = 2131165292;
-			
-			// aapt resource value: 0x7F07006D
-			public const int design_snackbar_padding_horizontal = 2131165293;
-			
-			// aapt resource value: 0x7F07006E
-			public const int design_snackbar_padding_vertical = 2131165294;
-			
-			// aapt resource value: 0x7F07006F
-			public const int design_snackbar_padding_vertical_2lines = 2131165295;
-			
-			// aapt resource value: 0x7F070070
-			public const int design_snackbar_text_size = 2131165296;
-			
-			// aapt resource value: 0x7F070071
-			public const int design_tab_max_width = 2131165297;
-			
-			// aapt resource value: 0x7F070072
-			public const int design_tab_scrollable_min_width = 2131165298;
-			
-			// aapt resource value: 0x7F070073
-			public const int design_tab_text_size = 2131165299;
-			
-			// aapt resource value: 0x7F070074
-			public const int design_tab_text_size_2line = 2131165300;
-			
-			// aapt resource value: 0x7F070075
-			public const int disabled_alpha_material_dark = 2131165301;
-			
-			// aapt resource value: 0x7F070076
-			public const int disabled_alpha_material_light = 2131165302;
-			
-			// aapt resource value: 0x7F070077
-			public const int fastscroll_default_thickness = 2131165303;
-			
-			// aapt resource value: 0x7F070078
-			public const int fastscroll_margin = 2131165304;
-			
-			// aapt resource value: 0x7F070079
-			public const int fastscroll_minimum_range = 2131165305;
-			
-			// aapt resource value: 0x7F07007A
-			public const int fingerprint_icon_size = 2131165306;
-			
-			// aapt resource value: 0x7F07007B
-			public const int fingerprint_status_layout_margin_vertical = 2131165307;
-			
-			// aapt resource value: 0x7F07007C
-			public const int highlight_alpha_material_colored = 2131165308;
-			
-			// aapt resource value: 0x7F07007D
-			public const int highlight_alpha_material_dark = 2131165309;
-			
-			// aapt resource value: 0x7F07007E
-			public const int highlight_alpha_material_light = 2131165310;
-			
-			// aapt resource value: 0x7F07007F
-			public const int hint_alpha_material_dark = 2131165311;
-			
-			// aapt resource value: 0x7F070080
-			public const int hint_alpha_material_light = 2131165312;
-			
-			// aapt resource value: 0x7F070081
-			public const int hint_pressed_alpha_material_dark = 2131165313;
-			
-			// aapt resource value: 0x7F070082
-			public const int hint_pressed_alpha_material_light = 2131165314;
-			
-			// aapt resource value: 0x7F070083
-			public const int item_touch_helper_max_drag_scroll_per_frame = 2131165315;
-			
-			// aapt resource value: 0x7F070084
-			public const int item_touch_helper_swipe_escape_max_velocity = 2131165316;
-			
-			// aapt resource value: 0x7F070085
-			public const int item_touch_helper_swipe_escape_velocity = 2131165317;
-			
-			// aapt resource value: 0x7F070086
-			public const int notification_action_icon_size = 2131165318;
-			
-			// aapt resource value: 0x7F070087
-			public const int notification_action_text_size = 2131165319;
-			
-			// aapt resource value: 0x7F070088
-			public const int notification_big_circle_margin = 2131165320;
-			
-			// aapt resource value: 0x7F070089
-			public const int notification_content_margin_start = 2131165321;
-			
-			// aapt resource value: 0x7F07008A
-			public const int notification_large_icon_height = 2131165322;
-			
-			// aapt resource value: 0x7F07008B
-			public const int notification_large_icon_width = 2131165323;
-			
-			// aapt resource value: 0x7F07008C
-			public const int notification_main_column_padding_top = 2131165324;
-			
-			// aapt resource value: 0x7F07008D
-			public const int notification_media_narrow_margin = 2131165325;
-			
-			// aapt resource value: 0x7F07008E
-			public const int notification_right_icon_size = 2131165326;
-			
-			// aapt resource value: 0x7F07008F
-			public const int notification_right_side_padding_top = 2131165327;
-			
-			// aapt resource value: 0x7F070090
-			public const int notification_small_icon_background_padding = 2131165328;
-			
-			// aapt resource value: 0x7F070091
-			public const int notification_small_icon_size_as_large = 2131165329;
-			
-			// aapt resource value: 0x7F070092
-			public const int notification_subtext_size = 2131165330;
-			
-			// aapt resource value: 0x7F070093
-			public const int notification_top_pad = 2131165331;
-			
-			// aapt resource value: 0x7F070094
-			public const int notification_top_pad_large_text = 2131165332;
-			
-			// aapt resource value: 0x7F070095
-			public const int pickerview_textsize = 2131165333;
-			
-			// aapt resource value: 0x7F070096
-			public const int pickerview_topbar_btn_textsize = 2131165334;
-			
-			// aapt resource value: 0x7F070097
-			public const int pickerview_topbar_height = 2131165335;
-			
-			// aapt resource value: 0x7F070098
-			public const int pickerview_topbar_padding = 2131165336;
-			
-			// aapt resource value: 0x7F070099
-			public const int pickerview_topbar_title_textsize = 2131165337;
-			
-			// aapt resource value: 0x7F07009A
-			public const int tooltip_corner_radius = 2131165338;
-			
-			// aapt resource value: 0x7F07009B
-			public const int tooltip_horizontal_padding = 2131165339;
-			
-			// aapt resource value: 0x7F07009C
-			public const int tooltip_margin = 2131165340;
-			
-			// aapt resource value: 0x7F07009D
-			public const int tooltip_precise_anchor_extra_offset = 2131165341;
-			
-			// aapt resource value: 0x7F07009E
-			public const int tooltip_precise_anchor_threshold = 2131165342;
-			
-			// aapt resource value: 0x7F07009F
-			public const int tooltip_vertical_padding = 2131165343;
-			
-			// aapt resource value: 0x7F0700A0
-			public const int tooltip_y_offset_non_touch = 2131165344;
-			
-			// aapt resource value: 0x7F0700A1
-			public const int tooltip_y_offset_touch = 2131165345;
-			
+
+			// aapt resource value: 0x7f080012
+			public const int abc_action_bar_content_inset_material = 2131230738;
+
+			// aapt resource value: 0x7f080013
+			public const int abc_action_bar_content_inset_with_nav = 2131230739;
+
+			// aapt resource value: 0x7f080007
+			public const int abc_action_bar_default_height_material = 2131230727;
+
+			// aapt resource value: 0x7f080014
+			public const int abc_action_bar_default_padding_end_material = 2131230740;
+
+			// aapt resource value: 0x7f080015
+			public const int abc_action_bar_default_padding_start_material = 2131230741;
+
+			// aapt resource value: 0x7f080017
+			public const int abc_action_bar_elevation_material = 2131230743;
+
+			// aapt resource value: 0x7f080018
+			public const int abc_action_bar_icon_vertical_padding_material = 2131230744;
+
+			// aapt resource value: 0x7f080019
+			public const int abc_action_bar_overflow_padding_end_material = 2131230745;
+
+			// aapt resource value: 0x7f08001a
+			public const int abc_action_bar_overflow_padding_start_material = 2131230746;
+
+			// aapt resource value: 0x7f080008
+			public const int abc_action_bar_progress_bar_size = 2131230728;
+
+			// aapt resource value: 0x7f08001b
+			public const int abc_action_bar_stacked_max_height = 2131230747;
+
+			// aapt resource value: 0x7f08001c
+			public const int abc_action_bar_stacked_tab_max_width = 2131230748;
+
+			// aapt resource value: 0x7f08001d
+			public const int abc_action_bar_subtitle_bottom_margin_material = 2131230749;
+
+			// aapt resource value: 0x7f08001e
+			public const int abc_action_bar_subtitle_top_margin_material = 2131230750;
+
+			// aapt resource value: 0x7f08001f
+			public const int abc_action_button_min_height_material = 2131230751;
+
+			// aapt resource value: 0x7f080020
+			public const int abc_action_button_min_width_material = 2131230752;
+
+			// aapt resource value: 0x7f080021
+			public const int abc_action_button_min_width_overflow_material = 2131230753;
+
+			// aapt resource value: 0x7f080006
+			public const int abc_alert_dialog_button_bar_height = 2131230726;
+
+			// aapt resource value: 0x7f080022
+			public const int abc_button_inset_horizontal_material = 2131230754;
+
+			// aapt resource value: 0x7f080023
+			public const int abc_button_inset_vertical_material = 2131230755;
+
+			// aapt resource value: 0x7f080024
+			public const int abc_button_padding_horizontal_material = 2131230756;
+
+			// aapt resource value: 0x7f080025
+			public const int abc_button_padding_vertical_material = 2131230757;
+
+			// aapt resource value: 0x7f080026
+			public const int abc_cascading_menus_min_smallest_width = 2131230758;
+
+			// aapt resource value: 0x7f08000b
+			public const int abc_config_prefDialogWidth = 2131230731;
+
+			// aapt resource value: 0x7f080027
+			public const int abc_control_corner_material = 2131230759;
+
+			// aapt resource value: 0x7f080028
+			public const int abc_control_inset_material = 2131230760;
+
+			// aapt resource value: 0x7f080029
+			public const int abc_control_padding_material = 2131230761;
+
+			// aapt resource value: 0x7f08000c
+			public const int abc_dialog_fixed_height_major = 2131230732;
+
+			// aapt resource value: 0x7f08000d
+			public const int abc_dialog_fixed_height_minor = 2131230733;
+
+			// aapt resource value: 0x7f08000e
+			public const int abc_dialog_fixed_width_major = 2131230734;
+
+			// aapt resource value: 0x7f08000f
+			public const int abc_dialog_fixed_width_minor = 2131230735;
+
+			// aapt resource value: 0x7f08002a
+			public const int abc_dialog_list_padding_bottom_no_buttons = 2131230762;
+
+			// aapt resource value: 0x7f08002b
+			public const int abc_dialog_list_padding_top_no_title = 2131230763;
+
+			// aapt resource value: 0x7f080010
+			public const int abc_dialog_min_width_major = 2131230736;
+
+			// aapt resource value: 0x7f080011
+			public const int abc_dialog_min_width_minor = 2131230737;
+
+			// aapt resource value: 0x7f08002c
+			public const int abc_dialog_padding_material = 2131230764;
+
+			// aapt resource value: 0x7f08002d
+			public const int abc_dialog_padding_top_material = 2131230765;
+
+			// aapt resource value: 0x7f08002e
+			public const int abc_dialog_title_divider_material = 2131230766;
+
+			// aapt resource value: 0x7f08002f
+			public const int abc_disabled_alpha_material_dark = 2131230767;
+
+			// aapt resource value: 0x7f080030
+			public const int abc_disabled_alpha_material_light = 2131230768;
+
+			// aapt resource value: 0x7f080031
+			public const int abc_dropdownitem_icon_width = 2131230769;
+
+			// aapt resource value: 0x7f080032
+			public const int abc_dropdownitem_text_padding_left = 2131230770;
+
+			// aapt resource value: 0x7f080033
+			public const int abc_dropdownitem_text_padding_right = 2131230771;
+
+			// aapt resource value: 0x7f080034
+			public const int abc_edit_text_inset_bottom_material = 2131230772;
+
+			// aapt resource value: 0x7f080035
+			public const int abc_edit_text_inset_horizontal_material = 2131230773;
+
+			// aapt resource value: 0x7f080036
+			public const int abc_edit_text_inset_top_material = 2131230774;
+
+			// aapt resource value: 0x7f080037
+			public const int abc_floating_window_z = 2131230775;
+
+			// aapt resource value: 0x7f080038
+			public const int abc_list_item_padding_horizontal_material = 2131230776;
+
+			// aapt resource value: 0x7f080039
+			public const int abc_panel_menu_list_width = 2131230777;
+
+			// aapt resource value: 0x7f08003a
+			public const int abc_progress_bar_height_material = 2131230778;
+
+			// aapt resource value: 0x7f08003b
+			public const int abc_search_view_preferred_height = 2131230779;
+
+			// aapt resource value: 0x7f08003c
+			public const int abc_search_view_preferred_width = 2131230780;
+
+			// aapt resource value: 0x7f08003d
+			public const int abc_seekbar_track_background_height_material = 2131230781;
+
+			// aapt resource value: 0x7f08003e
+			public const int abc_seekbar_track_progress_height_material = 2131230782;
+
+			// aapt resource value: 0x7f08003f
+			public const int abc_select_dialog_padding_start_material = 2131230783;
+
+			// aapt resource value: 0x7f080016
+			public const int abc_switch_padding = 2131230742;
+
+			// aapt resource value: 0x7f080040
+			public const int abc_text_size_body_1_material = 2131230784;
+
+			// aapt resource value: 0x7f080041
+			public const int abc_text_size_body_2_material = 2131230785;
+
+			// aapt resource value: 0x7f080042
+			public const int abc_text_size_button_material = 2131230786;
+
+			// aapt resource value: 0x7f080043
+			public const int abc_text_size_caption_material = 2131230787;
+
+			// aapt resource value: 0x7f080044
+			public const int abc_text_size_display_1_material = 2131230788;
+
+			// aapt resource value: 0x7f080045
+			public const int abc_text_size_display_2_material = 2131230789;
+
+			// aapt resource value: 0x7f080046
+			public const int abc_text_size_display_3_material = 2131230790;
+
+			// aapt resource value: 0x7f080047
+			public const int abc_text_size_display_4_material = 2131230791;
+
+			// aapt resource value: 0x7f080048
+			public const int abc_text_size_headline_material = 2131230792;
+
+			// aapt resource value: 0x7f080049
+			public const int abc_text_size_large_material = 2131230793;
+
+			// aapt resource value: 0x7f08004a
+			public const int abc_text_size_medium_material = 2131230794;
+
+			// aapt resource value: 0x7f08004b
+			public const int abc_text_size_menu_header_material = 2131230795;
+
+			// aapt resource value: 0x7f08004c
+			public const int abc_text_size_menu_material = 2131230796;
+
+			// aapt resource value: 0x7f08004d
+			public const int abc_text_size_small_material = 2131230797;
+
+			// aapt resource value: 0x7f08004e
+			public const int abc_text_size_subhead_material = 2131230798;
+
+			// aapt resource value: 0x7f080009
+			public const int abc_text_size_subtitle_material_toolbar = 2131230729;
+
+			// aapt resource value: 0x7f08004f
+			public const int abc_text_size_title_material = 2131230799;
+
+			// aapt resource value: 0x7f08000a
+			public const int abc_text_size_title_material_toolbar = 2131230730;
+
+			// aapt resource value: 0x7f08008b
+			public const int compat_button_inset_horizontal_material = 2131230859;
+
+			// aapt resource value: 0x7f08008c
+			public const int compat_button_inset_vertical_material = 2131230860;
+
+			// aapt resource value: 0x7f08008d
+			public const int compat_button_padding_horizontal_material = 2131230861;
+
+			// aapt resource value: 0x7f08008e
+			public const int compat_button_padding_vertical_material = 2131230862;
+
+			// aapt resource value: 0x7f08008f
+			public const int compat_control_corner_material = 2131230863;
+
+			// aapt resource value: 0x7f080069
+			public const int design_appbar_elevation = 2131230825;
+
+			// aapt resource value: 0x7f08006a
+			public const int design_bottom_navigation_active_item_max_width = 2131230826;
+
+			// aapt resource value: 0x7f08006b
+			public const int design_bottom_navigation_active_text_size = 2131230827;
+
+			// aapt resource value: 0x7f08006c
+			public const int design_bottom_navigation_elevation = 2131230828;
+
+			// aapt resource value: 0x7f08006d
+			public const int design_bottom_navigation_height = 2131230829;
+
+			// aapt resource value: 0x7f08006e
+			public const int design_bottom_navigation_item_max_width = 2131230830;
+
+			// aapt resource value: 0x7f08006f
+			public const int design_bottom_navigation_item_min_width = 2131230831;
+
+			// aapt resource value: 0x7f080070
+			public const int design_bottom_navigation_margin = 2131230832;
+
+			// aapt resource value: 0x7f080071
+			public const int design_bottom_navigation_shadow_height = 2131230833;
+
+			// aapt resource value: 0x7f080072
+			public const int design_bottom_navigation_text_size = 2131230834;
+
+			// aapt resource value: 0x7f080073
+			public const int design_bottom_sheet_modal_elevation = 2131230835;
+
+			// aapt resource value: 0x7f080074
+			public const int design_bottom_sheet_peek_height_min = 2131230836;
+
+			// aapt resource value: 0x7f080075
+			public const int design_fab_border_width = 2131230837;
+
+			// aapt resource value: 0x7f080076
+			public const int design_fab_elevation = 2131230838;
+
+			// aapt resource value: 0x7f080077
+			public const int design_fab_image_size = 2131230839;
+
+			// aapt resource value: 0x7f080078
+			public const int design_fab_size_mini = 2131230840;
+
+			// aapt resource value: 0x7f080079
+			public const int design_fab_size_normal = 2131230841;
+
+			// aapt resource value: 0x7f08007a
+			public const int design_fab_translation_z_pressed = 2131230842;
+
+			// aapt resource value: 0x7f08007b
+			public const int design_navigation_elevation = 2131230843;
+
+			// aapt resource value: 0x7f08007c
+			public const int design_navigation_icon_padding = 2131230844;
+
+			// aapt resource value: 0x7f08007d
+			public const int design_navigation_icon_size = 2131230845;
+
+			// aapt resource value: 0x7f080061
+			public const int design_navigation_max_width = 2131230817;
+
+			// aapt resource value: 0x7f08007e
+			public const int design_navigation_padding_bottom = 2131230846;
+
+			// aapt resource value: 0x7f08007f
+			public const int design_navigation_separator_vertical_padding = 2131230847;
+
+			// aapt resource value: 0x7f080062
+			public const int design_snackbar_action_inline_max_width = 2131230818;
+
+			// aapt resource value: 0x7f080063
+			public const int design_snackbar_background_corner_radius = 2131230819;
+
+			// aapt resource value: 0x7f080080
+			public const int design_snackbar_elevation = 2131230848;
+
+			// aapt resource value: 0x7f080064
+			public const int design_snackbar_extra_spacing_horizontal = 2131230820;
+
+			// aapt resource value: 0x7f080065
+			public const int design_snackbar_max_width = 2131230821;
+
+			// aapt resource value: 0x7f080066
+			public const int design_snackbar_min_width = 2131230822;
+
+			// aapt resource value: 0x7f080081
+			public const int design_snackbar_padding_horizontal = 2131230849;
+
+			// aapt resource value: 0x7f080082
+			public const int design_snackbar_padding_vertical = 2131230850;
+
+			// aapt resource value: 0x7f080067
+			public const int design_snackbar_padding_vertical_2lines = 2131230823;
+
+			// aapt resource value: 0x7f080083
+			public const int design_snackbar_text_size = 2131230851;
+
+			// aapt resource value: 0x7f080084
+			public const int design_tab_max_width = 2131230852;
+
+			// aapt resource value: 0x7f080068
+			public const int design_tab_scrollable_min_width = 2131230824;
+
+			// aapt resource value: 0x7f080085
+			public const int design_tab_text_size = 2131230853;
+
+			// aapt resource value: 0x7f080086
+			public const int design_tab_text_size_2line = 2131230854;
+
+			// aapt resource value: 0x7f080050
+			public const int disabled_alpha_material_dark = 2131230800;
+
+			// aapt resource value: 0x7f080051
+			public const int disabled_alpha_material_light = 2131230801;
+
+			// aapt resource value: 0x7f080000
+			public const int fastscroll_default_thickness = 2131230720;
+
+			// aapt resource value: 0x7f080001
+			public const int fastscroll_margin = 2131230721;
+
+			// aapt resource value: 0x7f080002
+			public const int fastscroll_minimum_range = 2131230722;
+
+			// aapt resource value: 0x7f08009c
+			public const int fingerprint_icon_size = 2131230876;
+
+			// aapt resource value: 0x7f08009b
+			public const int fingerprint_status_layout_margin_vertical = 2131230875;
+
+			// aapt resource value: 0x7f080052
+			public const int highlight_alpha_material_colored = 2131230802;
+
+			// aapt resource value: 0x7f080053
+			public const int highlight_alpha_material_dark = 2131230803;
+
+			// aapt resource value: 0x7f080054
+			public const int highlight_alpha_material_light = 2131230804;
+
+			// aapt resource value: 0x7f080055
+			public const int hint_alpha_material_dark = 2131230805;
+
+			// aapt resource value: 0x7f080056
+			public const int hint_alpha_material_light = 2131230806;
+
+			// aapt resource value: 0x7f080057
+			public const int hint_pressed_alpha_material_dark = 2131230807;
+
+			// aapt resource value: 0x7f080058
+			public const int hint_pressed_alpha_material_light = 2131230808;
+
+			// aapt resource value: 0x7f080003
+			public const int item_touch_helper_max_drag_scroll_per_frame = 2131230723;
+
+			// aapt resource value: 0x7f080004
+			public const int item_touch_helper_swipe_escape_max_velocity = 2131230724;
+
+			// aapt resource value: 0x7f080005
+			public const int item_touch_helper_swipe_escape_velocity = 2131230725;
+
+			// aapt resource value: 0x7f080090
+			public const int notification_action_icon_size = 2131230864;
+
+			// aapt resource value: 0x7f080091
+			public const int notification_action_text_size = 2131230865;
+
+			// aapt resource value: 0x7f080092
+			public const int notification_big_circle_margin = 2131230866;
+
+			// aapt resource value: 0x7f080088
+			public const int notification_content_margin_start = 2131230856;
+
+			// aapt resource value: 0x7f080093
+			public const int notification_large_icon_height = 2131230867;
+
+			// aapt resource value: 0x7f080094
+			public const int notification_large_icon_width = 2131230868;
+
+			// aapt resource value: 0x7f080089
+			public const int notification_main_column_padding_top = 2131230857;
+
+			// aapt resource value: 0x7f08008a
+			public const int notification_media_narrow_margin = 2131230858;
+
+			// aapt resource value: 0x7f080095
+			public const int notification_right_icon_size = 2131230869;
+
+			// aapt resource value: 0x7f080087
+			public const int notification_right_side_padding_top = 2131230855;
+
+			// aapt resource value: 0x7f080096
+			public const int notification_small_icon_background_padding = 2131230870;
+
+			// aapt resource value: 0x7f080097
+			public const int notification_small_icon_size_as_large = 2131230871;
+
+			// aapt resource value: 0x7f080098
+			public const int notification_subtext_size = 2131230872;
+
+			// aapt resource value: 0x7f080099
+			public const int notification_top_pad = 2131230873;
+
+			// aapt resource value: 0x7f08009a
+			public const int notification_top_pad_large_text = 2131230874;
+
+			// aapt resource value: 0x7f08009d
+			public const int pickerview_textsize = 2131230877;
+
+			// aapt resource value: 0x7f08009e
+			public const int pickerview_topbar_btn_textsize = 2131230878;
+
+			// aapt resource value: 0x7f08009f
+			public const int pickerview_topbar_height = 2131230879;
+
+			// aapt resource value: 0x7f0800a0
+			public const int pickerview_topbar_padding = 2131230880;
+
+			// aapt resource value: 0x7f0800a1
+			public const int pickerview_topbar_title_textsize = 2131230881;
+
+			// aapt resource value: 0x7f080059
+			public const int tooltip_corner_radius = 2131230809;
+
+			// aapt resource value: 0x7f08005a
+			public const int tooltip_horizontal_padding = 2131230810;
+
+			// aapt resource value: 0x7f08005b
+			public const int tooltip_margin = 2131230811;
+
+			// aapt resource value: 0x7f08005c
+			public const int tooltip_precise_anchor_extra_offset = 2131230812;
+
+			// aapt resource value: 0x7f08005d
+			public const int tooltip_precise_anchor_threshold = 2131230813;
+
+			// aapt resource value: 0x7f08005e
+			public const int tooltip_vertical_padding = 2131230814;
+
+			// aapt resource value: 0x7f08005f
+			public const int tooltip_y_offset_non_touch = 2131230815;
+
+			// aapt resource value: 0x7f080060
+			public const int tooltip_y_offset_touch = 2131230816;
+
 			static Dimension()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Dimension()
 			{
 			}
 		}
-		
+
 		public partial class Drawable
 		{
-			
-			// aapt resource value: 0x7F080006
-			public const int abc_ab_share_pack_mtrl_alpha = 2131230726;
-			
-			// aapt resource value: 0x7F080007
-			public const int abc_action_bar_item_background_material = 2131230727;
-			
-			// aapt resource value: 0x7F080008
-			public const int abc_btn_borderless_material = 2131230728;
-			
-			// aapt resource value: 0x7F080009
-			public const int abc_btn_check_material = 2131230729;
-			
-			// aapt resource value: 0x7F08000A
-			public const int abc_btn_check_to_on_mtrl_000 = 2131230730;
-			
-			// aapt resource value: 0x7F08000B
-			public const int abc_btn_check_to_on_mtrl_015 = 2131230731;
-			
-			// aapt resource value: 0x7F08000C
-			public const int abc_btn_colored_material = 2131230732;
-			
-			// aapt resource value: 0x7F08000D
-			public const int abc_btn_default_mtrl_shape = 2131230733;
-			
-			// aapt resource value: 0x7F08000E
-			public const int abc_btn_radio_material = 2131230734;
-			
-			// aapt resource value: 0x7F08000F
-			public const int abc_btn_radio_to_on_mtrl_000 = 2131230735;
-			
-			// aapt resource value: 0x7F080010
-			public const int abc_btn_radio_to_on_mtrl_015 = 2131230736;
-			
-			// aapt resource value: 0x7F080011
-			public const int abc_btn_switch_to_on_mtrl_00001 = 2131230737;
-			
-			// aapt resource value: 0x7F080012
-			public const int abc_btn_switch_to_on_mtrl_00012 = 2131230738;
-			
-			// aapt resource value: 0x7F080013
-			public const int abc_cab_background_internal_bg = 2131230739;
-			
-			// aapt resource value: 0x7F080014
-			public const int abc_cab_background_top_material = 2131230740;
-			
-			// aapt resource value: 0x7F080015
-			public const int abc_cab_background_top_mtrl_alpha = 2131230741;
-			
-			// aapt resource value: 0x7F080016
-			public const int abc_control_background_material = 2131230742;
-			
-			// aapt resource value: 0x7F080017
-			public const int abc_dialog_material_background = 2131230743;
-			
-			// aapt resource value: 0x7F080018
-			public const int abc_edit_text_material = 2131230744;
-			
-			// aapt resource value: 0x7F080019
-			public const int abc_ic_ab_back_material = 2131230745;
-			
-			// aapt resource value: 0x7F08001A
-			public const int abc_ic_arrow_drop_right_black_24dp = 2131230746;
-			
-			// aapt resource value: 0x7F08001B
-			public const int abc_ic_clear_material = 2131230747;
-			
-			// aapt resource value: 0x7F08001C
-			public const int abc_ic_commit_search_api_mtrl_alpha = 2131230748;
-			
-			// aapt resource value: 0x7F08001D
-			public const int abc_ic_go_search_api_material = 2131230749;
-			
-			// aapt resource value: 0x7F08001E
-			public const int abc_ic_menu_copy_mtrl_am_alpha = 2131230750;
-			
-			// aapt resource value: 0x7F08001F
-			public const int abc_ic_menu_cut_mtrl_alpha = 2131230751;
-			
-			// aapt resource value: 0x7F080020
-			public const int abc_ic_menu_overflow_material = 2131230752;
-			
-			// aapt resource value: 0x7F080021
-			public const int abc_ic_menu_paste_mtrl_am_alpha = 2131230753;
-			
-			// aapt resource value: 0x7F080022
-			public const int abc_ic_menu_selectall_mtrl_alpha = 2131230754;
-			
-			// aapt resource value: 0x7F080023
-			public const int abc_ic_menu_share_mtrl_alpha = 2131230755;
-			
-			// aapt resource value: 0x7F080024
-			public const int abc_ic_search_api_material = 2131230756;
-			
-			// aapt resource value: 0x7F080025
-			public const int abc_ic_star_black_16dp = 2131230757;
-			
-			// aapt resource value: 0x7F080026
-			public const int abc_ic_star_black_36dp = 2131230758;
-			
-			// aapt resource value: 0x7F080027
-			public const int abc_ic_star_black_48dp = 2131230759;
-			
-			// aapt resource value: 0x7F080028
-			public const int abc_ic_star_half_black_16dp = 2131230760;
-			
-			// aapt resource value: 0x7F080029
-			public const int abc_ic_star_half_black_36dp = 2131230761;
-			
-			// aapt resource value: 0x7F08002A
-			public const int abc_ic_star_half_black_48dp = 2131230762;
-			
-			// aapt resource value: 0x7F08002B
-			public const int abc_ic_voice_search_api_material = 2131230763;
-			
-			// aapt resource value: 0x7F08002C
-			public const int abc_item_background_holo_dark = 2131230764;
-			
-			// aapt resource value: 0x7F08002D
-			public const int abc_item_background_holo_light = 2131230765;
-			
-			// aapt resource value: 0x7F08002E
-			public const int abc_list_divider_mtrl_alpha = 2131230766;
-			
-			// aapt resource value: 0x7F08002F
-			public const int abc_list_focused_holo = 2131230767;
-			
-			// aapt resource value: 0x7F080030
-			public const int abc_list_longpressed_holo = 2131230768;
-			
-			// aapt resource value: 0x7F080031
-			public const int abc_list_pressed_holo_dark = 2131230769;
-			
-			// aapt resource value: 0x7F080032
-			public const int abc_list_pressed_holo_light = 2131230770;
-			
-			// aapt resource value: 0x7F080033
-			public const int abc_list_selector_background_transition_holo_dark = 2131230771;
-			
-			// aapt resource value: 0x7F080034
-			public const int abc_list_selector_background_transition_holo_light = 2131230772;
-			
-			// aapt resource value: 0x7F080035
-			public const int abc_list_selector_disabled_holo_dark = 2131230773;
-			
-			// aapt resource value: 0x7F080036
-			public const int abc_list_selector_disabled_holo_light = 2131230774;
-			
-			// aapt resource value: 0x7F080037
-			public const int abc_list_selector_holo_dark = 2131230775;
-			
-			// aapt resource value: 0x7F080038
-			public const int abc_list_selector_holo_light = 2131230776;
-			
-			// aapt resource value: 0x7F080039
-			public const int abc_menu_hardkey_panel_mtrl_mult = 2131230777;
-			
-			// aapt resource value: 0x7F08003A
-			public const int abc_popup_background_mtrl_mult = 2131230778;
-			
-			// aapt resource value: 0x7F08003B
-			public const int abc_ratingbar_indicator_material = 2131230779;
-			
-			// aapt resource value: 0x7F08003C
-			public const int abc_ratingbar_material = 2131230780;
-			
-			// aapt resource value: 0x7F08003D
-			public const int abc_ratingbar_small_material = 2131230781;
-			
-			// aapt resource value: 0x7F08003E
-			public const int abc_scrubber_control_off_mtrl_alpha = 2131230782;
-			
-			// aapt resource value: 0x7F08003F
-			public const int abc_scrubber_control_to_pressed_mtrl_000 = 2131230783;
-			
-			// aapt resource value: 0x7F080040
-			public const int abc_scrubber_control_to_pressed_mtrl_005 = 2131230784;
-			
-			// aapt resource value: 0x7F080041
-			public const int abc_scrubber_primary_mtrl_alpha = 2131230785;
-			
-			// aapt resource value: 0x7F080042
-			public const int abc_scrubber_track_mtrl_alpha = 2131230786;
-			
-			// aapt resource value: 0x7F080043
-			public const int abc_seekbar_thumb_material = 2131230787;
-			
-			// aapt resource value: 0x7F080044
-			public const int abc_seekbar_tick_mark_material = 2131230788;
-			
-			// aapt resource value: 0x7F080045
-			public const int abc_seekbar_track_material = 2131230789;
-			
-			// aapt resource value: 0x7F080046
-			public const int abc_spinner_mtrl_am_alpha = 2131230790;
-			
-			// aapt resource value: 0x7F080047
-			public const int abc_spinner_textfield_background_material = 2131230791;
-			
-			// aapt resource value: 0x7F080048
-			public const int abc_switch_thumb_material = 2131230792;
-			
-			// aapt resource value: 0x7F080049
-			public const int abc_switch_track_mtrl_alpha = 2131230793;
-			
-			// aapt resource value: 0x7F08004A
-			public const int abc_tab_indicator_material = 2131230794;
-			
-			// aapt resource value: 0x7F08004B
-			public const int abc_tab_indicator_mtrl_alpha = 2131230795;
-			
-			// aapt resource value: 0x7F080053
-			public const int abc_textfield_activated_mtrl_alpha = 2131230803;
-			
-			// aapt resource value: 0x7F080054
-			public const int abc_textfield_default_mtrl_alpha = 2131230804;
-			
-			// aapt resource value: 0x7F080055
-			public const int abc_textfield_search_activated_mtrl_alpha = 2131230805;
-			
-			// aapt resource value: 0x7F080056
-			public const int abc_textfield_search_default_mtrl_alpha = 2131230806;
-			
-			// aapt resource value: 0x7F080057
-			public const int abc_textfield_search_material = 2131230807;
-			
-			// aapt resource value: 0x7F08004C
-			public const int abc_text_cursor_material = 2131230796;
-			
-			// aapt resource value: 0x7F08004D
-			public const int abc_text_select_handle_left_mtrl_dark = 2131230797;
-			
-			// aapt resource value: 0x7F08004E
-			public const int abc_text_select_handle_left_mtrl_light = 2131230798;
-			
-			// aapt resource value: 0x7F08004F
-			public const int abc_text_select_handle_middle_mtrl_dark = 2131230799;
-			
-			// aapt resource value: 0x7F080050
-			public const int abc_text_select_handle_middle_mtrl_light = 2131230800;
-			
-			// aapt resource value: 0x7F080051
-			public const int abc_text_select_handle_right_mtrl_dark = 2131230801;
-			
-			// aapt resource value: 0x7F080052
-			public const int abc_text_select_handle_right_mtrl_light = 2131230802;
-			
-			// aapt resource value: 0x7F080058
-			public const int abc_vector_test = 2131230808;
-			
-			// aapt resource value: 0x7F080059
-			public const int avd_hide_password = 2131230809;
-			
-			// aapt resource value: 0x7F08005A
-			public const int avd_show_password = 2131230810;
-			
-			// aapt resource value: 0x7F08005B
-			public const int design_bottom_navigation_item_background = 2131230811;
-			
-			// aapt resource value: 0x7F08005C
-			public const int design_fab_background = 2131230812;
-			
-			// aapt resource value: 0x7F08005D
-			public const int design_ic_visibility = 2131230813;
-			
-			// aapt resource value: 0x7F08005E
-			public const int design_ic_visibility_off = 2131230814;
-			
-			// aapt resource value: 0x7F08005F
-			public const int design_password_eye = 2131230815;
-			
-			// aapt resource value: 0x7F080060
-			public const int design_snackbar_background = 2131230816;
-			
-			// aapt resource value: 0x7F080061
-			public const int fingerprint_draw_off = 2131230817;
-			
-			// aapt resource value: 0x7F080062
-			public const int fingerprint_draw_off_animation = 2131230818;
-			
-			// aapt resource value: 0x7F080063
-			public const int fingerprint_draw_on = 2131230819;
-			
-			// aapt resource value: 0x7F080064
-			public const int fingerprint_draw_on_animation = 2131230820;
-			
-			// aapt resource value: 0x7F080065
-			public const int fingerprint_error = 2131230821;
-			
-			// aapt resource value: 0x7F080066
-			public const int fingerprint_error_off = 2131230822;
-			
-			// aapt resource value: 0x7F080067
-			public const int fingerprint_error_off_animation = 2131230823;
-			
-			// aapt resource value: 0x7F080068
-			public const int fingerprint_error_on = 2131230824;
-			
-			// aapt resource value: 0x7F080069
-			public const int fingerprint_error_on_animation = 2131230825;
-			
-			// aapt resource value: 0x7F08006A
-			public const int fingerprint_error_state_to_fp = 2131230826;
-			
-			// aapt resource value: 0x7F08006B
-			public const int fingerprint_error_state_to_fp_animation = 2131230827;
-			
-			// aapt resource value: 0x7F08006C
-			public const int fingerprint_fingerprint = 2131230828;
-			
-			// aapt resource value: 0x7F08006D
-			public const int fingerprint_fp_to_error_state = 2131230829;
-			
-			// aapt resource value: 0x7F08006E
-			public const int fingerprint_fp_to_error_state_animation = 2131230830;
-			
-			// aapt resource value: 0x7F08006F
-			public const int gd_btn_shape_app_b = 2131230831;
-			
-			// aapt resource value: 0x7F080070
-			public const int gd_btn_shape_app_g = 2131230832;
-			
-			// aapt resource value: 0x7F080071
-			public const int gd_btn_shape_app_w = 2131230833;
-			
-			// aapt resource value: 0x7F080072
-			public const int gd_btn_shape_shadow_w = 2131230834;
-			
-			// aapt resource value: 0x7F080073
-			public const int gd_click_effect_select = 2131230835;
-			
-			// aapt resource value: 0x7F080086
-			public const int Icon = 2131230854;
-			
-			// aapt resource value: 0x7F080074
-			public const int ic_gdmap_add = 2131230836;
-			
-			// aapt resource value: 0x7F080075
-			public const int ic_gdmap_back = 2131230837;
-			
-			// aapt resource value: 0x7F080076
-			public const int ic_gdmap_delete = 2131230838;
-			
-			// aapt resource value: 0x7F080077
-			public const int ic_gdmap_home = 2131230839;
-			
-			// aapt resource value: 0x7F080078
-			public const int ic_gdmap_mylocation = 2131230840;
-			
-			// aapt resource value: 0x7F080079
-			public const int ic_gdmap_now = 2131230841;
-			
-			// aapt resource value: 0x7F08007A
-			public const int ic_gdmap_search = 2131230842;
-			
-			// aapt resource value: 0x7F08007B
-			public const int ic_gdmap_zoom_out = 2131230843;
-			
-			// aapt resource value: 0x7F08007C
-			public const int ic_gps_point = 2131230844;
-			
-			// aapt resource value: 0x7F08007D
-			public const int ic_wd_arc_scale_bg = 2131230845;
-			
-			// aapt resource value: 0x7F08007E
-			public const int ic_wd_curtain_bg_top = 2131230846;
-			
-			// aapt resource value: 0x7F08007F
-			public const int ic_wd_curtain_h_bg = 2131230847;
-			
-			// aapt resource value: 0x7F080080
-			public const int ic_wd_curtain_h_open = 2131230848;
-			
-			// aapt resource value: 0x7F080081
-			public const int ic_wd_curtain_h_progress = 2131230849;
-			
-			// aapt resource value: 0x7F080082
-			public const int ic_wd_curtain_h_top = 2131230850;
-			
-			// aapt resource value: 0x7F080083
-			public const int ic_wd_curtain_open = 2131230851;
-			
-			// aapt resource value: 0x7F080084
-			public const int ic_wd_curtain_roll_bg = 2131230852;
-			
-			// aapt resource value: 0x7F080085
-			public const int ic_wd_curtain_roll_progress = 2131230853;
-			
-			// aapt resource value: 0x7F080087
-			public const int Loading = 2131230855;
-			
-			// aapt resource value: 0x7F080088
-			public const int navigation_empty_icon = 2131230856;
-			
-			// aapt resource value: 0x7F080089
-			public const int notification_action_background = 2131230857;
-			
-			// aapt resource value: 0x7F08008A
-			public const int notification_bg = 2131230858;
-			
-			// aapt resource value: 0x7F08008B
-			public const int notification_bg_low = 2131230859;
-			
-			// aapt resource value: 0x7F08008C
-			public const int notification_bg_low_normal = 2131230860;
-			
-			// aapt resource value: 0x7F08008D
-			public const int notification_bg_low_pressed = 2131230861;
-			
-			// aapt resource value: 0x7F08008E
-			public const int notification_bg_normal = 2131230862;
-			
-			// aapt resource value: 0x7F08008F
-			public const int notification_bg_normal_pressed = 2131230863;
-			
-			// aapt resource value: 0x7F080090
-			public const int notification_icon_background = 2131230864;
-			
-			// aapt resource value: 0x7F080091
-			public const int notification_template_icon_bg = 2131230865;
-			
-			// aapt resource value: 0x7F080092
-			public const int notification_template_icon_low_bg = 2131230866;
-			
-			// aapt resource value: 0x7F080093
-			public const int notification_tile_bg = 2131230867;
-			
-			// aapt resource value: 0x7F080094
-			public const int notify_panel_notification_icon_bg = 2131230868;
-			
-			// aapt resource value: 0x7F080095
-			public const int selector_pickerview_btn = 2131230869;
-			
-			// aapt resource value: 0x7F080096
-			public const int tooltip_frame_dark = 2131230870;
-			
-			// aapt resource value: 0x7F080097
-			public const int tooltip_frame_light = 2131230871;
-			
+
+			// aapt resource value: 0x7f020000
+			public const int abc_ab_share_pack_mtrl_alpha = 2130837504;
+
+			// aapt resource value: 0x7f020001
+			public const int abc_action_bar_item_background_material = 2130837505;
+
+			// aapt resource value: 0x7f020002
+			public const int abc_btn_borderless_material = 2130837506;
+
+			// aapt resource value: 0x7f020003
+			public const int abc_btn_check_material = 2130837507;
+
+			// aapt resource value: 0x7f020004
+			public const int abc_btn_check_to_on_mtrl_000 = 2130837508;
+
+			// aapt resource value: 0x7f020005
+			public const int abc_btn_check_to_on_mtrl_015 = 2130837509;
+
+			// aapt resource value: 0x7f020006
+			public const int abc_btn_colored_material = 2130837510;
+
+			// aapt resource value: 0x7f020007
+			public const int abc_btn_default_mtrl_shape = 2130837511;
+
+			// aapt resource value: 0x7f020008
+			public const int abc_btn_radio_material = 2130837512;
+
+			// aapt resource value: 0x7f020009
+			public const int abc_btn_radio_to_on_mtrl_000 = 2130837513;
+
+			// aapt resource value: 0x7f02000a
+			public const int abc_btn_radio_to_on_mtrl_015 = 2130837514;
+
+			// aapt resource value: 0x7f02000b
+			public const int abc_btn_switch_to_on_mtrl_00001 = 2130837515;
+
+			// aapt resource value: 0x7f02000c
+			public const int abc_btn_switch_to_on_mtrl_00012 = 2130837516;
+
+			// aapt resource value: 0x7f02000d
+			public const int abc_cab_background_internal_bg = 2130837517;
+
+			// aapt resource value: 0x7f02000e
+			public const int abc_cab_background_top_material = 2130837518;
+
+			// aapt resource value: 0x7f02000f
+			public const int abc_cab_background_top_mtrl_alpha = 2130837519;
+
+			// aapt resource value: 0x7f020010
+			public const int abc_control_background_material = 2130837520;
+
+			// aapt resource value: 0x7f020011
+			public const int abc_dialog_material_background = 2130837521;
+
+			// aapt resource value: 0x7f020012
+			public const int abc_edit_text_material = 2130837522;
+
+			// aapt resource value: 0x7f020013
+			public const int abc_ic_ab_back_material = 2130837523;
+
+			// aapt resource value: 0x7f020014
+			public const int abc_ic_arrow_drop_right_black_24dp = 2130837524;
+
+			// aapt resource value: 0x7f020015
+			public const int abc_ic_clear_material = 2130837525;
+
+			// aapt resource value: 0x7f020016
+			public const int abc_ic_commit_search_api_mtrl_alpha = 2130837526;
+
+			// aapt resource value: 0x7f020017
+			public const int abc_ic_go_search_api_material = 2130837527;
+
+			// aapt resource value: 0x7f020018
+			public const int abc_ic_menu_copy_mtrl_am_alpha = 2130837528;
+
+			// aapt resource value: 0x7f020019
+			public const int abc_ic_menu_cut_mtrl_alpha = 2130837529;
+
+			// aapt resource value: 0x7f02001a
+			public const int abc_ic_menu_overflow_material = 2130837530;
+
+			// aapt resource value: 0x7f02001b
+			public const int abc_ic_menu_paste_mtrl_am_alpha = 2130837531;
+
+			// aapt resource value: 0x7f02001c
+			public const int abc_ic_menu_selectall_mtrl_alpha = 2130837532;
+
+			// aapt resource value: 0x7f02001d
+			public const int abc_ic_menu_share_mtrl_alpha = 2130837533;
+
+			// aapt resource value: 0x7f02001e
+			public const int abc_ic_search_api_material = 2130837534;
+
+			// aapt resource value: 0x7f02001f
+			public const int abc_ic_star_black_16dp = 2130837535;
+
+			// aapt resource value: 0x7f020020
+			public const int abc_ic_star_black_36dp = 2130837536;
+
+			// aapt resource value: 0x7f020021
+			public const int abc_ic_star_black_48dp = 2130837537;
+
+			// aapt resource value: 0x7f020022
+			public const int abc_ic_star_half_black_16dp = 2130837538;
+
+			// aapt resource value: 0x7f020023
+			public const int abc_ic_star_half_black_36dp = 2130837539;
+
+			// aapt resource value: 0x7f020024
+			public const int abc_ic_star_half_black_48dp = 2130837540;
+
+			// aapt resource value: 0x7f020025
+			public const int abc_ic_voice_search_api_material = 2130837541;
+
+			// aapt resource value: 0x7f020026
+			public const int abc_item_background_holo_dark = 2130837542;
+
+			// aapt resource value: 0x7f020027
+			public const int abc_item_background_holo_light = 2130837543;
+
+			// aapt resource value: 0x7f020028
+			public const int abc_list_divider_mtrl_alpha = 2130837544;
+
+			// aapt resource value: 0x7f020029
+			public const int abc_list_focused_holo = 2130837545;
+
+			// aapt resource value: 0x7f02002a
+			public const int abc_list_longpressed_holo = 2130837546;
+
+			// aapt resource value: 0x7f02002b
+			public const int abc_list_pressed_holo_dark = 2130837547;
+
+			// aapt resource value: 0x7f02002c
+			public const int abc_list_pressed_holo_light = 2130837548;
+
+			// aapt resource value: 0x7f02002d
+			public const int abc_list_selector_background_transition_holo_dark = 2130837549;
+
+			// aapt resource value: 0x7f02002e
+			public const int abc_list_selector_background_transition_holo_light = 2130837550;
+
+			// aapt resource value: 0x7f02002f
+			public const int abc_list_selector_disabled_holo_dark = 2130837551;
+
+			// aapt resource value: 0x7f020030
+			public const int abc_list_selector_disabled_holo_light = 2130837552;
+
+			// aapt resource value: 0x7f020031
+			public const int abc_list_selector_holo_dark = 2130837553;
+
+			// aapt resource value: 0x7f020032
+			public const int abc_list_selector_holo_light = 2130837554;
+
+			// aapt resource value: 0x7f020033
+			public const int abc_menu_hardkey_panel_mtrl_mult = 2130837555;
+
+			// aapt resource value: 0x7f020034
+			public const int abc_popup_background_mtrl_mult = 2130837556;
+
+			// aapt resource value: 0x7f020035
+			public const int abc_ratingbar_indicator_material = 2130837557;
+
+			// aapt resource value: 0x7f020036
+			public const int abc_ratingbar_material = 2130837558;
+
+			// aapt resource value: 0x7f020037
+			public const int abc_ratingbar_small_material = 2130837559;
+
+			// aapt resource value: 0x7f020038
+			public const int abc_scrubber_control_off_mtrl_alpha = 2130837560;
+
+			// aapt resource value: 0x7f020039
+			public const int abc_scrubber_control_to_pressed_mtrl_000 = 2130837561;
+
+			// aapt resource value: 0x7f02003a
+			public const int abc_scrubber_control_to_pressed_mtrl_005 = 2130837562;
+
+			// aapt resource value: 0x7f02003b
+			public const int abc_scrubber_primary_mtrl_alpha = 2130837563;
+
+			// aapt resource value: 0x7f02003c
+			public const int abc_scrubber_track_mtrl_alpha = 2130837564;
+
+			// aapt resource value: 0x7f02003d
+			public const int abc_seekbar_thumb_material = 2130837565;
+
+			// aapt resource value: 0x7f02003e
+			public const int abc_seekbar_tick_mark_material = 2130837566;
+
+			// aapt resource value: 0x7f02003f
+			public const int abc_seekbar_track_material = 2130837567;
+
+			// aapt resource value: 0x7f020040
+			public const int abc_spinner_mtrl_am_alpha = 2130837568;
+
+			// aapt resource value: 0x7f020041
+			public const int abc_spinner_textfield_background_material = 2130837569;
+
+			// 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: 0x7f020092
+			public const int avd_hide_password_1 = 2130837650;
+
+			// aapt resource value: 0x7f020093
+			public const int avd_hide_password_2 = 2130837651;
+
+			// aapt resource value: 0x7f020094
+			public const int avd_hide_password_3 = 2130837652;
+
+			// aapt resource value: 0x7f020054
+			public const int avd_show_password = 2130837588;
+
+			// aapt resource value: 0x7f020095
+			public const int avd_show_password_1 = 2130837653;
+
+			// aapt resource value: 0x7f020096
+			public const int avd_show_password_2 = 2130837654;
+
+			// aapt resource value: 0x7f020097
+			public const int avd_show_password_3 = 2130837655;
+
+			// aapt resource value: 0x7f020055
+			public const int design_bottom_navigation_item_background = 2130837589;
+
+			// aapt resource value: 0x7f020056
+			public const int design_fab_background = 2130837590;
+
+			// aapt resource value: 0x7f020057
+			public const int design_ic_visibility = 2130837591;
+
+			// aapt resource value: 0x7f020058
+			public const int design_ic_visibility_off = 2130837592;
+
+			// aapt resource value: 0x7f020059
+			public const int design_password_eye = 2130837593;
+
+			// aapt resource value: 0x7f02005a
+			public const int design_snackbar_background = 2130837594;
+
+			// aapt resource value: 0x7f02005b
+			public const int fingerprint_draw_off = 2130837595;
+
+			// aapt resource value: 0x7f02005c
+			public const int fingerprint_draw_off_animation = 2130837596;
+
+			// aapt resource value: 0x7f02005d
+			public const int fingerprint_draw_on = 2130837597;
+
+			// aapt resource value: 0x7f02005e
+			public const int fingerprint_draw_on_animation = 2130837598;
+
+			// aapt resource value: 0x7f02005f
+			public const int fingerprint_error = 2130837599;
+
+			// aapt resource value: 0x7f020060
+			public const int fingerprint_error_off = 2130837600;
+
+			// aapt resource value: 0x7f020061
+			public const int fingerprint_error_off_animation = 2130837601;
+
+			// aapt resource value: 0x7f020062
+			public const int fingerprint_error_on = 2130837602;
+
+			// aapt resource value: 0x7f020063
+			public const int fingerprint_error_on_animation = 2130837603;
+
+			// aapt resource value: 0x7f020064
+			public const int fingerprint_error_state_to_fp = 2130837604;
+
+			// aapt resource value: 0x7f020065
+			public const int fingerprint_error_state_to_fp_animation = 2130837605;
+
+			// aapt resource value: 0x7f020066
+			public const int fingerprint_fingerprint = 2130837606;
+
+			// aapt resource value: 0x7f020067
+			public const int fingerprint_fp_to_error_state = 2130837607;
+
+			// aapt resource value: 0x7f020068
+			public const int fingerprint_fp_to_error_state_animation = 2130837608;
+
+			// aapt resource value: 0x7f020069
+			public const int gd_btn_shape_app_b = 2130837609;
+
+			// aapt resource value: 0x7f02006a
+			public const int gd_btn_shape_app_g = 2130837610;
+
+			// aapt resource value: 0x7f02006b
+			public const int gd_btn_shape_app_w = 2130837611;
+
+			// aapt resource value: 0x7f02006c
+			public const int gd_btn_shape_shadow_w = 2130837612;
+
+			// aapt resource value: 0x7f02006d
+			public const int gd_click_effect_select = 2130837613;
+
+			// aapt resource value: 0x7f02006e
+			public const int ic_gdmap_add = 2130837614;
+
+			// aapt resource value: 0x7f02006f
+			public const int ic_gdmap_back = 2130837615;
+
+			// aapt resource value: 0x7f020070
+			public const int ic_gdmap_delete = 2130837616;
+
+			// aapt resource value: 0x7f020071
+			public const int ic_gdmap_home = 2130837617;
+
+			// aapt resource value: 0x7f020072
+			public const int ic_gdmap_mylocation = 2130837618;
+
+			// aapt resource value: 0x7f020073
+			public const int ic_gdmap_now = 2130837619;
+
+			// aapt resource value: 0x7f020074
+			public const int ic_gdmap_search = 2130837620;
+
+			// aapt resource value: 0x7f020075
+			public const int ic_gdmap_zoom_out = 2130837621;
+
+			// aapt resource value: 0x7f020076
+			public const int ic_gps_point = 2130837622;
+
+			// aapt resource value: 0x7f020077
+			public const int ic_wd_arc_scale_bg = 2130837623;
+
+			// aapt resource value: 0x7f020078
+			public const int ic_wd_curtain_bg_top = 2130837624;
+
+			// aapt resource value: 0x7f020079
+			public const int ic_wd_curtain_h_bg = 2130837625;
+
+			// aapt resource value: 0x7f02007a
+			public const int ic_wd_curtain_h_open = 2130837626;
+
+			// aapt resource value: 0x7f02007b
+			public const int ic_wd_curtain_h_progress = 2130837627;
+
+			// aapt resource value: 0x7f02007c
+			public const int ic_wd_curtain_h_top = 2130837628;
+
+			// aapt resource value: 0x7f02007d
+			public const int ic_wd_curtain_open = 2130837629;
+
+			// aapt resource value: 0x7f02007e
+			public const int ic_wd_curtain_roll_bg = 2130837630;
+
+			// aapt resource value: 0x7f02007f
+			public const int ic_wd_curtain_roll_progress = 2130837631;
+
+			// aapt resource value: 0x7f020080
+			public const int Icon = 2130837632;
+
+			// aapt resource value: 0x7f020081
+			public const int Loading = 2130837633;
+
+			// aapt resource value: 0x7f020082
+			public const int navigation_empty_icon = 2130837634;
+
+			// aapt resource value: 0x7f020083
+			public const int notification_action_background = 2130837635;
+
+			// aapt resource value: 0x7f020084
+			public const int notification_bg = 2130837636;
+
+			// aapt resource value: 0x7f020085
+			public const int notification_bg_low = 2130837637;
+
+			// aapt resource value: 0x7f020086
+			public const int notification_bg_low_normal = 2130837638;
+
+			// aapt resource value: 0x7f020087
+			public const int notification_bg_low_pressed = 2130837639;
+
+			// aapt resource value: 0x7f020088
+			public const int notification_bg_normal = 2130837640;
+
+			// aapt resource value: 0x7f020089
+			public const int notification_bg_normal_pressed = 2130837641;
+
+			// aapt resource value: 0x7f02008a
+			public const int notification_icon_background = 2130837642;
+
+			// aapt resource value: 0x7f020090
+			public const int notification_template_icon_bg = 2130837648;
+
+			// aapt resource value: 0x7f020091
+			public const int notification_template_icon_low_bg = 2130837649;
+
+			// aapt resource value: 0x7f02008b
+			public const int notification_tile_bg = 2130837643;
+
+			// aapt resource value: 0x7f02008c
+			public const int notify_panel_notification_icon_bg = 2130837644;
+
+			// aapt resource value: 0x7f02008d
+			public const int selector_pickerview_btn = 2130837645;
+
+			// aapt resource value: 0x7f02008e
+			public const int tooltip_frame_dark = 2130837646;
+
+			// aapt resource value: 0x7f02008f
+			public const int tooltip_frame_light = 2130837647;
+
 			static Drawable()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Drawable()
 			{
 			}
 		}
-		
+
 		public partial class Id
 		{
-			
-			// aapt resource value: 0x7F09000E
-			public const int action0 = 2131296270;
-			
-			// aapt resource value: 0x7F090020
-			public const int actions = 2131296288;
-			
-			// aapt resource value: 0x7F09000F
-			public const int action_bar = 2131296271;
-			
-			// aapt resource value: 0x7F090010
-			public const int action_bar_activity_content = 2131296272;
-			
-			// aapt resource value: 0x7F090011
-			public const int action_bar_container = 2131296273;
-			
-			// aapt resource value: 0x7F090012
-			public const int action_bar_root = 2131296274;
-			
-			// aapt resource value: 0x7F090013
-			public const int action_bar_spinner = 2131296275;
-			
-			// aapt resource value: 0x7F090014
-			public const int action_bar_subtitle = 2131296276;
-			
-			// aapt resource value: 0x7F090015
-			public const int action_bar_title = 2131296277;
-			
-			// aapt resource value: 0x7F090016
-			public const int action_container = 2131296278;
-			
-			// aapt resource value: 0x7F090017
-			public const int action_context_bar = 2131296279;
-			
-			// aapt resource value: 0x7F090018
-			public const int action_divider = 2131296280;
-			
-			// aapt resource value: 0x7F090019
-			public const int action_image = 2131296281;
-			
-			// aapt resource value: 0x7F09001A
-			public const int action_menu_divider = 2131296282;
-			
-			// aapt resource value: 0x7F09001B
-			public const int action_menu_presenter = 2131296283;
-			
-			// aapt resource value: 0x7F09001C
-			public const int action_mode_bar = 2131296284;
-			
-			// aapt resource value: 0x7F09001D
-			public const int action_mode_bar_stub = 2131296285;
-			
-			// aapt resource value: 0x7F09001E
-			public const int action_mode_close_button = 2131296286;
-			
-			// aapt resource value: 0x7F09001F
-			public const int action_text = 2131296287;
-			
-			// aapt resource value: 0x7F090021
-			public const int activity_chooser_view_content = 2131296289;
-			
-			// aapt resource value: 0x7F090022
-			public const int add = 2131296290;
-			
-			// aapt resource value: 0x7F090023
-			public const int alertTitle = 2131296291;
-			
-			// aapt resource value: 0x7F090024
-			public const int all = 2131296292;
-			
-			// aapt resource value: 0x7F090000
-			public const int ALT = 2131296256;
-			
-			// aapt resource value: 0x7F090025
-			public const int always = 2131296293;
-			
-			// aapt resource value: 0x7F090026
-			public const int async = 2131296294;
-			
-			// aapt resource value: 0x7F090027
-			public const int auto = 2131296295;
-			
-			// aapt resource value: 0x7F090028
-			public const int beginning = 2131296296;
-			
-			// aapt resource value: 0x7F090029
-			public const int blocking = 2131296297;
-			
-			// aapt resource value: 0x7F09002A
-			public const int bottom = 2131296298;
-			
-			// aapt resource value: 0x7F09002B
-			public const int btnCancel = 2131296299;
-			
-			// aapt resource value: 0x7F09002C
-			public const int btnSubmit = 2131296300;
-			
-			// aapt resource value: 0x7F09002D
-			public const int buttonPanel = 2131296301;
-			
-			// aapt resource value: 0x7F09002E
-			public const int cancel_action = 2131296302;
-			
-			// aapt resource value: 0x7F09002F
-			public const int center = 2131296303;
-			
-			// aapt resource value: 0x7F090030
-			public const int center_horizontal = 2131296304;
-			
-			// aapt resource value: 0x7F090031
-			public const int center_vertical = 2131296305;
-			
-			// aapt resource value: 0x7F090032
-			public const int checkbox = 2131296306;
-			
-			// aapt resource value: 0x7F090033
-			public const int chronometer = 2131296307;
-			
-			// aapt resource value: 0x7F090034
-			public const int clip_horizontal = 2131296308;
-			
-			// aapt resource value: 0x7F090035
-			public const int clip_vertical = 2131296309;
-			
-			// aapt resource value: 0x7F090036
-			public const int collapseActionView = 2131296310;
-			
-			// aapt resource value: 0x7F090037
-			public const int container = 2131296311;
-			
-			// aapt resource value: 0x7F090038
-			public const int contentFrame = 2131296312;
-			
-			// aapt resource value: 0x7F090039
-			public const int contentPanel = 2131296313;
-			
-			// aapt resource value: 0x7F09003A
-			public const int content_container = 2131296314;
-			
-			// aapt resource value: 0x7F09003B
-			public const int coordinator = 2131296315;
-			
-			// aapt resource value: 0x7F090001
-			public const int CTRL = 2131296257;
-			
-			// aapt resource value: 0x7F09003C
-			public const int custom = 2131296316;
-			
-			// aapt resource value: 0x7F09003D
-			public const int customPanel = 2131296317;
-			
-			// aapt resource value: 0x7F09003E
-			public const int day = 2131296318;
-			
-			// aapt resource value: 0x7F09003F
-			public const int decor_content_parent = 2131296319;
-			
-			// aapt resource value: 0x7F090040
-			public const int default_activity_button = 2131296320;
-			
-			// aapt resource value: 0x7F090041
-			public const int description = 2131296321;
-			
-			// aapt resource value: 0x7F090042
-			public const int design_bottom_sheet = 2131296322;
-			
-			// aapt resource value: 0x7F090043
-			public const int design_menu_item_action_area = 2131296323;
-			
-			// aapt resource value: 0x7F090044
-			public const int design_menu_item_action_area_stub = 2131296324;
-			
-			// aapt resource value: 0x7F090045
-			public const int design_menu_item_text = 2131296325;
-			
-			// aapt resource value: 0x7F090046
-			public const int design_navigation_view = 2131296326;
-			
-			// aapt resource value: 0x7F090047
-			public const int disableHome = 2131296327;
-			
-			// aapt resource value: 0x7F090048
-			public const int edit_query = 2131296328;
-			
-			// aapt resource value: 0x7F090049
-			public const int end = 2131296329;
-			
-			// aapt resource value: 0x7F09004A
-			public const int end_padder = 2131296330;
-			
-			// aapt resource value: 0x7F09004B
-			public const int enterAlways = 2131296331;
-			
-			// aapt resource value: 0x7F09004C
-			public const int enterAlwaysCollapsed = 2131296332;
-			
-			// aapt resource value: 0x7F09004D
-			public const int exitUntilCollapsed = 2131296333;
-			
-			// aapt resource value: 0x7F09004F
-			public const int expanded_menu = 2131296335;
-			
-			// aapt resource value: 0x7F09004E
-			public const int expand_activities_button = 2131296334;
-			
-			// aapt resource value: 0x7F090050
-			public const int fill = 2131296336;
-			
-			// aapt resource value: 0x7F090002
-			public const int FILL = 2131296258;
-			
-			// aapt resource value: 0x7F090051
-			public const int fill_horizontal = 2131296337;
-			
-			// aapt resource value: 0x7F090003
-			public const int FILL_STROKE = 2131296259;
-			
-			// aapt resource value: 0x7F090052
-			public const int fill_vertical = 2131296338;
-			
-			// aapt resource value: 0x7F090053
-			public const int fingerprint_icon = 2131296339;
-			
-			// aapt resource value: 0x7F090054
-			public const int @fixed = 2131296340;
-			
-			// aapt resource value: 0x7F090005
-			public const int FixedBehind = 2131296261;
-			
-			// aapt resource value: 0x7F090006
-			public const int FixedFront = 2131296262;
-			
-			// aapt resource value: 0x7F090055
-			public const int forever = 2131296341;
-			
-			// aapt resource value: 0x7F090004
-			public const int FUNCTION = 2131296260;
-			
-			// aapt resource value: 0x7F090056
-			public const int gd_btn_back = 2131296342;
-			
-			// aapt resource value: 0x7F090057
-			public const int gd_btn_myLocation = 2131296343;
-			
-			// aapt resource value: 0x7F090058
-			public const int gd_btn_save = 2131296344;
-			
-			// aapt resource value: 0x7F090059
-			public const int gd_img_search_delete = 2131296345;
-			
-			// aapt resource value: 0x7F09005A
-			public const int gd_ll_myhome = 2131296346;
-			
-			// aapt resource value: 0x7F09005B
-			public const int gd_ll_search = 2131296347;
-			
-			// aapt resource value: 0x7F09005C
-			public const int gd_mapView = 2131296348;
-			
-			// aapt resource value: 0x7F09005D
-			public const int gd_rl_topview = 2131296349;
-			
-			// aapt resource value: 0x7F09005E
-			public const int gd_tv_activity_title = 2131296350;
-			
-			// aapt resource value: 0x7F09005F
-			public const int gd_tv_radius = 2131296351;
-			
-			// aapt resource value: 0x7F090060
-			public const int gd_tv_search_title = 2131296352;
-			
-			// aapt resource value: 0x7F090061
-			public const int hdl_gallery_rootView = 2131296353;
-			
-			// aapt resource value: 0x7F090062
-			public const int hdl_gallery_viewPager = 2131296354;
-			
-			// aapt resource value: 0x7F090063
-			public const int hdl_options1 = 2131296355;
-			
-			// aapt resource value: 0x7F090064
-			public const int hdl_options2 = 2131296356;
-			
-			// aapt resource value: 0x7F090065
-			public const int hdl_options3 = 2131296357;
-			
-			// aapt resource value: 0x7F090066
-			public const int hdl_pickerview_ll = 2131296358;
-			
-			// aapt resource value: 0x7F090067
-			public const int home = 2131296359;
-			
-			// aapt resource value: 0x7F090068
-			public const int homeAsUp = 2131296360;
-			
-			// aapt resource value: 0x7F090069
-			public const int hour = 2131296361;
-			
-			// aapt resource value: 0x7F09006A
-			public const int icon = 2131296362;
-			
-			// aapt resource value: 0x7F09006B
-			public const int icon_group = 2131296363;
-			
-			// aapt resource value: 0x7F09006C
-			public const int ifRoom = 2131296364;
-			
-			// aapt resource value: 0x7F09006D
-			public const int image = 2131296365;
-			
-			// aapt resource value: 0x7F09006E
-			public const int info = 2131296366;
-			
-			// aapt resource value: 0x7F09006F
-			public const int italic = 2131296367;
-			
-			// aapt resource value: 0x7F090070
-			public const int item_touch_helper_previous_elevation = 2131296368;
-			
-			// aapt resource value: 0x7F090071
-			public const int largeLabel = 2131296369;
-			
-			// aapt resource value: 0x7F090072
-			public const int left = 2131296370;
-			
-			// aapt resource value: 0x7F090073
-			public const int line1 = 2131296371;
-			
-			// aapt resource value: 0x7F090074
-			public const int line3 = 2131296372;
-			
-			// aapt resource value: 0x7F090075
-			public const int listMode = 2131296373;
-			
-			// aapt resource value: 0x7F090076
-			public const int list_item = 2131296374;
-			
-			// aapt resource value: 0x7F090077
-			public const int masked = 2131296375;
-			
-			// aapt resource value: 0x7F090008
-			public const int MatchLayout = 2131296264;
-			
-			// aapt resource value: 0x7F090078
-			public const int media_actions = 2131296376;
-			
-			// aapt resource value: 0x7F090079
-			public const int message = 2131296377;
-			
-			// aapt resource value: 0x7F090007
-			public const int META = 2131296263;
-			
-			// aapt resource value: 0x7F09007A
-			public const int middle = 2131296378;
-			
-			// aapt resource value: 0x7F09007B
-			public const int min = 2131296379;
-			
-			// aapt resource value: 0x7F09007C
-			public const int mini = 2131296380;
-			
-			// aapt resource value: 0x7F09007D
-			public const int month = 2131296381;
-			
-			// aapt resource value: 0x7F09007E
-			public const int multiply = 2131296382;
-			
-			// aapt resource value: 0x7F09007F
-			public const int myButton = 2131296383;
-			
-			// aapt resource value: 0x7F090080
-			public const int navigation_header_container = 2131296384;
-			
-			// aapt resource value: 0x7F090081
-			public const int never = 2131296385;
-			
-			// aapt resource value: 0x7F090082
-			public const int none = 2131296386;
-			
-			// aapt resource value: 0x7F090083
-			public const int normal = 2131296387;
-			
-			// aapt resource value: 0x7F090084
-			public const int notification_background = 2131296388;
-			
-			// aapt resource value: 0x7F090085
-			public const int notification_main_column = 2131296389;
-			
-			// aapt resource value: 0x7F090086
-			public const int notification_main_column_container = 2131296390;
-			
-			// aapt resource value: 0x7F090087
-			public const int options1 = 2131296391;
-			
-			// aapt resource value: 0x7F090088
-			public const int options2 = 2131296392;
-			
-			// aapt resource value: 0x7F090089
-			public const int options3 = 2131296393;
-			
-			// aapt resource value: 0x7F09008A
-			public const int optionspicker = 2131296394;
-			
-			// aapt resource value: 0x7F09008B
-			public const int outmost_container = 2131296395;
-			
-			// aapt resource value: 0x7F09008C
-			public const int parallax = 2131296396;
-			
-			// aapt resource value: 0x7F09008D
-			public const int parentPanel = 2131296397;
-			
-			// aapt resource value: 0x7F09008E
-			public const int pin = 2131296398;
-			
-			// aapt resource value: 0x7F09008F
-			public const int progress_circular = 2131296399;
-			
-			// aapt resource value: 0x7F090090
-			public const int progress_horizontal = 2131296400;
-			
-			// aapt resource value: 0x7F090091
-			public const int radio = 2131296401;
-			
-			// aapt resource value: 0x7F090092
-			public const int right = 2131296402;
-			
-			// aapt resource value: 0x7F090093
-			public const int right_icon = 2131296403;
-			
-			// aapt resource value: 0x7F090094
-			public const int right_side = 2131296404;
-			
-			// aapt resource value: 0x7F090095
-			public const int rv_topbar = 2131296405;
-			
-			// aapt resource value: 0x7F09000C
-			public const int Scale = 2131296268;
-			
-			// aapt resource value: 0x7F090096
-			public const int screen = 2131296406;
-			
-			// aapt resource value: 0x7F090097
-			public const int scroll = 2131296407;
-			
-			// aapt resource value: 0x7F09009B
-			public const int scrollable = 2131296411;
-			
-			// aapt resource value: 0x7F090098
-			public const int scrollIndicatorDown = 2131296408;
-			
-			// aapt resource value: 0x7F090099
-			public const int scrollIndicatorUp = 2131296409;
-			
-			// aapt resource value: 0x7F09009A
-			public const int scrollView = 2131296410;
-			
-			// aapt resource value: 0x7F09009C
-			public const int search_badge = 2131296412;
-			
-			// aapt resource value: 0x7F09009D
-			public const int search_bar = 2131296413;
-			
-			// aapt resource value: 0x7F09009E
-			public const int search_button = 2131296414;
-			
-			// aapt resource value: 0x7F09009F
-			public const int search_close_btn = 2131296415;
-			
-			// aapt resource value: 0x7F0900A0
-			public const int search_edit_frame = 2131296416;
-			
-			// aapt resource value: 0x7F0900A1
-			public const int search_go_btn = 2131296417;
-			
-			// aapt resource value: 0x7F0900A2
-			public const int search_mag_icon = 2131296418;
-			
-			// aapt resource value: 0x7F0900A3
-			public const int search_plate = 2131296419;
-			
-			// aapt resource value: 0x7F0900A4
-			public const int search_src_text = 2131296420;
-			
-			// aapt resource value: 0x7F0900A5
-			public const int search_voice_btn = 2131296421;
-			
-			// aapt resource value: 0x7F0900A6
-			public const int second = 2131296422;
-			
-			// aapt resource value: 0x7F0900A7
-			public const int select_dialog_listview = 2131296423;
-			
-			// aapt resource value: 0x7F090009
-			public const int SHIFT = 2131296265;
-			
-			// aapt resource value: 0x7F0900A8
-			public const int shortcut = 2131296424;
-			
-			// aapt resource value: 0x7F0900A9
-			public const int showCustom = 2131296425;
-			
-			// aapt resource value: 0x7F0900AA
-			public const int showHome = 2131296426;
-			
-			// aapt resource value: 0x7F0900AB
-			public const int showTitle = 2131296427;
-			
-			// aapt resource value: 0x7F0900AC
-			public const int smallLabel = 2131296428;
-			
-			// aapt resource value: 0x7F0900AD
-			public const int snackbar_action = 2131296429;
-			
-			// aapt resource value: 0x7F0900AE
-			public const int snackbar_text = 2131296430;
-			
-			// aapt resource value: 0x7F0900AF
-			public const int snap = 2131296431;
-			
-			// aapt resource value: 0x7F0900B0
-			public const int spacer = 2131296432;
-			
-			// aapt resource value: 0x7F0900B1
-			public const int split_action_bar = 2131296433;
-			
-			// aapt resource value: 0x7F0900B2
-			public const int src_atop = 2131296434;
-			
-			// aapt resource value: 0x7F0900B3
-			public const int src_in = 2131296435;
-			
-			// aapt resource value: 0x7F0900B4
-			public const int src_over = 2131296436;
-			
-			// aapt resource value: 0x7F0900B5
-			public const int srl_classics_arrow = 2131296437;
-			
-			// aapt resource value: 0x7F0900B6
-			public const int srl_classics_center = 2131296438;
-			
-			// aapt resource value: 0x7F0900B7
-			public const int srl_classics_progress = 2131296439;
-			
-			// aapt resource value: 0x7F0900B8
-			public const int srl_classics_title = 2131296440;
-			
-			// aapt resource value: 0x7F0900B9
-			public const int srl_classics_update = 2131296441;
-			
-			// aapt resource value: 0x7F0900BA
-			public const int start = 2131296442;
-			
-			// aapt resource value: 0x7F0900BB
-			public const int status = 2131296443;
-			
-			// aapt resource value: 0x7F0900BC
-			public const int status_bar_latest_event_content = 2131296444;
-			
-			// aapt resource value: 0x7F09000A
-			public const int STROKE = 2131296266;
-			
-			// aapt resource value: 0x7F0900BD
-			public const int submenuarrow = 2131296445;
-			
-			// aapt resource value: 0x7F0900BE
-			public const int submit_area = 2131296446;
-			
-			// aapt resource value: 0x7F0900BF
-			public const int subtitle = 2131296447;
-			
-			// aapt resource value: 0x7F09000B
-			public const int SYM = 2131296267;
-			
-			// aapt resource value: 0x7F0900C0
-			public const int tabMode = 2131296448;
-			
-			// aapt resource value: 0x7F0900C1
-			public const int text = 2131296449;
-			
-			// aapt resource value: 0x7F0900C2
-			public const int text2 = 2131296450;
-			
-			// aapt resource value: 0x7F0900C6
-			public const int textinput_counter = 2131296454;
-			
-			// aapt resource value: 0x7F0900C7
-			public const int textinput_error = 2131296455;
-			
-			// aapt resource value: 0x7F0900C3
-			public const int textSpacerNoButtons = 2131296451;
-			
-			// aapt resource value: 0x7F0900C4
-			public const int textSpacerNoTitle = 2131296452;
-			
-			// aapt resource value: 0x7F0900C5
-			public const int text_input_password_toggle = 2131296453;
-			
-			// aapt resource value: 0x7F0900C8
-			public const int time = 2131296456;
-			
-			// aapt resource value: 0x7F0900C9
-			public const int timepicker = 2131296457;
-			
-			// aapt resource value: 0x7F0900CA
-			public const int title = 2131296458;
-			
-			// aapt resource value: 0x7F0900CB
-			public const int titleDividerNoCustom = 2131296459;
-			
-			// aapt resource value: 0x7F0900CC
-			public const int title_template = 2131296460;
-			
-			// aapt resource value: 0x7F0900CD
-			public const int top = 2131296461;
-			
-			// aapt resource value: 0x7F0900CE
-			public const int topPanel = 2131296462;
-			
-			// aapt resource value: 0x7F0900CF
-			public const int touch_outside = 2131296463;
-			
-			// aapt resource value: 0x7F09000D
-			public const int Translate = 2131296269;
-			
-			// aapt resource value: 0x7F0900D0
-			public const int tvTitle = 2131296464;
-			
-			// aapt resource value: 0x7F0900D1
-			public const int tv_zxing_back = 2131296465;
-			
-			// aapt resource value: 0x7F0900D2
-			public const int tv_zxing_flash = 2131296466;
-			
-			// aapt resource value: 0x7F0900D3
-			public const int tv_zxing_scan = 2131296467;
-			
-			// aapt resource value: 0x7F0900D4
-			public const int uniform = 2131296468;
-			
-			// aapt resource value: 0x7F0900D5
-			public const int up = 2131296469;
-			
-			// aapt resource value: 0x7F0900D6
-			public const int useLogo = 2131296470;
-			
-			// aapt resource value: 0x7F0900D7
-			public const int view_offset_helper = 2131296471;
-			
-			// aapt resource value: 0x7F0900D8
-			public const int visible = 2131296472;
-			
-			// aapt resource value: 0x7F0900D9
-			public const int withText = 2131296473;
-			
-			// aapt resource value: 0x7F0900DA
-			public const int wrap_content = 2131296474;
-			
-			// aapt resource value: 0x7F0900DB
-			public const int year = 2131296475;
-			
+
+			// aapt resource value: 0x7f090027
+			public const int ALT = 2131296295;
+
+			// aapt resource value: 0x7f090028
+			public const int CTRL = 2131296296;
+
+			// aapt resource value: 0x7f09008e
+			public const int Custom = 2131296398;
+
+			// aapt resource value: 0x7f09008d
+			public const int CustomLabel = 2131296397;
+
+			// aapt resource value: 0x7f090054
+			public const int FILL = 2131296340;
+
+			// aapt resource value: 0x7f090055
+			public const int FILL_STROKE = 2131296341;
+
+			// aapt resource value: 0x7f090029
+			public const int FUNCTION = 2131296297;
+
+			// aapt resource value: 0x7f09004f
+			public const int FixedBehind = 2131296335;
+
+			// aapt resource value: 0x7f090050
+			public const int FixedFront = 2131296336;
+
+			// aapt resource value: 0x7f09002a
+			public const int META = 2131296298;
+
+			// aapt resource value: 0x7f090051
+			public const int MatchLayout = 2131296337;
+
+			// aapt resource value: 0x7f090088
+			public const int Notice = 2131296392;
+
+			// aapt resource value: 0x7f09008c
+			public const int Password = 2131296396;
+
+			// aapt resource value: 0x7f09008b
+			public const int PasswordLabel = 2131296395;
+
+			// aapt resource value: 0x7f09002b
+			public const int SHIFT = 2131296299;
+
+			// aapt resource value: 0x7f09008a
+			public const int SSID = 2131296394;
+
+			// aapt resource value: 0x7f090089
+			public const int SSIDLabel = 2131296393;
+
+			// aapt resource value: 0x7f090056
+			public const int STROKE = 2131296342;
+
+			// aapt resource value: 0x7f09002c
+			public const int SYM = 2131296300;
+
+			// aapt resource value: 0x7f090052
+			public const int Scale = 2131296338;
+
+			// aapt resource value: 0x7f090053
+			public const int Translate = 2131296339;
+
+			// aapt resource value: 0x7f0900cb
+			public const int action0 = 2131296459;
+
+			// aapt resource value: 0x7f090079
+			public const int action_bar = 2131296377;
+
+			// aapt resource value: 0x7f090001
+			public const int action_bar_activity_content = 2131296257;
+
+			// aapt resource value: 0x7f090078
+			public const int action_bar_container = 2131296376;
+
+			// aapt resource value: 0x7f090074
+			public const int action_bar_root = 2131296372;
+
+			// aapt resource value: 0x7f090002
+			public const int action_bar_spinner = 2131296258;
+
+			// aapt resource value: 0x7f090058
+			public const int action_bar_subtitle = 2131296344;
+
+			// aapt resource value: 0x7f090057
+			public const int action_bar_title = 2131296343;
+
+			// aapt resource value: 0x7f0900c8
+			public const int action_container = 2131296456;
+
+			// aapt resource value: 0x7f09007a
+			public const int action_context_bar = 2131296378;
+
+			// aapt resource value: 0x7f0900cf
+			public const int action_divider = 2131296463;
+
+			// aapt resource value: 0x7f0900c9
+			public const int action_image = 2131296457;
+
+			// aapt resource value: 0x7f090003
+			public const int action_menu_divider = 2131296259;
+
+			// aapt resource value: 0x7f090004
+			public const int action_menu_presenter = 2131296260;
+
+			// aapt resource value: 0x7f090076
+			public const int action_mode_bar = 2131296374;
+
+			// aapt resource value: 0x7f090075
+			public const int action_mode_bar_stub = 2131296373;
+
+			// aapt resource value: 0x7f090059
+			public const int action_mode_close_button = 2131296345;
+
+			// aapt resource value: 0x7f0900ca
+			public const int action_text = 2131296458;
+
+			// aapt resource value: 0x7f0900d8
+			public const int actions = 2131296472;
+
+			// aapt resource value: 0x7f09005a
+			public const int activity_chooser_view_content = 2131296346;
+
+			// aapt resource value: 0x7f090021
+			public const int add = 2131296289;
+
+			// aapt resource value: 0x7f09006d
+			public const int alertTitle = 2131296365;
+
+			// aapt resource value: 0x7f090047
+			public const int all = 2131296327;
+
+			// aapt resource value: 0x7f09002d
+			public const int always = 2131296301;
+
+			// aapt resource value: 0x7f09004b
+			public const int async = 2131296331;
+
+			// aapt resource value: 0x7f090039
+			public const int auto = 2131296313;
+
+			// aapt resource value: 0x7f090024
+			public const int beginning = 2131296292;
+
+			// aapt resource value: 0x7f09004c
+			public const int blocking = 2131296332;
+
+			// aapt resource value: 0x7f090032
+			public const int bottom = 2131296306;
+
+			// aapt resource value: 0x7f0900b3
+			public const int btnCancel = 2131296435;
+
+			// aapt resource value: 0x7f0900b5
+			public const int btnSubmit = 2131296437;
+
+			// aapt resource value: 0x7f090060
+			public const int buttonPanel = 2131296352;
+
+			// aapt resource value: 0x7f0900cc
+			public const int cancel_action = 2131296460;
+
+			// aapt resource value: 0x7f09003a
+			public const int center = 2131296314;
+
+			// aapt resource value: 0x7f09003b
+			public const int center_horizontal = 2131296315;
+
+			// aapt resource value: 0x7f09003c
+			public const int center_vertical = 2131296316;
+
+			// aapt resource value: 0x7f090070
+			public const int checkbox = 2131296368;
+
+			// aapt resource value: 0x7f0900d4
+			public const int chronometer = 2131296468;
+
+			// aapt resource value: 0x7f090043
+			public const int clip_horizontal = 2131296323;
+
+			// aapt resource value: 0x7f090044
+			public const int clip_vertical = 2131296324;
+
+			// aapt resource value: 0x7f09002e
+			public const int collapseActionView = 2131296302;
+
+			// aapt resource value: 0x7f090099
+			public const int container = 2131296409;
+
+			// aapt resource value: 0x7f0900e4
+			public const int contentFrame = 2131296484;
+
+			// aapt resource value: 0x7f090063
+			public const int contentPanel = 2131296355;
+
+			// aapt resource value: 0x7f0900b7
+			public const int content_container = 2131296439;
+
+			// aapt resource value: 0x7f09009a
+			public const int coordinator = 2131296410;
+
+			// aapt resource value: 0x7f09006a
+			public const int custom = 2131296362;
+
+			// aapt resource value: 0x7f090069
+			public const int customPanel = 2131296361;
+
+			// aapt resource value: 0x7f0900c3
+			public const int day = 2131296451;
+
+			// aapt resource value: 0x7f090077
+			public const int decor_content_parent = 2131296375;
+
+			// aapt resource value: 0x7f09005d
+			public const int default_activity_button = 2131296349;
+
+			// aapt resource value: 0x7f090094
+			public const int description = 2131296404;
+
+			// aapt resource value: 0x7f09009c
+			public const int design_bottom_sheet = 2131296412;
+
+			// aapt resource value: 0x7f0900a3
+			public const int design_menu_item_action_area = 2131296419;
+
+			// aapt resource value: 0x7f0900a2
+			public const int design_menu_item_action_area_stub = 2131296418;
+
+			// aapt resource value: 0x7f0900a1
+			public const int design_menu_item_text = 2131296417;
+
+			// aapt resource value: 0x7f0900a0
+			public const int design_navigation_view = 2131296416;
+
+			// aapt resource value: 0x7f090015
+			public const int disableHome = 2131296277;
+
+			// aapt resource value: 0x7f09007b
+			public const int edit_query = 2131296379;
+
+			// aapt resource value: 0x7f090025
+			public const int end = 2131296293;
+
+			// aapt resource value: 0x7f0900da
+			public const int end_padder = 2131296474;
+
+			// aapt resource value: 0x7f090034
+			public const int enterAlways = 2131296308;
+
+			// aapt resource value: 0x7f090035
+			public const int enterAlwaysCollapsed = 2131296309;
+
+			// aapt resource value: 0x7f090036
+			public const int exitUntilCollapsed = 2131296310;
+
+			// aapt resource value: 0x7f09005b
+			public const int expand_activities_button = 2131296347;
+
+			// aapt resource value: 0x7f09006f
+			public const int expanded_menu = 2131296367;
+
+			// aapt resource value: 0x7f090045
+			public const int fill = 2131296325;
+
+			// aapt resource value: 0x7f090046
+			public const int fill_horizontal = 2131296326;
+
+			// aapt resource value: 0x7f09003d
+			public const int fill_vertical = 2131296317;
+
+			// aapt resource value: 0x7f090095
+			public const int fingerprint_icon = 2131296405;
+
+			// aapt resource value: 0x7f090049
+			public const int @fixed = 2131296329;
+
+			// aapt resource value: 0x7f09004d
+			public const int forever = 2131296333;
+
+			// aapt resource value: 0x7f0900a8
+			public const int gd_btn_back = 2131296424;
+
+			// aapt resource value: 0x7f0900b1
+			public const int gd_btn_myLocation = 2131296433;
+
+			// aapt resource value: 0x7f0900b0
+			public const int gd_btn_save = 2131296432;
+
+			// aapt resource value: 0x7f0900ad
+			public const int gd_img_search_delete = 2131296429;
+
+			// aapt resource value: 0x7f0900af
+			public const int gd_ll_myhome = 2131296431;
+
+			// aapt resource value: 0x7f0900ab
+			public const int gd_ll_search = 2131296427;
+
+			// aapt resource value: 0x7f0900aa
+			public const int gd_mapView = 2131296426;
+
+			// aapt resource value: 0x7f0900a7
+			public const int gd_rl_topview = 2131296423;
+
+			// aapt resource value: 0x7f0900a9
+			public const int gd_tv_activity_title = 2131296425;
+
+			// aapt resource value: 0x7f0900ae
+			public const int gd_tv_radius = 2131296430;
+
+			// aapt resource value: 0x7f0900ac
+			public const int gd_tv_search_title = 2131296428;
+
+			// aapt resource value: 0x7f0900a5
+			public const int hdl_gallery_rootView = 2131296421;
+
+			// aapt resource value: 0x7f0900a6
+			public const int hdl_gallery_viewPager = 2131296422;
+
+			// aapt resource value: 0x7f0900b9
+			public const int hdl_options1 = 2131296441;
+
+			// aapt resource value: 0x7f0900ba
+			public const int hdl_options2 = 2131296442;
+
+			// aapt resource value: 0x7f0900bb
+			public const int hdl_options3 = 2131296443;
+
+			// aapt resource value: 0x7f0900b8
+			public const int hdl_pickerview_ll = 2131296440;
+
+			// aapt resource value: 0x7f090005
+			public const int home = 2131296261;
+
+			// aapt resource value: 0x7f090016
+			public const int homeAsUp = 2131296278;
+
+			// aapt resource value: 0x7f0900c4
+			public const int hour = 2131296452;
+
+			// aapt resource value: 0x7f09005f
+			public const int icon = 2131296351;
+
+			// aapt resource value: 0x7f0900d9
+			public const int icon_group = 2131296473;
+
+			// aapt resource value: 0x7f09002f
+			public const int ifRoom = 2131296303;
+
+			// aapt resource value: 0x7f09005c
+			public const int image = 2131296348;
+
+			// aapt resource value: 0x7f0900d5
+			public const int info = 2131296469;
+
+			// aapt resource value: 0x7f09004e
+			public const int italic = 2131296334;
+
+			// aapt resource value: 0x7f090000
+			public const int item_touch_helper_previous_elevation = 2131296256;
+
+			// aapt resource value: 0x7f090098
+			public const int largeLabel = 2131296408;
+
+			// aapt resource value: 0x7f09003e
+			public const int left = 2131296318;
+
+			// aapt resource value: 0x7f09000d
+			public const int line1 = 2131296269;
+
+			// aapt resource value: 0x7f09000e
+			public const int line3 = 2131296270;
+
+			// aapt resource value: 0x7f090012
+			public const int listMode = 2131296274;
+
+			// aapt resource value: 0x7f09005e
+			public const int list_item = 2131296350;
+
+			// aapt resource value: 0x7f0900e6
+			public const int masked = 2131296486;
+
+			// aapt resource value: 0x7f0900ce
+			public const int media_actions = 2131296462;
+
+			// aapt resource value: 0x7f0900e0
+			public const int message = 2131296480;
+
+			// aapt resource value: 0x7f090026
+			public const int middle = 2131296294;
+
+			// aapt resource value: 0x7f0900c5
+			public const int min = 2131296453;
+
+			// aapt resource value: 0x7f090048
+			public const int mini = 2131296328;
+
+			// aapt resource value: 0x7f0900c2
+			public const int month = 2131296450;
+
+			// aapt resource value: 0x7f09001c
+			public const int multiply = 2131296284;
+
+			// aapt resource value: 0x7f0900c7
+			public const int myButton = 2131296455;
+
+			// aapt resource value: 0x7f09009f
+			public const int navigation_header_container = 2131296415;
+
+			// aapt resource value: 0x7f090030
+			public const int never = 2131296304;
+
+			// aapt resource value: 0x7f090017
+			public const int none = 2131296279;
+
+			// aapt resource value: 0x7f090013
+			public const int normal = 2131296275;
+
+			// aapt resource value: 0x7f0900d7
+			public const int notification_background = 2131296471;
+
+			// aapt resource value: 0x7f0900d1
+			public const int notification_main_column = 2131296465;
+
+			// aapt resource value: 0x7f0900d0
+			public const int notification_main_column_container = 2131296464;
+
+			// aapt resource value: 0x7f0900bd
+			public const int options1 = 2131296445;
+
+			// aapt resource value: 0x7f0900be
+			public const int options2 = 2131296446;
+
+			// aapt resource value: 0x7f0900bf
+			public const int options3 = 2131296447;
+
+			// aapt resource value: 0x7f0900bc
+			public const int optionspicker = 2131296444;
+
+			// aapt resource value: 0x7f0900b6
+			public const int outmost_container = 2131296438;
+
+			// aapt resource value: 0x7f090041
+			public const int parallax = 2131296321;
+
+			// aapt resource value: 0x7f090062
+			public const int parentPanel = 2131296354;
+
+			// aapt resource value: 0x7f090042
+			public const int pin = 2131296322;
+
+			// aapt resource value: 0x7f090006
+			public const int progress_circular = 2131296262;
+
+			// aapt resource value: 0x7f090007
+			public const int progress_horizontal = 2131296263;
+
+			// aapt resource value: 0x7f090072
+			public const int radio = 2131296370;
+
+			// aapt resource value: 0x7f09003f
+			public const int right = 2131296319;
+
+			// aapt resource value: 0x7f0900d6
+			public const int right_icon = 2131296470;
+
+			// aapt resource value: 0x7f0900d2
+			public const int right_side = 2131296466;
+
+			// aapt resource value: 0x7f0900b2
+			public const int rv_topbar = 2131296434;
+
+			// aapt resource value: 0x7f09001d
+			public const int screen = 2131296285;
+
+			// aapt resource value: 0x7f090037
+			public const int scroll = 2131296311;
+
+			// aapt resource value: 0x7f090068
+			public const int scrollIndicatorDown = 2131296360;
+
+			// aapt resource value: 0x7f090064
+			public const int scrollIndicatorUp = 2131296356;
+
+			// aapt resource value: 0x7f090065
+			public const int scrollView = 2131296357;
+
+			// aapt resource value: 0x7f09004a
+			public const int scrollable = 2131296330;
+
+			// aapt resource value: 0x7f09007d
+			public const int search_badge = 2131296381;
+
+			// aapt resource value: 0x7f09007c
+			public const int search_bar = 2131296380;
+
+			// aapt resource value: 0x7f09007e
+			public const int search_button = 2131296382;
+
+			// aapt resource value: 0x7f090083
+			public const int search_close_btn = 2131296387;
+
+			// aapt resource value: 0x7f09007f
+			public const int search_edit_frame = 2131296383;
+
+			// aapt resource value: 0x7f090085
+			public const int search_go_btn = 2131296389;
+
+			// aapt resource value: 0x7f090080
+			public const int search_mag_icon = 2131296384;
+
+			// aapt resource value: 0x7f090081
+			public const int search_plate = 2131296385;
+
+			// aapt resource value: 0x7f090082
+			public const int search_src_text = 2131296386;
+
+			// aapt resource value: 0x7f090086
+			public const int search_voice_btn = 2131296390;
+
+			// aapt resource value: 0x7f0900c6
+			public const int second = 2131296454;
+
+			// aapt resource value: 0x7f090087
+			public const int select_dialog_listview = 2131296391;
+
+			// aapt resource value: 0x7f090071
+			public const int shortcut = 2131296369;
+
+			// aapt resource value: 0x7f090018
+			public const int showCustom = 2131296280;
+
+			// aapt resource value: 0x7f090019
+			public const int showHome = 2131296281;
+
+			// aapt resource value: 0x7f09001a
+			public const int showTitle = 2131296282;
+
+			// aapt resource value: 0x7f090097
+			public const int smallLabel = 2131296407;
+
+			// aapt resource value: 0x7f09009e
+			public const int snackbar_action = 2131296414;
+
+			// aapt resource value: 0x7f09009d
+			public const int snackbar_text = 2131296413;
+
+			// aapt resource value: 0x7f090038
+			public const int snap = 2131296312;
+
+			// aapt resource value: 0x7f090061
+			public const int spacer = 2131296353;
+
+			// aapt resource value: 0x7f090008
+			public const int split_action_bar = 2131296264;
+
+			// aapt resource value: 0x7f09001e
+			public const int src_atop = 2131296286;
+
+			// aapt resource value: 0x7f09001f
+			public const int src_in = 2131296287;
+
+			// aapt resource value: 0x7f090020
+			public const int src_over = 2131296288;
+
+			// aapt resource value: 0x7f0900db
+			public const int srl_classics_arrow = 2131296475;
+
+			// aapt resource value: 0x7f0900de
+			public const int srl_classics_center = 2131296478;
+
+			// aapt resource value: 0x7f0900dd
+			public const int srl_classics_progress = 2131296477;
+
+			// aapt resource value: 0x7f0900dc
+			public const int srl_classics_title = 2131296476;
+
+			// aapt resource value: 0x7f0900df
+			public const int srl_classics_update = 2131296479;
+
+			// aapt resource value: 0x7f090040
+			public const int start = 2131296320;
+
+			// aapt resource value: 0x7f09008f
+			public const int startV1 = 2131296399;
+
+			// aapt resource value: 0x7f090091
+			public const int startV1V4 = 2131296401;
+
+			// aapt resource value: 0x7f090090
+			public const int startV4 = 2131296400;
+
+			// aapt resource value: 0x7f090096
+			public const int status = 2131296406;
+
+			// aapt resource value: 0x7f0900cd
+			public const int status_bar_latest_event_content = 2131296461;
+
+			// aapt resource value: 0x7f090092
+			public const int stop = 2131296402;
+
+			// aapt resource value: 0x7f090073
+			public const int submenuarrow = 2131296371;
+
+			// aapt resource value: 0x7f090084
+			public const int submit_area = 2131296388;
+
+			// aapt resource value: 0x7f090093
+			public const int subtitle = 2131296403;
+
+			// aapt resource value: 0x7f090014
+			public const int tabMode = 2131296276;
+
+			// aapt resource value: 0x7f09000f
+			public const int text = 2131296271;
+
+			// aapt resource value: 0x7f090010
+			public const int text2 = 2131296272;
+
+			// aapt resource value: 0x7f090067
+			public const int textSpacerNoButtons = 2131296359;
+
+			// aapt resource value: 0x7f090066
+			public const int textSpacerNoTitle = 2131296358;
+
+			// aapt resource value: 0x7f0900a4
+			public const int text_input_password_toggle = 2131296420;
+
+			// aapt resource value: 0x7f09000a
+			public const int textinput_counter = 2131296266;
+
+			// aapt resource value: 0x7f09000b
+			public const int textinput_error = 2131296267;
+
+			// aapt resource value: 0x7f0900d3
+			public const int time = 2131296467;
+
+			// aapt resource value: 0x7f0900c0
+			public const int timepicker = 2131296448;
+
+			// aapt resource value: 0x7f090011
+			public const int title = 2131296273;
+
+			// aapt resource value: 0x7f09006e
+			public const int titleDividerNoCustom = 2131296366;
+
+			// aapt resource value: 0x7f09006c
+			public const int title_template = 2131296364;
+
+			// aapt resource value: 0x7f090033
+			public const int top = 2131296307;
+
+			// aapt resource value: 0x7f09006b
+			public const int topPanel = 2131296363;
+
+			// aapt resource value: 0x7f09009b
+			public const int touch_outside = 2131296411;
+
+			// aapt resource value: 0x7f0900b4
+			public const int tvTitle = 2131296436;
+
+			// aapt resource value: 0x7f0900e2
+			public const int tv_zxing_back = 2131296482;
+
+			// aapt resource value: 0x7f0900e3
+			public const int tv_zxing_flash = 2131296483;
+
+			// aapt resource value: 0x7f0900e1
+			public const int tv_zxing_scan = 2131296481;
+
+			// aapt resource value: 0x7f090022
+			public const int uniform = 2131296290;
+
+			// aapt resource value: 0x7f090009
+			public const int up = 2131296265;
+
+			// aapt resource value: 0x7f09001b
+			public const int useLogo = 2131296283;
+
+			// aapt resource value: 0x7f09000c
+			public const int view_offset_helper = 2131296268;
+
+			// aapt resource value: 0x7f0900e5
+			public const int visible = 2131296485;
+
+			// aapt resource value: 0x7f090031
+			public const int withText = 2131296305;
+
+			// aapt resource value: 0x7f090023
+			public const int wrap_content = 2131296291;
+
+			// aapt resource value: 0x7f0900c1
+			public const int year = 2131296449;
+
 			static Id()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Id()
 			{
 			}
 		}
-		
+
 		public partial class Integer
 		{
-			
-			// aapt resource value: 0x7F0A0000
-			public const int abc_config_activityDefaultDur = 2131361792;
-			
-			// aapt resource value: 0x7F0A0001
-			public const int abc_config_activityShortDur = 2131361793;
-			
-			// aapt resource value: 0x7F0A0002
-			public const int animation_default_duration = 2131361794;
-			
-			// aapt resource value: 0x7F0A0003
-			public const int app_bar_elevation_anim_duration = 2131361795;
-			
-			// aapt resource value: 0x7F0A0004
-			public const int bottom_sheet_slide_duration = 2131361796;
-			
-			// aapt resource value: 0x7F0A0005
-			public const int cancel_button_image_alpha = 2131361797;
-			
-			// aapt resource value: 0x7F0A0006
-			public const int config_tooltipAnimTime = 2131361798;
-			
-			// aapt resource value: 0x7F0A0007
-			public const int design_snackbar_text_max_lines = 2131361799;
-			
-			// aapt resource value: 0x7F0A0008
-			public const int hide_password_duration = 2131361800;
-			
-			// aapt resource value: 0x7F0A0009
-			public const int show_password_duration = 2131361801;
-			
-			// aapt resource value: 0x7F0A000A
-			public const int status_bar_notification_info_maxnum = 2131361802;
-			
+
+			// aapt resource value: 0x7f0e0000
+			public const int abc_config_activityDefaultDur = 2131623936;
+
+			// aapt resource value: 0x7f0e0001
+			public const int abc_config_activityShortDur = 2131623937;
+
+			// aapt resource value: 0x7f0e000a
+			public const int animation_default_duration = 2131623946;
+
+			// aapt resource value: 0x7f0e0005
+			public const int app_bar_elevation_anim_duration = 2131623941;
+
+			// aapt resource value: 0x7f0e0006
+			public const int bottom_sheet_slide_duration = 2131623942;
+
+			// aapt resource value: 0x7f0e0002
+			public const int cancel_button_image_alpha = 2131623938;
+
+			// aapt resource value: 0x7f0e0003
+			public const int config_tooltipAnimTime = 2131623939;
+
+			// aapt resource value: 0x7f0e0004
+			public const int design_snackbar_text_max_lines = 2131623940;
+
+			// aapt resource value: 0x7f0e0007
+			public const int hide_password_duration = 2131623943;
+
+			// aapt resource value: 0x7f0e0008
+			public const int show_password_duration = 2131623944;
+
+			// aapt resource value: 0x7f0e0009
+			public const int status_bar_notification_info_maxnum = 2131623945;
+
 			static Integer()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Integer()
 			{
 			}
 		}
-		
+
 		public partial class Layout
 		{
-			
-			// aapt resource value: 0x7F0B0000
-			public const int abc_action_bar_title_item = 2131427328;
-			
-			// aapt resource value: 0x7F0B0001
-			public const int abc_action_bar_up_container = 2131427329;
-			
-			// aapt resource value: 0x7F0B0002
-			public const int abc_action_bar_view_list_nav_layout = 2131427330;
-			
-			// aapt resource value: 0x7F0B0003
-			public const int abc_action_menu_item_layout = 2131427331;
-			
-			// aapt resource value: 0x7F0B0004
-			public const int abc_action_menu_layout = 2131427332;
-			
-			// aapt resource value: 0x7F0B0005
-			public const int abc_action_mode_bar = 2131427333;
-			
-			// aapt resource value: 0x7F0B0006
-			public const int abc_action_mode_close_item_material = 2131427334;
-			
-			// aapt resource value: 0x7F0B0007
-			public const int abc_activity_chooser_view = 2131427335;
-			
-			// aapt resource value: 0x7F0B0008
-			public const int abc_activity_chooser_view_list_item = 2131427336;
-			
-			// aapt resource value: 0x7F0B0009
-			public const int abc_alert_dialog_button_bar_material = 2131427337;
-			
-			// aapt resource value: 0x7F0B000A
-			public const int abc_alert_dialog_material = 2131427338;
-			
-			// aapt resource value: 0x7F0B000B
-			public const int abc_alert_dialog_title_material = 2131427339;
-			
-			// aapt resource value: 0x7F0B000C
-			public const int abc_dialog_title_material = 2131427340;
-			
-			// aapt resource value: 0x7F0B000D
-			public const int abc_expanded_menu_layout = 2131427341;
-			
-			// aapt resource value: 0x7F0B000E
-			public const int abc_list_menu_item_checkbox = 2131427342;
-			
-			// aapt resource value: 0x7F0B000F
-			public const int abc_list_menu_item_icon = 2131427343;
-			
-			// aapt resource value: 0x7F0B0010
-			public const int abc_list_menu_item_layout = 2131427344;
-			
-			// aapt resource value: 0x7F0B0011
-			public const int abc_list_menu_item_radio = 2131427345;
-			
-			// aapt resource value: 0x7F0B0012
-			public const int abc_popup_menu_header_item_layout = 2131427346;
-			
-			// aapt resource value: 0x7F0B0013
-			public const int abc_popup_menu_item_layout = 2131427347;
-			
-			// aapt resource value: 0x7F0B0014
-			public const int abc_screen_content_include = 2131427348;
-			
-			// aapt resource value: 0x7F0B0015
-			public const int abc_screen_simple = 2131427349;
-			
-			// aapt resource value: 0x7F0B0016
-			public const int abc_screen_simple_overlay_action_mode = 2131427350;
-			
-			// aapt resource value: 0x7F0B0017
-			public const int abc_screen_toolbar = 2131427351;
-			
-			// aapt resource value: 0x7F0B0018
-			public const int abc_search_dropdown_item_icons_2line = 2131427352;
-			
-			// aapt resource value: 0x7F0B0019
-			public const int abc_search_view = 2131427353;
-			
-			// aapt resource value: 0x7F0B001A
-			public const int abc_select_dialog_material = 2131427354;
-			
-			// aapt resource value: 0x7F0B001B
-			public const int biometric_prompt_dialog_content = 2131427355;
-			
-			// aapt resource value: 0x7F0B001C
-			public const int design_bottom_navigation_item = 2131427356;
-			
-			// aapt resource value: 0x7F0B001D
-			public const int design_bottom_sheet_dialog = 2131427357;
-			
-			// aapt resource value: 0x7F0B001E
-			public const int design_layout_snackbar = 2131427358;
-			
-			// aapt resource value: 0x7F0B001F
-			public const int design_layout_snackbar_include = 2131427359;
-			
-			// aapt resource value: 0x7F0B0020
-			public const int design_layout_tab_icon = 2131427360;
-			
-			// aapt resource value: 0x7F0B0021
-			public const int design_layout_tab_text = 2131427361;
-			
-			// aapt resource value: 0x7F0B0022
-			public const int design_menu_item_action_area = 2131427362;
-			
-			// aapt resource value: 0x7F0B0023
-			public const int design_navigation_item = 2131427363;
-			
-			// aapt resource value: 0x7F0B0024
-			public const int design_navigation_item_header = 2131427364;
-			
-			// aapt resource value: 0x7F0B0025
-			public const int design_navigation_item_separator = 2131427365;
-			
-			// aapt resource value: 0x7F0B0026
-			public const int design_navigation_item_subheader = 2131427366;
-			
-			// aapt resource value: 0x7F0B0027
-			public const int design_navigation_menu = 2131427367;
-			
-			// aapt resource value: 0x7F0B0028
-			public const int design_navigation_menu_item = 2131427368;
-			
-			// aapt resource value: 0x7F0B0029
-			public const int design_text_input_password_icon = 2131427369;
-			
-			// aapt resource value: 0x7F0B002A
-			public const int hdl_gallery_banner_view_layout = 2131427370;
-			
-			// aapt resource value: 0x7F0B002B
-			public const int hdl_widget_activity_crop_image = 2131427371;
-			
-			// aapt resource value: 0x7F0B002C
-			public const int hdl_widget_activity_geofence_round = 2131427372;
-			
-			// aapt resource value: 0x7F0B002D
-			public const int hdl_widget_air_button = 2131427373;
-			
-			// aapt resource value: 0x7F0B002E
-			public const int hdl_widget_include_pickerview_topbar = 2131427374;
-			
-			// aapt resource value: 0x7F0B002F
-			public const int hdl_widget_layout_basepickerview = 2131427375;
-			
-			// aapt resource value: 0x7F0B0030
-			public const int hdl_widget_pickerview = 2131427376;
-			
-			// aapt resource value: 0x7F0B0031
-			public const int hdl_widget_pickerview_options = 2131427377;
-			
-			// aapt resource value: 0x7F0B0032
-			public const int hdl_widget_pickerview_time = 2131427378;
-			
-			// aapt resource value: 0x7F0B0033
-			public const int Main = 2131427379;
-			
-			// aapt resource value: 0x7F0B0034
-			public const int notification_action = 2131427380;
-			
-			// aapt resource value: 0x7F0B0035
-			public const int notification_action_tombstone = 2131427381;
-			
-			// aapt resource value: 0x7F0B0036
-			public const int notification_media_action = 2131427382;
-			
-			// aapt resource value: 0x7F0B0037
-			public const int notification_media_cancel_action = 2131427383;
-			
-			// aapt resource value: 0x7F0B0038
-			public const int notification_template_big_media = 2131427384;
-			
-			// aapt resource value: 0x7F0B0039
-			public const int notification_template_big_media_custom = 2131427385;
-			
-			// aapt resource value: 0x7F0B003A
-			public const int notification_template_big_media_narrow = 2131427386;
-			
-			// aapt resource value: 0x7F0B003B
-			public const int notification_template_big_media_narrow_custom = 2131427387;
-			
-			// aapt resource value: 0x7F0B003C
-			public const int notification_template_custom_big = 2131427388;
-			
-			// aapt resource value: 0x7F0B003D
-			public const int notification_template_icon_group = 2131427389;
-			
-			// aapt resource value: 0x7F0B003E
-			public const int notification_template_lines_media = 2131427390;
-			
-			// aapt resource value: 0x7F0B003F
-			public const int notification_template_media = 2131427391;
-			
-			// aapt resource value: 0x7F0B0040
-			public const int notification_template_media_custom = 2131427392;
-			
-			// aapt resource value: 0x7F0B0041
-			public const int notification_template_part_chronometer = 2131427393;
-			
-			// aapt resource value: 0x7F0B0042
-			public const int notification_template_part_time = 2131427394;
-			
-			// aapt resource value: 0x7F0B0043
-			public const int select_dialog_item_material = 2131427395;
-			
-			// aapt resource value: 0x7F0B0044
-			public const int select_dialog_multichoice_material = 2131427396;
-			
-			// aapt resource value: 0x7F0B0045
-			public const int select_dialog_singlechoice_material = 2131427397;
-			
-			// aapt resource value: 0x7F0B0046
-			public const int srl_classics_footer = 2131427398;
-			
-			// aapt resource value: 0x7F0B0047
-			public const int srl_classics_header = 2131427399;
-			
-			// aapt resource value: 0x7F0B0048
-			public const int support_simple_spinner_dropdown_item = 2131427400;
-			
-			// aapt resource value: 0x7F0B0049
-			public const int tooltip = 2131427401;
-			
-			// aapt resource value: 0x7F0B004B
-			public const int zxingscanneractivitylayout = 2131427403;
-			
-			// aapt resource value: 0x7F0B004C
-			public const int zxingscannerfragmentlayout = 2131427404;
-			
-			// aapt resource value: 0x7F0B004A
-			public const int zxing_layout = 2131427402;
-			
+
+			// aapt resource value: 0x7f040000
+			public const int abc_action_bar_title_item = 2130968576;
+
+			// aapt resource value: 0x7f040001
+			public const int abc_action_bar_up_container = 2130968577;
+
+			// aapt resource value: 0x7f040002
+			public const int abc_action_bar_view_list_nav_layout = 2130968578;
+
+			// aapt resource value: 0x7f040003
+			public const int abc_action_menu_item_layout = 2130968579;
+
+			// aapt resource value: 0x7f040004
+			public const int abc_action_menu_layout = 2130968580;
+
+			// aapt resource value: 0x7f040005
+			public const int abc_action_mode_bar = 2130968581;
+
+			// aapt resource value: 0x7f040006
+			public const int abc_action_mode_close_item_material = 2130968582;
+
+			// aapt resource value: 0x7f040007
+			public const int abc_activity_chooser_view = 2130968583;
+
+			// aapt resource value: 0x7f040008
+			public const int abc_activity_chooser_view_list_item = 2130968584;
+
+			// aapt resource value: 0x7f040009
+			public const int abc_alert_dialog_button_bar_material = 2130968585;
+
+			// aapt resource value: 0x7f04000a
+			public const int abc_alert_dialog_material = 2130968586;
+
+			// aapt resource value: 0x7f04000b
+			public const int abc_alert_dialog_title_material = 2130968587;
+
+			// aapt resource value: 0x7f04000c
+			public const int abc_dialog_title_material = 2130968588;
+
+			// aapt resource value: 0x7f04000d
+			public const int abc_expanded_menu_layout = 2130968589;
+
+			// aapt resource value: 0x7f04000e
+			public const int abc_list_menu_item_checkbox = 2130968590;
+
+			// aapt resource value: 0x7f04000f
+			public const int abc_list_menu_item_icon = 2130968591;
+
+			// aapt resource value: 0x7f040010
+			public const int abc_list_menu_item_layout = 2130968592;
+
+			// aapt resource value: 0x7f040011
+			public const int abc_list_menu_item_radio = 2130968593;
+
+			// aapt resource value: 0x7f040012
+			public const int abc_popup_menu_header_item_layout = 2130968594;
+
+			// aapt resource value: 0x7f040013
+			public const int abc_popup_menu_item_layout = 2130968595;
+
+			// aapt resource value: 0x7f040014
+			public const int abc_screen_content_include = 2130968596;
+
+			// aapt resource value: 0x7f040015
+			public const int abc_screen_simple = 2130968597;
+
+			// aapt resource value: 0x7f040016
+			public const int abc_screen_simple_overlay_action_mode = 2130968598;
+
+			// aapt resource value: 0x7f040017
+			public const int abc_screen_toolbar = 2130968599;
+
+			// aapt resource value: 0x7f040018
+			public const int abc_search_dropdown_item_icons_2line = 2130968600;
+
+			// aapt resource value: 0x7f040019
+			public const int abc_search_view = 2130968601;
+
+			// aapt resource value: 0x7f04001a
+			public const int abc_select_dialog_material = 2130968602;
+
+			// aapt resource value: 0x7f04001b
+			public const int activity_elian = 2130968603;
+
+			// aapt resource value: 0x7f04001c
+			public const int biometric_prompt_dialog_content = 2130968604;
+
+			// aapt resource value: 0x7f04001d
+			public const int design_bottom_navigation_item = 2130968605;
+
+			// aapt resource value: 0x7f04001e
+			public const int design_bottom_sheet_dialog = 2130968606;
+
+			// aapt resource value: 0x7f04001f
+			public const int design_layout_snackbar = 2130968607;
+
+			// aapt resource value: 0x7f040020
+			public const int design_layout_snackbar_include = 2130968608;
+
+			// aapt resource value: 0x7f040021
+			public const int design_layout_tab_icon = 2130968609;
+
+			// aapt resource value: 0x7f040022
+			public const int design_layout_tab_text = 2130968610;
+
+			// aapt resource value: 0x7f040023
+			public const int design_menu_item_action_area = 2130968611;
+
+			// aapt resource value: 0x7f040024
+			public const int design_navigation_item = 2130968612;
+
+			// aapt resource value: 0x7f040025
+			public const int design_navigation_item_header = 2130968613;
+
+			// aapt resource value: 0x7f040026
+			public const int design_navigation_item_separator = 2130968614;
+
+			// aapt resource value: 0x7f040027
+			public const int design_navigation_item_subheader = 2130968615;
+
+			// aapt resource value: 0x7f040028
+			public const int design_navigation_menu = 2130968616;
+
+			// aapt resource value: 0x7f040029
+			public const int design_navigation_menu_item = 2130968617;
+
+			// aapt resource value: 0x7f04002a
+			public const int design_text_input_password_icon = 2130968618;
+
+			// aapt resource value: 0x7f04002b
+			public const int hdl_gallery_banner_view_layout = 2130968619;
+
+			// aapt resource value: 0x7f04002c
+			public const int hdl_widget_activity_crop_image = 2130968620;
+
+			// aapt resource value: 0x7f04002d
+			public const int hdl_widget_activity_geofence_round = 2130968621;
+
+			// aapt resource value: 0x7f04002e
+			public const int hdl_widget_air_button = 2130968622;
+
+			// aapt resource value: 0x7f04002f
+			public const int hdl_widget_include_pickerview_topbar = 2130968623;
+
+			// aapt resource value: 0x7f040030
+			public const int hdl_widget_layout_basepickerview = 2130968624;
+
+			// aapt resource value: 0x7f040031
+			public const int hdl_widget_pickerview = 2130968625;
+
+			// aapt resource value: 0x7f040032
+			public const int hdl_widget_pickerview_options = 2130968626;
+
+			// aapt resource value: 0x7f040033
+			public const int hdl_widget_pickerview_time = 2130968627;
+
+			// aapt resource value: 0x7f040034
+			public const int Main = 2130968628;
+
+			// aapt resource value: 0x7f040035
+			public const int notification_action = 2130968629;
+
+			// aapt resource value: 0x7f040036
+			public const int notification_action_tombstone = 2130968630;
+
+			// aapt resource value: 0x7f040037
+			public const int notification_media_action = 2130968631;
+
+			// aapt resource value: 0x7f040038
+			public const int notification_media_cancel_action = 2130968632;
+
+			// aapt resource value: 0x7f040039
+			public const int notification_template_big_media = 2130968633;
+
+			// aapt resource value: 0x7f04003a
+			public const int notification_template_big_media_custom = 2130968634;
+
+			// aapt resource value: 0x7f04003b
+			public const int notification_template_big_media_narrow = 2130968635;
+
+			// aapt resource value: 0x7f04003c
+			public const int notification_template_big_media_narrow_custom = 2130968636;
+
+			// aapt resource value: 0x7f04003d
+			public const int notification_template_custom_big = 2130968637;
+
+			// aapt resource value: 0x7f04003e
+			public const int notification_template_icon_group = 2130968638;
+
+			// aapt resource value: 0x7f04003f
+			public const int notification_template_lines_media = 2130968639;
+
+			// aapt resource value: 0x7f040040
+			public const int notification_template_media = 2130968640;
+
+			// aapt resource value: 0x7f040041
+			public const int notification_template_media_custom = 2130968641;
+
+			// aapt resource value: 0x7f040042
+			public const int notification_template_part_chronometer = 2130968642;
+
+			// aapt resource value: 0x7f040043
+			public const int notification_template_part_time = 2130968643;
+
+			// aapt resource value: 0x7f040044
+			public const int select_dialog_item_material = 2130968644;
+
+			// aapt resource value: 0x7f040045
+			public const int select_dialog_multichoice_material = 2130968645;
+
+			// aapt resource value: 0x7f040046
+			public const int select_dialog_singlechoice_material = 2130968646;
+
+			// aapt resource value: 0x7f040047
+			public const int srl_classics_footer = 2130968647;
+
+			// aapt resource value: 0x7f040048
+			public const int srl_classics_header = 2130968648;
+
+			// aapt resource value: 0x7f040049
+			public const int support_simple_spinner_dropdown_item = 2130968649;
+
+			// aapt resource value: 0x7f04004a
+			public const int tooltip = 2130968650;
+
+			// aapt resource value: 0x7f04004b
+			public const int zxing_layout = 2130968651;
+
+			// aapt resource value: 0x7f04004c
+			public const int zxingscanneractivitylayout = 2130968652;
+
+			// aapt resource value: 0x7f04004d
+			public const int zxingscannerfragmentlayout = 2130968653;
+
 			static Layout()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Layout()
 			{
 			}
 		}
-		
+
 		public partial class Mipmap
 		{
-			
-			// aapt resource value: 0x7F0C0000
-			public const int Icon = 2131492864;
-			
+
+			// aapt resource value: 0x7f030000
+			public const int Icon = 2130903040;
+
 			static Mipmap()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Mipmap()
 			{
 			}
 		}
-		
+
 		public partial class String
 		{
-			
-			// aapt resource value: 0x7F0D0000
-			public const int abc_action_bar_home_description = 2131558400;
-			
-			// aapt resource value: 0x7F0D0001
-			public const int abc_action_bar_home_description_format = 2131558401;
-			
-			// aapt resource value: 0x7F0D0002
-			public const int abc_action_bar_home_subtitle_description_format = 2131558402;
-			
-			// aapt resource value: 0x7F0D0003
-			public const int abc_action_bar_up_description = 2131558403;
-			
-			// aapt resource value: 0x7F0D0004
-			public const int abc_action_menu_overflow_description = 2131558404;
-			
-			// aapt resource value: 0x7F0D0005
-			public const int abc_action_mode_done = 2131558405;
-			
-			// aapt resource value: 0x7F0D0007
-			public const int abc_activitychooserview_choose_application = 2131558407;
-			
-			// aapt resource value: 0x7F0D0006
-			public const int abc_activity_chooser_view_see_all = 2131558406;
-			
-			// aapt resource value: 0x7F0D0008
-			public const int abc_capital_off = 2131558408;
-			
-			// aapt resource value: 0x7F0D0009
-			public const int abc_capital_on = 2131558409;
-			
-			// aapt resource value: 0x7F0D000A
-			public const int abc_font_family_body_1_material = 2131558410;
-			
-			// aapt resource value: 0x7F0D000B
-			public const int abc_font_family_body_2_material = 2131558411;
-			
-			// aapt resource value: 0x7F0D000C
-			public const int abc_font_family_button_material = 2131558412;
-			
-			// aapt resource value: 0x7F0D000D
-			public const int abc_font_family_caption_material = 2131558413;
-			
-			// aapt resource value: 0x7F0D000E
-			public const int abc_font_family_display_1_material = 2131558414;
-			
-			// aapt resource value: 0x7F0D000F
-			public const int abc_font_family_display_2_material = 2131558415;
-			
-			// aapt resource value: 0x7F0D0010
-			public const int abc_font_family_display_3_material = 2131558416;
-			
-			// aapt resource value: 0x7F0D0011
-			public const int abc_font_family_display_4_material = 2131558417;
-			
-			// aapt resource value: 0x7F0D0012
-			public const int abc_font_family_headline_material = 2131558418;
-			
-			// aapt resource value: 0x7F0D0013
-			public const int abc_font_family_menu_material = 2131558419;
-			
-			// aapt resource value: 0x7F0D0014
-			public const int abc_font_family_subhead_material = 2131558420;
-			
-			// aapt resource value: 0x7F0D0015
-			public const int abc_font_family_title_material = 2131558421;
-			
-			// aapt resource value: 0x7F0D0017
-			public const int abc_searchview_description_clear = 2131558423;
-			
-			// aapt resource value: 0x7F0D0018
-			public const int abc_searchview_description_query = 2131558424;
-			
-			// aapt resource value: 0x7F0D0019
-			public const int abc_searchview_description_search = 2131558425;
-			
-			// aapt resource value: 0x7F0D001A
-			public const int abc_searchview_description_submit = 2131558426;
-			
-			// aapt resource value: 0x7F0D001B
-			public const int abc_searchview_description_voice = 2131558427;
-			
-			// aapt resource value: 0x7F0D0016
-			public const int abc_search_hint = 2131558422;
-			
-			// aapt resource value: 0x7F0D001C
-			public const int abc_shareactionprovider_share_with = 2131558428;
-			
-			// aapt resource value: 0x7F0D001D
-			public const int abc_shareactionprovider_share_with_application = 2131558429;
-			
-			// aapt resource value: 0x7F0D001E
-			public const int abc_toolbar_collapse_description = 2131558430;
-			
-			// aapt resource value: 0x7F0D0020
-			public const int appbar_scrolling_view_behavior = 2131558432;
-			
-			// aapt resource value: 0x7F0D001F
-			public const int app_name = 2131558431;
-			
-			// aapt resource value: 0x7F0D0021
-			public const int bottom_sheet_behavior = 2131558433;
-			
-			// aapt resource value: 0x7F0D0022
-			public const int character_counter_pattern = 2131558434;
-			
-			// aapt resource value: 0x7F0D0023
-			public const int gd_activity_title = 2131558435;
-			
-			// aapt resource value: 0x7F0D0024
-			public const int gd_cancel = 2131558436;
-			
-			// aapt resource value: 0x7F0D0025
-			public const int gd_myhome = 2131558437;
-			
-			// aapt resource value: 0x7F0D0026
-			public const int gd_notifyMsg = 2131558438;
-			
-			// aapt resource value: 0x7F0D0027
-			public const int gd_notifyTitle = 2131558439;
-			
-			// aapt resource value: 0x7F0D0028
-			public const int gd_save = 2131558440;
-			
-			// aapt resource value: 0x7F0D0029
-			public const int gd_search_tip = 2131558441;
-			
-			// aapt resource value: 0x7F0D002A
-			public const int gd_select_distance = 2131558442;
-			
-			// aapt resource value: 0x7F0D002B
-			public const int gd_setting = 2131558443;
-			
-			// aapt resource value: 0x7F0D002C
-			public const int hello = 2131558444;
-			
-			// aapt resource value: 0x7F0D002D
-			public const int not_recognized_fingerprint_hint = 2131558445;
-			
-			// aapt resource value: 0x7F0D002E
-			public const int password_toggle_content_description = 2131558446;
-			
-			// aapt resource value: 0x7F0D002F
-			public const int path_password_eye = 2131558447;
-			
-			// aapt resource value: 0x7F0D0030
-			public const int path_password_eye_mask_strike_through = 2131558448;
-			
-			// aapt resource value: 0x7F0D0031
-			public const int path_password_eye_mask_visible = 2131558449;
-			
-			// aapt resource value: 0x7F0D0032
-			public const int path_password_strike_through = 2131558450;
-			
-			// aapt resource value: 0x7F0D0033
-			public const int pickerview_cancel = 2131558451;
-			
-			// aapt resource value: 0x7F0D0034
-			public const int pickerview_day = 2131558452;
-			
-			// aapt resource value: 0x7F0D0035
-			public const int pickerview_hours = 2131558453;
-			
-			// aapt resource value: 0x7F0D0036
-			public const int pickerview_minutes = 2131558454;
-			
-			// aapt resource value: 0x7F0D0037
-			public const int pickerview_month = 2131558455;
-			
-			// aapt resource value: 0x7F0D0038
-			public const int pickerview_seconds = 2131558456;
-			
-			// aapt resource value: 0x7F0D0039
-			public const int pickerview_submit = 2131558457;
-			
-			// aapt resource value: 0x7F0D003A
-			public const int pickerview_year = 2131558458;
-			
-			// aapt resource value: 0x7F0D003B
-			public const int search_menu_title = 2131558459;
-			
-			// aapt resource value: 0x7F0D003C
-			public const int srl_component_falsify = 2131558460;
-			
-			// aapt resource value: 0x7F0D003D
-			public const int srl_content_empty = 2131558461;
-			
-			// aapt resource value: 0x7F0D003E
-			public const int srl_footer_failed = 2131558462;
-			
-			// aapt resource value: 0x7F0D003F
-			public const int srl_footer_finish = 2131558463;
-			
-			// aapt resource value: 0x7F0D0040
-			public const int srl_footer_loading = 2131558464;
-			
-			// aapt resource value: 0x7F0D0041
-			public const int srl_footer_nothing = 2131558465;
-			
-			// aapt resource value: 0x7F0D0042
-			public const int srl_footer_pulling = 2131558466;
-			
-			// aapt resource value: 0x7F0D0043
-			public const int srl_footer_refreshing = 2131558467;
-			
-			// aapt resource value: 0x7F0D0044
-			public const int srl_footer_release = 2131558468;
-			
-			// aapt resource value: 0x7F0D0045
-			public const int srl_header_failed = 2131558469;
-			
-			// aapt resource value: 0x7F0D0046
-			public const int srl_header_finish = 2131558470;
-			
-			// aapt resource value: 0x7F0D0047
-			public const int srl_header_loading = 2131558471;
-			
-			// aapt resource value: 0x7F0D0048
-			public const int srl_header_pulling = 2131558472;
-			
-			// aapt resource value: 0x7F0D0049
-			public const int srl_header_refreshing = 2131558473;
-			
-			// aapt resource value: 0x7F0D004A
-			public const int srl_header_release = 2131558474;
-			
-			// aapt resource value: 0x7F0D004B
-			public const int srl_header_secondary = 2131558475;
-			
-			// aapt resource value: 0x7F0D004C
-			public const int srl_header_update = 2131558476;
-			
-			// aapt resource value: 0x7F0D004D
-			public const int status_bar_notification_info_overflow = 2131558477;
-			
-			// aapt resource value: 0x7F0D004E
-			public const int touch_fingerprint_sensor_hint = 2131558478;
-			
+
+			// aapt resource value: 0x7f0a0000
+			public const int abc_action_bar_home_description = 2131361792;
+
+			// aapt resource value: 0x7f0a0001
+			public const int abc_action_bar_home_description_format = 2131361793;
+
+			// aapt resource value: 0x7f0a0002
+			public const int abc_action_bar_home_subtitle_description_format = 2131361794;
+
+			// aapt resource value: 0x7f0a0003
+			public const int abc_action_bar_up_description = 2131361795;
+
+			// aapt resource value: 0x7f0a0004
+			public const int abc_action_menu_overflow_description = 2131361796;
+
+			// aapt resource value: 0x7f0a0005
+			public const int abc_action_mode_done = 2131361797;
+
+			// aapt resource value: 0x7f0a0006
+			public const int abc_activity_chooser_view_see_all = 2131361798;
+
+			// aapt resource value: 0x7f0a0007
+			public const int abc_activitychooserview_choose_application = 2131361799;
+
+			// aapt resource value: 0x7f0a0008
+			public const int abc_capital_off = 2131361800;
+
+			// aapt resource value: 0x7f0a0009
+			public const int abc_capital_on = 2131361801;
+
+			// aapt resource value: 0x7f0a0015
+			public const int abc_font_family_body_1_material = 2131361813;
+
+			// aapt resource value: 0x7f0a0016
+			public const int abc_font_family_body_2_material = 2131361814;
+
+			// aapt resource value: 0x7f0a0017
+			public const int abc_font_family_button_material = 2131361815;
+
+			// aapt resource value: 0x7f0a0018
+			public const int abc_font_family_caption_material = 2131361816;
+
+			// aapt resource value: 0x7f0a0019
+			public const int abc_font_family_display_1_material = 2131361817;
+
+			// aapt resource value: 0x7f0a001a
+			public const int abc_font_family_display_2_material = 2131361818;
+
+			// aapt resource value: 0x7f0a001b
+			public const int abc_font_family_display_3_material = 2131361819;
+
+			// aapt resource value: 0x7f0a001c
+			public const int abc_font_family_display_4_material = 2131361820;
+
+			// aapt resource value: 0x7f0a001d
+			public const int abc_font_family_headline_material = 2131361821;
+
+			// aapt resource value: 0x7f0a001e
+			public const int abc_font_family_menu_material = 2131361822;
+
+			// aapt resource value: 0x7f0a001f
+			public const int abc_font_family_subhead_material = 2131361823;
+
+			// aapt resource value: 0x7f0a0020
+			public const int abc_font_family_title_material = 2131361824;
+
+			// aapt resource value: 0x7f0a000a
+			public const int abc_search_hint = 2131361802;
+
+			// aapt resource value: 0x7f0a000b
+			public const int abc_searchview_description_clear = 2131361803;
+
+			// aapt resource value: 0x7f0a000c
+			public const int abc_searchview_description_query = 2131361804;
+
+			// aapt resource value: 0x7f0a000d
+			public const int abc_searchview_description_search = 2131361805;
+
+			// aapt resource value: 0x7f0a000e
+			public const int abc_searchview_description_submit = 2131361806;
+
+			// aapt resource value: 0x7f0a000f
+			public const int abc_searchview_description_voice = 2131361807;
+
+			// aapt resource value: 0x7f0a0010
+			public const int abc_shareactionprovider_share_with = 2131361808;
+
+			// aapt resource value: 0x7f0a0011
+			public const int abc_shareactionprovider_share_with_application = 2131361809;
+
+			// aapt resource value: 0x7f0a0012
+			public const int abc_toolbar_collapse_description = 2131361810;
+
+			// aapt resource value: 0x7f0a003c
+			public const int app_name = 2131361852;
+
+			// aapt resource value: 0x7f0a0021
+			public const int appbar_scrolling_view_behavior = 2131361825;
+
+			// aapt resource value: 0x7f0a0022
+			public const int bottom_sheet_behavior = 2131361826;
+
+			// aapt resource value: 0x7f0a0023
+			public const int character_counter_pattern = 2131361827;
+
+			// aapt resource value: 0x7f0a003d
+			public const int gd_activity_title = 2131361853;
+
+			// aapt resource value: 0x7f0a003e
+			public const int gd_cancel = 2131361854;
+
+			// aapt resource value: 0x7f0a003f
+			public const int gd_myhome = 2131361855;
+
+			// aapt resource value: 0x7f0a0040
+			public const int gd_notifyMsg = 2131361856;
+
+			// aapt resource value: 0x7f0a0041
+			public const int gd_notifyTitle = 2131361857;
+
+			// aapt resource value: 0x7f0a0042
+			public const int gd_save = 2131361858;
+
+			// aapt resource value: 0x7f0a0043
+			public const int gd_search_tip = 2131361859;
+
+			// aapt resource value: 0x7f0a0044
+			public const int gd_select_distance = 2131361860;
+
+			// aapt resource value: 0x7f0a0045
+			public const int gd_setting = 2131361861;
+
+			// aapt resource value: 0x7f0a004e
+			public const int hello = 2131361870;
+
+			// aapt resource value: 0x7f0a0029
+			public const int not_recognized_fingerprint_hint = 2131361833;
+
+			// aapt resource value: 0x7f0a0024
+			public const int password_toggle_content_description = 2131361828;
+
+			// aapt resource value: 0x7f0a0025
+			public const int path_password_eye = 2131361829;
+
+			// aapt resource value: 0x7f0a0026
+			public const int path_password_eye_mask_strike_through = 2131361830;
+
+			// aapt resource value: 0x7f0a0027
+			public const int path_password_eye_mask_visible = 2131361831;
+
+			// aapt resource value: 0x7f0a0028
+			public const int path_password_strike_through = 2131361832;
+
+			// aapt resource value: 0x7f0a0046
+			public const int pickerview_cancel = 2131361862;
+
+			// aapt resource value: 0x7f0a0047
+			public const int pickerview_day = 2131361863;
+
+			// aapt resource value: 0x7f0a0048
+			public const int pickerview_hours = 2131361864;
+
+			// aapt resource value: 0x7f0a0049
+			public const int pickerview_minutes = 2131361865;
+
+			// aapt resource value: 0x7f0a004a
+			public const int pickerview_month = 2131361866;
+
+			// aapt resource value: 0x7f0a004b
+			public const int pickerview_seconds = 2131361867;
+
+			// aapt resource value: 0x7f0a004c
+			public const int pickerview_submit = 2131361868;
+
+			// aapt resource value: 0x7f0a004d
+			public const int pickerview_year = 2131361869;
+
+			// aapt resource value: 0x7f0a0013
+			public const int search_menu_title = 2131361811;
+
+			// aapt resource value: 0x7f0a002b
+			public const int srl_component_falsify = 2131361835;
+
+			// aapt resource value: 0x7f0a002c
+			public const int srl_content_empty = 2131361836;
+
+			// aapt resource value: 0x7f0a002d
+			public const int srl_footer_failed = 2131361837;
+
+			// aapt resource value: 0x7f0a002e
+			public const int srl_footer_finish = 2131361838;
+
+			// aapt resource value: 0x7f0a002f
+			public const int srl_footer_loading = 2131361839;
+
+			// aapt resource value: 0x7f0a0030
+			public const int srl_footer_nothing = 2131361840;
+
+			// aapt resource value: 0x7f0a0031
+			public const int srl_footer_pulling = 2131361841;
+
+			// aapt resource value: 0x7f0a0032
+			public const int srl_footer_refreshing = 2131361842;
+
+			// aapt resource value: 0x7f0a0033
+			public const int srl_footer_release = 2131361843;
+
+			// aapt resource value: 0x7f0a0034
+			public const int srl_header_failed = 2131361844;
+
+			// aapt resource value: 0x7f0a0035
+			public const int srl_header_finish = 2131361845;
+
+			// aapt resource value: 0x7f0a0036
+			public const int srl_header_loading = 2131361846;
+
+			// aapt resource value: 0x7f0a0037
+			public const int srl_header_pulling = 2131361847;
+
+			// aapt resource value: 0x7f0a0038
+			public const int srl_header_refreshing = 2131361848;
+
+			// aapt resource value: 0x7f0a0039
+			public const int srl_header_release = 2131361849;
+
+			// aapt resource value: 0x7f0a003a
+			public const int srl_header_secondary = 2131361850;
+
+			// aapt resource value: 0x7f0a003b
+			public const int srl_header_update = 2131361851;
+
+			// aapt resource value: 0x7f0a0014
+			public const int status_bar_notification_info_overflow = 2131361812;
+
+			// aapt resource value: 0x7f0a002a
+			public const int touch_fingerprint_sensor_hint = 2131361834;
+
 			static String()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private String()
 			{
 			}
 		}
-		
+
 		public partial class Style
 		{
-			
-			// aapt resource value: 0x7F0E0000
-			public const int AlertDialog_AppCompat = 2131623936;
-			
-			// aapt resource value: 0x7F0E0001
-			public const int AlertDialog_AppCompat_Light = 2131623937;
-			
-			// aapt resource value: 0x7F0E0002
-			public const int Animation_AppCompat_Dialog = 2131623938;
-			
-			// aapt resource value: 0x7F0E0003
-			public const int Animation_AppCompat_DropDownUp = 2131623939;
-			
-			// aapt resource value: 0x7F0E0004
-			public const int Animation_AppCompat_Tooltip = 2131623940;
-			
-			// aapt resource value: 0x7F0E0005
-			public const int Animation_Design_BottomSheetDialog = 2131623941;
-			
-			// aapt resource value: 0x7F0E0006
-			public const int Base_AlertDialog_AppCompat = 2131623942;
-			
-			// aapt resource value: 0x7F0E0007
-			public const int Base_AlertDialog_AppCompat_Light = 2131623943;
-			
-			// aapt resource value: 0x7F0E0008
-			public const int Base_Animation_AppCompat_Dialog = 2131623944;
-			
-			// aapt resource value: 0x7F0E0009
-			public const int Base_Animation_AppCompat_DropDownUp = 2131623945;
-			
-			// aapt resource value: 0x7F0E000A
-			public const int Base_Animation_AppCompat_Tooltip = 2131623946;
-			
-			// aapt resource value: 0x7F0E000C
-			public const int Base_DialogWindowTitleBackground_AppCompat = 2131623948;
-			
-			// aapt resource value: 0x7F0E000B
-			public const int Base_DialogWindowTitle_AppCompat = 2131623947;
-			
-			// aapt resource value: 0x7F0E000D
-			public const int Base_TextAppearance_AppCompat = 2131623949;
-			
-			// aapt resource value: 0x7F0E000E
-			public const int Base_TextAppearance_AppCompat_Body1 = 2131623950;
-			
-			// aapt resource value: 0x7F0E000F
-			public const int Base_TextAppearance_AppCompat_Body2 = 2131623951;
-			
-			// aapt resource value: 0x7F0E0010
-			public const int Base_TextAppearance_AppCompat_Button = 2131623952;
-			
-			// aapt resource value: 0x7F0E0011
-			public const int Base_TextAppearance_AppCompat_Caption = 2131623953;
-			
-			// aapt resource value: 0x7F0E0012
-			public const int Base_TextAppearance_AppCompat_Display1 = 2131623954;
-			
-			// aapt resource value: 0x7F0E0013
-			public const int Base_TextAppearance_AppCompat_Display2 = 2131623955;
-			
-			// aapt resource value: 0x7F0E0014
-			public const int Base_TextAppearance_AppCompat_Display3 = 2131623956;
-			
-			// aapt resource value: 0x7F0E0015
-			public const int Base_TextAppearance_AppCompat_Display4 = 2131623957;
-			
-			// aapt resource value: 0x7F0E0016
-			public const int Base_TextAppearance_AppCompat_Headline = 2131623958;
-			
-			// aapt resource value: 0x7F0E0017
-			public const int Base_TextAppearance_AppCompat_Inverse = 2131623959;
-			
-			// aapt resource value: 0x7F0E0018
-			public const int Base_TextAppearance_AppCompat_Large = 2131623960;
-			
-			// aapt resource value: 0x7F0E0019
-			public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131623961;
-			
-			// aapt resource value: 0x7F0E001A
-			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131623962;
-			
-			// aapt resource value: 0x7F0E001B
-			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131623963;
-			
-			// aapt resource value: 0x7F0E001C
-			public const int Base_TextAppearance_AppCompat_Medium = 2131623964;
-			
-			// aapt resource value: 0x7F0E001D
-			public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131623965;
-			
-			// aapt resource value: 0x7F0E001E
-			public const int Base_TextAppearance_AppCompat_Menu = 2131623966;
-			
-			// aapt resource value: 0x7F0E001F
-			public const int Base_TextAppearance_AppCompat_SearchResult = 2131623967;
-			
-			// aapt resource value: 0x7F0E0020
-			public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131623968;
-			
-			// aapt resource value: 0x7F0E0021
-			public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131623969;
-			
-			// aapt resource value: 0x7F0E0022
-			public const int Base_TextAppearance_AppCompat_Small = 2131623970;
-			
-			// aapt resource value: 0x7F0E0023
-			public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131623971;
-			
-			// aapt resource value: 0x7F0E0024
-			public const int Base_TextAppearance_AppCompat_Subhead = 2131623972;
-			
-			// aapt resource value: 0x7F0E0025
-			public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131623973;
-			
-			// aapt resource value: 0x7F0E0026
-			public const int Base_TextAppearance_AppCompat_Title = 2131623974;
-			
-			// aapt resource value: 0x7F0E0027
-			public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131623975;
-			
-			// aapt resource value: 0x7F0E0028
-			public const int Base_TextAppearance_AppCompat_Tooltip = 2131623976;
-			
-			// aapt resource value: 0x7F0E0029
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131623977;
-			
-			// aapt resource value: 0x7F0E002A
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131623978;
-			
-			// aapt resource value: 0x7F0E002B
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131623979;
-			
-			// aapt resource value: 0x7F0E002C
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131623980;
-			
-			// aapt resource value: 0x7F0E002D
-			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131623981;
-			
-			// aapt resource value: 0x7F0E002E
-			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131623982;
-			
-			// aapt resource value: 0x7F0E002F
-			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131623983;
-			
-			// aapt resource value: 0x7F0E0030
-			public const int Base_TextAppearance_AppCompat_Widget_Button = 2131623984;
-			
-			// aapt resource value: 0x7F0E0031
-			public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131623985;
-			
-			// aapt resource value: 0x7F0E0032
-			public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131623986;
-			
-			// aapt resource value: 0x7F0E0033
-			public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131623987;
-			
-			// aapt resource value: 0x7F0E0034
-			public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131623988;
-			
-			// aapt resource value: 0x7F0E0035
-			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131623989;
-			
-			// aapt resource value: 0x7F0E0036
-			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131623990;
-			
-			// aapt resource value: 0x7F0E0037
-			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131623991;
-			
-			// aapt resource value: 0x7F0E0038
-			public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131623992;
-			
-			// aapt resource value: 0x7F0E0039
-			public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131623993;
-			
-			// aapt resource value: 0x7F0E003A
-			public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131623994;
-			
-			// aapt resource value: 0x7F0E003B
-			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131623995;
-			
-			// aapt resource value: 0x7F0E003C
-			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131623996;
-			
-			// aapt resource value: 0x7F0E004B
-			public const int Base_ThemeOverlay_AppCompat = 2131624011;
-			
-			// aapt resource value: 0x7F0E004C
-			public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131624012;
-			
-			// aapt resource value: 0x7F0E004D
-			public const int Base_ThemeOverlay_AppCompat_Dark = 2131624013;
-			
-			// aapt resource value: 0x7F0E004E
-			public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131624014;
-			
-			// aapt resource value: 0x7F0E004F
-			public const int Base_ThemeOverlay_AppCompat_Dialog = 2131624015;
-			
-			// aapt resource value: 0x7F0E0050
-			public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131624016;
-			
-			// aapt resource value: 0x7F0E0051
-			public const int Base_ThemeOverlay_AppCompat_Light = 2131624017;
-			
-			// aapt resource value: 0x7F0E003D
-			public const int Base_Theme_AppCompat = 2131623997;
-			
-			// aapt resource value: 0x7F0E003E
-			public const int Base_Theme_AppCompat_CompactMenu = 2131623998;
-			
-			// aapt resource value: 0x7F0E003F
-			public const int Base_Theme_AppCompat_Dialog = 2131623999;
-			
-			// aapt resource value: 0x7F0E0043
-			public const int Base_Theme_AppCompat_DialogWhenLarge = 2131624003;
-			
-			// aapt resource value: 0x7F0E0040
-			public const int Base_Theme_AppCompat_Dialog_Alert = 2131624000;
-			
-			// aapt resource value: 0x7F0E0041
-			public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131624001;
-			
-			// aapt resource value: 0x7F0E0042
-			public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131624002;
-			
-			// aapt resource value: 0x7F0E0044
-			public const int Base_Theme_AppCompat_Light = 2131624004;
-			
-			// aapt resource value: 0x7F0E0045
-			public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131624005;
-			
-			// aapt resource value: 0x7F0E0046
-			public const int Base_Theme_AppCompat_Light_Dialog = 2131624006;
-			
-			// aapt resource value: 0x7F0E004A
-			public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131624010;
-			
-			// aapt resource value: 0x7F0E0047
-			public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131624007;
-			
-			// aapt resource value: 0x7F0E0048
-			public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131624008;
-			
-			// aapt resource value: 0x7F0E0049
-			public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131624009;
-			
-			// aapt resource value: 0x7F0E0054
-			public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131624020;
-			
-			// aapt resource value: 0x7F0E0052
-			public const int Base_V11_Theme_AppCompat_Dialog = 2131624018;
-			
-			// aapt resource value: 0x7F0E0053
-			public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131624019;
-			
-			// aapt resource value: 0x7F0E0055
-			public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131624021;
-			
-			// aapt resource value: 0x7F0E0056
-			public const int Base_V12_Widget_AppCompat_EditText = 2131624022;
-			
-			// aapt resource value: 0x7F0E0057
-			public const int Base_V14_Widget_Design_AppBarLayout = 2131624023;
-			
-			// aapt resource value: 0x7F0E005C
-			public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131624028;
-			
-			// aapt resource value: 0x7F0E0058
-			public const int Base_V21_Theme_AppCompat = 2131624024;
-			
-			// aapt resource value: 0x7F0E0059
-			public const int Base_V21_Theme_AppCompat_Dialog = 2131624025;
-			
-			// aapt resource value: 0x7F0E005A
-			public const int Base_V21_Theme_AppCompat_Light = 2131624026;
-			
-			// aapt resource value: 0x7F0E005B
-			public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131624027;
-			
-			// aapt resource value: 0x7F0E005D
-			public const int Base_V21_Widget_Design_AppBarLayout = 2131624029;
-			
-			// aapt resource value: 0x7F0E005E
-			public const int Base_V22_Theme_AppCompat = 2131624030;
-			
-			// aapt resource value: 0x7F0E005F
-			public const int Base_V22_Theme_AppCompat_Light = 2131624031;
-			
-			// aapt resource value: 0x7F0E0060
-			public const int Base_V23_Theme_AppCompat = 2131624032;
-			
-			// aapt resource value: 0x7F0E0061
-			public const int Base_V23_Theme_AppCompat_Light = 2131624033;
-			
-			// aapt resource value: 0x7F0E0062
-			public const int Base_V26_Theme_AppCompat = 2131624034;
-			
-			// aapt resource value: 0x7F0E0063
-			public const int Base_V26_Theme_AppCompat_Light = 2131624035;
-			
-			// aapt resource value: 0x7F0E0064
-			public const int Base_V26_Widget_AppCompat_Toolbar = 2131624036;
-			
-			// aapt resource value: 0x7F0E0065
-			public const int Base_V26_Widget_Design_AppBarLayout = 2131624037;
-			
-			// aapt resource value: 0x7F0E006A
-			public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131624042;
-			
-			// aapt resource value: 0x7F0E0066
-			public const int Base_V7_Theme_AppCompat = 2131624038;
-			
-			// aapt resource value: 0x7F0E0067
-			public const int Base_V7_Theme_AppCompat_Dialog = 2131624039;
-			
-			// aapt resource value: 0x7F0E0068
-			public const int Base_V7_Theme_AppCompat_Light = 2131624040;
-			
-			// aapt resource value: 0x7F0E0069
-			public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131624041;
-			
-			// aapt resource value: 0x7F0E006B
-			public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131624043;
-			
-			// aapt resource value: 0x7F0E006C
-			public const int Base_V7_Widget_AppCompat_EditText = 2131624044;
-			
-			// aapt resource value: 0x7F0E006D
-			public const int Base_V7_Widget_AppCompat_Toolbar = 2131624045;
-			
-			// aapt resource value: 0x7F0E006E
-			public const int Base_Widget_AppCompat_ActionBar = 2131624046;
-			
-			// aapt resource value: 0x7F0E006F
-			public const int Base_Widget_AppCompat_ActionBar_Solid = 2131624047;
-			
-			// aapt resource value: 0x7F0E0070
-			public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131624048;
-			
-			// aapt resource value: 0x7F0E0071
-			public const int Base_Widget_AppCompat_ActionBar_TabText = 2131624049;
-			
-			// aapt resource value: 0x7F0E0072
-			public const int Base_Widget_AppCompat_ActionBar_TabView = 2131624050;
-			
-			// aapt resource value: 0x7F0E0073
-			public const int Base_Widget_AppCompat_ActionButton = 2131624051;
-			
-			// aapt resource value: 0x7F0E0074
-			public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131624052;
-			
-			// aapt resource value: 0x7F0E0075
-			public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131624053;
-			
-			// aapt resource value: 0x7F0E0076
-			public const int Base_Widget_AppCompat_ActionMode = 2131624054;
-			
-			// aapt resource value: 0x7F0E0077
-			public const int Base_Widget_AppCompat_ActivityChooserView = 2131624055;
-			
-			// aapt resource value: 0x7F0E0078
-			public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131624056;
-			
-			// aapt resource value: 0x7F0E0079
-			public const int Base_Widget_AppCompat_Button = 2131624057;
-			
-			// aapt resource value: 0x7F0E007F
-			public const int Base_Widget_AppCompat_ButtonBar = 2131624063;
-			
-			// aapt resource value: 0x7F0E0080
-			public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131624064;
-			
-			// aapt resource value: 0x7F0E007A
-			public const int Base_Widget_AppCompat_Button_Borderless = 2131624058;
-			
-			// aapt resource value: 0x7F0E007B
-			public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131624059;
-			
-			// aapt resource value: 0x7F0E007C
-			public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624060;
-			
-			// aapt resource value: 0x7F0E007D
-			public const int Base_Widget_AppCompat_Button_Colored = 2131624061;
-			
-			// aapt resource value: 0x7F0E007E
-			public const int Base_Widget_AppCompat_Button_Small = 2131624062;
-			
-			// aapt resource value: 0x7F0E0081
-			public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131624065;
-			
-			// aapt resource value: 0x7F0E0082
-			public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131624066;
-			
-			// aapt resource value: 0x7F0E0083
-			public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131624067;
-			
-			// aapt resource value: 0x7F0E0084
-			public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131624068;
-			
-			// aapt resource value: 0x7F0E0085
-			public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131624069;
-			
-			// aapt resource value: 0x7F0E0086
-			public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131624070;
-			
-			// aapt resource value: 0x7F0E0087
-			public const int Base_Widget_AppCompat_EditText = 2131624071;
-			
-			// aapt resource value: 0x7F0E0088
-			public const int Base_Widget_AppCompat_ImageButton = 2131624072;
-			
-			// aapt resource value: 0x7F0E0089
-			public const int Base_Widget_AppCompat_Light_ActionBar = 2131624073;
-			
-			// aapt resource value: 0x7F0E008A
-			public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131624074;
-			
-			// aapt resource value: 0x7F0E008B
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131624075;
-			
-			// aapt resource value: 0x7F0E008C
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131624076;
-			
-			// aapt resource value: 0x7F0E008D
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624077;
-			
-			// aapt resource value: 0x7F0E008E
-			public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131624078;
-			
-			// aapt resource value: 0x7F0E008F
-			public const int Base_Widget_AppCompat_Light_PopupMenu = 2131624079;
-			
-			// aapt resource value: 0x7F0E0090
-			public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131624080;
-			
-			// aapt resource value: 0x7F0E0091
-			public const int Base_Widget_AppCompat_ListMenuView = 2131624081;
-			
-			// aapt resource value: 0x7F0E0092
-			public const int Base_Widget_AppCompat_ListPopupWindow = 2131624082;
-			
-			// aapt resource value: 0x7F0E0093
-			public const int Base_Widget_AppCompat_ListView = 2131624083;
-			
-			// aapt resource value: 0x7F0E0094
-			public const int Base_Widget_AppCompat_ListView_DropDown = 2131624084;
-			
-			// aapt resource value: 0x7F0E0095
-			public const int Base_Widget_AppCompat_ListView_Menu = 2131624085;
-			
-			// aapt resource value: 0x7F0E0096
-			public const int Base_Widget_AppCompat_PopupMenu = 2131624086;
-			
-			// aapt resource value: 0x7F0E0097
-			public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131624087;
-			
-			// aapt resource value: 0x7F0E0098
-			public const int Base_Widget_AppCompat_PopupWindow = 2131624088;
-			
-			// aapt resource value: 0x7F0E0099
-			public const int Base_Widget_AppCompat_ProgressBar = 2131624089;
-			
-			// aapt resource value: 0x7F0E009A
-			public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131624090;
-			
-			// aapt resource value: 0x7F0E009B
-			public const int Base_Widget_AppCompat_RatingBar = 2131624091;
-			
-			// aapt resource value: 0x7F0E009C
-			public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131624092;
-			
-			// aapt resource value: 0x7F0E009D
-			public const int Base_Widget_AppCompat_RatingBar_Small = 2131624093;
-			
-			// aapt resource value: 0x7F0E009E
-			public const int Base_Widget_AppCompat_SearchView = 2131624094;
-			
-			// aapt resource value: 0x7F0E009F
-			public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131624095;
-			
-			// aapt resource value: 0x7F0E00A0
-			public const int Base_Widget_AppCompat_SeekBar = 2131624096;
-			
-			// aapt resource value: 0x7F0E00A1
-			public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131624097;
-			
-			// aapt resource value: 0x7F0E00A2
-			public const int Base_Widget_AppCompat_Spinner = 2131624098;
-			
-			// aapt resource value: 0x7F0E00A3
-			public const int Base_Widget_AppCompat_Spinner_Underlined = 2131624099;
-			
-			// aapt resource value: 0x7F0E00A4
-			public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131624100;
-			
-			// aapt resource value: 0x7F0E00A5
-			public const int Base_Widget_AppCompat_Toolbar = 2131624101;
-			
-			// aapt resource value: 0x7F0E00A6
-			public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131624102;
-			
-			// aapt resource value: 0x7F0E00A7
-			public const int Base_Widget_Design_AppBarLayout = 2131624103;
-			
-			// aapt resource value: 0x7F0E00A8
-			public const int Base_Widget_Design_TabLayout = 2131624104;
-			
-			// aapt resource value: 0x7F0E00A9
-			public const int BottomSheetDialogAnimation = 2131624105;
-			
-			// aapt resource value: 0x7F0E018D
-			public const int custom_dialog2 = 2131624333;
-			
-			// aapt resource value: 0x7F0E00AA
-			public const int MyTheme = 2131624106;
-			
-			// aapt resource value: 0x7F0E018E
-			public const int picker_view_scale_anim = 2131624334;
-			
-			// aapt resource value: 0x7F0E018F
-			public const int picker_view_slide_anim = 2131624335;
-			
-			// aapt resource value: 0x7F0E00AB
-			public const int Platform_AppCompat = 2131624107;
-			
-			// aapt resource value: 0x7F0E00AC
-			public const int Platform_AppCompat_Light = 2131624108;
-			
-			// aapt resource value: 0x7F0E00AD
-			public const int Platform_ThemeOverlay_AppCompat = 2131624109;
-			
-			// aapt resource value: 0x7F0E00AE
-			public const int Platform_ThemeOverlay_AppCompat_Dark = 2131624110;
-			
-			// aapt resource value: 0x7F0E00AF
-			public const int Platform_ThemeOverlay_AppCompat_Light = 2131624111;
-			
-			// aapt resource value: 0x7F0E00B0
-			public const int Platform_V11_AppCompat = 2131624112;
-			
-			// aapt resource value: 0x7F0E00B1
-			public const int Platform_V11_AppCompat_Light = 2131624113;
-			
-			// aapt resource value: 0x7F0E00B2
-			public const int Platform_V14_AppCompat = 2131624114;
-			
-			// aapt resource value: 0x7F0E00B3
-			public const int Platform_V14_AppCompat_Light = 2131624115;
-			
-			// aapt resource value: 0x7F0E00B4
-			public const int Platform_V21_AppCompat = 2131624116;
-			
-			// aapt resource value: 0x7F0E00B5
-			public const int Platform_V21_AppCompat_Light = 2131624117;
-			
-			// aapt resource value: 0x7F0E00B6
-			public const int Platform_V25_AppCompat = 2131624118;
-			
-			// aapt resource value: 0x7F0E00B7
-			public const int Platform_V25_AppCompat_Light = 2131624119;
-			
-			// aapt resource value: 0x7F0E00B8
-			public const int Platform_Widget_AppCompat_Spinner = 2131624120;
-			
-			// aapt resource value: 0x7F0E00B9
-			public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131624121;
-			
-			// aapt resource value: 0x7F0E00BA
-			public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131624122;
-			
-			// aapt resource value: 0x7F0E00BB
-			public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131624123;
-			
-			// aapt resource value: 0x7F0E00BC
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131624124;
-			
-			// aapt resource value: 0x7F0E00BD
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131624125;
-			
-			// aapt resource value: 0x7F0E00BE
-			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131624126;
-			
-			// aapt resource value: 0x7F0E00C4
-			public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131624132;
-			
-			// aapt resource value: 0x7F0E00BF
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131624127;
-			
-			// aapt resource value: 0x7F0E00C0
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131624128;
-			
-			// aapt resource value: 0x7F0E00C1
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131624129;
-			
-			// aapt resource value: 0x7F0E00C2
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131624130;
-			
-			// aapt resource value: 0x7F0E00C3
-			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131624131;
-			
-			// aapt resource value: 0x7F0E00C5
-			public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131624133;
-			
-			// aapt resource value: 0x7F0E00C6
-			public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131624134;
-			
-			// aapt resource value: 0x7F0E00C7
-			public const int TextAppearance_AppCompat = 2131624135;
-			
-			// aapt resource value: 0x7F0E00C8
-			public const int TextAppearance_AppCompat_Body1 = 2131624136;
-			
-			// aapt resource value: 0x7F0E00C9
-			public const int TextAppearance_AppCompat_Body2 = 2131624137;
-			
-			// aapt resource value: 0x7F0E00CA
-			public const int TextAppearance_AppCompat_Button = 2131624138;
-			
-			// aapt resource value: 0x7F0E00CB
-			public const int TextAppearance_AppCompat_Caption = 2131624139;
-			
-			// aapt resource value: 0x7F0E00CC
-			public const int TextAppearance_AppCompat_Display1 = 2131624140;
-			
-			// aapt resource value: 0x7F0E00CD
-			public const int TextAppearance_AppCompat_Display2 = 2131624141;
-			
-			// aapt resource value: 0x7F0E00CE
-			public const int TextAppearance_AppCompat_Display3 = 2131624142;
-			
-			// aapt resource value: 0x7F0E00CF
-			public const int TextAppearance_AppCompat_Display4 = 2131624143;
-			
-			// aapt resource value: 0x7F0E00D0
-			public const int TextAppearance_AppCompat_Headline = 2131624144;
-			
-			// aapt resource value: 0x7F0E00D1
-			public const int TextAppearance_AppCompat_Inverse = 2131624145;
-			
-			// aapt resource value: 0x7F0E00D2
-			public const int TextAppearance_AppCompat_Large = 2131624146;
-			
-			// aapt resource value: 0x7F0E00D3
-			public const int TextAppearance_AppCompat_Large_Inverse = 2131624147;
-			
-			// aapt resource value: 0x7F0E00D4
-			public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131624148;
-			
-			// aapt resource value: 0x7F0E00D5
-			public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131624149;
-			
-			// aapt resource value: 0x7F0E00D6
-			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131624150;
-			
-			// aapt resource value: 0x7F0E00D7
-			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131624151;
-			
-			// aapt resource value: 0x7F0E00D8
-			public const int TextAppearance_AppCompat_Medium = 2131624152;
-			
-			// aapt resource value: 0x7F0E00D9
-			public const int TextAppearance_AppCompat_Medium_Inverse = 2131624153;
-			
-			// aapt resource value: 0x7F0E00DA
-			public const int TextAppearance_AppCompat_Menu = 2131624154;
-			
-			// aapt resource value: 0x7F0E00DB
-			public const int TextAppearance_AppCompat_Notification = 2131624155;
-			
-			// aapt resource value: 0x7F0E00DC
-			public const int TextAppearance_AppCompat_Notification_Info = 2131624156;
-			
-			// aapt resource value: 0x7F0E00DD
-			public const int TextAppearance_AppCompat_Notification_Info_Media = 2131624157;
-			
-			// aapt resource value: 0x7F0E00DE
-			public const int TextAppearance_AppCompat_Notification_Line2 = 2131624158;
-			
-			// aapt resource value: 0x7F0E00DF
-			public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131624159;
-			
-			// aapt resource value: 0x7F0E00E0
-			public const int TextAppearance_AppCompat_Notification_Media = 2131624160;
-			
-			// aapt resource value: 0x7F0E00E1
-			public const int TextAppearance_AppCompat_Notification_Time = 2131624161;
-			
-			// aapt resource value: 0x7F0E00E2
-			public const int TextAppearance_AppCompat_Notification_Time_Media = 2131624162;
-			
-			// aapt resource value: 0x7F0E00E3
-			public const int TextAppearance_AppCompat_Notification_Title = 2131624163;
-			
-			// aapt resource value: 0x7F0E00E4
-			public const int TextAppearance_AppCompat_Notification_Title_Media = 2131624164;
-			
-			// aapt resource value: 0x7F0E00E5
-			public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131624165;
-			
-			// aapt resource value: 0x7F0E00E6
-			public const int TextAppearance_AppCompat_SearchResult_Title = 2131624166;
-			
-			// aapt resource value: 0x7F0E00E7
-			public const int TextAppearance_AppCompat_Small = 2131624167;
-			
-			// aapt resource value: 0x7F0E00E8
-			public const int TextAppearance_AppCompat_Small_Inverse = 2131624168;
-			
-			// aapt resource value: 0x7F0E00E9
-			public const int TextAppearance_AppCompat_Subhead = 2131624169;
-			
-			// aapt resource value: 0x7F0E00EA
-			public const int TextAppearance_AppCompat_Subhead_Inverse = 2131624170;
-			
-			// aapt resource value: 0x7F0E00EB
-			public const int TextAppearance_AppCompat_Title = 2131624171;
-			
-			// aapt resource value: 0x7F0E00EC
-			public const int TextAppearance_AppCompat_Title_Inverse = 2131624172;
-			
-			// aapt resource value: 0x7F0E00ED
-			public const int TextAppearance_AppCompat_Tooltip = 2131624173;
-			
-			// aapt resource value: 0x7F0E00EE
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131624174;
-			
-			// aapt resource value: 0x7F0E00EF
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131624175;
-			
-			// aapt resource value: 0x7F0E00F0
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131624176;
-			
-			// aapt resource value: 0x7F0E00F1
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131624177;
-			
-			// aapt resource value: 0x7F0E00F2
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131624178;
-			
-			// aapt resource value: 0x7F0E00F3
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131624179;
-			
-			// aapt resource value: 0x7F0E00F4
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131624180;
-			
-			// aapt resource value: 0x7F0E00F5
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131624181;
-			
-			// aapt resource value: 0x7F0E00F6
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131624182;
-			
-			// aapt resource value: 0x7F0E00F7
-			public const int TextAppearance_AppCompat_Widget_Button = 2131624183;
-			
-			// aapt resource value: 0x7F0E00F8
-			public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131624184;
-			
-			// aapt resource value: 0x7F0E00F9
-			public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131624185;
-			
-			// aapt resource value: 0x7F0E00FA
-			public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131624186;
-			
-			// aapt resource value: 0x7F0E00FB
-			public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131624187;
-			
-			// aapt resource value: 0x7F0E00FC
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131624188;
-			
-			// aapt resource value: 0x7F0E00FD
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131624189;
-			
-			// aapt resource value: 0x7F0E00FE
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131624190;
-			
-			// aapt resource value: 0x7F0E00FF
-			public const int TextAppearance_AppCompat_Widget_Switch = 2131624191;
-			
-			// aapt resource value: 0x7F0E0100
-			public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131624192;
-			
-			// aapt resource value: 0x7F0E0101
-			public const int TextAppearance_Compat_Notification = 2131624193;
-			
-			// aapt resource value: 0x7F0E0102
-			public const int TextAppearance_Compat_Notification_Info = 2131624194;
-			
-			// aapt resource value: 0x7F0E0103
-			public const int TextAppearance_Compat_Notification_Info_Media = 2131624195;
-			
-			// aapt resource value: 0x7F0E0104
-			public const int TextAppearance_Compat_Notification_Line2 = 2131624196;
-			
-			// aapt resource value: 0x7F0E0105
-			public const int TextAppearance_Compat_Notification_Line2_Media = 2131624197;
-			
-			// aapt resource value: 0x7F0E0106
-			public const int TextAppearance_Compat_Notification_Media = 2131624198;
-			
-			// aapt resource value: 0x7F0E0107
-			public const int TextAppearance_Compat_Notification_Time = 2131624199;
-			
-			// aapt resource value: 0x7F0E0108
-			public const int TextAppearance_Compat_Notification_Time_Media = 2131624200;
-			
-			// aapt resource value: 0x7F0E0109
-			public const int TextAppearance_Compat_Notification_Title = 2131624201;
-			
-			// aapt resource value: 0x7F0E010A
-			public const int TextAppearance_Compat_Notification_Title_Media = 2131624202;
-			
-			// aapt resource value: 0x7F0E010B
-			public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131624203;
-			
-			// aapt resource value: 0x7F0E010C
-			public const int TextAppearance_Design_Counter = 2131624204;
-			
-			// aapt resource value: 0x7F0E010D
-			public const int TextAppearance_Design_Counter_Overflow = 2131624205;
-			
-			// aapt resource value: 0x7F0E010E
-			public const int TextAppearance_Design_Error = 2131624206;
-			
-			// aapt resource value: 0x7F0E010F
-			public const int TextAppearance_Design_Hint = 2131624207;
-			
-			// aapt resource value: 0x7F0E0110
-			public const int TextAppearance_Design_Snackbar_Message = 2131624208;
-			
-			// aapt resource value: 0x7F0E0111
-			public const int TextAppearance_Design_Tab = 2131624209;
-			
-			// aapt resource value: 0x7F0E0112
-			public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131624210;
-			
-			// aapt resource value: 0x7F0E0113
-			public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131624211;
-			
-			// aapt resource value: 0x7F0E0114
-			public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131624212;
-			
-			// aapt resource value: 0x7F0E0131
-			public const int ThemeOverlay_AppCompat = 2131624241;
-			
-			// aapt resource value: 0x7F0E0132
-			public const int ThemeOverlay_AppCompat_ActionBar = 2131624242;
-			
-			// aapt resource value: 0x7F0E0133
-			public const int ThemeOverlay_AppCompat_Dark = 2131624243;
-			
-			// aapt resource value: 0x7F0E0134
-			public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131624244;
-			
-			// aapt resource value: 0x7F0E0135
-			public const int ThemeOverlay_AppCompat_Dialog = 2131624245;
-			
-			// aapt resource value: 0x7F0E0136
-			public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131624246;
-			
-			// aapt resource value: 0x7F0E0137
-			public const int ThemeOverlay_AppCompat_Light = 2131624247;
-			
-			// aapt resource value: 0x7F0E0115
-			public const int Theme_AppCompat = 2131624213;
-			
-			// aapt resource value: 0x7F0E0116
-			public const int Theme_AppCompat_CompactMenu = 2131624214;
-			
-			// aapt resource value: 0x7F0E0117
-			public const int Theme_AppCompat_DayNight = 2131624215;
-			
-			// aapt resource value: 0x7F0E0118
-			public const int Theme_AppCompat_DayNight_DarkActionBar = 2131624216;
-			
-			// aapt resource value: 0x7F0E0119
-			public const int Theme_AppCompat_DayNight_Dialog = 2131624217;
-			
-			// aapt resource value: 0x7F0E011C
-			public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131624220;
-			
-			// aapt resource value: 0x7F0E011A
-			public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131624218;
-			
-			// aapt resource value: 0x7F0E011B
-			public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131624219;
-			
-			// aapt resource value: 0x7F0E011D
-			public const int Theme_AppCompat_DayNight_NoActionBar = 2131624221;
-			
-			// aapt resource value: 0x7F0E011E
-			public const int Theme_AppCompat_Dialog = 2131624222;
-			
-			// aapt resource value: 0x7F0E0121
-			public const int Theme_AppCompat_DialogWhenLarge = 2131624225;
-			
-			// aapt resource value: 0x7F0E011F
-			public const int Theme_AppCompat_Dialog_Alert = 2131624223;
-			
-			// aapt resource value: 0x7F0E0120
-			public const int Theme_AppCompat_Dialog_MinWidth = 2131624224;
-			
-			// aapt resource value: 0x7F0E0122
-			public const int Theme_AppCompat_Light = 2131624226;
-			
-			// aapt resource value: 0x7F0E0123
-			public const int Theme_AppCompat_Light_DarkActionBar = 2131624227;
-			
-			// aapt resource value: 0x7F0E0124
-			public const int Theme_AppCompat_Light_Dialog = 2131624228;
-			
-			// aapt resource value: 0x7F0E0127
-			public const int Theme_AppCompat_Light_DialogWhenLarge = 2131624231;
-			
-			// aapt resource value: 0x7F0E0125
-			public const int Theme_AppCompat_Light_Dialog_Alert = 2131624229;
-			
-			// aapt resource value: 0x7F0E0126
-			public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131624230;
-			
-			// aapt resource value: 0x7F0E0128
-			public const int Theme_AppCompat_Light_NoActionBar = 2131624232;
-			
-			// aapt resource value: 0x7F0E0129
-			public const int Theme_AppCompat_NoActionBar = 2131624233;
-			
-			// aapt resource value: 0x7F0E012A
-			public const int Theme_BiometricPromptDialog = 2131624234;
-			
-			// aapt resource value: 0x7F0E012B
-			public const int Theme_Design = 2131624235;
-			
-			// aapt resource value: 0x7F0E012C
-			public const int Theme_Design_BottomSheetDialog = 2131624236;
-			
-			// aapt resource value: 0x7F0E012D
-			public const int Theme_Design_Light = 2131624237;
-			
-			// aapt resource value: 0x7F0E012E
-			public const int Theme_Design_Light_BottomSheetDialog = 2131624238;
-			
-			// aapt resource value: 0x7F0E012F
-			public const int Theme_Design_Light_NoActionBar = 2131624239;
-			
-			// aapt resource value: 0x7F0E0130
-			public const int Theme_Design_NoActionBar = 2131624240;
-			
-			// aapt resource value: 0x7F0E0138
-			public const int Widget_AppCompat_ActionBar = 2131624248;
-			
-			// aapt resource value: 0x7F0E0139
-			public const int Widget_AppCompat_ActionBar_Solid = 2131624249;
-			
-			// aapt resource value: 0x7F0E013A
-			public const int Widget_AppCompat_ActionBar_TabBar = 2131624250;
-			
-			// aapt resource value: 0x7F0E013B
-			public const int Widget_AppCompat_ActionBar_TabText = 2131624251;
-			
-			// aapt resource value: 0x7F0E013C
-			public const int Widget_AppCompat_ActionBar_TabView = 2131624252;
-			
-			// aapt resource value: 0x7F0E013D
-			public const int Widget_AppCompat_ActionButton = 2131624253;
-			
-			// aapt resource value: 0x7F0E013E
-			public const int Widget_AppCompat_ActionButton_CloseMode = 2131624254;
-			
-			// aapt resource value: 0x7F0E013F
-			public const int Widget_AppCompat_ActionButton_Overflow = 2131624255;
-			
-			// aapt resource value: 0x7F0E0140
-			public const int Widget_AppCompat_ActionMode = 2131624256;
-			
-			// aapt resource value: 0x7F0E0141
-			public const int Widget_AppCompat_ActivityChooserView = 2131624257;
-			
-			// aapt resource value: 0x7F0E0142
-			public const int Widget_AppCompat_AutoCompleteTextView = 2131624258;
-			
-			// aapt resource value: 0x7F0E0143
-			public const int Widget_AppCompat_Button = 2131624259;
-			
-			// aapt resource value: 0x7F0E0149
-			public const int Widget_AppCompat_ButtonBar = 2131624265;
-			
-			// aapt resource value: 0x7F0E014A
-			public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131624266;
-			
-			// aapt resource value: 0x7F0E0144
-			public const int Widget_AppCompat_Button_Borderless = 2131624260;
-			
-			// aapt resource value: 0x7F0E0145
-			public const int Widget_AppCompat_Button_Borderless_Colored = 2131624261;
-			
-			// aapt resource value: 0x7F0E0146
-			public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624262;
-			
-			// aapt resource value: 0x7F0E0147
-			public const int Widget_AppCompat_Button_Colored = 2131624263;
-			
-			// aapt resource value: 0x7F0E0148
-			public const int Widget_AppCompat_Button_Small = 2131624264;
-			
-			// aapt resource value: 0x7F0E014B
-			public const int Widget_AppCompat_CompoundButton_CheckBox = 2131624267;
-			
-			// aapt resource value: 0x7F0E014C
-			public const int Widget_AppCompat_CompoundButton_RadioButton = 2131624268;
-			
-			// aapt resource value: 0x7F0E014D
-			public const int Widget_AppCompat_CompoundButton_Switch = 2131624269;
-			
-			// aapt resource value: 0x7F0E014E
-			public const int Widget_AppCompat_DrawerArrowToggle = 2131624270;
-			
-			// aapt resource value: 0x7F0E014F
-			public const int Widget_AppCompat_DropDownItem_Spinner = 2131624271;
-			
-			// aapt resource value: 0x7F0E0150
-			public const int Widget_AppCompat_EditText = 2131624272;
-			
-			// aapt resource value: 0x7F0E0151
-			public const int Widget_AppCompat_ImageButton = 2131624273;
-			
-			// aapt resource value: 0x7F0E0152
-			public const int Widget_AppCompat_Light_ActionBar = 2131624274;
-			
-			// aapt resource value: 0x7F0E0153
-			public const int Widget_AppCompat_Light_ActionBar_Solid = 2131624275;
-			
-			// aapt resource value: 0x7F0E0154
-			public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131624276;
-			
-			// aapt resource value: 0x7F0E0155
-			public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131624277;
-			
-			// aapt resource value: 0x7F0E0156
-			public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131624278;
-			
-			// aapt resource value: 0x7F0E0157
-			public const int Widget_AppCompat_Light_ActionBar_TabText = 2131624279;
-			
-			// aapt resource value: 0x7F0E0158
-			public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624280;
-			
-			// aapt resource value: 0x7F0E0159
-			public const int Widget_AppCompat_Light_ActionBar_TabView = 2131624281;
-			
-			// aapt resource value: 0x7F0E015A
-			public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131624282;
-			
-			// aapt resource value: 0x7F0E015B
-			public const int Widget_AppCompat_Light_ActionButton = 2131624283;
-			
-			// aapt resource value: 0x7F0E015C
-			public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131624284;
-			
-			// aapt resource value: 0x7F0E015D
-			public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131624285;
-			
-			// aapt resource value: 0x7F0E015E
-			public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131624286;
-			
-			// aapt resource value: 0x7F0E015F
-			public const int Widget_AppCompat_Light_ActivityChooserView = 2131624287;
-			
-			// aapt resource value: 0x7F0E0160
-			public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131624288;
-			
-			// aapt resource value: 0x7F0E0161
-			public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131624289;
-			
-			// aapt resource value: 0x7F0E0162
-			public const int Widget_AppCompat_Light_ListPopupWindow = 2131624290;
-			
-			// aapt resource value: 0x7F0E0163
-			public const int Widget_AppCompat_Light_ListView_DropDown = 2131624291;
-			
-			// aapt resource value: 0x7F0E0164
-			public const int Widget_AppCompat_Light_PopupMenu = 2131624292;
-			
-			// aapt resource value: 0x7F0E0165
-			public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131624293;
-			
-			// aapt resource value: 0x7F0E0166
-			public const int Widget_AppCompat_Light_SearchView = 2131624294;
-			
-			// aapt resource value: 0x7F0E0167
-			public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131624295;
-			
-			// aapt resource value: 0x7F0E0168
-			public const int Widget_AppCompat_ListMenuView = 2131624296;
-			
-			// aapt resource value: 0x7F0E0169
-			public const int Widget_AppCompat_ListPopupWindow = 2131624297;
-			
-			// aapt resource value: 0x7F0E016A
-			public const int Widget_AppCompat_ListView = 2131624298;
-			
-			// aapt resource value: 0x7F0E016B
-			public const int Widget_AppCompat_ListView_DropDown = 2131624299;
-			
-			// aapt resource value: 0x7F0E016C
-			public const int Widget_AppCompat_ListView_Menu = 2131624300;
-			
-			// aapt resource value: 0x7F0E016D
-			public const int Widget_AppCompat_PopupMenu = 2131624301;
-			
-			// aapt resource value: 0x7F0E016E
-			public const int Widget_AppCompat_PopupMenu_Overflow = 2131624302;
-			
-			// aapt resource value: 0x7F0E016F
-			public const int Widget_AppCompat_PopupWindow = 2131624303;
-			
-			// aapt resource value: 0x7F0E0170
-			public const int Widget_AppCompat_ProgressBar = 2131624304;
-			
-			// aapt resource value: 0x7F0E0171
-			public const int Widget_AppCompat_ProgressBar_Horizontal = 2131624305;
-			
-			// aapt resource value: 0x7F0E0172
-			public const int Widget_AppCompat_RatingBar = 2131624306;
-			
-			// aapt resource value: 0x7F0E0173
-			public const int Widget_AppCompat_RatingBar_Indicator = 2131624307;
-			
-			// aapt resource value: 0x7F0E0174
-			public const int Widget_AppCompat_RatingBar_Small = 2131624308;
-			
-			// aapt resource value: 0x7F0E0175
-			public const int Widget_AppCompat_SearchView = 2131624309;
-			
-			// aapt resource value: 0x7F0E0176
-			public const int Widget_AppCompat_SearchView_ActionBar = 2131624310;
-			
-			// aapt resource value: 0x7F0E0177
-			public const int Widget_AppCompat_SeekBar = 2131624311;
-			
-			// aapt resource value: 0x7F0E0178
-			public const int Widget_AppCompat_SeekBar_Discrete = 2131624312;
-			
-			// aapt resource value: 0x7F0E0179
-			public const int Widget_AppCompat_Spinner = 2131624313;
-			
-			// aapt resource value: 0x7F0E017A
-			public const int Widget_AppCompat_Spinner_DropDown = 2131624314;
-			
-			// aapt resource value: 0x7F0E017B
-			public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131624315;
-			
-			// aapt resource value: 0x7F0E017C
-			public const int Widget_AppCompat_Spinner_Underlined = 2131624316;
-			
-			// aapt resource value: 0x7F0E017D
-			public const int Widget_AppCompat_TextView_SpinnerItem = 2131624317;
-			
-			// aapt resource value: 0x7F0E017E
-			public const int Widget_AppCompat_Toolbar = 2131624318;
-			
-			// aapt resource value: 0x7F0E017F
-			public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131624319;
-			
-			// aapt resource value: 0x7F0E0180
-			public const int Widget_Compat_NotificationActionContainer = 2131624320;
-			
-			// aapt resource value: 0x7F0E0181
-			public const int Widget_Compat_NotificationActionText = 2131624321;
-			
-			// aapt resource value: 0x7F0E0182
-			public const int Widget_Design_AppBarLayout = 2131624322;
-			
-			// aapt resource value: 0x7F0E0183
-			public const int Widget_Design_BottomNavigationView = 2131624323;
-			
-			// aapt resource value: 0x7F0E0184
-			public const int Widget_Design_BottomSheet_Modal = 2131624324;
-			
-			// aapt resource value: 0x7F0E0185
-			public const int Widget_Design_CollapsingToolbar = 2131624325;
-			
-			// aapt resource value: 0x7F0E0186
-			public const int Widget_Design_CoordinatorLayout = 2131624326;
-			
-			// aapt resource value: 0x7F0E0187
-			public const int Widget_Design_FloatingActionButton = 2131624327;
-			
-			// aapt resource value: 0x7F0E0188
-			public const int Widget_Design_NavigationView = 2131624328;
-			
-			// aapt resource value: 0x7F0E0189
-			public const int Widget_Design_ScrimInsetsFrameLayout = 2131624329;
-			
-			// aapt resource value: 0x7F0E018A
-			public const int Widget_Design_Snackbar = 2131624330;
-			
-			// aapt resource value: 0x7F0E018B
-			public const int Widget_Design_TabLayout = 2131624331;
-			
-			// aapt resource value: 0x7F0E018C
-			public const int Widget_Design_TextInputLayout = 2131624332;
-			
+
+			// aapt resource value: 0x7f0b009d
+			public const int AlertDialog_AppCompat = 2131427485;
+
+			// aapt resource value: 0x7f0b009e
+			public const int AlertDialog_AppCompat_Light = 2131427486;
+
+			// aapt resource value: 0x7f0b009f
+			public const int Animation_AppCompat_Dialog = 2131427487;
+
+			// aapt resource value: 0x7f0b00a0
+			public const int Animation_AppCompat_DropDownUp = 2131427488;
+
+			// aapt resource value: 0x7f0b00a1
+			public const int Animation_AppCompat_Tooltip = 2131427489;
+
+			// aapt resource value: 0x7f0b0169
+			public const int Animation_Design_BottomSheetDialog = 2131427689;
+
+			// aapt resource value: 0x7f0b00a2
+			public const int Base_AlertDialog_AppCompat = 2131427490;
+
+			// aapt resource value: 0x7f0b00a3
+			public const int Base_AlertDialog_AppCompat_Light = 2131427491;
+
+			// aapt resource value: 0x7f0b00a4
+			public const int Base_Animation_AppCompat_Dialog = 2131427492;
+
+			// aapt resource value: 0x7f0b00a5
+			public const int Base_Animation_AppCompat_DropDownUp = 2131427493;
+
+			// aapt resource value: 0x7f0b00a6
+			public const int Base_Animation_AppCompat_Tooltip = 2131427494;
+
+			// aapt resource value: 0x7f0b00a7
+			public const int Base_DialogWindowTitle_AppCompat = 2131427495;
+
+			// aapt resource value: 0x7f0b00a8
+			public const int Base_DialogWindowTitleBackground_AppCompat = 2131427496;
+
+			// aapt resource value: 0x7f0b0039
+			public const int Base_TextAppearance_AppCompat = 2131427385;
+
+			// aapt resource value: 0x7f0b003a
+			public const int Base_TextAppearance_AppCompat_Body1 = 2131427386;
+
+			// aapt resource value: 0x7f0b003b
+			public const int Base_TextAppearance_AppCompat_Body2 = 2131427387;
+
+			// aapt resource value: 0x7f0b0027
+			public const int Base_TextAppearance_AppCompat_Button = 2131427367;
+
+			// aapt resource value: 0x7f0b003c
+			public const int Base_TextAppearance_AppCompat_Caption = 2131427388;
+
+			// aapt resource value: 0x7f0b003d
+			public const int Base_TextAppearance_AppCompat_Display1 = 2131427389;
+
+			// aapt resource value: 0x7f0b003e
+			public const int Base_TextAppearance_AppCompat_Display2 = 2131427390;
+
+			// aapt resource value: 0x7f0b003f
+			public const int Base_TextAppearance_AppCompat_Display3 = 2131427391;
+
+			// aapt resource value: 0x7f0b0040
+			public const int Base_TextAppearance_AppCompat_Display4 = 2131427392;
+
+			// aapt resource value: 0x7f0b0041
+			public const int Base_TextAppearance_AppCompat_Headline = 2131427393;
+
+			// aapt resource value: 0x7f0b000b
+			public const int Base_TextAppearance_AppCompat_Inverse = 2131427339;
+
+			// aapt resource value: 0x7f0b0042
+			public const int Base_TextAppearance_AppCompat_Large = 2131427394;
+
+			// aapt resource value: 0x7f0b000c
+			public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131427340;
+
+			// aapt resource value: 0x7f0b0043
+			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427395;
+
+			// aapt resource value: 0x7f0b0044
+			public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427396;
+
+			// aapt resource value: 0x7f0b0045
+			public const int Base_TextAppearance_AppCompat_Medium = 2131427397;
+
+			// aapt resource value: 0x7f0b000d
+			public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131427341;
+
+			// aapt resource value: 0x7f0b0046
+			public const int Base_TextAppearance_AppCompat_Menu = 2131427398;
+
+			// aapt resource value: 0x7f0b00a9
+			public const int Base_TextAppearance_AppCompat_SearchResult = 2131427497;
+
+			// aapt resource value: 0x7f0b0047
+			public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131427399;
+
+			// aapt resource value: 0x7f0b0048
+			public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131427400;
+
+			// aapt resource value: 0x7f0b0049
+			public const int Base_TextAppearance_AppCompat_Small = 2131427401;
+
+			// aapt resource value: 0x7f0b000e
+			public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131427342;
+
+			// aapt resource value: 0x7f0b004a
+			public const int Base_TextAppearance_AppCompat_Subhead = 2131427402;
+
+			// aapt resource value: 0x7f0b000f
+			public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131427343;
+
+			// aapt resource value: 0x7f0b004b
+			public const int Base_TextAppearance_AppCompat_Title = 2131427403;
+
+			// aapt resource value: 0x7f0b0010
+			public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131427344;
+
+			// aapt resource value: 0x7f0b00aa
+			public const int Base_TextAppearance_AppCompat_Tooltip = 2131427498;
+
+			// aapt resource value: 0x7f0b008e
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427470;
+
+			// aapt resource value: 0x7f0b004c
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427404;
+
+			// aapt resource value: 0x7f0b004d
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427405;
+
+			// aapt resource value: 0x7f0b004e
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427406;
+
+			// aapt resource value: 0x7f0b004f
+			public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427407;
+
+			// aapt resource value: 0x7f0b0050
+			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427408;
+
+			// aapt resource value: 0x7f0b0051
+			public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427409;
+
+			// aapt resource value: 0x7f0b0052
+			public const int Base_TextAppearance_AppCompat_Widget_Button = 2131427410;
+
+			// aapt resource value: 0x7f0b0095
+			public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427477;
+
+			// aapt resource value: 0x7f0b0096
+			public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131427478;
+
+			// aapt resource value: 0x7f0b008f
+			public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131427471;
+
+			// aapt resource value: 0x7f0b00ab
+			public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131427499;
+
+			// aapt resource value: 0x7f0b0053
+			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427411;
+
+			// aapt resource value: 0x7f0b0054
+			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427412;
+
+			// aapt resource value: 0x7f0b0055
+			public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427413;
+
+			// aapt resource value: 0x7f0b0056
+			public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131427414;
+
+			// aapt resource value: 0x7f0b0057
+			public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427415;
+
+			// aapt resource value: 0x7f0b00ac
+			public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427500;
+
+			// aapt resource value: 0x7f0b0058
+			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427416;
+
+			// aapt resource value: 0x7f0b0059
+			public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427417;
+
+			// aapt resource value: 0x7f0b005a
+			public const int Base_Theme_AppCompat = 2131427418;
+
+			// aapt resource value: 0x7f0b00ad
+			public const int Base_Theme_AppCompat_CompactMenu = 2131427501;
+
+			// aapt resource value: 0x7f0b0011
+			public const int Base_Theme_AppCompat_Dialog = 2131427345;
+
+			// aapt resource value: 0x7f0b0012
+			public const int Base_Theme_AppCompat_Dialog_Alert = 2131427346;
+
+			// aapt resource value: 0x7f0b00ae
+			public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131427502;
+
+			// aapt resource value: 0x7f0b0013
+			public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131427347;
+
+			// aapt resource value: 0x7f0b0001
+			public const int Base_Theme_AppCompat_DialogWhenLarge = 2131427329;
+
+			// aapt resource value: 0x7f0b005b
+			public const int Base_Theme_AppCompat_Light = 2131427419;
+
+			// aapt resource value: 0x7f0b00af
+			public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131427503;
+
+			// aapt resource value: 0x7f0b0014
+			public const int Base_Theme_AppCompat_Light_Dialog = 2131427348;
+
+			// aapt resource value: 0x7f0b0015
+			public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131427349;
+
+			// aapt resource value: 0x7f0b00b0
+			public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131427504;
+
+			// aapt resource value: 0x7f0b0016
+			public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131427350;
+
+			// aapt resource value: 0x7f0b0002
+			public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131427330;
+
+			// aapt resource value: 0x7f0b00b1
+			public const int Base_ThemeOverlay_AppCompat = 2131427505;
+
+			// aapt resource value: 0x7f0b00b2
+			public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131427506;
+
+			// aapt resource value: 0x7f0b00b3
+			public const int Base_ThemeOverlay_AppCompat_Dark = 2131427507;
+
+			// aapt resource value: 0x7f0b00b4
+			public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131427508;
+
+			// aapt resource value: 0x7f0b0017
+			public const int Base_ThemeOverlay_AppCompat_Dialog = 2131427351;
+
+			// aapt resource value: 0x7f0b0018
+			public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131427352;
+
+			// aapt resource value: 0x7f0b00b5
+			public const int Base_ThemeOverlay_AppCompat_Light = 2131427509;
+
+			// aapt resource value: 0x7f0b0019
+			public const int Base_V11_Theme_AppCompat_Dialog = 2131427353;
+
+			// aapt resource value: 0x7f0b001a
+			public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131427354;
+
+			// aapt resource value: 0x7f0b001b
+			public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131427355;
+
+			// aapt resource value: 0x7f0b0023
+			public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131427363;
+
+			// aapt resource value: 0x7f0b0024
+			public const int Base_V12_Widget_AppCompat_EditText = 2131427364;
+
+			// aapt resource value: 0x7f0b016a
+			public const int Base_V14_Widget_Design_AppBarLayout = 2131427690;
+
+			// aapt resource value: 0x7f0b005c
+			public const int Base_V21_Theme_AppCompat = 2131427420;
+
+			// aapt resource value: 0x7f0b005d
+			public const int Base_V21_Theme_AppCompat_Dialog = 2131427421;
+
+			// aapt resource value: 0x7f0b005e
+			public const int Base_V21_Theme_AppCompat_Light = 2131427422;
+
+			// aapt resource value: 0x7f0b005f
+			public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131427423;
+
+			// aapt resource value: 0x7f0b0060
+			public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131427424;
+
+			// aapt resource value: 0x7f0b0166
+			public const int Base_V21_Widget_Design_AppBarLayout = 2131427686;
+
+			// aapt resource value: 0x7f0b008c
+			public const int Base_V22_Theme_AppCompat = 2131427468;
+
+			// aapt resource value: 0x7f0b008d
+			public const int Base_V22_Theme_AppCompat_Light = 2131427469;
+
+			// aapt resource value: 0x7f0b0090
+			public const int Base_V23_Theme_AppCompat = 2131427472;
+
+			// aapt resource value: 0x7f0b0091
+			public const int Base_V23_Theme_AppCompat_Light = 2131427473;
+
+			// aapt resource value: 0x7f0b0099
+			public const int Base_V26_Theme_AppCompat = 2131427481;
+
+			// aapt resource value: 0x7f0b009a
+			public const int Base_V26_Theme_AppCompat_Light = 2131427482;
+
+			// aapt resource value: 0x7f0b009b
+			public const int Base_V26_Widget_AppCompat_Toolbar = 2131427483;
+
+			// aapt resource value: 0x7f0b0168
+			public const int Base_V26_Widget_Design_AppBarLayout = 2131427688;
+
+			// aapt resource value: 0x7f0b00b6
+			public const int Base_V7_Theme_AppCompat = 2131427510;
+
+			// aapt resource value: 0x7f0b00b7
+			public const int Base_V7_Theme_AppCompat_Dialog = 2131427511;
+
+			// aapt resource value: 0x7f0b00b8
+			public const int Base_V7_Theme_AppCompat_Light = 2131427512;
+
+			// aapt resource value: 0x7f0b00b9
+			public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131427513;
+
+			// aapt resource value: 0x7f0b00ba
+			public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131427514;
+
+			// aapt resource value: 0x7f0b00bb
+			public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131427515;
+
+			// aapt resource value: 0x7f0b00bc
+			public const int Base_V7_Widget_AppCompat_EditText = 2131427516;
+
+			// aapt resource value: 0x7f0b00bd
+			public const int Base_V7_Widget_AppCompat_Toolbar = 2131427517;
+
+			// aapt resource value: 0x7f0b00be
+			public const int Base_Widget_AppCompat_ActionBar = 2131427518;
+
+			// aapt resource value: 0x7f0b00bf
+			public const int Base_Widget_AppCompat_ActionBar_Solid = 2131427519;
+
+			// aapt resource value: 0x7f0b00c0
+			public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131427520;
+
+			// aapt resource value: 0x7f0b0061
+			public const int Base_Widget_AppCompat_ActionBar_TabText = 2131427425;
+
+			// aapt resource value: 0x7f0b0062
+			public const int Base_Widget_AppCompat_ActionBar_TabView = 2131427426;
+
+			// aapt resource value: 0x7f0b0063
+			public const int Base_Widget_AppCompat_ActionButton = 2131427427;
+
+			// aapt resource value: 0x7f0b0064
+			public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131427428;
+
+			// aapt resource value: 0x7f0b0065
+			public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131427429;
+
+			// aapt resource value: 0x7f0b00c1
+			public const int Base_Widget_AppCompat_ActionMode = 2131427521;
+
+			// aapt resource value: 0x7f0b00c2
+			public const int Base_Widget_AppCompat_ActivityChooserView = 2131427522;
+
+			// aapt resource value: 0x7f0b0025
+			public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131427365;
+
+			// aapt resource value: 0x7f0b0066
+			public const int Base_Widget_AppCompat_Button = 2131427430;
+
+			// aapt resource value: 0x7f0b0067
+			public const int Base_Widget_AppCompat_Button_Borderless = 2131427431;
+
+			// aapt resource value: 0x7f0b0068
+			public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131427432;
+
+			// aapt resource value: 0x7f0b00c3
+			public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427523;
+
+			// aapt resource value: 0x7f0b0092
+			public const int Base_Widget_AppCompat_Button_Colored = 2131427474;
+
+			// aapt resource value: 0x7f0b0069
+			public const int Base_Widget_AppCompat_Button_Small = 2131427433;
+
+			// aapt resource value: 0x7f0b006a
+			public const int Base_Widget_AppCompat_ButtonBar = 2131427434;
+
+			// aapt resource value: 0x7f0b00c4
+			public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131427524;
+
+			// aapt resource value: 0x7f0b006b
+			public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131427435;
+
+			// aapt resource value: 0x7f0b006c
+			public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131427436;
+
+			// aapt resource value: 0x7f0b00c5
+			public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131427525;
+
+			// aapt resource value: 0x7f0b0000
+			public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131427328;
+
+			// aapt resource value: 0x7f0b00c6
+			public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131427526;
+
+			// aapt resource value: 0x7f0b006d
+			public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131427437;
+
+			// aapt resource value: 0x7f0b0026
+			public const int Base_Widget_AppCompat_EditText = 2131427366;
+
+			// aapt resource value: 0x7f0b006e
+			public const int Base_Widget_AppCompat_ImageButton = 2131427438;
+
+			// aapt resource value: 0x7f0b00c7
+			public const int Base_Widget_AppCompat_Light_ActionBar = 2131427527;
+
+			// aapt resource value: 0x7f0b00c8
+			public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131427528;
+
+			// aapt resource value: 0x7f0b00c9
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131427529;
+
+			// aapt resource value: 0x7f0b006f
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131427439;
+
+			// aapt resource value: 0x7f0b0070
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427440;
+
+			// aapt resource value: 0x7f0b0071
+			public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131427441;
+
+			// aapt resource value: 0x7f0b0072
+			public const int Base_Widget_AppCompat_Light_PopupMenu = 2131427442;
+
+			// aapt resource value: 0x7f0b0073
+			public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131427443;
+
+			// aapt resource value: 0x7f0b00ca
+			public const int Base_Widget_AppCompat_ListMenuView = 2131427530;
+
+			// aapt resource value: 0x7f0b0074
+			public const int Base_Widget_AppCompat_ListPopupWindow = 2131427444;
+
+			// aapt resource value: 0x7f0b0075
+			public const int Base_Widget_AppCompat_ListView = 2131427445;
+
+			// aapt resource value: 0x7f0b0076
+			public const int Base_Widget_AppCompat_ListView_DropDown = 2131427446;
+
+			// aapt resource value: 0x7f0b0077
+			public const int Base_Widget_AppCompat_ListView_Menu = 2131427447;
+
+			// aapt resource value: 0x7f0b0078
+			public const int Base_Widget_AppCompat_PopupMenu = 2131427448;
+
+			// aapt resource value: 0x7f0b0079
+			public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131427449;
+
+			// aapt resource value: 0x7f0b00cb
+			public const int Base_Widget_AppCompat_PopupWindow = 2131427531;
+
+			// aapt resource value: 0x7f0b001c
+			public const int Base_Widget_AppCompat_ProgressBar = 2131427356;
+
+			// aapt resource value: 0x7f0b001d
+			public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131427357;
+
+			// aapt resource value: 0x7f0b007a
+			public const int Base_Widget_AppCompat_RatingBar = 2131427450;
+
+			// aapt resource value: 0x7f0b0093
+			public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131427475;
+
+			// aapt resource value: 0x7f0b0094
+			public const int Base_Widget_AppCompat_RatingBar_Small = 2131427476;
+
+			// aapt resource value: 0x7f0b00cc
+			public const int Base_Widget_AppCompat_SearchView = 2131427532;
+
+			// aapt resource value: 0x7f0b00cd
+			public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131427533;
+
+			// aapt resource value: 0x7f0b007b
+			public const int Base_Widget_AppCompat_SeekBar = 2131427451;
+
+			// aapt resource value: 0x7f0b00ce
+			public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131427534;
+
+			// aapt resource value: 0x7f0b007c
+			public const int Base_Widget_AppCompat_Spinner = 2131427452;
+
+			// aapt resource value: 0x7f0b0003
+			public const int Base_Widget_AppCompat_Spinner_Underlined = 2131427331;
+
+			// aapt resource value: 0x7f0b007d
+			public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131427453;
+
+			// aapt resource value: 0x7f0b009c
+			public const int Base_Widget_AppCompat_Toolbar = 2131427484;
+
+			// aapt resource value: 0x7f0b007e
+			public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131427454;
+
+			// aapt resource value: 0x7f0b0167
+			public const int Base_Widget_Design_AppBarLayout = 2131427687;
+
+			// aapt resource value: 0x7f0b016b
+			public const int Base_Widget_Design_TabLayout = 2131427691;
+
+			// aapt resource value: 0x7f0b018a
+			public const int BottomSheetDialogAnimation = 2131427722;
+
+			// aapt resource value: 0x7f0b018f
+			public const int MyTheme = 2131427727;
+
+			// aapt resource value: 0x7f0b001e
+			public const int Platform_AppCompat = 2131427358;
+
+			// aapt resource value: 0x7f0b001f
+			public const int Platform_AppCompat_Light = 2131427359;
+
+			// aapt resource value: 0x7f0b007f
+			public const int Platform_ThemeOverlay_AppCompat = 2131427455;
+
+			// aapt resource value: 0x7f0b0080
+			public const int Platform_ThemeOverlay_AppCompat_Dark = 2131427456;
+
+			// aapt resource value: 0x7f0b0081
+			public const int Platform_ThemeOverlay_AppCompat_Light = 2131427457;
+
+			// aapt resource value: 0x7f0b0020
+			public const int Platform_V11_AppCompat = 2131427360;
+
+			// aapt resource value: 0x7f0b0021
+			public const int Platform_V11_AppCompat_Light = 2131427361;
+
+			// aapt resource value: 0x7f0b0028
+			public const int Platform_V14_AppCompat = 2131427368;
+
+			// aapt resource value: 0x7f0b0029
+			public const int Platform_V14_AppCompat_Light = 2131427369;
+
+			// aapt resource value: 0x7f0b0082
+			public const int Platform_V21_AppCompat = 2131427458;
+
+			// aapt resource value: 0x7f0b0083
+			public const int Platform_V21_AppCompat_Light = 2131427459;
+
+			// aapt resource value: 0x7f0b0097
+			public const int Platform_V25_AppCompat = 2131427479;
+
+			// aapt resource value: 0x7f0b0098
+			public const int Platform_V25_AppCompat_Light = 2131427480;
+
+			// aapt resource value: 0x7f0b0022
+			public const int Platform_Widget_AppCompat_Spinner = 2131427362;
+
+			// aapt resource value: 0x7f0b002b
+			public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131427371;
+
+			// aapt resource value: 0x7f0b002c
+			public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131427372;
+
+			// aapt resource value: 0x7f0b002d
+			public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131427373;
+
+			// aapt resource value: 0x7f0b002e
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131427374;
+
+			// aapt resource value: 0x7f0b002f
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131427375;
+
+			// aapt resource value: 0x7f0b0030
+			public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131427376;
+
+			// aapt resource value: 0x7f0b0031
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131427377;
+
+			// aapt resource value: 0x7f0b0032
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131427378;
+
+			// aapt resource value: 0x7f0b0033
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131427379;
+
+			// aapt resource value: 0x7f0b0034
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131427380;
+
+			// aapt resource value: 0x7f0b0035
+			public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131427381;
+
+			// aapt resource value: 0x7f0b0036
+			public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131427382;
+
+			// aapt resource value: 0x7f0b0037
+			public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131427383;
+
+			// aapt resource value: 0x7f0b0038
+			public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131427384;
+
+			// aapt resource value: 0x7f0b00cf
+			public const int TextAppearance_AppCompat = 2131427535;
+
+			// aapt resource value: 0x7f0b00d0
+			public const int TextAppearance_AppCompat_Body1 = 2131427536;
+
+			// aapt resource value: 0x7f0b00d1
+			public const int TextAppearance_AppCompat_Body2 = 2131427537;
+
+			// aapt resource value: 0x7f0b00d2
+			public const int TextAppearance_AppCompat_Button = 2131427538;
+
+			// aapt resource value: 0x7f0b00d3
+			public const int TextAppearance_AppCompat_Caption = 2131427539;
+
+			// aapt resource value: 0x7f0b00d4
+			public const int TextAppearance_AppCompat_Display1 = 2131427540;
+
+			// aapt resource value: 0x7f0b00d5
+			public const int TextAppearance_AppCompat_Display2 = 2131427541;
+
+			// aapt resource value: 0x7f0b00d6
+			public const int TextAppearance_AppCompat_Display3 = 2131427542;
+
+			// aapt resource value: 0x7f0b00d7
+			public const int TextAppearance_AppCompat_Display4 = 2131427543;
+
+			// aapt resource value: 0x7f0b00d8
+			public const int TextAppearance_AppCompat_Headline = 2131427544;
+
+			// aapt resource value: 0x7f0b00d9
+			public const int TextAppearance_AppCompat_Inverse = 2131427545;
+
+			// aapt resource value: 0x7f0b00da
+			public const int TextAppearance_AppCompat_Large = 2131427546;
+
+			// aapt resource value: 0x7f0b00db
+			public const int TextAppearance_AppCompat_Large_Inverse = 2131427547;
+
+			// aapt resource value: 0x7f0b00dc
+			public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131427548;
+
+			// aapt resource value: 0x7f0b00dd
+			public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131427549;
+
+			// aapt resource value: 0x7f0b00de
+			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427550;
+
+			// aapt resource value: 0x7f0b00df
+			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427551;
+
+			// aapt resource value: 0x7f0b00e0
+			public const int TextAppearance_AppCompat_Medium = 2131427552;
+
+			// aapt resource value: 0x7f0b00e1
+			public const int TextAppearance_AppCompat_Medium_Inverse = 2131427553;
+
+			// aapt resource value: 0x7f0b00e2
+			public const int TextAppearance_AppCompat_Menu = 2131427554;
+
+			// aapt resource value: 0x7f0b0084
+			public const int TextAppearance_AppCompat_Notification = 2131427460;
+
+			// aapt resource value: 0x7f0b0085
+			public const int TextAppearance_AppCompat_Notification_Info = 2131427461;
+
+			// aapt resource value: 0x7f0b0086
+			public const int TextAppearance_AppCompat_Notification_Info_Media = 2131427462;
+
+			// aapt resource value: 0x7f0b00e3
+			public const int TextAppearance_AppCompat_Notification_Line2 = 2131427555;
+
+			// aapt resource value: 0x7f0b00e4
+			public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131427556;
+
+			// aapt resource value: 0x7f0b0087
+			public const int TextAppearance_AppCompat_Notification_Media = 2131427463;
+
+			// aapt resource value: 0x7f0b0088
+			public const int TextAppearance_AppCompat_Notification_Time = 2131427464;
+
+			// aapt resource value: 0x7f0b0089
+			public const int TextAppearance_AppCompat_Notification_Time_Media = 2131427465;
+
+			// aapt resource value: 0x7f0b008a
+			public const int TextAppearance_AppCompat_Notification_Title = 2131427466;
+
+			// aapt resource value: 0x7f0b008b
+			public const int TextAppearance_AppCompat_Notification_Title_Media = 2131427467;
+
+			// aapt resource value: 0x7f0b00e5
+			public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131427557;
+
+			// aapt resource value: 0x7f0b00e6
+			public const int TextAppearance_AppCompat_SearchResult_Title = 2131427558;
+
+			// aapt resource value: 0x7f0b00e7
+			public const int TextAppearance_AppCompat_Small = 2131427559;
+
+			// aapt resource value: 0x7f0b00e8
+			public const int TextAppearance_AppCompat_Small_Inverse = 2131427560;
+
+			// aapt resource value: 0x7f0b00e9
+			public const int TextAppearance_AppCompat_Subhead = 2131427561;
+
+			// aapt resource value: 0x7f0b00ea
+			public const int TextAppearance_AppCompat_Subhead_Inverse = 2131427562;
+
+			// aapt resource value: 0x7f0b00eb
+			public const int TextAppearance_AppCompat_Title = 2131427563;
+
+			// aapt resource value: 0x7f0b00ec
+			public const int TextAppearance_AppCompat_Title_Inverse = 2131427564;
+
+			// aapt resource value: 0x7f0b002a
+			public const int TextAppearance_AppCompat_Tooltip = 2131427370;
+
+			// aapt resource value: 0x7f0b00ed
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427565;
+
+			// aapt resource value: 0x7f0b00ee
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427566;
+
+			// aapt resource value: 0x7f0b00ef
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427567;
+
+			// aapt resource value: 0x7f0b00f0
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427568;
+
+			// aapt resource value: 0x7f0b00f1
+			public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427569;
+
+			// aapt resource value: 0x7f0b00f2
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427570;
+
+			// aapt resource value: 0x7f0b00f3
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131427571;
+
+			// aapt resource value: 0x7f0b00f4
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427572;
+
+			// aapt resource value: 0x7f0b00f5
+			public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131427573;
+
+			// aapt resource value: 0x7f0b00f6
+			public const int TextAppearance_AppCompat_Widget_Button = 2131427574;
+
+			// aapt resource value: 0x7f0b00f7
+			public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427575;
+
+			// aapt resource value: 0x7f0b00f8
+			public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131427576;
+
+			// aapt resource value: 0x7f0b00f9
+			public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131427577;
+
+			// aapt resource value: 0x7f0b00fa
+			public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131427578;
+
+			// aapt resource value: 0x7f0b00fb
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427579;
+
+			// aapt resource value: 0x7f0b00fc
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427580;
+
+			// aapt resource value: 0x7f0b00fd
+			public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427581;
+
+			// aapt resource value: 0x7f0b00fe
+			public const int TextAppearance_AppCompat_Widget_Switch = 2131427582;
+
+			// aapt resource value: 0x7f0b00ff
+			public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427583;
+
+			// aapt resource value: 0x7f0b0183
+			public const int TextAppearance_Compat_Notification = 2131427715;
+
+			// aapt resource value: 0x7f0b0184
+			public const int TextAppearance_Compat_Notification_Info = 2131427716;
+
+			// aapt resource value: 0x7f0b0160
+			public const int TextAppearance_Compat_Notification_Info_Media = 2131427680;
+
+			// aapt resource value: 0x7f0b0189
+			public const int TextAppearance_Compat_Notification_Line2 = 2131427721;
+
+			// aapt resource value: 0x7f0b0164
+			public const int TextAppearance_Compat_Notification_Line2_Media = 2131427684;
+
+			// aapt resource value: 0x7f0b0161
+			public const int TextAppearance_Compat_Notification_Media = 2131427681;
+
+			// aapt resource value: 0x7f0b0185
+			public const int TextAppearance_Compat_Notification_Time = 2131427717;
+
+			// aapt resource value: 0x7f0b0162
+			public const int TextAppearance_Compat_Notification_Time_Media = 2131427682;
+
+			// aapt resource value: 0x7f0b0186
+			public const int TextAppearance_Compat_Notification_Title = 2131427718;
+
+			// aapt resource value: 0x7f0b0163
+			public const int TextAppearance_Compat_Notification_Title_Media = 2131427683;
+
+			// aapt resource value: 0x7f0b016c
+			public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131427692;
+
+			// aapt resource value: 0x7f0b016d
+			public const int TextAppearance_Design_Counter = 2131427693;
+
+			// aapt resource value: 0x7f0b016e
+			public const int TextAppearance_Design_Counter_Overflow = 2131427694;
+
+			// aapt resource value: 0x7f0b016f
+			public const int TextAppearance_Design_Error = 2131427695;
+
+			// aapt resource value: 0x7f0b0170
+			public const int TextAppearance_Design_Hint = 2131427696;
+
+			// aapt resource value: 0x7f0b0171
+			public const int TextAppearance_Design_Snackbar_Message = 2131427697;
+
+			// aapt resource value: 0x7f0b0172
+			public const int TextAppearance_Design_Tab = 2131427698;
+
+			// aapt resource value: 0x7f0b0100
+			public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427584;
+
+			// aapt resource value: 0x7f0b0101
+			public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427585;
+
+			// aapt resource value: 0x7f0b0102
+			public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427586;
+
+			// aapt resource value: 0x7f0b0103
+			public const int Theme_AppCompat = 2131427587;
+
+			// aapt resource value: 0x7f0b0104
+			public const int Theme_AppCompat_CompactMenu = 2131427588;
+
+			// aapt resource value: 0x7f0b0004
+			public const int Theme_AppCompat_DayNight = 2131427332;
+
+			// aapt resource value: 0x7f0b0005
+			public const int Theme_AppCompat_DayNight_DarkActionBar = 2131427333;
+
+			// aapt resource value: 0x7f0b0006
+			public const int Theme_AppCompat_DayNight_Dialog = 2131427334;
+
+			// aapt resource value: 0x7f0b0007
+			public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131427335;
+
+			// aapt resource value: 0x7f0b0008
+			public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131427336;
+
+			// aapt resource value: 0x7f0b0009
+			public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131427337;
+
+			// aapt resource value: 0x7f0b000a
+			public const int Theme_AppCompat_DayNight_NoActionBar = 2131427338;
+
+			// aapt resource value: 0x7f0b0105
+			public const int Theme_AppCompat_Dialog = 2131427589;
+
+			// aapt resource value: 0x7f0b0106
+			public const int Theme_AppCompat_Dialog_Alert = 2131427590;
+
+			// aapt resource value: 0x7f0b0107
+			public const int Theme_AppCompat_Dialog_MinWidth = 2131427591;
+
+			// aapt resource value: 0x7f0b0108
+			public const int Theme_AppCompat_DialogWhenLarge = 2131427592;
+
+			// aapt resource value: 0x7f0b0109
+			public const int Theme_AppCompat_Light = 2131427593;
+
+			// aapt resource value: 0x7f0b010a
+			public const int Theme_AppCompat_Light_DarkActionBar = 2131427594;
+
+			// aapt resource value: 0x7f0b010b
+			public const int Theme_AppCompat_Light_Dialog = 2131427595;
+
+			// aapt resource value: 0x7f0b010c
+			public const int Theme_AppCompat_Light_Dialog_Alert = 2131427596;
+
+			// aapt resource value: 0x7f0b010d
+			public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131427597;
+
+			// aapt resource value: 0x7f0b010e
+			public const int Theme_AppCompat_Light_DialogWhenLarge = 2131427598;
+
+			// aapt resource value: 0x7f0b010f
+			public const int Theme_AppCompat_Light_NoActionBar = 2131427599;
+
+			// aapt resource value: 0x7f0b0110
+			public const int Theme_AppCompat_NoActionBar = 2131427600;
+
+			// aapt resource value: 0x7f0b018b
+			public const int Theme_BiometricPromptDialog = 2131427723;
+
+			// aapt resource value: 0x7f0b0173
+			public const int Theme_Design = 2131427699;
+
+			// aapt resource value: 0x7f0b0174
+			public const int Theme_Design_BottomSheetDialog = 2131427700;
+
+			// aapt resource value: 0x7f0b0175
+			public const int Theme_Design_Light = 2131427701;
+
+			// aapt resource value: 0x7f0b0176
+			public const int Theme_Design_Light_BottomSheetDialog = 2131427702;
+
+			// aapt resource value: 0x7f0b0177
+			public const int Theme_Design_Light_NoActionBar = 2131427703;
+
+			// aapt resource value: 0x7f0b0178
+			public const int Theme_Design_NoActionBar = 2131427704;
+
+			// aapt resource value: 0x7f0b0111
+			public const int ThemeOverlay_AppCompat = 2131427601;
+
+			// aapt resource value: 0x7f0b0112
+			public const int ThemeOverlay_AppCompat_ActionBar = 2131427602;
+
+			// aapt resource value: 0x7f0b0113
+			public const int ThemeOverlay_AppCompat_Dark = 2131427603;
+
+			// aapt resource value: 0x7f0b0114
+			public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131427604;
+
+			// aapt resource value: 0x7f0b0115
+			public const int ThemeOverlay_AppCompat_Dialog = 2131427605;
+
+			// aapt resource value: 0x7f0b0116
+			public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131427606;
+
+			// aapt resource value: 0x7f0b0117
+			public const int ThemeOverlay_AppCompat_Light = 2131427607;
+
+			// aapt resource value: 0x7f0b0118
+			public const int Widget_AppCompat_ActionBar = 2131427608;
+
+			// aapt resource value: 0x7f0b0119
+			public const int Widget_AppCompat_ActionBar_Solid = 2131427609;
+
+			// aapt resource value: 0x7f0b011a
+			public const int Widget_AppCompat_ActionBar_TabBar = 2131427610;
+
+			// aapt resource value: 0x7f0b011b
+			public const int Widget_AppCompat_ActionBar_TabText = 2131427611;
+
+			// aapt resource value: 0x7f0b011c
+			public const int Widget_AppCompat_ActionBar_TabView = 2131427612;
+
+			// aapt resource value: 0x7f0b011d
+			public const int Widget_AppCompat_ActionButton = 2131427613;
+
+			// aapt resource value: 0x7f0b011e
+			public const int Widget_AppCompat_ActionButton_CloseMode = 2131427614;
+
+			// aapt resource value: 0x7f0b011f
+			public const int Widget_AppCompat_ActionButton_Overflow = 2131427615;
+
+			// aapt resource value: 0x7f0b0120
+			public const int Widget_AppCompat_ActionMode = 2131427616;
+
+			// aapt resource value: 0x7f0b0121
+			public const int Widget_AppCompat_ActivityChooserView = 2131427617;
+
+			// aapt resource value: 0x7f0b0122
+			public const int Widget_AppCompat_AutoCompleteTextView = 2131427618;
+
+			// aapt resource value: 0x7f0b0123
+			public const int Widget_AppCompat_Button = 2131427619;
+
+			// aapt resource value: 0x7f0b0124
+			public const int Widget_AppCompat_Button_Borderless = 2131427620;
+
+			// aapt resource value: 0x7f0b0125
+			public const int Widget_AppCompat_Button_Borderless_Colored = 2131427621;
+
+			// aapt resource value: 0x7f0b0126
+			public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427622;
+
+			// aapt resource value: 0x7f0b0127
+			public const int Widget_AppCompat_Button_Colored = 2131427623;
+
+			// aapt resource value: 0x7f0b0128
+			public const int Widget_AppCompat_Button_Small = 2131427624;
+
+			// aapt resource value: 0x7f0b0129
+			public const int Widget_AppCompat_ButtonBar = 2131427625;
+
+			// aapt resource value: 0x7f0b012a
+			public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131427626;
+
+			// aapt resource value: 0x7f0b012b
+			public const int Widget_AppCompat_CompoundButton_CheckBox = 2131427627;
+
+			// aapt resource value: 0x7f0b012c
+			public const int Widget_AppCompat_CompoundButton_RadioButton = 2131427628;
+
+			// aapt resource value: 0x7f0b012d
+			public const int Widget_AppCompat_CompoundButton_Switch = 2131427629;
+
+			// aapt resource value: 0x7f0b012e
+			public const int Widget_AppCompat_DrawerArrowToggle = 2131427630;
+
+			// aapt resource value: 0x7f0b012f
+			public const int Widget_AppCompat_DropDownItem_Spinner = 2131427631;
+
+			// aapt resource value: 0x7f0b0130
+			public const int Widget_AppCompat_EditText = 2131427632;
+
+			// aapt resource value: 0x7f0b0131
+			public const int Widget_AppCompat_ImageButton = 2131427633;
+
+			// aapt resource value: 0x7f0b0132
+			public const int Widget_AppCompat_Light_ActionBar = 2131427634;
+
+			// aapt resource value: 0x7f0b0133
+			public const int Widget_AppCompat_Light_ActionBar_Solid = 2131427635;
+
+			// aapt resource value: 0x7f0b0134
+			public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131427636;
+
+			// aapt resource value: 0x7f0b0135
+			public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131427637;
+
+			// aapt resource value: 0x7f0b0136
+			public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131427638;
+
+			// aapt resource value: 0x7f0b0137
+			public const int Widget_AppCompat_Light_ActionBar_TabText = 2131427639;
+
+			// aapt resource value: 0x7f0b0138
+			public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427640;
+
+			// aapt resource value: 0x7f0b0139
+			public const int Widget_AppCompat_Light_ActionBar_TabView = 2131427641;
+
+			// aapt resource value: 0x7f0b013a
+			public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131427642;
+
+			// aapt resource value: 0x7f0b013b
+			public const int Widget_AppCompat_Light_ActionButton = 2131427643;
+
+			// aapt resource value: 0x7f0b013c
+			public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131427644;
+
+			// aapt resource value: 0x7f0b013d
+			public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131427645;
+
+			// aapt resource value: 0x7f0b013e
+			public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131427646;
+
+			// aapt resource value: 0x7f0b013f
+			public const int Widget_AppCompat_Light_ActivityChooserView = 2131427647;
+
+			// aapt resource value: 0x7f0b0140
+			public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131427648;
+
+			// aapt resource value: 0x7f0b0141
+			public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131427649;
+
+			// aapt resource value: 0x7f0b0142
+			public const int Widget_AppCompat_Light_ListPopupWindow = 2131427650;
+
+			// aapt resource value: 0x7f0b0143
+			public const int Widget_AppCompat_Light_ListView_DropDown = 2131427651;
+
+			// aapt resource value: 0x7f0b0144
+			public const int Widget_AppCompat_Light_PopupMenu = 2131427652;
+
+			// aapt resource value: 0x7f0b0145
+			public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131427653;
+
+			// aapt resource value: 0x7f0b0146
+			public const int Widget_AppCompat_Light_SearchView = 2131427654;
+
+			// aapt resource value: 0x7f0b0147
+			public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131427655;
+
+			// aapt resource value: 0x7f0b0148
+			public const int Widget_AppCompat_ListMenuView = 2131427656;
+
+			// aapt resource value: 0x7f0b0149
+			public const int Widget_AppCompat_ListPopupWindow = 2131427657;
+
+			// aapt resource value: 0x7f0b014a
+			public const int Widget_AppCompat_ListView = 2131427658;
+
+			// aapt resource value: 0x7f0b014b
+			public const int Widget_AppCompat_ListView_DropDown = 2131427659;
+
+			// aapt resource value: 0x7f0b014c
+			public const int Widget_AppCompat_ListView_Menu = 2131427660;
+
+			// aapt resource value: 0x7f0b014d
+			public const int Widget_AppCompat_PopupMenu = 2131427661;
+
+			// aapt resource value: 0x7f0b014e
+			public const int Widget_AppCompat_PopupMenu_Overflow = 2131427662;
+
+			// aapt resource value: 0x7f0b014f
+			public const int Widget_AppCompat_PopupWindow = 2131427663;
+
+			// aapt resource value: 0x7f0b0150
+			public const int Widget_AppCompat_ProgressBar = 2131427664;
+
+			// aapt resource value: 0x7f0b0151
+			public const int Widget_AppCompat_ProgressBar_Horizontal = 2131427665;
+
+			// aapt resource value: 0x7f0b0152
+			public const int Widget_AppCompat_RatingBar = 2131427666;
+
+			// aapt resource value: 0x7f0b0153
+			public const int Widget_AppCompat_RatingBar_Indicator = 2131427667;
+
+			// aapt resource value: 0x7f0b0154
+			public const int Widget_AppCompat_RatingBar_Small = 2131427668;
+
+			// aapt resource value: 0x7f0b0155
+			public const int Widget_AppCompat_SearchView = 2131427669;
+
+			// aapt resource value: 0x7f0b0156
+			public const int Widget_AppCompat_SearchView_ActionBar = 2131427670;
+
+			// aapt resource value: 0x7f0b0157
+			public const int Widget_AppCompat_SeekBar = 2131427671;
+
+			// aapt resource value: 0x7f0b0158
+			public const int Widget_AppCompat_SeekBar_Discrete = 2131427672;
+
+			// aapt resource value: 0x7f0b0159
+			public const int Widget_AppCompat_Spinner = 2131427673;
+
+			// aapt resource value: 0x7f0b015a
+			public const int Widget_AppCompat_Spinner_DropDown = 2131427674;
+
+			// aapt resource value: 0x7f0b015b
+			public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131427675;
+
+			// aapt resource value: 0x7f0b015c
+			public const int Widget_AppCompat_Spinner_Underlined = 2131427676;
+
+			// aapt resource value: 0x7f0b015d
+			public const int Widget_AppCompat_TextView_SpinnerItem = 2131427677;
+
+			// aapt resource value: 0x7f0b015e
+			public const int Widget_AppCompat_Toolbar = 2131427678;
+
+			// aapt resource value: 0x7f0b015f
+			public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131427679;
+
+			// aapt resource value: 0x7f0b0187
+			public const int Widget_Compat_NotificationActionContainer = 2131427719;
+
+			// aapt resource value: 0x7f0b0188
+			public const int Widget_Compat_NotificationActionText = 2131427720;
+
+			// aapt resource value: 0x7f0b0179
+			public const int Widget_Design_AppBarLayout = 2131427705;
+
+			// aapt resource value: 0x7f0b017a
+			public const int Widget_Design_BottomNavigationView = 2131427706;
+
+			// aapt resource value: 0x7f0b017b
+			public const int Widget_Design_BottomSheet_Modal = 2131427707;
+
+			// aapt resource value: 0x7f0b017c
+			public const int Widget_Design_CollapsingToolbar = 2131427708;
+
+			// aapt resource value: 0x7f0b017d
+			public const int Widget_Design_CoordinatorLayout = 2131427709;
+
+			// aapt resource value: 0x7f0b017e
+			public const int Widget_Design_FloatingActionButton = 2131427710;
+
+			// aapt resource value: 0x7f0b017f
+			public const int Widget_Design_NavigationView = 2131427711;
+
+			// aapt resource value: 0x7f0b0180
+			public const int Widget_Design_ScrimInsetsFrameLayout = 2131427712;
+
+			// aapt resource value: 0x7f0b0181
+			public const int Widget_Design_Snackbar = 2131427713;
+
+			// aapt resource value: 0x7f0b0165
+			public const int Widget_Design_TabLayout = 2131427685;
+
+			// aapt resource value: 0x7f0b0182
+			public const int Widget_Design_TextInputLayout = 2131427714;
+
+			// aapt resource value: 0x7f0b018c
+			public const int custom_dialog2 = 2131427724;
+
+			// aapt resource value: 0x7f0b018d
+			public const int picker_view_scale_anim = 2131427725;
+
+			// aapt resource value: 0x7f0b018e
+			public const int picker_view_slide_anim = 2131427726;
+
 			static Style()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Style()
 			{
 			}
 		}
-		
+
+		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};
-			
-			// aapt resource value: { 0x10100B3 }
+					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: 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};
-			
-			// aapt resource value: { 0x7F040042,0x7F040043,0x7F040060,0x7F0400B4,0x7F04016B,0x7F0401A1 }
+
+			public static int[] ActionMenuView;
+
 			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;
-			
-			// aapt resource value: { 0x10100F2,0x7F040058,0x7F0400DA,0x7F0400DB,0x7F0400E9,0x7F040117,0x7F040118 }
+			public const int ActionMode_titleTextStyle = 1;
+
+			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;
-			
+
 			// aapt resource value: 1
 			public const int AlertDialog_buttonPanelSideLayout = 1;
-			
-			// aapt resource value: 2
-			public const int AlertDialog_listItemLayout = 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_listItemLayout = 5;
+
+			// aapt resource value: 2
+			public const int AlertDialog_listLayout = 2;
+
+			// aapt resource value: 3
+			public const int AlertDialog_multiChoiceItemLayout = 3;
+
 			// aapt resource value: 6
-			public const int AlertDialog_singleChoiceItemLayout = 6;
-			
-			// aapt resource value: { 0x10100D4,0x101048F,0x1010540,0x7F040093,0x7F040097 }
+			public const int AlertDialog_showTitle = 6;
+
+			// 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;
-			
+
 			// aapt resource value: 2
 			public const int AppBarLayout_android_keyboardNavigationCluster = 2;
-			
+
 			// aapt resource value: 1
 			public const int AppBarLayout_android_touchscreenBlocksFocus = 1;
-			
+
 			// aapt resource value: 3
 			public const int AppBarLayout_elevation = 3;
-			
+
 			// 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;
-			
+
 			// 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;
-			
+
 			// aapt resource value: 1
 			public const int AppCompatImageView_srcCompat = 1;
-			
+
 			// aapt resource value: 2
 			public const int AppCompatImageView_tint = 2;
-			
+
 			// 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;
-			
+
 			// aapt resource value: 1
 			public const int AppCompatSeekBar_tickMark = 1;
-			
+
 			// aapt resource value: 2
 			public const int AppCompatSeekBar_tickMarkTint = 2;
-			
+
 			// 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,
@@ -5719,1281 +5778,1252 @@
 					16843120,
 					16843666,
 					16843667};
-			
+
 			// aapt resource value: 2
 			public const int AppCompatTextHelper_android_drawableBottom = 2;
-			
+
 			// aapt resource value: 6
 			public const int AppCompatTextHelper_android_drawableEnd = 6;
-			
+
 			// aapt resource value: 3
 			public const int AppCompatTextHelper_android_drawableLeft = 3;
-			
+
 			// aapt resource value: 4
 			public const int AppCompatTextHelper_android_drawableRight = 4;
-			
+
 			// aapt resource value: 5
 			public const int AppCompatTextHelper_android_drawableStart = 5;
-			
+
 			// aapt resource value: 1
 			public const int AppCompatTextHelper_android_drawableTop = 1;
-			
+
 			// 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: 5
-			public const int AppCompatTextView_autoSizeTextType = 5;
-			
+
 			// aapt resource value: 6
-			public const int AppCompatTextView_fontFamily = 6;
-			
+			public const int AppCompatTextView_autoSizeMaxTextSize = 6;
+
+			// aapt resource value: 5
+			public const int AppCompatTextView_autoSizeMinTextSize = 5;
+
+			// 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;
-			
-			// 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 }
+			public const int AppCompatTextView_fontFamily = 7;
+
+			// 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;
-			
-			// aapt resource value: 30
-			public const int AppCompatTheme_actionOverflowButtonStyle = 30;
-			
+			public const int AppCompatTheme_actionModeBackground = 29;
+
+			// 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;
-			
+
 			// 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;
-			
-			// aapt resource value: 56
-			public const int AppCompatTheme_colorPrimaryDark = 56;
-			
+			public const int AppCompatTheme_borderlessButtonStyle = 55;
+
+			// 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;
-			
-			// 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;
-			
+			public const int AppCompatTheme_dividerHorizontal = 57;
+
+			// 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;
-			
-			// aapt resource value: 77
-			public const int AppCompatTheme_listPreferredItemPaddingLeft = 77;
-			
-			// aapt resource value: 78
-			public const int AppCompatTheme_listPreferredItemPaddingRight = 78;
-			
-			// aapt resource value: 79
-			public const int AppCompatTheme_panelBackground = 79;
-			
+			public const int AppCompatTheme_listPopupWindowStyle = 76;
+
+			// aapt resource value: 70
+			public const int AppCompatTheme_listPreferredItemHeight = 70;
+
+			// aapt resource value: 72
+			public const int AppCompatTheme_listPreferredItemHeightLarge = 72;
+
+			// 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: 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: 61
+			public const int AppCompatTheme_popupMenuStyle = 61;
+
+			// 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;
-			
-			// aapt resource value: 115
-			public const int AppCompatTheme_windowFixedWidthMinor = 115;
-			
-			// aapt resource value: 116
-			public const int AppCompatTheme_windowMinWidthMajor = 116;
-			
+			public const int AppCompatTheme_switchStyle = 114;
+
+			// aapt resource value: 40
+			public const int AppCompatTheme_textAppearanceLargePopupMenu = 40;
+
+			// 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;
-			
-			// aapt resource value: 118
-			public const int AppCompatTheme_windowNoTitle = 118;
-			
-			// aapt resource value: { 0x7F040120,0x7F040121,0x7F040150 }
+			public const int AppCompatTheme_tooltipForegroundColor = 117;
+
+			// aapt resource value: 116
+			public const int AppCompatTheme_tooltipFrameBackground = 116;
+
+			// 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;
-			
+
 			// aapt resource value: 1
 			public const int BezierRadarHeader_srlEnableHorizontalDrag = 1;
-			
+
 			// 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;
-			
+
 			// aapt resource value: 3
 			public const int BottomNavigationView_itemTextColor = 3;
-			
-			// aapt resource value: 4
-			public const int BottomNavigationView_menu = 4;
-			
-			// 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;
-			
+
 			// aapt resource value: 1
-			public const int BottomSheetBehavior_Layout_behavior_peekHeight = 1;
-			
+			public const int BottomNavigationView_menu = 1;
+
+			public static int[] BottomSheetBehavior_Layout = new int[] {
+					2130772228,
+					2130772229,
+					2130772230};
+
+			// aapt resource value: 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;
-			
+
 			// aapt resource value: 1
 			public const int ClassicsFooter_srlClassicsSpinnerStyle = 1;
-			
+
 			// aapt resource value: 2
 			public const int ClassicsFooter_srlDrawableArrow = 2;
-			
+
 			// aapt resource value: 3
 			public const int ClassicsFooter_srlDrawableArrowSize = 3;
-			
+
 			// aapt resource value: 4
 			public const int ClassicsFooter_srlDrawableMarginRight = 4;
-			
+
 			// aapt resource value: 5
 			public const int ClassicsFooter_srlDrawableProgress = 5;
-			
+
 			// aapt resource value: 6
 			public const int ClassicsFooter_srlDrawableProgressSize = 6;
-			
+
 			// aapt resource value: 7
 			public const int ClassicsFooter_srlDrawableSize = 7;
-			
+
 			// aapt resource value: 8
 			public const int ClassicsFooter_srlFinishDuration = 8;
-			
+
 			// aapt resource value: 9
 			public const int ClassicsFooter_srlPrimaryColor = 9;
-			
+
 			// aapt resource value: 10
 			public const int ClassicsFooter_srlTextFailed = 10;
-			
+
 			// aapt resource value: 11
 			public const int ClassicsFooter_srlTextFinish = 11;
-			
+
 			// aapt resource value: 12
 			public const int ClassicsFooter_srlTextLoading = 12;
-			
+
 			// aapt resource value: 13
 			public const int ClassicsFooter_srlTextNothing = 13;
-			
+
 			// aapt resource value: 14
 			public const int ClassicsFooter_srlTextPulling = 14;
-			
+
 			// aapt resource value: 15
 			public const int ClassicsFooter_srlTextRefreshing = 15;
-			
+
 			// aapt resource value: 16
 			public const int ClassicsFooter_srlTextRelease = 16;
-			
+
 			// 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;
-			
+
 			// aapt resource value: 1
 			public const int ClassicsHeader_srlClassicsSpinnerStyle = 1;
-			
+
 			// aapt resource value: 2
 			public const int ClassicsHeader_srlDrawableArrow = 2;
-			
+
 			// aapt resource value: 3
 			public const int ClassicsHeader_srlDrawableArrowSize = 3;
-			
+
 			// aapt resource value: 4
 			public const int ClassicsHeader_srlDrawableMarginRight = 4;
-			
+
 			// aapt resource value: 5
 			public const int ClassicsHeader_srlDrawableProgress = 5;
-			
+
 			// aapt resource value: 6
 			public const int ClassicsHeader_srlDrawableProgressSize = 6;
-			
+
 			// 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: { 0x7F040063,0x7F040064,0x7F040078,0x7F040098,0x7F040099,0x7F04009A,0x7F04009B,0x7F04009C,0x7F04009D,0x7F04009E,0x7F04010A,0x7F04010B,0x7F040165,0x7F040197,0x7F040198,0x7F0401A2 }
+
+			// aapt resource value: 19
+			public const int ClassicsHeader_srlTextUpdate = 19;
+
 			public static int[] CollapsingToolbarLayout = new int[] {
-					2130968675,
-					2130968676,
-					2130968696,
-					2130968728,
-					2130968729,
-					2130968730,
-					2130968731,
-					2130968732,
-					2130968733,
-					2130968734,
-					2130968842,
-					2130968843,
-					2130968933,
-					2130968983,
-					2130968984,
-					2130968994};
-			
-			// aapt resource value: 0
-			public const int CollapsingToolbarLayout_collapsedTitleGravity = 0;
-			
+					2130771980,
+					2130772231,
+					2130772232,
+					2130772233,
+					2130772234,
+					2130772235,
+					2130772236,
+					2130772237,
+					2130772238,
+					2130772239,
+					2130772240,
+					2130772241,
+					2130772242,
+					2130772243,
+					2130772244,
+					2130772245};
+
+			// 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;
-			
-			// aapt resource value: 7
-			public const int CollapsingToolbarLayout_expandedTitleMarginStart = 7;
-			
-			// aapt resource value: 8
-			public const int CollapsingToolbarLayout_expandedTitleMarginTop = 8;
-			
-			// aapt resource value: 9
-			public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 9;
-			
-			// aapt resource value: { 0x7F0400CF,0x7F0400D0 }
-			public static int[] CollapsingToolbarLayout_Layout = new int[] {
-					2130968783,
-					2130968784};
-			
-			// aapt resource value: 0
-			public const int CollapsingToolbarLayout_Layout_layout_collapseMode = 0;
-			
-			// aapt resource value: 1
-			public const int CollapsingToolbarLayout_Layout_layout_collapseParallaxMultiplier = 1;
-			
-			// aapt resource value: 10
-			public const int CollapsingToolbarLayout_scrimAnimationDuration = 10;
-			
+			public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 6;
+
+			// aapt resource value: 12
+			public const int CollapsingToolbarLayout_scrimAnimationDuration = 12;
+
 			// 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: 9
+			public const int CollapsingToolbarLayout_statusBarScrim = 9;
+
+			// aapt resource value: 0
+			public const int CollapsingToolbarLayout_title = 0;
+
 			// aapt resource value: 15
-			public const int CollapsingToolbarLayout_toolbarId = 15;
-			
-			// aapt resource value: { 0x10101A5,0x101031F,0x7F040027 }
+			public const int CollapsingToolbarLayout_titleEnabled = 15;
+
+			// aapt resource value: 10
+			public const int CollapsingToolbarLayout_toolbarId = 10;
+
+			public static int[] CollapsingToolbarLayout_Layout = new int[] {
+					2130772246,
+					2130772247};
+
+			// aapt resource value: 0
+			public const int CollapsingToolbarLayout_Layout_layout_collapseMode = 0;
+
+			// aapt resource value: 1
+			public const int CollapsingToolbarLayout_Layout_layout_collapseParallaxMultiplier = 1;
+
 			public static int[] ColorStateListItem = new int[] {
 					16843173,
 					16843551,
-					2130968615};
-			
+					2130772147};
+
 			// aapt resource value: 2
 			public const int ColorStateListItem_alpha = 2;
-			
+
 			// aapt resource value: 1
 			public const int ColorStateListItem_android_alpha = 1;
-			
+
 			// 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;
-			
+
 			// aapt resource value: 1
 			public const int CompoundButton_buttonTint = 1;
-			
+
 			// 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 }
-			public static int[] CoordinatorLayout_Layout = new int[] {
-					16842931,
-					2130968780,
-					2130968781,
-					2130968782,
-					2130968785,
-					2130968786,
-					2130968787};
-			
-			// 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;
-			
-			// aapt resource value: 4
-			public const int CoordinatorLayout_Layout_layout_dodgeInsetEdges = 4;
-			
-			// 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: 1
 			public const int CoordinatorLayout_statusBarBackground = 1;
-			
-			// aapt resource value: { 0x7F040050,0x7F040051,0x7F04018B }
+
+			public static int[] CoordinatorLayout_Layout = new int[] {
+					16842931,
+					2130772250,
+					2130772251,
+					2130772252,
+					2130772253,
+					2130772254,
+					2130772255};
+
+			// aapt resource value: 0
+			public const int CoordinatorLayout_Layout_android_layout_gravity = 0;
+
+			// aapt resource value: 2
+			public const int CoordinatorLayout_Layout_layout_anchor = 2;
+
+			// aapt resource value: 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: 3
+			public const int CoordinatorLayout_Layout_layout_keyline = 3;
+
 			public static int[] DesignTheme = new int[] {
-					2130968656,
-					2130968657,
-					2130968971};
-			
+					2130772256,
+					2130772257,
+					2130772258};
+
 			// aapt resource value: 0
 			public const int DesignTheme_bottomSheetDialogTheme = 0;
-			
+
 			// aapt resource value: 1
 			public const int DesignTheme_bottomSheetStyle = 1;
-			
+
 			// 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;
-			
-			// aapt resource value: 3
-			public const int FloatingActionButton_elevation = 3;
-			
+			public const int FloatingActionButton_backgroundTintMode = 2;
+
+			// 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;
-			
+
 			// 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;
-			
-			// aapt resource value: 1
-			public const int FontFamilyFont_fontStyle = 1;
-			
-			// aapt resource value: 2
-			public const int FontFamilyFont_fontWeight = 2;
-			
+			public const int FloatingActionButton_Behavior_Layout_behavior_autoHide = 0;
+
+			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;
-			
-			// aapt resource value: { 0x1010109,0x1010200,0x7F0400AF }
+			public const int FontFamily_fontProviderFetchTimeout = 5;
+
+			// 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;
-			
+
 			// aapt resource value: 1
 			public const int ForegroundLinearLayout_android_foregroundGravity = 1;
-			
+
 			// 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;
-			
-			// aapt resource value: 9
-			public const int HDLArcSeekBar_arc_rotate_angle = 9;
-			
+			public const int HDLArcSeekBar_arc_progress = 8;
+
+			// 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: 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: 12
+			public const int HDLArcSeekBar_arc_thumb_shadow_radius = 12;
+
+			// 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;
-			
-			// aapt resource value: 1
-			public const int HDLCurtainSeekBar_curtain_bar_border_color = 1;
-			
+			public const int HDLArcSeekBar_arc_width = 0;
+
+			// 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: { 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;
-			
+
 			// aapt resource value: 1
-			public const int HDLWaveSeekBar_wave_bg_color = 1;
-			
+			public const int HDLCurtainSeekBar_second_curtain_bar_color = 1;
+
+			public static int[] HDLWaveSeekBar = new int[] {
+					2130772406,
+					2130772407,
+					2130772408,
+					2130772409,
+					2130772410,
+					2130772411};
+
+			// aapt resource value: 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;
-			
-			// aapt resource value: 4
-			public const int HDLWaveSeekBar_wave_height = 4;
-			
+			public const int HDLWaveSeekBar_wave_border_color = 3;
+
+			// aapt resource value: 0
+			public const int HDLWaveSeekBar_wave_color = 0;
+
 			// aapt resource value: 5
-			public const int HDLWaveSeekBar_wave_width = 5;
-			
-			// aapt resource value: { 0x10100AF,0x10100C4,0x1010126,0x1010127,0x1010128,0x7F040088,0x7F04008A,0x7F0400E7,0x7F040115 }
+			public const int HDLWaveSeekBar_wave_height = 5;
+
+			// 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;
-			
+
 			// aapt resource value: 3
 			public const int LinearLayoutCompat_android_baselineAlignedChildIndex = 3;
-			
+
 			// aapt resource value: 0
 			public const int LinearLayoutCompat_android_gravity = 0;
-			
+
 			// aapt resource value: 1
 			public const int LinearLayoutCompat_android_orientation = 1;
-			
+
 			// aapt resource value: 4
 			public const int LinearLayoutCompat_android_weightSum = 4;
-			
+
 			// aapt resource value: 5
 			public const int LinearLayoutCompat_divider = 5;
-			
+
+			// aapt resource value: 8
+			public const int LinearLayoutCompat_dividerPadding = 8;
+
 			// aapt resource value: 6
-			public const int LinearLayoutCompat_dividerPadding = 6;
-			
-			// aapt resource value: { 0x10100B3,0x10100F4,0x10100F5,0x1010181 }
+			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,
 					16842997,
 					16843137};
-			
+
 			// aapt resource value: 0
 			public const int LinearLayoutCompat_Layout_android_layout_gravity = 0;
-			
+
 			// aapt resource value: 2
 			public const int LinearLayoutCompat_Layout_android_layout_height = 2;
-			
+
 			// aapt resource value: 3
 			public const int LinearLayoutCompat_Layout_android_layout_weight = 3;
-			
+
 			// 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};
-			
+
 			// aapt resource value: 0
 			public const int ListPopupWindow_android_dropDownHorizontalOffset = 0;
-			
+
 			// 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,
@@ -7001,26 +7031,25 @@
 					16843230,
 					16843231,
 					16843232};
-			
+
 			// aapt resource value: 5
 			public const int MenuGroup_android_checkableBehavior = 5;
-			
+
 			// aapt resource value: 0
 			public const int MenuGroup_android_enabled = 0;
-			
+
 			// aapt resource value: 1
 			public const int MenuGroup_android_id = 1;
-			
+
 			// aapt resource value: 3
 			public const int MenuGroup_android_menuCategory = 3;
-			
+
 			// aapt resource value: 4
 			public const int MenuGroup_android_orderInCategory = 4;
-			
+
 			// 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,87 +7064,86 @@
 					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;
-			
+
 			// aapt resource value: 11
 			public const int MenuItem_android_checkable = 11;
-			
+
 			// aapt resource value: 3
 			public const int MenuItem_android_checked = 3;
-			
+
 			// aapt resource value: 1
 			public const int MenuItem_android_enabled = 1;
-			
+
 			// aapt resource value: 0
 			public const int MenuItem_android_icon = 0;
-			
+
 			// aapt resource value: 2
 			public const int MenuItem_android_id = 2;
-			
+
 			// aapt resource value: 5
 			public const int MenuItem_android_menuCategory = 5;
-			
+
 			// aapt resource value: 10
 			public const int MenuItem_android_numericShortcut = 10;
-			
+
 			// aapt resource value: 12
 			public const int MenuItem_android_onClick = 12;
-			
+
 			// aapt resource value: 6
 			public const int MenuItem_android_orderInCategory = 6;
-			
+
 			// aapt resource value: 7
 			public const int MenuItem_android_title = 7;
-			
+
 			// aapt resource value: 8
 			public const int MenuItem_android_titleCondensed = 8;
-			
+
 			// 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;
-			
-			// aapt resource value: { 0x10100AE,0x101012C,0x101012D,0x101012E,0x101012F,0x1010130,0x1010131,0x7F0400FE,0x7F040166 }
+			public const int MenuItem_iconTintMode = 22;
+
+			// 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,613 +7152,570 @@
 					16843055,
 					16843056,
 					16843057,
-					2130968830,
-					2130968934};
-			
+					2130772171,
+					2130772172};
+
 			// aapt resource value: 4
 			public const int MenuView_android_headerBackground = 4;
-			
+
 			// aapt resource value: 2
 			public const int MenuView_android_horizontalDivider = 2;
-			
+
 			// aapt resource value: 5
 			public const int MenuView_android_itemBackground = 5;
-			
+
 			// aapt resource value: 6
 			public const int MenuView_android_itemIconDisabledAlpha = 6;
-			
+
 			// aapt resource value: 1
 			public const int MenuView_android_itemTextAppearance = 1;
-			
+
 			// aapt resource value: 3
 			public const int MenuView_android_verticalDivider = 3;
-			
+
 			// aapt resource value: 0
 			public const int MenuView_android_windowAnimationStyle = 0;
-			
+
 			// aapt resource value: 7
 			public const int MenuView_preserveIconSpacing = 7;
-			
+
 			// 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;
-			
+
 			// aapt resource value: 1
 			public const int NavigationView_android_fitsSystemWindows = 1;
-			
+
 			// aapt resource value: 2
 			public const int NavigationView_android_maxWidth = 2;
-			
+
 			// 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: 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_headerLayout = 9;
+
+			// aapt resource value: 7
+			public const int NavigationView_itemBackground = 7;
+
 			// aapt resource value: 5
-			public const int pickerview_wheelview_textSize = 5;
-			
-			// aapt resource value: { 0x1010176,0x10102C9,0x7F0400EE }
+			public const int NavigationView_itemIconTint = 5;
+
+			// 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;
-			
+
 			// aapt resource value: 0
 			public const int PopupWindow_android_popupBackground = 0;
-			
+
 			// 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;
-			
+
 			// 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;
-			
+
 			// 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;
-			
-			// aapt resource value: { 0x7F0400C2 }
+			public const int RecyclerView_fastScrollHorizontalTrackDrawable = 10;
+
+			// 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;
-			
+
 			// aapt resource value: 3
 			public const int SearchView_android_imeOptions = 3;
-			
+
 			// aapt resource value: 2
 			public const int SearchView_android_inputType = 2;
-			
+
 			// 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;
-			
-			// aapt resource value: 14
-			public const int SearchView_submitBackground = 14;
-			
+			public const int SearchView_commitIcon = 13;
+
+			// 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;
-			
-			// 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 }
+			public const int SearchView_submitBackground = 16;
+
+			// 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;
-			
+
 			// 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: 33
-			public const int SmartRefreshLayout_srlHeaderTranslationViewId = 33;
-			
+
 			// aapt resource value: 34
-			public const int SmartRefreshLayout_srlHeaderTriggerRate = 34;
-			
-			// aapt resource value: 35
-			public const int SmartRefreshLayout_srlPrimaryColor = 35;
-			
+			public const int SmartRefreshLayout_srlDisableContentWhenLoading = 34;
+
+			// aapt resource value: 33
+			public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 33;
+
+			// aapt resource value: 9
+			public const int SmartRefreshLayout_srlDragRate = 9;
+
+			// 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;
-			
-			// aapt resource value: { 0x101011F,0x7F040093,0x7F0400E5 }
+			public const int SmartRefreshLayout_srlFixedFooterViewId = 36;
+
+			// 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;
-			
+
 			// aapt resource value: 1
 			public const int SnackbarLayout_elevation = 1;
-			
+
 			// 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;
-			
+
 			// aapt resource value: 0
 			public const int Spinner_android_entries = 0;
-			
+
 			// aapt resource value: 1
 			public const int Spinner_android_popupBackground = 1;
-			
+
 			// aapt resource value: 2
 			public const int Spinner_android_prompt = 2;
-			
+
 			// 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;
-			
+
 			// aapt resource value: 0
 			public const int SwitchCompat_android_textOn = 0;
-			
+
 			// aapt resource value: 2
 			public const int SwitchCompat_android_thumb = 2;
-			
-			// aapt resource value: 3
-			public const int SwitchCompat_showText = 3;
-			
-			// aapt resource value: 4
-			public const int SwitchCompat_splitTrack = 4;
-			
-			// aapt resource value: 5
-			public const int SwitchCompat_switchMinWidth = 5;
-			
-			// aapt resource value: 6
-			public const int SwitchCompat_switchPadding = 6;
-			
-			// aapt resource value: 7
-			public const int SwitchCompat_switchTextAppearance = 7;
-			
+
+			// aapt resource value: 13
+			public const int SwitchCompat_showText = 13;
+
+			// aapt resource value: 12
+			public const int SwitchCompat_splitTrack = 12;
+
+			// aapt resource value: 10
+			public const int SwitchCompat_switchMinWidth = 10;
+
+			// aapt resource value: 11
+			public const int SwitchCompat_switchPadding = 11;
+
+			// 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: 10
-			public const int SwitchCompat_thumbTintMode = 10;
-			
-			// aapt resource value: 11
-			public const int SwitchCompat_track = 11;
-			
-			// aapt resource value: 12
-			public const int SwitchCompat_trackTint = 12;
-			
-			// aapt resource value: 13
-			public const int SwitchCompat_trackTintMode = 13;
-			
-			// aapt resource value: { 0x1010002,0x10100F2,0x101014F }
+
+			// aapt resource value: 3
+			public const int SwitchCompat_thumbTint = 3;
+
+			// aapt resource value: 4
+			public const int SwitchCompat_thumbTintMode = 4;
+
+			// aapt resource value: 5
+			public const int SwitchCompat_track = 5;
+
+			// aapt resource value: 6
+			public const int SwitchCompat_trackTint = 6;
+
+			// aapt resource value: 7
+			public const int SwitchCompat_trackTintMode = 7;
+
 			public static int[] TabItem = new int[] {
 					16842754,
 					16842994,
 					16843087};
-			
+
 			// aapt resource value: 0
 			public const int TabItem_android_icon = 0;
-			
+
 			// aapt resource value: 1
 			public const int TabItem_android_layout = 1;
-			
+
 			// 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;
-			
-			// aapt resource value: 4
-			public const int TabLayout_tabIndicatorHeight = 4;
-			
+			public const int TabLayout_tabBackground = 3;
+
+			// 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: 8
-			public const int TabLayout_tabPadding = 8;
-			
-			// aapt resource value: 9
-			public const int TabLayout_tabPaddingBottom = 9;
-			
-			// aapt resource value: 10
-			public const int TabLayout_tabPaddingEnd = 10;
-			
+
+			// aapt resource value: 4
+			public const int TabLayout_tabMode = 4;
+
+			// aapt resource value: 15
+			public const int TabLayout_tabPadding = 15;
+
+			// aapt resource value: 14
+			public const int TabLayout_tabPaddingBottom = 14;
+
+			// aapt resource value: 13
+			public const int TabLayout_tabPaddingEnd = 13;
+
 			// aapt resource value: 11
 			public const int TabLayout_tabPaddingStart = 11;
-			
+
 			// aapt resource value: 12
 			public const int TabLayout_tabPaddingTop = 12;
-			
-			// aapt resource value: 13
-			public const int TabLayout_tabSelectedTextColor = 13;
-			
-			// aapt resource value: 14
-			public const int TabLayout_tabTextAppearance = 14;
-			
-			// aapt resource value: 15
-			public const int TabLayout_tabTextColor = 15;
-			
-			// aapt resource value: { 0x1010095,0x1010096,0x1010097,0x1010098,0x101009A,0x101009B,0x1010161,0x1010162,0x1010163,0x1010164,0x10103AC,0x7F0400A6,0x7F040181 }
+
+			// aapt resource value: 10
+			public const int TabLayout_tabSelectedTextColor = 10;
+
+			// aapt resource value: 8
+			public const int TabLayout_tabTextAppearance = 8;
+
+			// aapt resource value: 9
+			public const int TabLayout_tabTextColor = 9;
+
 			public static int[] TextAppearance = new int[] {
 					16842901,
 					16842902,
@@ -7743,339 +7728,340 @@
 					16843107,
 					16843108,
 					16843692,
-					2130968742,
-					2130968961};
-			
+					2130772022,
+					2130772028};
+
 			// aapt resource value: 10
 			public const int TextAppearance_android_fontFamily = 10;
-			
+
 			// aapt resource value: 6
 			public const int TextAppearance_android_shadowColor = 6;
-			
+
 			// aapt resource value: 7
 			public const int TextAppearance_android_shadowDx = 7;
-			
+
 			// aapt resource value: 8
 			public const int TextAppearance_android_shadowDy = 8;
-			
+
 			// aapt resource value: 9
 			public const int TextAppearance_android_shadowRadius = 9;
-			
+
 			// aapt resource value: 3
 			public const int TextAppearance_android_textColor = 3;
-			
+
 			// aapt resource value: 4
 			public const int TextAppearance_android_textColorHint = 4;
-			
+
 			// aapt resource value: 5
 			public const int TextAppearance_android_textColorLink = 5;
-			
+
 			// aapt resource value: 0
 			public const int TextAppearance_android_textSize = 0;
-			
+
 			// aapt resource value: 2
 			public const int TextAppearance_android_textStyle = 2;
-			
+
 			// 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;
-			
-			// aapt resource value: { 0x101009A,0x1010150,0x7F04007A,0x7F04007B,0x7F04007C,0x7F04007D,0x7F040094,0x7F040095,0x7F0400B6,0x7F0400B7,0x7F0400B8,0x7F0400F6,0x7F0400F7,0x7F0400F8,0x7F0400F9,0x7F0400FA }
+			public const int TextAppearance_fontFamily = 12;
+
+			// 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;
-			
+
 			// 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;
-			
-			// aapt resource value: 11
-			public const int TextInputLayout_passwordToggleContentDescription = 11;
-			
+			public const int TextInputLayout_hintAnimationEnabled = 10;
+
+			// 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;
-			
+
 			// 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;
-			
+
 			// aapt resource value: 1
 			public const int Toolbar_android_minHeight = 1;
-			
-			// aapt resource value: 2
-			public const int Toolbar_buttonGravity = 2;
-			
-			// aapt resource value: 3
-			public const int Toolbar_collapseContentDescription = 3;
-			
-			// aapt resource value: 4
-			public const int Toolbar_collapseIcon = 4;
-			
-			// aapt resource value: 5
-			public const int Toolbar_contentInsetEnd = 5;
-			
+
+			// aapt resource value: 21
+			public const int Toolbar_buttonGravity = 21;
+
+			// aapt resource value: 23
+			public const int Toolbar_collapseContentDescription = 23;
+
+			// 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;
-			
+
 			// aapt resource value: 8
 			public const int Toolbar_contentInsetRight = 8;
-			
-			// 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;
-			
-			// aapt resource value: 4
-			public const int TwoLevelHeader_srlMaxRage = 4;
-			
+
 			// aapt resource value: 5
-			public const int TwoLevelHeader_srlRefreshRage = 5;
-			
-			// aapt resource value: { 0x1010000,0x10100DA,0x7F0400F0,0x7F0400F1,0x7F04018D }
+			public const int Toolbar_contentInsetStart = 5;
+
+			// aapt resource value: 9
+			public const int Toolbar_contentInsetStartWithNavigation = 9;
+
+			// aapt resource value: 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_srlEnablePullToCloseTwoLevel = 5;
+
+			// 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};
-			
-			// aapt resource value: { 0x10100D4,0x7F040045,0x7F040046 }
+					2130772218,
+					2130772219,
+					2130772220};
+
+			// 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;
-			
+
 			// aapt resource value: 1
 			public const int ViewBackgroundHelper_backgroundTint = 1;
-			
+
 			// aapt resource value: 2
 			public const int ViewBackgroundHelper_backgroundTintMode = 2;
-			
-			// aapt resource value: { 0x10100D0,0x10100F2,0x10100F3 }
+
 			public static int[] ViewStubCompat = new int[] {
 					16842960,
 					16842994,
 					16842995};
-			
+
 			// aapt resource value: 0
 			public const int ViewStubCompat_android_id = 0;
-			
+
 			// aapt resource value: 2
 			public const int ViewStubCompat_android_inflatedId = 2;
-			
+
 			// 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()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			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/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 1b79083..5c1bc41 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -468,7 +468,7 @@
       <BundleResource Include="Resources\Phone\DoorLock\UnLockSideslipIcon.png" />
       <BundleResource Include="Resources\Phone\DoorLock\UndistributeIcon.png" />
       <BundleResource Include="Resources\Phone\Logo\Logo.png" />
-      <BundleResource Include="Resources\Phone\Logo\2.png" />
+      <BundleResource Include="Resources\Phone\Logo\StartBackGroud.png" />
       <BundleResource Include="Resources\Phone\Item\Shared.png" />
       <BundleResource Include="Resources\Phone\Item\RoomIcon.png" />
       <BundleResource Include="Resources\Phone\Item\Add.png" />
diff --git a/ZigbeeApp/Home.Ios/MainViewController.cs b/ZigbeeApp/Home.Ios/MainViewController.cs
index 151b277..8304520 100644
--- a/ZigbeeApp/Home.Ios/MainViewController.cs
+++ b/ZigbeeApp/Home.Ios/MainViewController.cs
@@ -12,6 +12,12 @@
         {
             base.ViewDidLoad();
 
+            //11.0鐗堟湰浠ヤ笅鑷姩鍋忕Щ鍙栨秷
+            if (!UIDevice.CurrentDevice.CheckSystemVersion(11, 0))
+            {
+                this.AutomaticallyAdjustsScrollViewInsets = false;
+            }
+
             if (NSLocale.PreferredLanguages[0].Contains("zh-"))
             {
                 //if (NSLocale.PreferredLanguages [0].Contains (@"zh-") && NSLocale.PreferredLanguages [0].Contains (@"-CN")) {
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index beb2feb..22098cd 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -322,7 +322,7 @@
 319=杞诲害姹℃煋
 320=涓害姹℃煋
 321=閲嶅害姹℃煋
-322=涓ラ噸姹℃煋 
+322=涓ラ噸姹℃煋
 
 5097=鍙栨秷
 5098=纭畾
@@ -1852,96 +1852,99 @@
 16114=鐏叏鍏�
 16115=甯稿紑鑷姩鍖栨墜鍔ㄥ彇娑�
 16116=娓稿浣撻獙
+16117=鏅鸿兘鏀瑰彉鐢熸椿 | Enjoy smart life
+16118=缃戠粶涓嶇ǔ瀹氾紝鍦烘櫙鍒楄〃淇℃伅缂烘崯
+16119=DATA缁胯壊鎸囩ず鐏棯鐑�
 
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
-18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
-18005=鐢ㄦ埛涓嶅瓨鍦ㄤ簬姝や綇瀹�
-18006=璐﹀彿宸茬粡瀛樺湪浜庢浣忓畢
-18009=鎿嶄綔鏉冮檺涓嶈冻
-18010=琚粦瀹氱殑瀛愯处鍙蜂笉瀛樺湪锛岃娉ㄥ唽鍚庡啀璇�
-18011=鎿嶄綔鐨勫瓙璐﹀彿涓嶅瓨鍦�
-18012=瑙i櫎缁戝畾鐨勫瓙璐﹀彿涓嶅瓨鍦�
-18013=楠岃瘉鐮佸彂閫佸け璐�
-18015=璐﹀彿宸茬粡瀛樺湪
-18016=楠岃瘉鐮侀敊璇�
-18017=楠岃瘉鐮佸凡澶辨晥
-18018=缁戝畾鐨勮处鍙蜂笉瀛樺湪
-18019=鎸囧畾璐﹀彿宸插瓨鍦�
-18022=楠岃瘉鐮佸彂閫佸け璐�
-18024=鎸囧畾璐﹀彿涓嶅瓨鍦�
-18025=鍘熷瘑鐮佸拰鏂板瘑鐮佺浉鍚�
-18026=鍘熷瘑鐮侀敊璇�
-18034=璐﹀彿鏈敞鍐�
-18035=璇锋眰鍙傛暟閿欒
-18036=鏃犳晥鐨勭櫥褰曞瘑鍖�
-18039=褰撳墠缂栬緫鐨勪綇瀹呭悕绉板凡缁忓瓨鍦�
-18040=褰撳墠娣诲姞鐨勪綇瀹呭悕绉板凡缁忓瓨鍦�
-18041=鎸囧畾鐨勪綇瀹呬笉瀛樺湪
-18042=褰撳墠澶囦唤涓嶅睘浜庢偍褰撳墠鐨勪綇瀹�
-18043=澶囨敞鍚嶇О宸茬粡瀛樺湪,璇锋洿鎹㈠悗閲嶈瘯锛�
-18044=鎸囧畾鐨勭綉鍏矷D骞朵笉瀛樺湪
-18045=褰撳墠浣忓畢涓嬪苟娌℃湁缁戝畾鎸囧畾鐨勭綉鍏�
-18046=褰撳墠浣忓畢杩樺瓨鍦ㄧ潃鏈В闄ょ粦瀹氱殑缃戝叧
-18047=鍏变韩鏁版嵁涓嶅瓨鍦�
-18048=鍒嗕韩鐨勭洰鏍囪处鍙蜂笉瀛樺湪
-18049=鍒嗕韩鏁版嵁鎿嶄綔澶辫触
-18050=涓嶈兘鎶婅嚜宸辨坊鍔犱负鎴愬憳
-18051=涓嶈兘鎶婁富璐﹀彿娣诲姞涓烘垚鍛�
-
-
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囩殑鍏ョ綉姝ラ,浠�21000寮�濮嬧槄鈽呪槄鈽�
-;鏅鸿兘闂ㄩ攣鍏ョ綉鎿嶄綔鎸囩ず
-21000=鍞ら啋闂ㄩ攣锛岃緭鍏モ��*鈥濄�佲��#鈥濄�佲�滅鐞嗗憳瀵嗙爜鈥漿0}鎸夎闊虫彁绀猴紝杈撳叆鈥�4鈥濋�夋嫨鍔熻兘鑿滃崟{0}杈撳叆鈥�1鈥濓紝纭璁惧鍏ョ綉
-;3璺户鐢靛櫒鍏ョ綉鎿嶄綔鎸囩ず
-21001=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
-;1璺皟鍏夊櫒灏忔ā鍧楀叆缃戞搷浣滄寚绀�
-21002=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
-;浜屾寜閿潰鏉垮叆缃戞搷浣滄寚绀�
-21003=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
-;涓夋寜閿潰鏉垮叆缃戞搷浣滄寚绀�
-21004=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
-;鍥涙寜閿潰鏉垮叆缃戞搷浣滄寚绀�
-21005=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
-;Zigbee鏅鸿兘寮�鍚堝笜鐢垫満鍏ョ綉鎿嶄綔鎸囩ず
-21006=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
-;Zigbee鏅鸿兘绠$姸鐢垫満鍏ョ綉鎿嶄綔鎸囩ず
-21007=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
-;绾㈠浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21008=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;闂ㄧ獥浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21009=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;鐕冩皵浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21010=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;鐑熼浘浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21011=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;姘存蹈浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21012=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-;绌烘皵寮�鍏冲叆缃戞搷浣滄寚绀�
-21013=鎸夐敭浠庡伐浣滄ā寮忔嫧鍒伴厤瀵规ā寮�,5绉掑悗绾㈢伅{0}鎱㈤棯鐑佹椂鎷ㄥ洖宸ヤ綔妯″紡,{0}杩涘叆閰嶇綉妯″紡,绾㈢伅甯镐寒鍒欓厤缃戞垚鍔�
-;涓户鍣ㄥ叆缃戞搷浣滄寚绀�
-21014=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁块棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欏叆缃戞垚鍔�
-;绌鸿皟鍏ョ綉鎿嶄綔鎸囩ず
-21015=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊,杩涘叆閰嶇綉鐘舵�亄0}缁跨伅姣�5绉掗棯鐑佷竴娆″垯鍏ョ綉鎴愬姛
-;pir浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
-21016=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�亄0}闂儊杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
-;娓╂箍搴︿紶鎰熷櫒鍏ョ綉鎿嶄綔鎸囩ず
-21017=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�傚浘鏍囧父浜垯閰嶇綉鎴愬姛
-;鏂规偊2鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
-21018=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
-;鏂规偊4鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
-21019=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
-;鏂规偊8鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
-21020=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
-;鏂规偊鐜闈㈡澘鍏ョ綉鎿嶄綔鎸囩ず
-21021=鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
-;绐楀笜闈㈡澘鐨勫叆缃戞搷浣滄寚绀�
-21022=闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
-;鍚搁《鐕冩皵浼犳劅鍣ㄧ殑鍏ョ綉鎿嶄綔鎸囩ず
-21023=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
-
-;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
-30000=绱ф�ユ寜閽�
-30001=鐕冩皵浼犳劅鍣�
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
+18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
+18005=鐢ㄦ埛涓嶅瓨鍦ㄤ簬姝や綇瀹�
+18006=璐﹀彿宸茬粡瀛樺湪浜庢浣忓畢
+18009=鎿嶄綔鏉冮檺涓嶈冻
+18010=琚粦瀹氱殑瀛愯处鍙蜂笉瀛樺湪锛岃娉ㄥ唽鍚庡啀璇�
+18011=鎿嶄綔鐨勫瓙璐﹀彿涓嶅瓨鍦�
+18012=瑙i櫎缁戝畾鐨勫瓙璐﹀彿涓嶅瓨鍦�
+18013=楠岃瘉鐮佸彂閫佸け璐�
+18015=璐﹀彿宸茬粡瀛樺湪
+18016=楠岃瘉鐮侀敊璇�
+18017=楠岃瘉鐮佸凡澶辨晥
+18018=缁戝畾鐨勮处鍙蜂笉瀛樺湪
+18019=鎸囧畾璐﹀彿宸插瓨鍦�
+18022=楠岃瘉鐮佸彂閫佸け璐�
+18024=鎸囧畾璐﹀彿涓嶅瓨鍦�
+18025=鍘熷瘑鐮佸拰鏂板瘑鐮佺浉鍚�
+18026=鍘熷瘑鐮侀敊璇�
+18034=璐﹀彿鏈敞鍐�
+18035=璇锋眰鍙傛暟閿欒
+18036=鏃犳晥鐨勭櫥褰曞瘑鍖�
+18039=褰撳墠缂栬緫鐨勪綇瀹呭悕绉板凡缁忓瓨鍦�
+18040=褰撳墠娣诲姞鐨勪綇瀹呭悕绉板凡缁忓瓨鍦�
+18041=鎸囧畾鐨勪綇瀹呬笉瀛樺湪
+18042=褰撳墠澶囦唤涓嶅睘浜庢偍褰撳墠鐨勪綇瀹�
+18043=澶囨敞鍚嶇О宸茬粡瀛樺湪,璇锋洿鎹㈠悗閲嶈瘯锛�
+18044=鎸囧畾鐨勭綉鍏矷D骞朵笉瀛樺湪
+18045=褰撳墠浣忓畢涓嬪苟娌℃湁缁戝畾鎸囧畾鐨勭綉鍏�
+18046=褰撳墠浣忓畢杩樺瓨鍦ㄧ潃鏈В闄ょ粦瀹氱殑缃戝叧
+18047=鍏变韩鏁版嵁涓嶅瓨鍦�
+18048=鍒嗕韩鐨勭洰鏍囪处鍙蜂笉瀛樺湪
+18049=鍒嗕韩鏁版嵁鎿嶄綔澶辫触
+18050=涓嶈兘鎶婅嚜宸辨坊鍔犱负鎴愬憳
+18051=涓嶈兘鎶婁富璐﹀彿娣诲姞涓烘垚鍛�
+
+
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囩殑鍏ョ綉姝ラ,浠�21000寮�濮嬧槄鈽呪槄鈽�
+;鏅鸿兘闂ㄩ攣鍏ョ綉鎿嶄綔鎸囩ず
+21000=鍞ら啋闂ㄩ攣锛岃緭鍏モ��*鈥濄�佲��#鈥濄�佲�滅鐞嗗憳瀵嗙爜鈥漿0}鎸夎闊虫彁绀猴紝杈撳叆鈥�4鈥濋�夋嫨鍔熻兘鑿滃崟{0}杈撳叆鈥�1鈥濓紝纭璁惧鍏ョ綉
+;3璺户鐢靛櫒鍏ョ綉鎿嶄綔鎸囩ず
+21001=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
+;1璺皟鍏夊櫒灏忔ā鍧楀叆缃戞搷浣滄寚绀�
+21002=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
+;浜屾寜閿潰鏉垮叆缃戞搷浣滄寚绀�
+21003=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
+;涓夋寜閿潰鏉垮叆缃戞搷浣滄寚绀�
+21004=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
+;鍥涙寜閿潰鏉垮叆缃戞搷浣滄寚绀�
+21005=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑亄0}杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
+;Zigbee鏅鸿兘寮�鍚堝笜鐢垫満鍏ョ綉鎿嶄綔鎸囩ず
+21006=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+;Zigbee鏅鸿兘绠$姸鐢垫満鍏ョ綉鎿嶄綔鎸囩ず
+21007=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊锛屽垯杩涘叆閰嶇綉鐘舵�亄0}缁跨伅鐔勭伃鍒欓厤缃戞垚鍔�
+;绾㈠浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21008=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;闂ㄧ獥浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21009=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;鐕冩皵浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21010=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;鐑熼浘浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21011=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;姘存蹈浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21012=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+;绌烘皵寮�鍏冲叆缃戞搷浣滄寚绀�
+21013=鎸夐敭浠庡伐浣滄ā寮忔嫧鍒伴厤瀵规ā寮�,5绉掑悗绾㈢伅{0}鎱㈤棯鐑佹椂鎷ㄥ洖宸ヤ綔妯″紡,{0}杩涘叆閰嶇綉妯″紡,绾㈢伅甯镐寒鍒欓厤缃戞垚鍔�
+;涓户鍣ㄥ叆缃戞搷浣滄寚绀�
+21014=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁块棯鐑亄0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅鐔勭伃鍒欏叆缃戞垚鍔�
+;绌鸿皟鍏ョ綉鎿嶄綔鎸囩ず
+21015=闀挎寜缂栫▼鎸夐敭5绉�,DATA缁胯壊LED闂儊,{0}棰戠巼涓轰寒0.5绉�,鐏�0.5绉�
+;pir浼犳劅鍣ㄥ叆缃戞搷浣滄寚绀�
+21016=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�亄0}闂儊杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
+;娓╂箍搴︿紶鎰熷櫒鍏ョ綉鎿嶄綔鎸囩ず
+21017=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝淇″彿鍥炬爣{0}蹇棯锛� 杩涘叆閰嶇綉鐘舵�併�傚浘鏍囧父浜垯閰嶇綉鎴愬姛
+;鏂规偊2鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
+21018=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
+;鏂规偊4鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
+21019=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
+;鏂规偊8鎸夐敭杞昏Е寮忛潰鏉垮叆缃戞搷浣滄寚绀�
+21020=闀挎寜BUTTON1鎸夐敭5绉掞紝鎵�鏈夋寚绀虹伅{0}鍙樹负缁胯壊骞堕棯鐑侊紝杩涘叆閰嶇綉鐘舵��
+;鏂规偊鐜闈㈡澘鍏ョ綉鎿嶄綔鎸囩ず
+21021=鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+;绐楀笜闈㈡澘鐨勫叆缃戞搷浣滄寚绀�
+21022=闀挎寜闈㈡澘宸︿笂瑙掓寜閿紝鎵�鏈夋寜閿畕0}鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+;鍚搁《鐕冩皵浼犳劅鍣ㄧ殑鍏ョ綉鎿嶄綔鎸囩ず
+21023=闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝缁胯壊蹇棯{0}杩涘叆閰嶇綉鐘舵�侊紝缁跨伅甯镐寒鍒欏叆缃戞垚鍔�
+
+;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勫畼鏂瑰悕瀛�,浠�30000寮�濮嬧槄鈽呪槄鈽�
+30000=绱ф�ユ寜閽�
+30001=鐕冩皵浼犳劅鍣�
 30002=鐑熼浘浼犳劅鍣�
 30003=姘翠镜浼犳劅鍣�
 30004=閽ュ寵鎵�
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditioner.png b/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditioner.png
index b084aab..306e789 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditioner.png
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditioner.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerSelected.png b/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerSelected.png
index 4d303e2..8a74f8d 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerSelected.png
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerSelected.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerSelected2.png b/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerSelected2.png
index 0915084..6a4f978 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerSelected2.png
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerSelected2.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerZbGateway.png b/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerZbGateway.png
index b084aab..306e789 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerZbGateway.png
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerZbGateway.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerZbGatewaySelected.png b/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerZbGatewaySelected.png
index 4d303e2..8a74f8d 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerZbGatewaySelected.png
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerZbGatewaySelected.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerZbGatewaySelected2.png b/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerZbGatewaySelected2.png
index 0915084..6a4f978 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerZbGatewaySelected2.png
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Device/AirConditionerZbGatewaySelected2.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/AirConditionerZbGateway.png b/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/AirConditionerZbGateway.png
index 48792d0..96a1e16 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/AirConditionerZbGateway.png
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/AirConditionerZbGateway.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Logo/2.png b/ZigbeeApp/Home.Ios/Resources/Phone/Logo/2.png
deleted file mode 100755
index 7a07804..0000000
--- a/ZigbeeApp/Home.Ios/Resources/Phone/Logo/2.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Logo/Logo.png b/ZigbeeApp/Home.Ios/Resources/Phone/Logo/Logo.png
index 232eeea..30b57f2 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/Logo/Logo.png
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Logo/Logo.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Logo/StartBackGroud.png b/ZigbeeApp/Home.Ios/Resources/Phone/Logo/StartBackGroud.png
new file mode 100755
index 0000000..43956d1
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Logo/StartBackGroud.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/RealDevice/AirConditionerZbGateway.png b/ZigbeeApp/Home.Ios/Resources/Phone/RealDevice/AirConditionerZbGateway.png
index 510b39b..bd9c682 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/RealDevice/AirConditionerZbGateway.png
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/RealDevice/AirConditionerZbGateway.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/mono_crash.115869ea88.0.json b/ZigbeeApp/Home.Ios/mono_crash.115869ea88.0.json
new file mode 100644
index 0000000..759f137
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/mono_crash.115869ea88.0.json
@@ -0,0 +1,775 @@
+{
+  "protocol_version" : "0.0.5",
+  "configuration" : {
+    "version" : "(6.6.0.155) (2019-08/296a9afdb24)",
+    "tlc" : "normal",
+    "sigsgev" : "altstack",
+    "notifications" : "kqueue",
+    "architecture" : "amd64",
+    "disabled_features" : "none",
+    "smallconfig" : "disabled",
+    "bigarrays" : "disabled",
+    "softdebug" : "enabled",
+    "interpreter" : "enabled",
+    "llvm_support" : "0",
+    "suspend" : "hybrid"
+  },
+  "memory" : {
+    "Resident Size" : "156639232",
+    "Virtual Size" : "4818821120",
+    "minor_gc_time" : "3344349",
+    "major_gc_time" : "1878887",
+    "minor_gc_count" : "4",
+    "major_gc_count" : "8",
+    "major_gc_time_concurrent" : "0"
+ },
+  "threads" : [
+ {
+    "is_managed" : false,
+    "offset_free_hash" : "0x0",
+    "offset_rich_hash" : "0x0",
+    "crashed" : false,
+    "native_thread_id" : "0x70000685a000",
+    "thread_info_addr" : "0x7fea5c83bc00",
+    "thread_name" : "Finalizer",
+    "ctx" : {
+      "IP" : "0x7fff61571266",
+      "SP" : "0x700006859da8",
+      "BP" : "0x700006859e50"
+  },
+    "unmanaged_frames" : [
+  {
+      "is_managed" : "false",
+      "native_address" : "0x10ff50156",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x1100f6775",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x1100f64a7",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x10ffbaf3c",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x7fff61627b5d",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x7fea5be0c040",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x1100f7373",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x7fff616302eb",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x7fff61633249",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x7fff6162f40d",
+      "native_offset" : "0x00000"
+   }
+
+  ]
+ },
+ {
+    "is_managed" : false,
+    "offset_free_hash" : "0x0",
+    "offset_rich_hash" : "0x0",
+    "crashed" : false,
+    "native_thread_id" : "0x11281b5c0",
+    "thread_info_addr" : "0x7fea5c801800",
+    "thread_name" : "tid_307",
+    "ctx" : {
+      "IP" : "0x7fff6157486a",
+      "SP" : "0x7ffedfd62c98",
+      "BP" : "0x7ffedfd62d20"
+  },
+    "unmanaged_frames" : [
+  {
+      "is_managed" : "false",
+      "native_address" : "0x10ff50156",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x1100f6775",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x1100f64a7",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x10ffbaf3c",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x7fff61627b5d",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x10ff525b6",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x1101a07c0",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x1101bb2e1",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x1100f3774",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x1100f358a",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x10ff156c2",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x10fe9f848",
+      "native_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "0x7fff6143c3d5",
+      "native_offset" : "0x00000"
+   }
+
+  ]
+ },
+ {
+    "is_managed" : true,
+    "offset_free_hash" : "0x115869ea88",
+    "offset_rich_hash" : "0x115869ee42",
+    "crashed" : true,
+    "native_thread_id" : "0x700006fec000",
+    "thread_info_addr" : "0x7fea5c45ac00",
+    "thread_name" : "Thread Pool Worker",
+    "ctx" : {
+      "IP" : "0x7fff615772c6",
+      "SP" : "0x700006fea548",
+      "BP" : "0x700006fea580"
+  },
+    "managed_frames" : [
+  {
+      "is_managed" : "false",
+      "native_address" : "unregistered"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+      "token" : "0x00000",
+      "native_offset" : "0x0",
+      "filename" : "mscorlib.dll",
+      "sizeofimage" : "0x472000",
+      "timestamp" : "0xec216ac8",
+      "il_offset" : "0x0000c"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+      "token" : "0x6001f80",
+      "native_offset" : "0x0",
+      "filename" : "mscorlib.dll",
+      "sizeofimage" : "0x472000",
+      "timestamp" : "0xec216ac8",
+      "il_offset" : "0x0001a"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+      "token" : "0x6001f27",
+      "native_offset" : "0x0",
+      "filename" : "mscorlib.dll",
+      "sizeofimage" : "0x472000",
+      "timestamp" : "0xec216ac8",
+      "il_offset" : "0x00028"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+      "token" : "0x6001f25",
+      "native_offset" : "0x0",
+      "filename" : "mscorlib.dll",
+      "sizeofimage" : "0x472000",
+      "timestamp" : "0xec216ac8",
+      "il_offset" : "0x00002"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+      "token" : "0x6000084",
+      "native_offset" : "0x0",
+      "filename" : "MonoDevelop.MSBuildBuilder.exe",
+      "sizeofimage" : "0x14000",
+      "timestamp" : "0xb4416f59",
+      "il_offset" : "0x000ae"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+      "token" : "0x6000083",
+      "native_offset" : "0x0",
+      "filename" : "MonoDevelop.MSBuildBuilder.exe",
+      "sizeofimage" : "0x14000",
+      "timestamp" : "0xb4416f59",
+      "il_offset" : "0x00001"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+      "token" : "0x600006a",
+      "native_offset" : "0x0",
+      "filename" : "MonoDevelop.MSBuildBuilder.exe",
+      "sizeofimage" : "0x14000",
+      "timestamp" : "0xb4416f59",
+      "il_offset" : "0x00048"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+      "token" : "0x60000a1",
+      "native_offset" : "0x0",
+      "filename" : "MonoDevelop.MSBuildBuilder.exe",
+      "sizeofimage" : "0x14000",
+      "timestamp" : "0xb4416f59",
+      "il_offset" : "0x00001"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+      "token" : "0x6000067",
+      "native_offset" : "0x0",
+      "filename" : "MonoDevelop.MSBuildBuilder.exe",
+      "sizeofimage" : "0x14000",
+      "timestamp" : "0xb4416f59",
+      "il_offset" : "0x00001"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+      "token" : "0x6000075",
+      "native_offset" : "0x0",
+      "filename" : "MonoDevelop.MSBuildBuilder.exe",
+      "sizeofimage" : "0x14000",
+      "timestamp" : "0xb4416f59",
+      "il_offset" : "0x00057"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+      "token" : "0x00000",
+      "native_offset" : "0x0",
+      "filename" : "MonoDevelop.MSBuildBuilder.exe",
+      "sizeofimage" : "0x14000",
+      "timestamp" : "0xb4416f59",
+      "il_offset" : "0x0002a"
+   }
+,
+  {
+      "is_managed" : "false",
+      "native_address" : "unregistered"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+      "token" : "0x00000",
+      "native_offset" : "0x0",
+      "filename" : "mscorlib.dll",
+      "sizeofimage" : "0x472000",
+      "timestamp" : "0xec216ac8",
+      "il_offset" : "0x0000c"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+      "token" : "0x6004cdb",
+      "native_offset" : "0x0",
+      "filename" : "mscorlib.dll",
+      "sizeofimage" : "0x472000",
+      "timestamp" : "0xec216ac8",
+      "il_offset" : "0x0006a"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+      "token" : "0x60048c4",
+      "native_offset" : "0x0",
+      "filename" : "mscorlib.dll",
+      "sizeofimage" : "0x472000",
+      "timestamp" : "0xec216ac8",
+      "il_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+      "token" : "0x6000039",
+      "native_offset" : "0x0",
+      "filename" : "MonoDevelop.MSBuildBuilder.exe",
+      "sizeofimage" : "0x14000",
+      "timestamp" : "0xb4416f59",
+      "il_offset" : "0x00019"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+      "token" : "0x6000166",
+      "native_offset" : "0x0",
+      "filename" : "MonoDevelop.MSBuildBuilder.exe",
+      "sizeofimage" : "0x14000",
+      "timestamp" : "0xb4416f59",
+      "il_offset" : "0x00029"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+      "token" : "0x6000181",
+      "native_offset" : "0x0",
+      "filename" : "MonoDevelop.MSBuildBuilder.exe",
+      "sizeofimage" : "0x14000",
+      "timestamp" : "0xb4416f59",
+      "il_offset" : "0x00001"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+      "token" : "0x6001fe8",
+      "native_offset" : "0x0",
+      "filename" : "mscorlib.dll",
+      "sizeofimage" : "0x472000",
+      "timestamp" : "0xec216ac8",
+      "il_offset" : "0x00007"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+      "token" : "0x6001ec3",
+      "native_offset" : "0x0",
+      "filename" : "mscorlib.dll",
+      "sizeofimage" : "0x472000",
+      "timestamp" : "0xec216ac8",
+      "il_offset" : "0x00071"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+      "token" : "0x6001ec1",
+      "native_offset" : "0x0",
+      "filename" : "mscorlib.dll",
+      "sizeofimage" : "0x472000",
+      "timestamp" : "0xec216ac8",
+      "il_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+      "token" : "0x6001fe6",
+      "native_offset" : "0x0",
+      "filename" : "mscorlib.dll",
+      "sizeofimage" : "0x472000",
+      "timestamp" : "0xec216ac8",
+      "il_offset" : "0x00021"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+      "token" : "0x6001fce",
+      "native_offset" : "0x0",
+      "filename" : "mscorlib.dll",
+      "sizeofimage" : "0x472000",
+      "timestamp" : "0xec216ac8",
+      "il_offset" : "0x00074"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+      "token" : "0x6001fe3",
+      "native_offset" : "0x0",
+      "filename" : "mscorlib.dll",
+      "sizeofimage" : "0x472000",
+      "timestamp" : "0xec216ac8",
+      "il_offset" : "0x00000"
+   }
+,
+  {
+      "is_managed" : "true",
+      "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+      "token" : "0x00000",
+      "native_offset" : "0x0",
+      "filename" : "mscorlib.dll",
+      "sizeofimage" : "0x472000",
+      "timestamp" : "0xec216ac8",
+      "il_offset" : "0x0002a"
+   }
+
+  ],
+  "unmanaged_frames" : [
+ {
+    "is_managed" : "false",
+    "native_address" : "0x10ff50156",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x1100f6775",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x1100f6dfa",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x10ffbbf46",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x10ff54c65",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x10ffbb2db",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x7fff61627b5d",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x110221439",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x7fff614e16a6",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x1101c5cb7",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x1101a6b2f",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x1101c603e",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x1101c61bf",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x110060e76",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x110061478",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x1101b419f",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x1101b44b0",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x1100637ab",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x110086675",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "true",
+    "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+    "token" : "0x00000",
+    "native_offset" : "0x0",
+    "filename" : "mscorlib.dll",
+    "sizeofimage" : "0x472000",
+    "timestamp" : "0xec216ac8",
+    "il_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "true",
+    "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+    "token" : "0x6000083",
+    "native_offset" : "0x0",
+    "filename" : "MonoDevelop.MSBuildBuilder.exe",
+    "sizeofimage" : "0x14000",
+    "timestamp" : "0xb4416f59",
+    "il_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "true",
+    "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+    "token" : "0x60000a1",
+    "native_offset" : "0x0",
+    "filename" : "MonoDevelop.MSBuildBuilder.exe",
+    "sizeofimage" : "0x14000",
+    "timestamp" : "0xb4416f59",
+    "il_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "true",
+    "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+    "token" : "0x00000",
+    "native_offset" : "0x0",
+    "filename" : "MonoDevelop.MSBuildBuilder.exe",
+    "sizeofimage" : "0x14000",
+    "timestamp" : "0xb4416f59",
+    "il_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x10feb062d",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x1100cffa4",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x1100d43a6",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x11006b6f4",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "true",
+    "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+    "token" : "0x00000",
+    "native_offset" : "0x0",
+    "filename" : "mscorlib.dll",
+    "sizeofimage" : "0x472000",
+    "timestamp" : "0xec216ac8",
+    "il_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "true",
+    "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+    "token" : "0x60048c4",
+    "native_offset" : "0x0",
+    "filename" : "mscorlib.dll",
+    "sizeofimage" : "0x472000",
+    "timestamp" : "0xec216ac8",
+    "il_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "true",
+    "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+    "token" : "0x6000181",
+    "native_offset" : "0x0",
+    "filename" : "MonoDevelop.MSBuildBuilder.exe",
+    "sizeofimage" : "0x14000",
+    "timestamp" : "0xb4416f59",
+    "il_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "true",
+    "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+    "token" : "0x6001ec1",
+    "native_offset" : "0x0",
+    "filename" : "mscorlib.dll",
+    "sizeofimage" : "0x472000",
+    "timestamp" : "0xec216ac8",
+    "il_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "true",
+    "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+    "token" : "0x6001fe3",
+    "native_offset" : "0x0",
+    "filename" : "mscorlib.dll",
+    "sizeofimage" : "0x472000",
+    "timestamp" : "0xec216ac8",
+    "il_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x10feb062d",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x1100cffa4",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x1100f9ec0",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x11002c28c",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x1100f7373",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x7fff616302eb",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x7fff61633249",
+    "native_offset" : "0x00000"
+  }
+,
+ {
+    "is_managed" : "false",
+    "native_address" : "0x7fff6162f40d",
+    "native_offset" : "0x00000"
+  }
+
+ ]
+}
+]
+}
\ No newline at end of file
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index 89f2577..83a2602 100755
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -45,19 +45,12 @@
             Phone.UserView.HomePage.Instance.InitPage();
         }
 
-        public static string SoftTitle = "ZigBee";
-        /// <summary>
-        /// 鐭俊妯℃澘缂栧彿
-        /// </summary>
-        public static int SoftSmsType = 0;
-        public static string LogoString = @"Logo/Logo.png";
-        public static string RegisterLogoString = @"Logo/Register_logo.png";
         //public static string RequestHttpsHost = "https://global.hdlcontrol.com/HangZhouHdlCloudApi";
         public static string RequestHttpsHost = "https://global.hdlcontrol.com/ProposedProductionApi";
         /// <summary>
         /// 鐗堟湰鍙�
         /// </summary>
-        public static string CodeIDString = "1.0.20050901";
+        public static string CodeIDString = "1.0.20051801";
         /// <summary>
         /// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
         /// </summary>
@@ -80,10 +73,6 @@
         /// </summary>
         public static int XLeft = 58;
         /// <summary>
-        /// button楂樺害--110
-        /// </summary>
-        public static int ButtonHeight = 110;
-        /// <summary>
         /// 浣跨敤鐨勮瑷�
         /// </summary>
         public static string ZigBeeLanguage
@@ -94,10 +83,6 @@
             }
         }
         /// <summary>
-        /// 澶ф帶浠跺渾瑙� --- 10銆備笉鏄笉鍗婂渾閭g銆�
-        /// </summary>
-        public static uint BigFormRadius = 10;
-        /// <summary>
         /// 榛樿鎵嬫満鍖哄彿涓�86涓浗澶ч檰
         /// </summary>
         public static string PhoneZoneStr = "86";
@@ -106,46 +91,9 @@
         /// </summary>
         public static string ZoneNameStr = "涓浗澶ч檰";
         /// <summary>
-        /// 璺濈椤剁楂樺害--80 鐘舵�佹爮楂樺害
-        /// </summary>
-        public static int NavigationTitle_Y = 80;
-        /// <summary>
-        /// 琛岄珮--180
-        /// </summary>
-        public static int RowHeight = 180;
-        /// <summary>
         /// APP瀹藉害 -- 1080
         /// </summary>
         public static int AppRealWidth = 1080;
-        /// <summary>
-        /// APP楂樺害 -- 1920
-        /// </summary>
-        public static int AppRealHeight = 1920;
-        /// <summary>
-        /// 杩斿洖閿窛绂诲乏杈圭殑璺濈 30
-        /// </summary>
-        public static int Navigation_X = 30;
-        /// <summary>
-        /// 瀵艰埅鏍忛珮搴�-220
-        /// </summary>
-        public static int Navigation_Height = 220;
-        /// <summary>
-        /// 搴曡竟鏍忛珮搴�
-        /// </summary>
-        public const int TabbarHeight = 141;
-        /// <summary>
-        /// 绾挎潯鐨勯珮搴�--瀹為檯鍍忕礌3
-        /// </summary>
-        public static int LineHeight = 3;
-        /// <summary>
-        /// 鏁翠釜鍦烘櫙寤舵椂鏃堕棿--60绉�
-        /// </summary>
-        public static int SceneDelayTime = 60;
-
-        /// <summary>
-        /// 闂撮殧澶氶暱鏃堕棿璇诲彇璁惧鐘舵�� 鍗曚綅 绉� --榛樿30
-        /// </summary>
-        public static int ReadDeviceStatuSpan = 30;
         /// <summary>
         /// 璇诲彇澶氬皯椤�--999
         /// </summary>
@@ -163,21 +111,10 @@
         /// 鐢ㄤ簬楠岃瘉閭姝e垯琛ㄨ揪寮�
         /// </summary>
         public static string EmailRegexStr = "^\\s*([A-Za-z0-9_-]+(\\.\\w+)*@(\\w+\\.)+\\w{2,5})\\s*$";
-
-
-        //public static Encoding EncodingUTF8 = Encoding.UTF8;
-        //public static Encoding EncodingGB2312 = Encoding.GetEncoding("gb2312");
-        public static bool IsRemote = false;
-        public static bool FindGateway = false;
         /// <summary>
         /// 褰撳墠缃戠粶杩炴帴鐨勬ā寮�  0:娌℃湁缃戠粶  1锛氳繙绋嬭繛鎺ワ紝涔熷彨3G,4G  2锛歐IFI
         /// </summary>
         public static int nowNetworkMode = 0;
-        /// <summary>
-        /// 鍗犱綅瀛椾綋澶у皬
-        /// 11
-        /// </summary>
-        public static int PlaceHolderTextSize = 11;
         /// <summary>
         /// 瀹夊崜鐨勭郴缁熻繑鍥炴寜閿兘鍚︽寜涓�(姣斿鍦ㄥ浠借繕鍘熸椂,涓嶈兘鎸変笅杩斿洖閿�)
         /// </summary>
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index 0be27e0..f1bc1e4 100644
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -1954,26 +1954,10 @@
         /// <param name="saveRoadDevice">濡傛灉鍙湁涓�涓洖璺�,鏄惁鎶婂洖璺殑鎴块棿涓�璧蜂慨鏀�</param>
         public void SaveRealDeviceRoomId(List<CommonDevice> listDevice, string roomId, bool saveRoadDevice = true)
         {
-            if (listDevice != null)
+            if (listDevice == null)
             {
-                if (roomId == string.Empty)
-                {
-                    //閫夋嫨鐨勬槸鏈垎閰�
-                    this.dicDeviceRoomId.Remove(listDevice[0].DeviceAddr);
-                }
-                else
-                {
-                    this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
-                }
+                return;
             }
-
-            //淇濆瓨璁板綍
-            string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
-            UserCenterLogic.SaveFileContent(fullName, this.dicDeviceRoomId);
-
-            //娣诲姞鑷姩澶囦唤
-            HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
-
             //濡傛灉璁惧鍙湁涓�涓洖璺紝濡傛灉鏀瑰彉浜嗙湡瀹炶澶囧尯鍩燂紝鍒欏畠鐨勫洖璺殑鍖哄煙涔熶竴璧锋敼浜�
             if (saveRoadDevice == true && listDevice != null && listDevice.Count == 1)
             {
@@ -1983,6 +1967,41 @@
                     return;
                 }
                 HdlRoomLogic.Current.ChangedRoom(listDevice[0], roomId, false);
+            }
+            bool save = false;
+            if (roomId == string.Empty)
+            {
+                //閫夋嫨鐨勬槸鏈垎閰�
+                this.dicDeviceRoomId.Remove(listDevice[0].DeviceAddr);
+                save = true;
+            }
+            else
+            {
+                if (this.dicDeviceRoomId.ContainsKey(listDevice[0].DeviceAddr) == false)
+                {
+                    this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
+                    save = true;
+                }
+                else
+                {
+                    //2020.05.18杩藉姞:濡傛灉璁板綍鐨勬埧闂碔D鏄笉瀛樺湪鐨勮瘽,鍒欓噸鏂拌鐩�
+                    var room = HdlRoomLogic.Current.GetRoomById(this.dicDeviceRoomId[listDevice[0].DeviceAddr]);
+                    if (room == null)
+                    {
+                        this.dicDeviceRoomId[listDevice[0].DeviceAddr] = roomId;
+                        save = true;
+                    }
+                }
+            }
+
+            if (save == true)
+            {
+                //淇濆瓨璁板綍
+                string fullName = UserCenterLogic.CombinePath(DirNameResourse.DeviceRoomIdFile);
+                UserCenterLogic.SaveFileContent(fullName, this.dicDeviceRoomId);
+
+                //娣诲姞鑷姩澶囦唤
+                HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
             }
         }
 
@@ -2052,6 +2071,25 @@
 
             //娣诲姞鑷姩澶囦唤
             HdlAutoBackupLogic.AddOrEditorFile(DirNameResourse.DeviceRoomIdFile);
+        }
+
+        /// <summary>
+        /// 鏍规嵁鎴块棿ID,绉婚櫎鎸囧畾鐨勭湡瀹炵墿鐞嗚澶囩殑鎵�灞炴埧闂磋褰�
+        /// </summary>
+        /// <param name="i_RoomId"></param>
+        public void DeleteRealDeviceByRoomId(string i_RoomId)
+        {
+            var listDeleteKey = new List<string>();
+            foreach (var deviceAddr in this.dicDeviceRoomId.Keys)
+            {
+                if (this.dicDeviceRoomId[deviceAddr] == i_RoomId
+                    && listDeleteKey.Contains(deviceAddr) == false)
+                {
+                    listDeleteKey.Add(deviceAddr);
+                }
+            }
+            //灏嗙湡瀹炵墿鐞嗚澶囦粠鎴块棿涓Щ闄�
+            this.DeleteRealDeviceFromRoom(listDeleteKey);
         }
 
         #endregion
@@ -2149,26 +2187,15 @@
                 listDevice = this.GetDeviceByGatewayID(gwId);
             }
 
-            var dicDevice = new Dictionary<string, CommonDevice>();
+            var listCheck = new HashSet<string>();
+            var listReturn = new List<CommonDevice>();
             foreach (var device in listDevice)
             {
-                if (dicDevice.ContainsKey(device.DeviceAddr) == false)
+                if (listCheck.Contains(device.DeviceAddr) == false)
                 {
-                    dicDevice[device.DeviceAddr] = device;
-                    continue;
+                    listCheck.Add(device.DeviceAddr);
+                    listReturn.Add(device);
                 }
-                //璁惧鏄惁澶勪簬鍦ㄧ嚎鐘舵��
-                bool online = this.CheckDeviceIsOnline(device);
-                if (online == true)
-                {
-                    //濡傛灉璁惧鍥炶矾鍦ㄧ嚎,鍒欎紭鍏堜娇鐢ㄥ湪绾跨殑鍥炶矾,鍚庢潵鐨勭洿鎺ヨ鐩�
-                    dicDevice[device.DeviceAddr] = device;
-                }
-            }
-            var listReturn = new List<CommonDevice>();
-            foreach (var device in dicDevice.Values)
-            {
-                listReturn.Add(device);
             }
             return listReturn;
         }
@@ -2184,8 +2211,18 @@
         /// <returns></returns>
         public bool CheckDeviceIsOnline(CommonDevice i_device)
         {
-            //0:绂荤嚎 1:鍦ㄧ嚎 2:姝e湪鍒锋柊鐘舵��
-            return i_device.IsOnline == 1 || i_device.IsOnline == 2;
+            var listDevice = this.GetDevicesByMac(i_device.DeviceAddr, false);
+            foreach (var device in listDevice)
+            {
+                //0:绂荤嚎 1:鍦ㄧ嚎 2:姝e湪鍒锋柊鐘舵��
+                bool statu = i_device.IsOnline == 1 || i_device.IsOnline == 2;
+                if (statu == true)
+                {
+                    //鏈変竴涓洖璺湪绾�,鍗冲湪绾�
+                    return true;
+                }
+            }
+            return false;
         }
 
         /// <summary>
@@ -2415,8 +2452,14 @@
                                 if (listCheck.Contains(mainkeys) == false)
                                 {
                                     listDevice.Add(device);
-
                                     listCheck.Add(mainkeys);
+                                    //鍒锋柊涓�涓嬫湰鍦扮紦瀛�
+                                    var localDevice = this.GetDevice(mainkeys);
+                                    if (localDevice != null)
+                                    {
+                                        //鍒锋柊灞炴��
+                                        this.SetDeviceInfoToMain(localDevice, device);
+                                    }
                                 }
                             }
                         }
@@ -2596,8 +2639,9 @@
             //濡傛灉鏄笁璺户鐢靛櫒鐨勫洖璺殑璇�,榛樿涓虹伅鍏�
             else if (mainDevice.Type == DeviceType.OnOffOutput)
             {
-                var myType = this.GetHdlMyDeviceEnumInfo(mainDevice);
-                if (myType != null && myType.ConcreteType == DeviceConcreteType.Relay_ThreeLoad)
+                //2020.05.13鍙樻洿:缁х數鍣ㄩ兘榛樿涓虹伅鍏�
+                //var myType = this.GetHdlMyDeviceEnumInfo(mainDevice);
+                //if (myType != null && myType.ConcreteType == DeviceConcreteType.Relay_ThreeLoad)
                 {
                     if (mainDevice.DfunctionType == DeviceFunctionType.A鏈畾涔�)
                     {
diff --git a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
index 1141503..d1a8fcf 100644
--- a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
@@ -162,7 +162,7 @@
                     floors.FloorAction += (floorId) =>
                     {
                         btnFloorName.Text = Config.Instance.Home.GetFloorNameById(floorId);
-                        HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();
+                        HdlRoomLogic.Current.NowCategoryRoom = HdlRoomLogic.Current.GetLoveRoom();
                         //鍒锋柊bodyView
                         this.RefreshBodyView();
                     };
@@ -276,16 +276,21 @@
         {
             //褰撳墠妤煎眰鐨勫叏閮ㄦ埧闂�
             var lisrRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();
+            if (HdlRoomLogic.Current.NowCategoryRoom == null)
+            {
+                //璁剧疆绗竴涓负鍒濆鎴块棿
+                HdlRoomLogic.Current.NowCategoryRoom = lisrRoom[0];
+            }
             //鎴块棿鑿滃崟鎺т欢
             var roomSwitchContr = new RoomDeviceGroupMenuControl(lisrRoom);
             roomSwitchContr.Y = Application.GetRealHeight(-55);
             this.functionSceneAutoBodyView.AddChidren(roomSwitchContr);
             //璁剧疆鍒濆鍊�
-            roomSwitchContr.SetDefultIndex(HdlRoomLogic.Current.CurrentRoom.Id);
+            roomSwitchContr.SetDefultIndex(HdlRoomLogic.Current.NowCategoryRoom.Id);
             //閫夋嫨浜嬩欢
             roomSwitchContr.SelectRoomEvent += (selectRoom) =>
             {
-                HdlRoomLogic.Current.CurrentRoom = selectRoom;
+                HdlRoomLogic.Current.NowCategoryRoom = selectRoom;
                 //鍦烘櫙
                 if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 0)
                 {
@@ -537,7 +542,7 @@
                     cardContr.chidrenYaxis = listView.rowSpace / 2;
                     //鍒濆鍖栧崱鐗�
                     listView.AddChidren(cardContr);
-                    cardContr.InitControl(device);
+                    cardContr.InitControl(device, HdlRoomLogic.Current.NowCategoryRoom);
                     //鎺т欢璁板綍鍒扮紦瀛樹腑
                     this.dicDeviceRowControl[LocalDevice.Current.GetDeviceMainKeys(device)] = cardContr;
                     //鍔犵紦瀛�,鐒跺悗鍙戝懡浠�
@@ -588,6 +593,46 @@
         /// <param name="room"></param>
         private void RefreshSceneView(Room room)
         {
+            //涓讳汉锛岀鐞嗗憳涓撶敤鍒锋柊鎺т欢
+            VerticalListRefreshControl listview1 = null;
+            //鎴愬憳涓撶敤涓嶈兘鍒锋柊鐨勬帶浠�
+            VerticalListControl listview2 = null;
+            if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
+            {
+                //涓讳汉锛岀鐞嗗憳涓撶敤鍒锋柊鎺т欢
+                listview1 = new VerticalListRefreshControl();
+                functionSceneBodyView.AddChidren(listview1);
+                //涓嬫媺鍒锋柊
+                listview1.BeginHeaderRefreshingAction += () =>
+                {
+                    HdlThreadLogic.Current.RunThread(() =>
+                    {
+                        //浠庣綉鍏冲埛鏂板満鏅垪琛�
+                        bool result = HdlSceneLogic.Current.RefreshSceneUIList();
+                        HdlThreadLogic.Current.RunMain(() =>
+                        {
+                            listview1.EndHeaderRefreshing();
+                            if (result == true)
+                            {
+                                //鍦ㄥ闈㈡竻绌�(鐗规晥鐨勯棶棰�)
+                                this.functionSceneBodyView.RemoveAll();
+                                HdlThreadLogic.Current.RunMainInThread(() =>
+                                {
+                                    //鍒锋柊鍦烘櫙鍒嗘敮鎺т欢
+                                    this.RefreshSceneView(room);
+                                });
+                            }
+                        });
+                    });
+                };
+            }
+            else
+            {
+                //鎴愬憳涓撶敤涓嶈兘鍒锋柊鐨勬帶浠�
+                listview2 = new VerticalListControl();
+                functionSceneBodyView.AddChidren(listview2);
+            }
+
             var listScene = new List<SceneUI>();
             foreach (var sceneId in room.ListSceneId)
             {
@@ -599,28 +644,17 @@
             }
             if (listScene.Count == 0)
             {
+                //鍦ㄦ粦鍔ㄦ帶浠堕噷闈㈡坊鍔犱竴涓甯�
+                var frameTable = new FrameLayout();
+                listview1?.AddChidren(frameTable);
+                listview2?.AddChidren(frameTable);
                 //娌℃湁鍦烘櫙{0}璇风偣鍑诲彸涓婅娣诲姞
                 string[] arryMsg = Language.StringByID(R.MyInternationalizationString.NoScene).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
-                this.ShowNotDataImage(functionSceneBodyView, arryMsg);
+                this.ShowNotDataImage(frameTable, arryMsg);
                 return;
             }
 
             var dicSceneContr = new Dictionary<int, SceneCategoryView>();
-            //涓讳汉锛岀鐞嗗憳涓撶敤鍒锋柊鎺т欢
-            VerticalListRefreshControl listview1 = null;
-            //鎴愬憳涓撶敤涓嶈兘鍒锋柊鐨勬帶浠�
-            VerticalListControl listview2 = null;
-            //if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
-            //{
-            //    listview1 = new VerticalListRefreshControl();
-            //    functionSceneBodyView.AddChidren(listview1);
-            //}
-            //else
-            {
-                listview2 = new VerticalListControl();
-                functionSceneBodyView.AddChidren(listview2);
-            }
-
             foreach (var scene in listScene)
             {
                 //鍦烘櫙鍗$墖鎺т欢
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
index 2789bd2..737c569 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
@@ -53,6 +53,10 @@
         /// 鍒ゆ柇鏄惁鏈夊紑鍏冲姛鑳�
         /// </summary>
         private bool isHadOpenSwitch = true;
+        /// <summary>
+        /// 褰撳墠閫夋嫨鐨勬埧闂�
+        /// </summary>
+        public Common.Room nowSelectRoom = null;
 
         #endregion
 
@@ -71,9 +75,11 @@
         /// 鍒濆鍖栨帶浠�
         /// </summary>
         /// <param name="i_device">璁惧瀵硅薄</param>
-        public virtual void InitControl(CommonDevice i_device)
+        /// <param name="i_nowSelectRoom">褰撳墠閫夋嫨鐨勬埧闂�(鏈夌偣鐢ㄥ)</param>
+        public virtual void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)
         {
             this.device = i_device;
+            this.nowSelectRoom = i_nowSelectRoom;
             //璁惧鍥炬爣鑳屾櫙鎺т欢
             this.frameIconBackGroud = new FrameLayout();
             frameIconBackGroud.Height = this.GetPictrueRealSize(112);
@@ -137,17 +143,17 @@
             btnSwitch.SelectedImagePath = "Item/SwitchSelected.png";
 
             //鍒嗕韩鐨勬埧闂�,鍒欎笉鑳界紪杈戝拰鍒犻櫎
-            if (HdlRoomLogic.Current.CurrentRoom.IsSharedRoom == false)
+            if (this.nowSelectRoom.IsSharedRoom == false)
             {
                 //缂栬緫
                 var btnEditor = this.AddEditorControl();
                 btnEditor.ButtonClickEvent += (sender, e) =>
                 {
                     var detailInfo = new MainPage.DeviceDetailInfoForm();
-                    detailInfo.AddForm(i_device, HdlRoomLogic.Current.CurrentRoom);
-                    detailInfo.FormCloseEvent += (curDevice, curRoom) =>
+                    detailInfo.AddForm(i_device, this.nowSelectRoom);
+                    detailInfo.FormCloseEvent += () =>
                     {
-                        if (HdlRoomLogic.Current.CurrentRoom.IsLove == true)
+                        if (this.nowSelectRoom.IsLove == true)
                         {
                             //褰撳墠鏄枩鐖辨埧闂存椂
                             if (HdlRoomLogic.Current.IsCollectInRoom(this.device) == false)
@@ -159,7 +165,8 @@
                                 return;
                             }
                         }
-                        else if (HdlRoomLogic.Current.CurrentRoom.Id != curRoom.Id)
+                        var curRoom = HdlRoomLogic.Current.GetRoomByDevice(this.device);
+                        if (curRoom == null || this.nowSelectRoom.Id != curRoom.Id)
                         {
                             //鍥炶皟鎺т欢琚Щ闄ょ殑浜嬩欢
                             this.RowNeedRemoveEvent?.Invoke();
@@ -182,7 +189,7 @@
                     {
                         //绉婚櫎鏀惰棌(涓嶇浠�涔堟儏鍐�,鏀惰棌閮借绉婚櫎)
                         HdlRoomLogic.Current.DeleteLoveDevice(i_device);
-                        if (HdlRoomLogic.Current.CurrentRoom.IsLove == false)
+                        if (this.nowSelectRoom.IsLove == false)
                         {
                             //浠庢埧闂翠腑绉婚櫎
                             HdlRoomLogic.Current.DeleteDevice(i_device);
@@ -342,10 +349,9 @@
         /// 娣卞害鍗$墖淇℃伅鐨勮繑鍥炰簨浠�(搴曞眰涓撶敤)
         /// </summary>
         /// <param name="device">璁惧</param>
-        /// <param name="room">鎴块棿</param>
-        public void CardDetailInfoBackEvent(CommonDevice device, Common.Room room)
+        public void CardDetailInfoBackEvent(CommonDevice device)
         {
-            if (HdlRoomLogic.Current.CurrentRoom.IsLove == true)
+            if (this.nowSelectRoom.IsLove == true)
             {
                 //宸茬粡鍙栨秷鐨勬敹钘�
                 if (HdlRoomLogic.Current.IsCollectInRoom(device) == false)
@@ -361,7 +367,7 @@
             {   
                 //濡傛灉杩欎釜璁惧鏀瑰彉浜嗘埧闂寸殑璇�,鍥炶皟鍗$墖琚垹闄ょ殑鍑芥暟
                 var nowRoom = HdlRoomLogic.Current.GetRoomByDevice(device);
-                if (nowRoom == null || nowRoom.Id != HdlRoomLogic.Current.CurrentRoom.Id)
+                if (nowRoom == null || nowRoom.Id != this.nowSelectRoom.Id)
                 {
                     //鍥炶皟鎺т欢琚Щ闄ょ殑浜嬩欢
                     this.RowNeedRemoveEvent?.Invoke();
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs
index 8674a16..3ea4dc9 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAcRowControl.cs
@@ -17,9 +17,9 @@
         /// 鍒濆鍖栨帶浠�
         /// </summary>
         /// <param name="i_device"></param>
-        public override void InitControl(CommonDevice i_device)
+        public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)
         {
-            base.InitControl(i_device);
+            base.InitControl(i_device, i_nowSelectRoom);
 
             //娣诲姞璺宠浆娣卞害鍗$墖淇℃伅浜嬩欢
             this.AddDetailInfoEvent(i_device);
@@ -63,7 +63,7 @@
             {
                 //绌鸿皟绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈�
                 var form = new MainPage.ControlForm.DeviceAcDetailCardForm();
-                form.AddForm(i_device, HdlRoomLogic.Current.CurrentRoom, 965, 1457);
+                form.AddForm(i_device, this.nowSelectRoom, 965, 1457);
                 form.FormCloseEvent += this.CardDetailInfoBackEvent;
             };
         }
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAirSwitchRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAirSwitchRowControl.cs
index d039131..9f813fa 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAirSwitchRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceAirSwitchRowControl.cs
@@ -17,9 +17,9 @@
         /// 鍒濆鍖栨帶浠�
         /// </summary>
         /// <param name="i_device"></param>
-        public override void InitControl(CommonDevice i_device)
+        public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)
         {
-            base.InitControl(i_device);
+            base.InitControl(i_device, i_nowSelectRoom);
 
             //娣诲姞璺宠浆娣卞害鍗$墖淇℃伅浜嬩欢
             this.AddDetailInfoEvent(i_device);
@@ -85,7 +85,7 @@
 
                 //缁х數鍣ㄧ被鍨嬬殑娣卞害鍗$墖鐣岄潰(鍚┖姘斿紑鍏�)
                 var form = new MainPage.ControlForm.DeviceRelayDetailCardForm();
-                form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, backHeight);
+                form.AddForm(i_device, this.nowSelectRoom, 965, backHeight);
                 form.FormCloseEvent += this.CardDetailInfoBackEvent;
             };
         }
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs
index 247ce4f..35c8dc4 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs
@@ -17,9 +17,9 @@
         /// 鍒濆鍖栨帶浠�
         /// </summary>
         /// <param name="i_device"></param>
-        public override void InitControl(CommonDevice i_device)
+        public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)
         {
-            base.InitControl(i_device);
+            base.InitControl(i_device, i_nowSelectRoom);
 
             //娣诲姞璺宠浆娣卞害鍗$墖淇℃伅浜嬩欢
             this.AddDetailInfoEvent(i_device);
@@ -71,7 +71,7 @@
             {
                 //褰╃伅,璋冨厜鍣ㄧ被鍨嬬殑娣卞害鍗$墖鐣岄潰
                 var form = new MainPage.ControlForm.DeviceColorLightDetailCardForm();
-                form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, 1316);
+                form.AddForm(i_device, this.nowSelectRoom, 965, 1316);
                 form.FormCloseEvent += this.CardDetailInfoBackEvent;
             };
         }
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceCurtainRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceCurtainRowControl.cs
index 0d6511b..9688346 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceCurtainRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceCurtainRowControl.cs
@@ -38,9 +38,9 @@
         /// 鍒濆鍖栨帶浠�
         /// </summary>
         /// <param name="i_device"></param>
-        public override void InitControl(CommonDevice i_device)
+        public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)
         {
-            base.InitControl(i_device);
+            base.InitControl(i_device, i_nowSelectRoom);
 
             //娣诲姞璺宠浆娣卞害鍗$墖淇℃伅浜嬩欢
             this.AddDetailInfoEvent(i_device);
@@ -116,7 +116,7 @@
             {
                 //绐楀笜绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈�
                 var form = new MainPage.ControlForm.DeviceCurtainDetailCardForm();
-                form.AddForm(i_device, HdlRoomLogic.Current.CurrentRoom, 965, 1316);
+                form.AddForm(i_device, this.nowSelectRoom, 965, 1316);
                 form.FormCloseEvent += this.CardDetailInfoBackEvent;
             };
         }
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceDoorLockRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceDoorLockRowControl.cs
index cda4706..c1afa2a 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceDoorLockRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceDoorLockRowControl.cs
@@ -25,9 +25,9 @@
         /// 鍒濆鍖栨帶浠�
         /// </summary>
         /// <param name="i_device"></param>
-        public override void InitControl(CommonDevice i_device)
+        public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)
         {
-            base.InitControl(i_device);
+            base.InitControl(i_device, i_nowSelectRoom);
 
             //濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�,姝ゅ姛鑳芥棤鏁�
             if (Common.Config.Instance.Home.IsVirtually == false)
@@ -49,7 +49,7 @@
             //娣卞害鍗$墖淇℃伅
             this.frameTable.ButtonClickEvent += (sender, e) =>
             {
-                var userDoorLockPage = new UserCenter.DoorLock.UserDoorLockPage(UserCenter.HdlRoomLogic.Current.CurrentRoom, i_device);
+                var userDoorLockPage = new UserCenter.DoorLock.UserDoorLockPage(this.nowSelectRoom, i_device);
                 UserView.HomePage.Instance.AddChidren(userDoorLockPage);
                 UserView.HomePage.Instance.PageIndex += 1;
                 userDoorLockPage.Show();
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceFreshAirRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceFreshAirRowControl.cs
index 3329e2f..de6520e 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceFreshAirRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceFreshAirRowControl.cs
@@ -13,9 +13,9 @@
         /// 鍒濆鍖栨帶浠�
         /// </summary>
         /// <param name="i_device"></param>
-        public override void InitControl(CommonDevice i_device)
+        public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)
         {
-            base.InitControl(i_device);
+            base.InitControl(i_device, i_nowSelectRoom);
 
             //娣诲姞璺宠浆娣卞害鍗$墖淇℃伅浜嬩欢
             this.AddDetailInfoEvent(i_device);
@@ -57,7 +57,7 @@
             {
                 //鏂伴绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈�
                 var form = new MainPage.ControlForm.DeviceFreshAirDetailCardForm();
-                form.AddForm(i_device, HdlRoomLogic.Current.CurrentRoom, 965, 1374);
+                form.AddForm(i_device, this.nowSelectRoom, 965, 1374);
                 form.FormCloseEvent += this.CardDetailInfoBackEvent;
             };
         }
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DevicePmSensorRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DevicePmSensorRowControl.cs
index b6a2612..646eb3c 100644
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DevicePmSensorRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DevicePmSensorRowControl.cs
@@ -12,9 +12,9 @@
         /// 鍒濆鍖栨帶浠�
         /// </summary>
         /// <param name="i_device"></param>
-        public override void InitControl(CommonDevice i_device)
+        public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)
         {
-            base.InitControl(i_device);
+            base.InitControl(i_device, i_nowSelectRoom);
 
             //娣诲姞璺宠浆娣卞害鍗$墖淇℃伅浜嬩欢
             this.AddDetailInfoEvent(i_device);
@@ -32,7 +32,7 @@
             {
                 //PM2.5浼犳劅鍣ㄧ被鍨嬬殑娣卞害鍗$墖鐣岄潰
                 var form = new MainPage.ControlForm.DevicePmSensorDetailCardForm();
-                form.AddForm(i_device, HdlRoomLogic.Current.CurrentRoom, 965, 1374);
+                form.AddForm(i_device, this.nowSelectRoom, 965, 1374);
                 form.FormCloseEvent += this.CardDetailInfoBackEvent;
             };
         }
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceRelayRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceRelayRowControl.cs
index 34e1d60..38a38bc 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceRelayRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceRelayRowControl.cs
@@ -17,9 +17,9 @@
         /// 鍒濆鍖栨帶浠�
         /// </summary>
         /// <param name="i_device"></param>
-        public override void InitControl(CommonDevice i_device)
+        public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)
         {
-            base.InitControl(i_device);
+            base.InitControl(i_device, i_nowSelectRoom);
 
             //娣诲姞璺宠浆娣卞害鍗$墖淇℃伅浜嬩欢
             this.AddDetailInfoEvent(i_device);
@@ -86,7 +86,7 @@
 
                 //缁х數鍣ㄧ被鍨嬬殑娣卞害鍗$墖鐣岄潰(鍚┖姘斿紑鍏�)
                 var form = new MainPage.ControlForm.DeviceRelayDetailCardForm();
-                form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, backHeight);
+                form.AddForm(i_device, this.nowSelectRoom, 965, backHeight);
                 form.FormCloseEvent += this.CardDetailInfoBackEvent;
             };
         }
diff --git a/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
index d0417ce..f7b2221 100755
--- a/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/CommonForm/EditorCommonForm.cs
@@ -188,13 +188,16 @@
         /// <param name="parameter">鍚姩鍙傛暟锛氬弬鏁扮敱鎸囧畾鐢婚潰鐨凷howForm鍑芥暟鎵�鎸囧畾</param>
         public override void AddForm(params object[] parameter)
         {
+            //鐣岄潰鍔犺浇涓�
+            ControlCommonResourse.IsFormAdding = true;
+
             base.AddForm(parameter);
 
-            //妫�娴嬭兘鍚﹁拷鍔犵敾闈�
-            if (UserCenterLogic.CheckCanAddForm(this) == false)
-            {
-                return;
-            }
+            //妫�娴嬭兘鍚﹁拷鍔犵敾闈� 2020.05.14鑸嶅純
+            //if (UserCenterLogic.CheckCanAddForm(this) == false)
+            //{
+            //    return;
+            //}
 
             UserView.HomePage.Instance.AddChidren(this);
             UserView.HomePage.Instance.PageIndex += 1;
@@ -204,6 +207,9 @@
 
             //鎵цShowForm()鏂规硶
             this.LoadShowFormMethod(parameter);
+
+            //鐣岄潰鍔犺浇缁撴潫
+            ControlCommonResourse.IsFormAdding = false;
         }
 
         #endregion
@@ -225,9 +231,38 @@
             this.m_parameter = null;
             //娓呯┖bodyFrame
             this.ClearBodyFrame();
-        }
+        }
 
         #endregion
+
+        #region 鈻� 娣诲姞甯姪鎺т欢_______________________
+
+        /// <summary>
+        /// 娣诲姞鏌ョ湅甯姪鎺т欢
+        /// </summary>
+        /// <returns></returns>
+        public NormalViewControl AddHelpControl()
+        {
+            //鏌ョ湅甯姪
+            var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
+            btnHelp.Y = Application.GetRealHeight(1388);
+            btnHelp.TextSize = 12;
+            btnHelp.TextAlignment = TextAlignment.Center;
+            btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
+            btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
+            bodyFrameLayout.AddChidren(btnHelp);
+            //搴曠嚎
+            int lineWidth = btnHelp.GetRealWidthByText();
+            var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
+            btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
+            btnLine.Gravity = Gravity.CenterHorizontal;
+            btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
+            bodyFrameLayout.AddChidren(btnLine);
+
+            return btnHelp;
+        }
+
+        #endregion
 
         #region 鈻� 鏄剧ず閲嶆柊鍔犺浇_______________________
 
@@ -289,35 +324,6 @@
         {
         }
 
-        #endregion
-
-        #region 鈻� 娣诲姞甯姪鎺т欢_______________________
-
-        /// <summary>
-        /// 娣诲姞鏌ョ湅甯姪鎺т欢
-        /// </summary>
-        /// <returns></returns>
-        public NormalViewControl AddHelpControl()
-        {
-            //鏌ョ湅甯姪
-            var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false);
-            btnHelp.Y = Application.GetRealHeight(1388);
-            btnHelp.TextSize = 12;
-            btnHelp.TextAlignment = TextAlignment.Center;
-            btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor;
-            btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp);
-            bodyFrameLayout.AddChidren(btnHelp);
-            //搴曠嚎
-            int lineWidth = btnHelp.GetRealWidthByText();
-            var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
-            btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
-            btnLine.Gravity = Gravity.CenterHorizontal;
-            btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8);
-            bodyFrameLayout.AddChidren(btnLine);
-
-            return btnHelp;
-        }
-
         #endregion
 
         #region 鈻� 鏄剧ず娌℃湁鏁版嵁鐨勫浘鍍忔樉绀虹壒鏁坃________
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
index 742b6f6..6e7edf2 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -83,9 +83,6 @@
         public async void Read()
         {
 
-
-
-
             CommonPage.Loading.Start();
             if (!BoolExist())
             {
@@ -101,28 +98,32 @@
                         {
                             continue;
                         }
-                        bool yes = false;
-                        for (int a = 0; a < logic.Accounts.Count; a++)
-                        {
-                            //Option4鏄澶噈ac锛汷ption2鏄澶囩鍙o紱
-                            if (logic.Accounts[a]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[a]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
-                            {
-                                //鏌ユ壘鏄惁鏄偅涓棬閿侊紱
-                                //濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
-                                yes = false;
-                                break;
-                            }
-                            if (logic.Accounts[a]["Account"].ToString() == Config.Instance.Guid)
-                            {
-                                //鏌ユ壘鑷繁璐﹀彿涓嬬殑鍒涘缓鑱斿姩浜嬩欢锛�
-                                yes = true;
-                                break;
-                            }
-                        }
-                        if (yes)
-                        {
-                            Common.Logic.LockLogicList.Add(listlogic[j]);
-                        }
+                        Common.Logic.LockLogicList.Add(logic);
+                        //bool yes = false;
+                        //for (int a = 0; a < logic.Accounts.Count; a++)
+                        //{
+                        //    //Option4鏄澶噈ac锛汷ption2鏄澶囩鍙o紱
+                        //    if (logic.Accounts[a]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr)
+                        //    {
+                        //        //鏌ユ壘鏄惁鏄偅涓棬閿侊紱
+                        //        //濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
+                        //        yes = false;
+                        //    }
+                        //    else
+                        //    {
+                        //        yes = true;
+                        //    }
+                        //    //if (logic.Accounts[a]["Account"].ToString() == Config.Instance.Guid)
+                        //    //{
+                        //    //    //鏌ユ壘鑷繁璐﹀彿涓嬬殑鍒涘缓鑱斿姩浜嬩欢锛�
+                        //    //    yes = true;
+                        //    //    break;
+                        //    //}
+                        //}
+                        //if (yes)
+                        //{
+                        //    Common.Logic.LockLogicList.Add(listlogic[j]);
+                        //}
                     }
                 }
             }
@@ -317,26 +318,17 @@
         /// <returns></returns>
         private bool Exist(Common.Logic logic)
         {
-            bool yes = false;
             for (int j = 0; j < logic.Accounts.Count; j++)
             {
                 //Option4鏄澶噈ac锛汷ption2鏄澶囩鍙o紱
-                if (logic.Accounts[j]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[j]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
+                if (logic.Accounts[j]["Option4"].ToString() == Send.CurrentDoorLock.DeviceAddr)
                 {
                     //鏌ユ壘鏄惁鏄偅涓棬閿侊紱
                     //濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
-                    yes = false;
-                    break;
+                    return true;
                 }
-                if (logic.Accounts[j]["Account"].ToString() == Config.Instance.Guid)
-                {
-                    //鏌ユ壘鑷繁璐﹀彿涓嬬殑鍒涘缓鑱斿姩浜嬩欢锛�
-                    yes = true;
-                    break;
-                }
-
             }
-            return yes;
+            return false;
         }
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index e4fff88..6178384 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -833,7 +833,7 @@
                         }
                         if (LogicView.IfString._SoneLogic == if_logic)
                         {
-                            //Sone闂ㄩ攣鑱斿姩浜嬩欢閫昏緫鍒楄〃
+                            //Sone闂ㄩ攣甯稿紑妯″紡閫昏緫鍒楄〃
                             Common.Logic.SoneLogicList.Add(CurrentLogic);
 
                         }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index b1b086f..bb8de80 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -22,6 +22,7 @@
             return await System.Threading.Tasks.Task.Run(async () =>
             {
                 List<int> logicIdList = new List<int>();
+                
                 Action<string, string> action = (topic, data) =>
                 {
                     var gatewayID = topic.Split('/')[0];
@@ -30,7 +31,7 @@
                     {
                         return;
                     }
-
+                    
                     if (topic == $"{gatewayID}/Logic/GetLogicList_Respon")
                     {
 
@@ -43,6 +44,7 @@
                         {
                             var logicId = int.Parse(listIfon["LogicId"].ToString());
                             logicIdList.Add(logicId);
+                           
                         }
 
                     }
@@ -526,6 +528,24 @@
                                     accounts.Add(location);
                                 }
                                 break;
+                            case 8:
+                                {
+                                    var accounts1 = new JObject();
+                                    if (dictionary.ContainsKey("Type"))
+                                    {
+                                        accounts1.Add("Type", dictionary["Type"]);
+                                    }
+                                    if (dictionary.ContainsKey("Option4"))
+                                    {
+                                        accounts1.Add("Option4", dictionary["Option4"]);
+                                    }
+                                    if (dictionary.ContainsKey("Option2"))
+                                    {
+                                        accounts1.Add("Option2", int.Parse(dictionary["Option2"]));
+                                    }
+                                    accounts.Add(accounts1);
+                                }
+                                break;
                         }
 
                     }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index 2e68b30..852b7dc 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -717,12 +717,18 @@
             timeConditionsInfo.Add("DelayTime", "0");
             timeConditionsInfo.Add("StartHour", h);
             timeConditionsInfo.Add("StartMin", m);
-            timeConditionsInfo.Add("DoorLockOpenDelayTime", timeVlaue.ToString());
+            timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue*60*60).ToString());
+            //timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 3600).ToString());
             Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
             actionsInfo.Add("LinkType", 8);
             actionsInfo.Add("DeviceAddr", common.DeviceAddr);
-            actionsInfo.Add("Epoint", common.DeviceEpoint);
+            actionsInfo.Add("Epoint", "200");
             actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
+
+            Dictionary<string, string> accounts = new Dictionary<string, string>();
+            accounts.Add("Type", "8");
+            accounts.Add("Option4", common.DeviceAddr.ToString());//鐢ㄤ簬鍒ゆ柇璇嗗埆鏄摢涓棬閿�;
+            accounts.Add("Option2", common.DeviceEpoint.ToString());
 
             Common.Logic currentLogic = new Common.Logic();
             currentLogic.IsEnable = 1;//榛樿涓哄紑
@@ -731,6 +737,7 @@
             currentLogic.LogicName = Language.StringByID(R.MyInternationalizationString.openmode);
             currentLogic.Conditions.Add(timeConditionsInfo);
             currentLogic.Actions.Add(actionsInfo);
+            currentLogic.Accounts.Add(accounts);
             var logicIfon = await Send.AddModifyLogic(currentLogic);
             if (logicIfon != null && logicIfon.LogicId != 0)
             {
@@ -747,24 +754,42 @@
         /// 娉ㄦ剰(鍙傛暟:2-甯稿紑鑷姩鍖�;3-澶辨晥鏃堕棿鑷姩鍖�);
         /// 杩斿洖鍊硷細0涓嶅瓨鍦�;鍏跺畠鍊奸兘瀛樺湪;
         /// </summary>
-        public static async System.Threading.Tasks.Task<int> Exist(int valueInt)
+        public static async System.Threading.Tasks.Task<int> Exist(int valueInt, ZigBee.Device.DoorLock doorLock)
         {
             int exist = 0;
             var Idlist = await Send.GetLogicId(valueInt);
             if (Idlist.Count != 0)
             {
                 //榛樿鍙栫涓�涓�昏緫ID
-                exist = Idlist[0];
-
+                var id = Idlist[0];
+                if (valueInt != 3)
+                {
+                    exist = id;
+                }
+                else
+                {
+                    var logic = await Send.GetLogic(id, 3);
+                    if (logic != null)
+                    {
+                        if (ExistLogic(logic, doorLock))
+                        {
+                            exist = id;
+                        }
+                        else
+                        {
+                            exist = 0;
+                        }
+                    }
+                }
             }
             return exist;
         }
-    
+
         ///<summary>
-        ///鑾峰彇閫昏緫淇℃伅
+        ///鑾峰彇闂ㄩ攣閫昏緫淇℃伅
         /// 杩斿洖鍊硷細null涓嶅瓨鍦�;鍏跺畠鍊奸兘瀛樺湪;
         /// </summary>
-        public static async System.Threading.Tasks.Task<Common.Logic> GetLogicIfon()
+        public static async System.Threading.Tasks.Task<Common.Logic> GetLogicIfon(ZigBee.Device.DoorLock doorLock)
         {
             Common.Logic logic = null;
             var Idlist = await Send.GetLogicId(3);
@@ -773,15 +798,19 @@
                 //榛樿鍙栫涓�涓�昏緫ID(鏃舵晥鎬у彧鏈変竴鏉¢�昏緫)
                 int exist = Idlist[0];
                 logic = await Send.GetLogic(exist, 3);
+                if (!ExistLogic(logic, doorLock))
+                {
+                    logic = null;
+                }
             }
             return logic;
         }
 
         ///<summary>
-        ///鍒犻櫎鎵�鏈夋椂鏁堟�ц嚜鍔ㄥ寲
+        ///鍒犻櫎璇ラ棬閿佹墍鏈夋椂鏁堟�ц嚜鍔ㄥ寲
         /// 杩斿洖鍊硷細true鎴愬姛;false澶辫触;
         /// </summary>
-        public static async System.Threading.Tasks.Task<bool> GetLogicAll()
+        public static async System.Threading.Tasks.Task<bool> GetLogicAll(ZigBee.Device.DoorLock doorLock)
         {
             bool _if = false;
             var Idlist = await Send.GetLogicId(3);
@@ -792,15 +821,40 @@
                 for (int i = 0; i < Idlist.Count; i++)
                 {
                     int id = Idlist[i];
-                    //鏈潵鍙湁涓�鏉℃椂鏁堟�ц嚜鍔ㄥ寲锛�
-                    //闃叉鐗规畩鎯呭喌,鎵惧埌灏卞垹闄ゆ帀;
-                    Send.DelLogic(id);
+                    var logic = await Send.GetLogic(id, 3);
+                    if (logic != null)
+                    {
+                        if (ExistLogic(logic, doorLock))
+                        {
+                            //鏈潵鍙湁涓�鏉℃椂鏁堟�ц嚜鍔ㄥ寲锛�
+                            //闃叉鐗规畩鎯呭喌,鎵惧埌灏卞垹闄ゆ帀;
+                            Send.DelLogic(id);
+                        }
+                    }
                 }
             }
             return _if;
         }
 
-    
+        /// <summary>
+        /// 鏌ユ壘杩欎竴鏉¤嚜鍔ㄥ寲鏄惁灞炰簬璇ラ棬閿�
+        /// </summary>
+        /// <returns></returns>
+        public static bool ExistLogic(Common.Logic logic, ZigBee.Device.DoorLock doorLock)
+        {
+            for (int j = 0; j < logic.Accounts.Count; j++)
+            {
+                //Option4鏄澶噈ac锛汷ption2鏄澶囩鍙o紱
+                if (logic.Accounts[j]["Option4"].ToString() == doorLock.DeviceAddr)
+                {
+                    //鏌ユ壘鏄惁鏄偅涓棬閿侊紱
+                    //濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
+                    return true;
+                }
+
+            }
+            return false;
+        }
 
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index 17e5641..18fe327 100644
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -31,6 +31,14 @@
         /// 璁板綍閫変腑鏃堕棿
         /// </summary>
         public int timeValue = 0;
+        /// <summary>
+        /// 鏍囪鏄剧ず鎵ц鏃ユ湡(鐢ㄧ綉鍏崇殑锛岃繕鏄敤绯荤粺鐨勬椂闂�)
+        /// </summary>
+        public bool _if = false;
+        /// <summary>
+        /// 鏃堕棿鎴�
+        /// </summary>
+        public int timeLong = 0;
         public async void Show()
         {
 
@@ -60,11 +68,12 @@
             this.AddChidren(middle);
             #endregion
             //鏄父寮�妯″紡鍐嶅幓璇诲彇
+
             if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
             {
                 //杩涙潵鏇存柊涓�娆�
                 //鏌ユ壘鏄惁瀛樺湪鏃舵晥鎬ц嚜鍔ㄥ寲锛涙湁鐨勮瘽灏辫繑鍥炶嚜鍔ㄥ寲瀵硅薄;
-                var logic = await SkipView.GetLogicIfon();
+                var logic = await SkipView.GetLogicIfon(Send.CurrentDoorLock);
                 if (logic != null)
                 {
                     try
@@ -72,6 +81,8 @@
                         //杩涙潵鏇存柊涓�娆″��
                         logicId = logic.LogicId;
                         timeValue = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
+                        timeLong = int.Parse(logic.Conditions[0]["TriggerTime"]);
+
                     }
                     catch { }
                 }
@@ -86,7 +97,6 @@
                 BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
             };
             middle.AddChidren(fLayout);
-            ModeView();
             #endregion
             #region 甯稿紑鑷姩鍖�
             ///绗笁鍧楃涓�绾х埗鎺т欢
@@ -100,7 +110,7 @@
             };
             middle.AddChidren(listLogicFl);
             listLogicFl.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
-
+            ModeView();
             ///娣诲姞甯稿紑鑷姩鍖栫殑鐖舵帶浠�
             var addLogicfL = new FrameLayout
             {
@@ -162,7 +172,11 @@
                 actionsInfo.Add("LinkType", 8);
                 actionsInfo.Add("DeviceAddr", Send.CurrentDoorLock.DeviceAddr);
                 actionsInfo.Add("Epoint", "200");
-                actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
+                actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
+                Dictionary<string, string> accounts = new Dictionary<string, string>();
+                accounts.Add("Type", "8");
+                accounts.Add("Option4", Send.CurrentDoorLock.DeviceAddr.ToString());//鐢ㄤ簬鍒ゆ柇璇嗗埆鏄摢涓棬閿�;
+                accounts.Add("Option2", Send.CurrentDoorLock.DeviceEpoint.ToString());
                 //new涓�涓柊閫昏緫瀵硅薄锛�
                 //鏂板闂ㄩ攣甯稿紑妯″紡鑷姩鍖栧叆鍙o紱
                 Common.Logic.CurrentLogic = new Common.Logic();
@@ -170,7 +184,8 @@
                 Common.Logic.CurrentLogic.LogicType = 2;//鏍囪閫昏緫绫诲瀷
                 Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.openmode);
                 Common.Logic.CurrentLogic.Conditions.Add(timeConditionsInfo);//娣诲姞鏉′欢
-                Common.Logic.CurrentLogic.Actions.Add(actionsInfo);//娣诲姞鐩爣
+                Common.Logic.CurrentLogic.Actions.Add(actionsInfo);//娣诲姞鐩爣
+                Common.Logic.CurrentLogic.Accounts.Add(accounts);
                 var oneLogic = new OneLogic();
                 UserView.HomePage.Instance.AddChidren(oneLogic);
                 UserView.HomePage.Instance.PageIndex += 1;
@@ -264,10 +279,12 @@
                         {
                             if (logicId != 0)
                             {
+
                                 ///鏈夊彲鑳藉彧鏈夊父寮�妯″紡锛屾病鏈夋椂鏁堟�ц嚜鍔ㄥ寲
                                 Send.DelLogic(logicId);
                             }
                             Send.CurrentDoorLock.IsDoorLockNormallyMode = false;
+                            _if = false;
                             ModeView();
                         }
                         else
@@ -290,8 +307,8 @@
                 var timeTextBtn = new Button
                 {
                     Y = Application.GetRealHeight(127 + 69),
-                    X = Application.GetRealWidth(125),
-                    Width = Application.GetRealWidth(634 + 200),
+                    X = Application.GetRealWidth(86),//125
+                    Width = Application.GetRealWidth(907),//634 + 200
                     Height = Application.GetRealHeight(60),
                     TextSize = 15,
                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
@@ -299,20 +316,40 @@
                 if (logicId != 0)
                 {
                     openModeFl.AddChidren(timeTextBtn);
-                    ///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
-                    var y = DateTime.Now.Year.ToString();//閭d竴骞�
-                    var m = DateTime.Now.Month.ToString();//閭d竴鏈�
-                    var d = DateTime.Now.ToString("dd");//閭d竴澶�
-                    var h = int.Parse(DateTime.Now.ToString("HH"));//褰撳墠绯荤粺鏃堕棿
-                    int dayInt = (h + timeValue) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
-                    int hour = (h + timeValue) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
-                    int days = int.Parse(d) + dayInt;
                     string text1 = Language.StringByID(MyInternationalizationString.timeSensitive);
                     string text2 = Language.StringByID(MyInternationalizationString.yearSone);
                     string text3 = Language.StringByID(MyInternationalizationString.monthSone);
                     string text4 = Language.StringByID(MyInternationalizationString.numberSone);
-                    string text5 = Language.StringByID(MyInternationalizationString.executeSone);
-                    timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5;
+                    string text5 = Language.StringByID(MyInternationalizationString.hour1);
+                    string text6 = Language.StringByID(MyInternationalizationString.executeSone);
+                    if (_if)
+                    {
+
+                        ///绗竴娆¤繘鏉ヨ鍙栫綉鍏虫椂闂达紱
+                        var datetime = GetLocalTime(timeLong);
+                        ///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
+                        var y = datetime.Year.ToString();//閭d竴骞�
+                        var m = datetime.Month.ToString();//閭d竴鏈�
+                        var d = datetime.ToString("dd");//閭d竴澶�
+                        var h = int.Parse(datetime.ToString("HH"));//灏忔椂
+                        int minute = datetime.Minute;//鍒嗛挓
+                        timeTextBtn.Text = text1 + y + text2 + m + text3 + d + text4 + h + text5 + minute.ToString() + text6;
+
+                    }
+                    else
+                    {
+
+                        ///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
+                        var y = DateTime.Now.Year.ToString();//閭d竴骞�
+                        var m = DateTime.Now.Month.ToString();//閭d竴鏈�
+                        var d = DateTime.Now.ToString("dd");//閭d竴澶�
+                        var h = int.Parse(DateTime.Now.ToString("HH"));//灏忔椂
+                        int dayInt = (h + timeValue) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
+                        int hour = (h + timeValue) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
+                        int days = int.Parse(d) + dayInt;
+                        int minute = DateTime.Now.Minute;//鍒嗛挓
+                        timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6;
+                    }
                 }
 
 
@@ -369,66 +406,75 @@
                 clickBtn.MouseUpEventHandler += (sender, e) =>
                 {
 
-                    LogicView.TipView.ShowConfrimTip(() =>
+                     LogicView.TipView.ShowConfrimTip(() =>
+                     {///鍐嶆纭
+                         LogicView.TipView.ShowInputTip(true, async (str) =>
+                          {///纭鍙戦�佸懡浠�
+                              CommonPage.Loading.Start();
+                              try
+                              {
+                                  ///xm
+                                  var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
+                                  if (!result)
+                                  {
+                                      LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.openFailed));
+                                      return;
+                                  }
+                                  else
+                                  {
+                                      ///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛�
+                                      SkipView.GetLogicAll(Send.CurrentDoorLock);//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
+                                      var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
+                                      if (addResult == 0)
+                                      {
+                                          ///鍙璇村鏋滃父寮�妯″紡寮�锛屽垱寤鸿嚜鍔ㄥ寲澶辫触锛岄偅涔堝皢瑕佸彂涓�鏉″父寮�妯″紡鍏抽棴鍛戒护;
+                                          UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
+                                          ///鎻愮ず澶辫触
+                                          LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.addFailed));
+                                          return;
+                                      }
+                                      else
+                                      {
+                                          logicId = addResult;
+                                          timeValue = int.Parse(str);
+                                          Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
+                                          _if = false;
+                                          ModeView();
+                                          ///娣诲姞APP寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
+                                          UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock, 9001, string.Empty);
+                                      }
 
-                    {///鍐嶆纭
-                        LogicView.TipView.ShowInputTip(true, async (str) =>
-                        {///纭鍙戦�佸懡浠�
-                            CommonPage.Loading.Start();
-                            try
-                            {
-                                ///xm
-                                var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
-                                if (!result)
-                                {
-                                    LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.openFailed));
-                                    return;
-                                }
-                                else
-                                {
-                                    ///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛�
-                                    SkipView.GetLogicAll();//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
-                                    var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
-                                    if (addResult == 0)
-                                    {
-                                        ///鍙璇村鏋滃父寮�妯″紡寮�锛屽垱寤鸿嚜鍔ㄥ寲澶辫触锛岄偅涔堝皢瑕佸彂涓�鏉″父寮�妯″紡鍏抽棴鍛戒护;
-                                        UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
-                                        ///鎻愮ず澶辫触
-                                        LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.addFailed));
-                                        return;
-                                    }
-                                    logicId = addResult;
-                                    timeValue = int.Parse(str);
-                                    Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
-                                    ModeView();
-                                    //娣诲姞App寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
-                                    UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock, 9001, string.Empty);
-                                }
-                            }
-                            catch
-                            {
 
-                            }
-                            finally
-                            {
-                                Application.RunOnMainThread(() =>
-                                {
-                                    CommonPage.Loading.Hide();
+                                  }
+                              }
+                              catch
+                              {
 
-                                });
-                            }
-                        });
+                              }
+                              finally
+                              {
+                                  Application.RunOnMainThread(() =>
+                                  {
+                                      CommonPage.Loading.Hide();
 
-                    });
+                                  });
+                              }
+                          });
 
-                };
+                     });
+
+                 };
             }
-
             listLogicFl.Y = fLayout.Bottom;
             listLogicFl.X = Application.GetRealWidth(58);
             listLogicFl.Height = Application.GetRealHeight(Method.H - 184) - fLayout.Height;
             listLogicFl.Width = Application.GetRealWidth(1022);
             listLogicFl.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
+
+            verticalRefresh.Y = Application.GetRealHeight(187);
+            verticalRefresh.X = Application.GetRealWidth(46);
+            verticalRefresh.Height = listLogicFl.Height - Application.GetRealHeight(187);//鍔ㄦ�佹敼鍔ㄤ笂涓嬫粦鍔╲iew楂樺害;
+            verticalRefresh.Width = listLogicFl.Width - Application.GetRealWidth(46);
         }
         /// <summary>
         /// 璇诲彇鑷姩鍖栧垪琛ㄦ暟鎹紱
@@ -454,8 +500,11 @@
                             if (logic.LogicType != 2)
                             {
                                 continue;
+                            }
+                            if (SkipView.ExistLogic(logic, Send.CurrentDoorLock))
+                            {
+                                Common.Logic.SoneLogicList.Add(logic);
                             }
-                            Common.Logic.SoneLogicList.Add(logic);
                         }
                     }
                 }
@@ -485,6 +534,10 @@
             verticalRefresh.RemoveAll();
             foreach (var logic in Common.Logic.SoneLogicList)
             {
+                if (!SkipView.ExistLogic(logic, Send.CurrentDoorLock))
+                {
+                    continue;
+                }
                 #region  鑷姩鍖栧竷灞�View
                 ///鑷姩鍖栫埗鎺т欢
                 var fLayoutLogic = new FrameLayout
@@ -608,6 +661,7 @@
                     else
                     {
                         //閫昏緫鍏�
+                        logic.IsEnable = 0;
                         typeIconBtn.UnSelectedImagePath = "ZigeeLogic/nofunction.png";
                         typeBjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
                     }
@@ -642,5 +696,16 @@
             }
         }
 
+        /// <summary>
+        /// 灏哢NIX鏃堕棿鎴宠浆鎹㈡垚绯荤粺鏃堕棿(绮剧‘鍒扮)
+        /// <returns></returns>
+        public DateTime GetLocalTime(int unixTimeStamp)
+        {
+            DateTime dtStart = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
+            long lTime = long.Parse(unixTimeStamp + "0000000");
+            TimeSpan toNow = new TimeSpan(lTime);
+            DateTime dtResult = dtStart.Add(toNow);
+            return dtResult;
+        }
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
index b726d07..2b8608a 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
@@ -32,9 +32,10 @@
         /// <param name="account">鐧婚檰璐﹀彿</param>
         public void ShowForm(string account = "")
         {
-            if (Config.Instance.IsLogin == true)
+            if (account == string.Empty)
             {
-                return;
+                //浣跨敤涓婁竴娆$櫥闄嗙殑璐﹀彿
+                account = Common.Config.Instance.Account;
             }
             CommonPage.Instance.IsDrawerLockMode = true;
             this.Tag = "Login";
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs
index a118bf0..d73a1b9 100644
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/Base/DeviceDetailCardCommonForm.cs
@@ -16,15 +16,15 @@
         /// <summary>
         /// 鐣岄潰鍏抽棴浜嬩欢
         /// </summary>
-        public Action<CommonDevice, Common.Room> FormCloseEvent = null;
+        public Action<CommonDevice> FormCloseEvent = null;
         /// <summary>
         /// 璁惧瀵硅薄
         /// </summary>
         public CommonDevice device = null;
         /// <summary>
-        /// 鎴块棿瀵硅薄
+        /// 褰撳墠閫夋嫨鐨勬埧闂村璞�(鍐嶆鍒锋柊鐣岄潰鏃�,杩欎釜涓滆タ鏈夊彲鑳芥槸null)
         /// </summary>
-        public Common.Room room = null;
+        public Common.Room nowSelectRoom = null;
         /// <summary>
         /// 鐘舵�佹帶浠�
         /// </summary>
@@ -66,13 +66,13 @@
         /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
         /// </summary>
         /// <param name="i_device">璁惧瀵硅薄</param>
-        /// <param name="i_room">鎴块棿</param>
+        /// <param name="i_nowSelectRoom">鎴块棿</param>
         /// <param name="i_backWidth">鐧借壊鑳屾櫙鐨勫搴�(闈炵湡瀹炲��)</param>
         /// <param name="i_backHeight">鐧借壊鑳屾櫙鐨勯珮搴�(闈炵湡瀹炲��)</param>
-        public void ShowForm(CommonDevice i_device, Common.Room i_room, int i_backWidth, int i_backHeight)
+        public void ShowForm(CommonDevice i_device, Common.Room i_nowSelectRoom, int i_backWidth, int i_backHeight)
         {
             this.CurrentText = Language.StringByID(R.MyInternationalizationString.Current) + "  ";
-            this.room = i_room;
+            this.nowSelectRoom = i_nowSelectRoom;
             this.backFrameWidth = i_backWidth;
             this.backFrameHeight = i_backHeight;
 
@@ -84,7 +84,7 @@
             btnMore.ButtonClickEvent += (sender, e) =>
             {
                 var detailInfo = new DeviceDetailInfoForm();
-                detailInfo.AddForm(device, room);
+                detailInfo.AddForm(device, nowSelectRoom);
             };
 
             //鍒濆鍖栦腑閮ㄤ俊鎭�
@@ -166,7 +166,15 @@
             btnRoomName.TextSize = 12;
             btnRoomName.TextColor = UserCenterColor.Current.White;
             btnRoomName.Gravity = Gravity.CenterVertical;
-            btnRoomName.Text = this.room.Name;
+            if (this.nowSelectRoom != null)
+            {
+                btnRoomName.Text = this.nowSelectRoom.Name;
+            }
+            else
+            {
+                //鏈垎閰�
+                btnRoomName.TextID = R.MyInternationalizationString.uDeviceNotAssignedRoom;
+            }
             frameRoomBlack.AddChidren(btnRoomName);
 
             //鏀惰棌
@@ -328,9 +336,9 @@
         public override int FormActionAgainEvent()
         {
             //濡傛灉涓嶆槸鍠滅埍鎴块棿鐨勮瘽,瀹冪殑鎴块棿鏈夊彲鑳借鍒囨崲浜�
-            if (this.room.IsLove == false)
+            if (this.nowSelectRoom == null || this.nowSelectRoom.IsLove == false)
             {
-                this.room = HdlRoomLogic.Current.GetRoomByDevice(this.device);
+                this.nowSelectRoom = HdlRoomLogic.Current.GetRoomByDevice(this.device);
             }
             //濡傛灉鍔熻兘绫诲瀷鍙樻洿浜�
             if (this.nowDeviceFuncType != this.device.DfunctionType)
@@ -344,8 +352,15 @@
                 this.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(this.device);
                 btnDeviceName.Width = btnDeviceName.GetRealWidthByText();
                 btnDeviceName.Gravity = Gravity.CenterHorizontal;
-
-                this.btnRoomName.Text = this.room.Name;
+                if (this.nowSelectRoom == null)
+                {
+                    //鏈垎閰�
+                    this.btnRoomName.TextID = R.MyInternationalizationString.uDeviceNotAssignedRoom;
+                }
+                else
+                {
+                    this.btnRoomName.Text = this.nowSelectRoom.Name;
+                }
             }
 
             return 1;
@@ -365,7 +380,7 @@
             HdlGatewayReceiveLogic.Current.RemoveEvent("DeviceDetailCardAttribute" + mainKeys);
 
             //鍥炶皟鍑芥暟
-            this.FormCloseEvent?.Invoke(this.device, this.room);
+            this.FormCloseEvent?.Invoke(this.device);
             this.FormCloseEvent = null;
 
             base.CloseFormBefore();
@@ -389,7 +404,7 @@
         /// </summary>
         /// <param name="text"></param>
         public void SetPmTwoPointFiveStatuText(string text)
-        {
+        {
             this.btnStatu.Text = text;
         }
 
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs
index 50ed3c5..774a737 100644
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs
@@ -52,7 +52,7 @@
         /// 鍒濆鍖朠M2.5浼犳劅鍣ㄦ帶浠�
         /// </summary>
         /// <param name="frameWhiteBack"></param>
-        private void InitPmControl(FrameLayout frameWhiteBack)
+        private void InitPmControl(FrameLayout frameWhiteBack)
         {
             //婀垮害瀹瑰櫒
             var frameHumidityPic = new FrameLayout();
@@ -147,7 +147,7 @@
             framePmPic.AddChidren(btnPmText);
 
             //PM2.5鏁版嵁锛堢3涓紝listControl銆�2銆戯級
-            var btnPmStatus = new NormalViewControl(162, 92, true);
+            var btnPmStatus = new NormalViewControl(162, 92, true);
             btnPmStatus.Y = Application.GetRealHeight(181);
             btnPmStatus.Text = "155";
             btnPmStatus.TextSize = 30;
@@ -156,8 +156,8 @@
             framePmPic.AddChidren(btnPmStatus);
             this.listControl.Add(btnPmStatus);
 
-            //PM2.5鍗曚綅  锛堢4涓紝listControl銆�3銆戯級 
-            var btnPmUnit = new NormalViewControl(120 + 26, 43, true);
+            //PM2.5鍗曚綅  锛堢4涓紝listControl銆�3銆戯級
+            var btnPmUnit = new NormalViewControl(120 + 26, 43, true);
             btnPmUnit.Y = Application.GetRealHeight(181 + 46);
             btnPmUnit.X = Application.GetRealWidth(153);
             btnPmUnit.Text = "渭g/m鲁";
@@ -230,10 +230,10 @@
                             //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
                             return true;
                         }
-                    }
-                }
-            }
-            return false;
+                    }
+                }
+            }
+            return false;
         }
         #endregion
 
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
index 721b112..e966a0b 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
@@ -57,6 +57,10 @@
         /// 鍒ゆ柇鏄惁鏈夊紑鍏冲姛鑳�
         /// </summary>
         private bool isHadOpenSwitch = true;
+        /// <summary>
+        /// 褰撳墠閫夋嫨鐨勬埧闂�
+        /// </summary>
+        public Common.Room nowSelectRoom = null;
 
         #endregion
 
@@ -79,9 +83,11 @@
         /// 鍒濆鍖栨帶浠�
         /// </summary>
         /// <param name="i_device">鎸囧畾璁惧</param>
-        public virtual void InitControl(CommonDevice i_device)
+        /// <param name="i_nowSelectRoom">褰撳墠閫夋嫨鐨勬埧闂�(鏈夌偣鐢ㄥ)</param>
+        public virtual void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)
         {
             this.device = i_device;
+            this.nowSelectRoom = i_nowSelectRoom;
             //鑳屾櫙鍥剧墖
             this.btnBackGroud = new PicViewControl(this.Width, this.Height, false);
             btnBackGroud.UnSelectedImagePath = "Item/FunctionCardView.png";
@@ -115,7 +121,7 @@
                 {
                     //鍙栨秷鏀惰棌
                     HdlRoomLogic.Current.DeleteLoveDevice(i_device);
-                    if (HdlRoomLogic.Current.CurrentRoom.IsLove == true)
+                    if (this.nowSelectRoom.IsLove == true)
                     {
                         //濡傛灉褰撳墠鎴块棿鏄垜鐨勫枩鐖辩殑璇�,鍥炶皟鍗$墖琚垹闄ょ殑浜嬩欢
                         this.CardNeedRemoveEvent?.Invoke();
@@ -308,10 +314,9 @@
         /// 娣卞害鍗$墖淇℃伅鐨勮繑鍥炰簨浠�(搴曞眰涓撶敤)
         /// </summary>
         /// <param name="device">璁惧</param>
-        /// <param name="room">鎴块棿</param>
-        public void CardDetailInfoBackEvent(CommonDevice device, Common.Room room)
+        public void CardDetailInfoBackEvent(CommonDevice device)
         {
-            if (HdlRoomLogic.Current.CurrentRoom.IsLove == true)
+            if (this.nowSelectRoom.IsLove == true)
             {
                 //濡傛灉鏄富椤靛彇娑堟悳钘忕殑璇�,鍥炶皟鍗$墖琚垹闄ょ殑鍑芥暟
                 if (HdlRoomLogic.Current.IsCollectInRoom(device) == false)
@@ -324,7 +329,7 @@
             {
                 //濡傛灉杩欎釜璁惧鏀瑰彉浜嗘埧闂寸殑璇�,鍥炶皟鍗$墖琚垹闄ょ殑鍑芥暟
                 var nowRoom = HdlRoomLogic.Current.GetRoomByDevice(device);
-                if (nowRoom == null || nowRoom.Id != HdlRoomLogic.Current.CurrentRoom.Id)
+                if (nowRoom == null || nowRoom.Id != this.nowSelectRoom.Id)
                 {
                     this.CardNeedRemoveEvent?.Invoke();
                     return;
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAcCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAcCardControl.cs
index fecfda3..e3836a7 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAcCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAcCardControl.cs
@@ -17,9 +17,9 @@
         /// 鍒濆鍖栨帶浠�
         /// </summary>
         /// <param name="i_device"></param>
-        public override void InitControl(CommonDevice i_device)
+        public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)
         {
-            base.InitControl(i_device);
+            base.InitControl(i_device, i_nowSelectRoom);
 
             //娣诲姞璺宠浆娣卞害鍗$墖淇℃伅浜嬩欢
             this.AddDetailInfoEvent(i_device);
@@ -74,7 +74,7 @@
 
                 //绌鸿皟绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈�
                 var form = new ControlForm.DeviceAcDetailCardForm();
-                form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, 1457);
+                form.AddForm(i_device, this.nowSelectRoom, 965, 1457);
                 form.FormCloseEvent += this.CardDetailInfoBackEvent;
             };
         }
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAirSwitchCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAirSwitchCardControl.cs
index d37e7e5..83fa9c1 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAirSwitchCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceAirSwitchCardControl.cs
@@ -17,9 +17,9 @@
         /// 鍒濆鍖栨帶浠�
         /// </summary>
         /// <param name="i_device"></param>
-        public override void InitControl(CommonDevice i_device)
+        public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)
         {
-            base.InitControl(i_device);
+            base.InitControl(i_device, i_nowSelectRoom);
 
             //娣诲姞璺宠浆娣卞害鍗$墖淇℃伅浜嬩欢
             this.AddDetailInfoEvent(i_device);
@@ -87,7 +87,7 @@
 
                 //缁х數鍣ㄧ被鍨嬬殑娣卞害鍗$墖鐣岄潰(鍚┖姘斿紑鍏�)
                 var form = new ControlForm.DeviceRelayDetailCardForm();
-                form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, backHeight);
+                form.AddForm(i_device, this.nowSelectRoom, 965, backHeight);
                 form.FormCloseEvent += this.CardDetailInfoBackEvent;
             };
         }
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
index 1d249da..5f4b1ad 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
@@ -17,9 +17,9 @@
         /// 鍒濆鍖栨帶浠�
         /// </summary>
         /// <param name="i_device"></param>
-        public override void InitControl(CommonDevice i_device)
+        public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)
         {
-            base.InitControl(i_device);
+            base.InitControl(i_device, i_nowSelectRoom);
 
             //娣诲姞璺宠浆娣卞害鍗$墖淇℃伅浜嬩欢
             this.AddDetailInfoEvent(i_device);
@@ -73,7 +73,7 @@
 
                 //褰╃伅,璋冨厜鍣ㄧ被鍨嬬殑娣卞害鍗$墖鐣岄潰
                 var form = new ControlForm.DeviceColorLightDetailCardForm();
-                form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, 1316);
+                form.AddForm(i_device, this.nowSelectRoom, 965, 1316);
                 form.FormCloseEvent += this.CardDetailInfoBackEvent;
             };
         }
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs
index e0184f4..974068c 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceCurtainCardControl.cs
@@ -17,9 +17,9 @@
         /// 鍒濆鍖栨帶浠�
         /// </summary>
         /// <param name="i_device"></param>
-        public override void InitControl(CommonDevice i_device)
+        public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)
         {
-            base.InitControl(i_device);
+            base.InitControl(i_device, i_nowSelectRoom);
 
             //娣诲姞璺宠浆娣卞害鍗$墖淇℃伅浜嬩欢
             this.AddDetailInfoEvent(i_device);
@@ -73,7 +73,7 @@
                 Common.CommonPage.Instance.IsDrawerLockMode = true;
                 //绐楀笜绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈�
                 var form = new ControlForm.DeviceCurtainDetailCardForm();
-                form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, 1316);
+                form.AddForm(i_device, this.nowSelectRoom, 965, 1316);
                 form.FormCloseEvent += this.CardDetailInfoBackEvent;
             };
         }
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceDoorLockCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceDoorLockCardControl.cs
index fdc89bc..bc8a1b5 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceDoorLockCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceDoorLockCardControl.cs
@@ -16,9 +16,9 @@
         /// 鍒濆鍖栨帶浠�
         /// </summary>
         /// <param name="i_device"></param>
-        public override void InitControl(CommonDevice i_device)
+        public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)
         {
-            base.InitControl(i_device);
+            base.InitControl(i_device, i_nowSelectRoom);
             //濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�,鍒欐鍔熻兘鏃犳晥
             if (Common.Config.Instance.Home.IsVirtually == false)
             {
@@ -41,7 +41,7 @@
             {
                 Common.CommonPage.Instance.IsDrawerLockMode = true;
 
-                var userDoorLockPage = new UserCenter.DoorLock.UserDoorLockPage(UserCenter.HdlRoomLogic.Current.CurrentRoom, i_device);
+                var userDoorLockPage = new UserCenter.DoorLock.UserDoorLockPage(this.nowSelectRoom, i_device);
                 userDoorLockPage.IsDrawerLockMode = true;
                 UserView.HomePage.Instance.AddChidren(userDoorLockPage);
                 UserView.HomePage.Instance.PageIndex += 1;
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceFreshAirCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceFreshAirCardControl.cs
index 9fc1779..9ff6bb4 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceFreshAirCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceFreshAirCardControl.cs
@@ -7,16 +7,16 @@
     /// 鏂伴鍗$墖鐨勬帶浠�
     /// </summary>
     public class DeviceFreshAirCardControl : DeviceCardCommon
-    {
+    {
         #region 鈻� 鍒濆鍖朹____________________________
-
+
         /// <summary>
         /// 鍒濆鍖栨帶浠�
         /// </summary>
         /// <param name="i_device"></param>
-        public override void InitControl(CommonDevice i_device)
+        public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)
         {
-            base.InitControl(i_device);
+            base.InitControl(i_device, i_nowSelectRoom);
 
             //娣诲姞璺宠浆娣卞害鍗$墖淇℃伅浜嬩欢
             this.AddDetailInfoEvent(i_device);
@@ -71,7 +71,7 @@
 
                 //鏂伴绫诲瀷鐨勬繁搴﹀崱鐗囩晫闈�
                 var form = new MainPage.ControlForm.DeviceFreshAirDetailCardForm();
-                form.AddForm(i_device, HdlRoomLogic.Current.CurrentRoom, 965, 1374);
+                form.AddForm(i_device, this.nowSelectRoom, 965, 1374);
                 form.FormCloseEvent += this.CardDetailInfoBackEvent;
             };
         }
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceRelayCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceRelayCardControl.cs
index 738ffde..6d7bcb2 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceRelayCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceRelayCardControl.cs
@@ -17,9 +17,9 @@
         /// 鍒濆鍖栨帶浠�
         /// </summary>
         /// <param name="i_device"></param>
-        public override void InitControl(CommonDevice i_device)
+        public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom)
         {
-            base.InitControl(i_device);
+            base.InitControl(i_device, i_nowSelectRoom);
 
             //娣诲姞璺宠浆娣卞害鍗$墖淇℃伅浜嬩欢
             this.AddDetailInfoEvent(i_device);
@@ -88,7 +88,7 @@
 
                 //缁х數鍣ㄧ被鍨嬬殑娣卞害鍗$墖鐣岄潰(鍚┖姘斿紑鍏�)
                 var form = new ControlForm.DeviceRelayDetailCardForm();
-                form.AddForm(i_device, UserCenter.HdlRoomLogic.Current.CurrentRoom, 965, backHeight);
+                form.AddForm(i_device, this.nowSelectRoom, 965, backHeight);
                 form.FormCloseEvent += this.CardDetailInfoBackEvent;
             };
         }
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs
index 58b89b3..604a490 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/SceneCardControl.cs
@@ -150,7 +150,7 @@
                 {
                     //鍙栨秷鏀惰棌
                     HdlSceneLogic.Current.DeleteLoveScene(i_scene);
-                    if (HdlRoomLogic.Current.CurrentRoom.IsLove == true)
+                    if (HdlRoomLogic.Current.NowMainPageRoom.IsLove == true)
                     {
                         //濡傛灉褰撳墠鎴块棿鏄垜鐨勫枩鐖辩殑璇�,鍥炶皟鍗$墖琚垹闄ょ殑浜嬩欢
                         this.CardNeedRemoveEvent?.Invoke();
diff --git a/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs b/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs
index 8bec1a6..0a03bdf 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/DeviceDetailInfoForm.cs
@@ -17,13 +17,13 @@
         /// <summary>
         /// 鐣岄潰鍏抽棴浜嬩欢(璇ヤ簨浠剁洰鍓嶇粰鍒嗙被鐣岄潰鐨勮嚜瀹氫箟琛屾帶浠朵娇鐢�)
         /// </summary>
-        public Action<CommonDevice, Room> FormCloseEvent = null;
+        public Action FormCloseEvent = null;
         /// <summary>
         /// 璁惧瀵硅薄
         /// </summary>
         private CommonDevice device;
         /// <summary>
-        /// 鎴块棿瀵硅薄(杩欎釜鎴块棿鏈夊彲鑳芥槸鍠滅埍)
+        /// 鎴块棿瀵硅薄(杩欎釜鎴块棿鏈夊彲鑳芥槸鍠滅埍,鏈夊彲鑳芥槸null)
         /// </summary>
         private Room room = null;
         /// <summary>
@@ -132,7 +132,7 @@
             };
 
             //鍠滅埍鎴块棿涓嶅厑璁稿彉鏇村尯鍩�
-            if (this.room.IsLove == false)
+            if (this.room == null || this.room.IsLove == false)
             {
                 //鎵�灞炲尯鍩�
                 var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);
@@ -232,7 +232,7 @@
             btnNote.AddBottomLine();
 
             //鍠滅埍鎴块棿涓嶅厑璁稿嚭鐜板尯鍩�
-            if (this.room.IsLove == false)
+            if (this.room == null || this.room.IsLove == false)
             {
                 //鎵�灞炲尯鍩�
                 caption = Language.StringByID(R.MyInternationalizationString.uBelongArea);
@@ -345,7 +345,7 @@
         /// </summary>
         public override void CloseFormBefore()
         {
-            this.FormCloseEvent?.Invoke(this.device, this.room);
+            this.FormCloseEvent?.Invoke();
             this.FormCloseEvent = null;
 
             base.CloseFormBefore();
diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
index e1a5808..13b308f 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
@@ -398,6 +398,11 @@
 
             //褰撳墠鎴块棿
             var listRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();
+            if (HdlRoomLogic.Current.NowMainPageRoom == null)
+            {
+                //璁剧疆绗竴涓负鍒濆鎴块棿
+                HdlRoomLogic.Current.NowMainPageRoom = listRoom[0];
+            }
             var curIndex = 0;
             for (int i = 0; i < listRoom.Count; i++)
             {
@@ -405,7 +410,7 @@
                 roomPageView.AddChidren(roomView);
                 roomView.Init(listRoom[i]);
 
-                if (listRoom[i].Id == HdlRoomLogic.Current.CurrentRoom.Id)
+                if (listRoom[i].Id == HdlRoomLogic.Current.NowMainPageRoom.Id)
                 {
                     //褰撳墠鎴块棿,鍒欐樉绀洪偅浜涙暟鎹嚭鏉�
                     roomView.HideName(false);
@@ -470,7 +475,7 @@
                 btnRoomRightShadow.Visible = true;
                 btnRoomBottomShadow.Visible = true;
                 //鍒囨崲褰撳墠鎴块棿
-                HdlRoomLogic.Current.CurrentRoom = listRoom[curIndex];
+                HdlRoomLogic.Current.NowMainPageRoom = listRoom[curIndex];
                 //鍒锋柊璁惧妗屽竷鎺т欢
                 this.isRoomChanging = false;
                 this.RefreshBodyView();
@@ -532,7 +537,7 @@
             this.dicDeviceCardControl.Clear();
 
             var listDevice = new List<CommonDevice>();
-            foreach (var mainkeys in HdlRoomLogic.Current.CurrentRoom.ListDevice)
+            foreach (var mainkeys in HdlRoomLogic.Current.NowMainPageRoom.ListDevice)
             {
                 var device = LocalDevice.Current.GetDevice(mainkeys);
                 //鍒ゆ柇璇ヨ澶囪兘鍚︽樉绀哄湪涓婚〉
@@ -640,7 +645,7 @@
                     cardContr.X = XX;
                     cardContr.Y = YY;
                     listDeviceBackContr.AddChidren(cardContr);
-                    cardContr.InitControl(device);
+                    cardContr.InitControl(device, HdlRoomLogic.Current.NowMainPageRoom);
                     //鍗$墖闇�瑕佽绉婚櫎鐨勪簨浠�
                     cardContr.CardNeedRemoveEvent += () =>
                     {
@@ -787,7 +792,7 @@
             this.dicDeviceCardControl.Clear();
 
             var listScene = new List<SceneUI>();
-            foreach (int sceneId in HdlRoomLogic.Current.CurrentRoom.ListSceneId)
+            foreach (int sceneId in HdlRoomLogic.Current.NowMainPageRoom.ListSceneId)
             {
                 var sceneUi = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
                 if (sceneUi == null)
@@ -1162,7 +1167,7 @@
             floorFL.FloorAction = (floorId) =>
             {
                 btnFloor.Text = Config.Instance.Home.GetFloorNameById(floorId);
-                HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();
+                HdlRoomLogic.Current.NowMainPageRoom = HdlRoomLogic.Current.GetLoveRoom();
                 this.ShowForm();
             };
         }
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs b/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs
index 1347cbe..6846d70 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs
@@ -214,7 +214,6 @@
                     }
                     string oldFloorId = Config.Instance.Home.CurrentFloorId;
                     CommonPage.Instance.CloseLeftMenu();
-                    HdlRoomLogic.Current.CurrentRoom = room;
 
                     HdlThreadLogic.Current.RunThread(() =>
                     {
diff --git a/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs b/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
index a238bb8..330f836 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
@@ -193,7 +193,7 @@
                     frameContr.CollectEvent += (collect) =>
                     {
                         //濡傛灉褰撳墠鏄敹钘忔埧闂�,鍒欓渶瑕佸埛鏂颁富椤�
-                        if (HdlRoomLogic.Current.CurrentRoom.IsLove == true)
+                        if (HdlRoomLogic.Current.NowMainPageRoom.IsLove == true)
                         {
                             this.dataHadChanged = true;
                         }
@@ -536,7 +536,7 @@
                 selectZone.ZoneAction += (selectRoom) =>
                 {
                     //鍙樻洿浜嗗綋鍓嶆埧闂寸殑涓滆タ,涓婚〉闇�瑕佸埛鏂�
-                    if (HdlRoomLogic.Current.CurrentRoom.Id == selectRoom.Id)
+                    if (HdlRoomLogic.Current.NowMainPageRoom.Id == selectRoom.Id)
                     {
                         this.dataHadChanged = true;
                     }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
index 5ffb606..051d41a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Abount/AbountForm.cs
@@ -217,7 +217,7 @@
                     }
                     var newVersion = results[0]["version"]?.ToString();
                     var updateContent = results[0]["releaseNotes"]?.ToString();
-                    if (newVersion != CommonPage.CodeIDString)
+                    if (newVersion.CompareTo(CommonPage.CodeIDString) > 0)
                     {
                         return true;
                     }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
index 098ffaa..160b6c3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/ButtonBase.cs
@@ -181,7 +181,8 @@
                 this.MouseUpEventHandler -= ButtonBase_MouseUpEventHandler;
                 return;
             }
-            if (CanClick == true)
+            //2020.05.14杩藉姞IsFormAdding:鐣岄潰杩樺湪鍔犺浇涓�,涓嶈兘鍐嶇偣鍑�
+            if (CanClick == true && ControlCommonResourse.IsFormAdding == false)
             {
                 //Log鍑哄姏
                 this.WriteLog(0);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs
index 3c44056..da2a3c0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs
@@ -115,6 +115,21 @@
             }
             if (e.Focus == true)
             {
+                //鑷姩鐒︾偣閫夋嫨鍓嶉潰鐨勭┖鐧戒綅缃�
+                //if (txtCode.Text == string.Empty)
+                //{
+                //    for (int i = 0; i < this.CodeLenth; i++)
+                //    {
+                //        if (dicCodeControls[i].Text == string.Empty)
+                //        {
+                //            dicCodeControls[i].FoucsChanged -= this.TxtCode_FoucsChangedEvent;
+                //            dicCodeControls[i].Parent.BorderColor = UserCenterColor.Current.TextFrameSelectColor;
+                //            dicCodeControls[i].Foucs = true;
+                //            dicCodeControls[i].FoucsChanged += this.TxtCode_FoucsChangedEvent;
+                //            return;
+                //        }
+                //    }
+                //}
                 txtCode.Parent.BorderColor = UserCenterColor.Current.TextFrameSelectColor;
             }
             else
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
index 8038b83..84f54ab 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameControl.cs
@@ -42,6 +42,13 @@
         public VerticalFrameControl(int i_rowSpace = 0)
         {
             rowSpace = Application.GetRealHeight(i_rowSpace);
+#if iOS
+            //鑷姩鍋忕Щ鍙栨秷
+            if (UIKit.UIDevice.CurrentDevice.CheckSystemVersion(11, 0))
+            {
+                (this.uiView as UIKit.UIScrollView).ContentInsetAdjustmentBehavior = UIKit.UIScrollViewContentInsetAdjustmentBehavior.Never;
+            }
+#endif
         }
 
         /// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
index 42583b1..3ad73c6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalFrameRefreshControl.cs
@@ -43,6 +43,13 @@
         {
             rowSpace = Application.GetRealHeight(i_rowSpace);
             this.VerticalScrollBarEnabled = false;
+#if iOS
+            //鑷姩鍋忕Щ鍙栨秷
+            if (UIKit.UIDevice.CurrentDevice.CheckSystemVersion(11, 0))
+            {
+                (this.uiView as UIKit.UIScrollView).ContentInsetAdjustmentBehavior = UIKit.UIScrollViewContentInsetAdjustmentBehavior.Never;
+            }
+#endif
         }
 
         /// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
index 9d2e43b..282f443 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListControl.cs
@@ -50,6 +50,13 @@
         public VerticalListControl(int i_rowSpace = 0)
         {
             this.rowSpace = Application.GetRealHeight(i_rowSpace);
+#if iOS
+            //鑷姩鍋忕Щ鍙栨秷
+            if (UIKit.UIDevice.CurrentDevice.CheckSystemVersion(11, 0))
+            {
+                (this.uiView as UIKit.UIScrollView).ContentInsetAdjustmentBehavior = UIKit.UIScrollViewContentInsetAdjustmentBehavior.Never;
+            }
+#endif
         }
 
         #endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListRefreshControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListRefreshControl.cs
index 25fd9b0..ba307b5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListRefreshControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/ListViewLayoutControls/VerticalListRefreshControl.cs
@@ -51,6 +51,13 @@
         {
             this.rowSpace = Application.GetRealHeight(i_rowSpace);
             this.VerticalScrollBarEnabled = false;
+#if iOS
+            //鑷姩鍋忕Щ鍙栨秷
+            if (UIKit.UIDevice.CurrentDevice.CheckSystemVersion(11, 0))
+            {
+                (this.uiView as UIKit.UIScrollView).ContentInsetAdjustmentBehavior = UIKit.UIScrollViewContentInsetAdjustmentBehavior.Never;
+            }
+#endif
         }
 
         #endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs
index 6e3c9d1..e050cac 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs
@@ -340,6 +340,60 @@
 
         #endregion
 
+        #region 鈻� PM2.5_______________________________
+        /// <summary>
+        /// SendPmSensorComand
+        /// </summary>
+        /// <param name="device">璁惧</param>
+        public void SendPmSensorComand(CommonDevice device)
+        {
+            if (device == null)
+            {
+                return;
+            }
+            new System.Threading.Thread(() =>
+            {
+                SendPmSensorStatuComand(device);
+                //璇诲彇Pm2.5浼犳劅鍣ㄧ殑娓╁害鏁版嵁
+                HdlDeviceAttributeLogic.Current.SendTemperatureStatuComand(device);
+                //璇诲彇Pm2.5浼犳劅鍣ㄧ殑婀垮害鏁版嵁
+                HdlDeviceAttributeLogic.Current.SendHumidityStatuComand(device);
+                System.Threading.Thread.Sleep(300);
+            })
+            { IsBackground = true }.Start();
+        }
+
+        /// <summary>
+        /// SendFanStatuComand
+        /// </summary>
+        /// <param name="device">璁惧</param>
+        private void SendPmSensorStatuComand(CommonDevice device)
+        {
+            if (device == null)
+            {
+                return;
+            }
+            var jObject = new Newtonsoft.Json.Linq.JObject
+            {
+                { "DeviceAddr",device.DeviceAddr },
+                { "Epoint", device.DeviceEpoint },
+                { "Cluster_ID", (int)Cluster_ID.PmTwoPointFiveMeasurement  },
+                { "Command", 108 }
+            };
+            var attriBute = new Newtonsoft.Json.Linq.JArray
+            {
+               new Newtonsoft.Json.Linq.JObject
+               {
+                 { "AttriButeId", (int)AttriButeId.MeasuredValue}
+               }
+            };
+            var data = new Newtonsoft.Json.Linq.JObject { { "AttriBute", attriBute } };
+            jObject.Add("Data", data);
+            device.Gateway?.Send("GetDeviceStatus", jObject.ToString());
+        }
+
+        #endregion
+
         #region 鈻� 绐楀笜_______________________________
         /// <summary>
         /// 鍙戦�佽幏鍙栫獥甯樼姸鎬佸懡浠�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
index 9ac7b9a..482c652 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
@@ -189,48 +189,48 @@
                 if (device.HadReadDeviceStatu == false)
                 {
                     return Language.StringByID(R.MyInternationalizationString.uOffLine);
-                }
-                //绌烘皵璐ㄩ噺
+                }
+                //绌烘皵璐ㄩ噺
                 string curQuality = "";
                 //娓╁害
                 string temperature = string.Empty;
                 //婀垮害
                 string humidity = string.Empty;
                 //PM2.5
-                string pm = string.Empty;
-                var pMSensor = device as PMSensor;
-                if (pMSensor.currentPmData <= 35 && pMSensor.currentPmData >= 0)
-                {
-                    curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
-                }
-                else if (pMSensor.currentPmData <= 75 && pMSensor.currentPmData > 35)
-                {
-                    curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
-                }
-                else if (pMSensor.currentPmData <= 115 && pMSensor.currentPmData > 75)
-                {
-                    curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
-                }
-                else if (pMSensor.currentPmData <= 150 && pMSensor.currentPmData > 115)
-                {
-                    curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
-                }
-                else if (pMSensor.currentPmData <= 250 && pMSensor.currentPmData > 150)
-                {
-                    curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
-                }
-                else if (pMSensor.currentPmData > 250)
-                {
-                    curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
-                }
-                else
-                {
-                    curQuality = "--";
-                }
-
-                humidity = $"{pMSensor.currentHumidity}%";
-                temperature = $"{pMSensor.currentTemperature}鈩�";
-                pm = $"{pMSensor.currentPmData}渭g/m鲁";
+                string pm = string.Empty;
+                var pMSensor = device as PMSensor;
+                if (pMSensor.currentPmData <= 35 && pMSensor.currentPmData >= 0)
+                {
+                    curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
+                }
+                else if (pMSensor.currentPmData <= 75 && pMSensor.currentPmData > 35)
+                {
+                    curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
+                }
+                else if (pMSensor.currentPmData <= 115 && pMSensor.currentPmData > 75)
+                {
+                    curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
+                }
+                else if (pMSensor.currentPmData <= 150 && pMSensor.currentPmData > 115)
+                {
+                    curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
+                }
+                else if (pMSensor.currentPmData <= 250 && pMSensor.currentPmData > 150)
+                {
+                    curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
+                }
+                else if (pMSensor.currentPmData > 250)
+                {
+                    curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
+                }
+                else
+                {
+                    curQuality = "--";
+                }
+
+                humidity = $"{pMSensor.currentHumidity}%";
+                temperature = $"{pMSensor.currentTemperature}鈩�";
+                pm = $"{pMSensor.currentPmData}渭g/m鲁";
                 return $"{curQuality},{pm},{temperature},{humidity}";
 
             }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
index 5203ff7..1e792df 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
@@ -58,6 +58,8 @@
             this.InitDeviceData();
             //鍒濆鍖栧満鏅�
             this.InitSceneData();
+            //鍒锋柊宸﹁竟鍒锋柊鎴块棿瑙嗗浘鍒楄〃
+            HdlRoomLogic.Current.RefreshRoomListView();
         }
 
         #endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
index 2a1b88a..18ffe33 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
@@ -2228,13 +2228,13 @@
                     waitCount++;
                     if (this.nowGwConnectMode == GatewayConnectMode.Remote)
                     {
-                        //杩滅▼姣�10绉掓娴嬩竴娆�
-                        if (waitCount < 10) { continue; }
+                        //杩滅▼姣�20绉掓娴嬩竴娆�
+                        if (waitCount < 20) { continue; }
                     }
                     else if (this.nowGwConnectMode == GatewayConnectMode.WIFI)
                     {
-                        //灞�鍩熺綉姣�3绉掓娴嬩竴娆�
-                        if (waitCount < 3) { continue; }
+                        //灞�鍩熺綉姣�5绉掓娴嬩竴娆�
+                        if (waitCount < 5) { continue; }
                     }
                     waitCount = 0;
 
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
index 3f81650..d766728 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -548,6 +548,28 @@
                 }
 
                 #endregion
+
+                #region 鈻� PM2.5鏁版嵁
+                //PM2.5鏁版嵁
+                else if (report.DeviceStatusReport.CluterID == 1066)
+                {
+                    foreach (var attData in report.DeviceStatusReport.AttriBute)
+                    {
+                        //PM2.5
+                        if (attData.AttributeId == (int)AttriButeId.MeasuredValue)
+                        {
+
+                            if (attData.AttriButeDataType == 57)
+                            {
+                                ((PMSensor)locadevice).currentPmData = attData.AttriButeData;
+                            }
+                        }
+                        //宸茬粡鎺ユ敹鍒扮姸鎬�
+                        locadevice.HadReadDeviceStatu = true;
+                    }
+                }
+
+                #endregion
             }
 
             this.DeviceReportPush(report, ReceiveComandDiv.A璁惧灞炴�т笂鎶�);
@@ -619,7 +641,7 @@
                         {
                             //娓╁眳鍩庣殑瑕佺綉鍏充腑鏄惁鏈夐�昏緫瀛樺湪 
                             //鍙傛暟:2-甯稿紑鑷姩鍖�;3-澶辨晥鏃堕棿鑷姩鍖�
-                            var result = await Shared.Phone.Device.Logic.SkipView.Exist(2);
+                            var result = await Shared.Phone.Device.Logic.SkipView.Exist(3, (ZigBee.Device.DoorLock)device);
                             HdlThreadLogic.Current.RunMain(() =>
                             {
                                 //寮瑰嚭寰愭鐨勯偅涓獥鍙�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
index 2edc90e..04158ce 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
@@ -31,32 +31,14 @@
                 return m_Current;
             }
         }
-
         /// <summary>
-        /// 褰撳墠閫夋嫨鐨勬埧闂�
+        /// 褰撳墠涓婚〉閫夋嫨鐨勬埧闂村璞�
         /// </summary>
-        private Room m_CurrentRoom = null;
+        public Room NowMainPageRoom = null;
         /// <summary>
-        /// 褰撳墠閫夋嫨鐨勬埧闂�
+        /// 褰撳墠鍒嗙被閫夋嫨鐨勬埧闂村璞�
         /// </summary>
-        public Room CurrentRoom
-        {
-            get
-            {
-                if (m_CurrentRoom == null && dicRooms.Count > 0)
-                {
-                    //璁剧疆鍒濆鍊�
-                    foreach (var room in dicRooms.Values)
-                    {
-                        m_CurrentRoom = room;
-                        break;
-                    }
-                }
-                return m_CurrentRoom;
-            }
-            set { m_CurrentRoom = value; }
-        }
-
+        public Room NowCategoryRoom = null;
         /// <summary>
         /// 鎵�鏈夌殑鎴块棿淇℃伅
         /// </summary>
@@ -72,6 +54,9 @@
         /// </summary>
         public void InitAllRoom()
         {
+            this.NowMainPageRoom = null;
+            this.NowCategoryRoom = null;
+
             //娓呯┖鏈湴缂撳瓨
             this.dicRooms.Clear();
             //妫�娴嬫垜鐨勫枩鐖辫繖涓埧闂村璞�
@@ -305,6 +290,10 @@
                 Global.DeleteFilebyHomeId(roomFilePath);
             }
             HdlAutoBackupLogic.DeleteFile(roomFilePath);
+
+            //鏍规嵁鎴块棿ID,绉婚櫎鎸囧畾鐨勭湡瀹炵墿鐞嗚澶囩殑鎵�灞炴埧闂磋褰�
+            Common.LocalDevice.Current.DeleteRealDeviceByRoomId(roomId);
+
             //鍒锋柊鎴块棿瑙嗗浘鍒楄〃
             this.RefreshRoomListView();
         }
@@ -591,8 +580,8 @@
             {
                 return;
             }
-            //浠庡師鏉ョ殑鎴块棿绉婚櫎璁惧
-            this.DeleteDevice(device);
+            //浠庡師鏉ョ殑鎴块棿绉婚櫎璁惧,杩欓噷涓嶅垹闄ょ湡瀹炶澶囩殑鎴块棿
+            this.DeleteDevice(device, false);
 
             //娣诲姞鍒版柊鐨勬埧闂�
             var room = this.GetRoomById(roomId);
@@ -705,12 +694,20 @@
         /// 鍒犻櫎璁惧(杩欎釜鍑芥暟涓嶅垹闄ゆ垜鐨勫枩鐖�)
         /// </summary>
         /// <param name="device">瑕佸垹闄ょ殑璁惧瀵硅薄</param>
-        public void DeleteDevice(CommonDevice device)
+        /// <param name="deleteReal">鏄惁鍒犻櫎鐪熷疄鐗╃悊璁惧鐨勬埧闂�</param>
+        public void DeleteDevice(CommonDevice device, bool deleteReal = true)
         {
             if (device == null)
             {
                 return;
             }
+            //濡傛灉瀹冨彧鏈変竴涓洖璺�
+            if (deleteReal == true && LocalDevice.Current.GetDevicesCountByMac(device.DeviceAddr) == 1)
+            {
+                //鍒犻櫎鎺夊畠鐨勭湡瀹炵墿鐞嗚澶囩殑鎵�鍦ㄤ綅缃�
+                LocalDevice.Current.DeleteRealDeviceFromRoom(device);
+            }
+
             //鏍规嵁璁惧锛岃幏鍙栨墍鍦ㄧ殑鎴块棿
             var room = this.GetRoomByDevice(device);
             if (room == null)
@@ -725,7 +722,7 @@
             HdlAutoBackupLogic.AddOrEditorFile(room.FileName);
 
             //閫掑綊锛氬垹闄ゆ帀浠ュ墠鐨勬棫鏁版嵁瀵艰嚧鐨勫涓埧闂寸殑闂
-            this.DeleteDevice(device);
+            this.DeleteDevice(device, deleteReal);
         }
 
         /// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
index ab7df40..fc07077 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
@@ -79,10 +79,10 @@
         /// <summary>
         /// 鍒锋柊鏈湴鐨勫叏閮ㄥ満鏅�
         /// </summary>
-        public async Task<bool> RefreshSceneUIList()
+        public bool RefreshSceneUIList()
         {
             //鑾峰彇缃戝叧瀛樺湪鐨勫満鏅�
-            var sceneList = await ZigBee.Device.Scene.GetSceneListAsync();
+            var sceneList = this.RefreshSceneListFromGateway();
             if (sceneList == null)
             {
                 return false;
@@ -95,6 +95,8 @@
                     continue;
                 }
                 listEsxit.Add(scene.ScenesId);
+                //鍒锋柊scene鐨勪俊鎭�
+                this.RefreshScene(scene);
             }
 
             var listDelete = new List<SceneUI>();
@@ -115,6 +117,99 @@
             return true;
         }
 
+        /// <summary>
+        /// 鍒锋柊scene鐨勪俊鎭�
+        /// </summary>
+        /// <param name="sceneInfo"></param>
+        private void RefreshScene(Scene.GetSceneAllInfo sceneInfo)
+        {
+            if (this.dicScenes.ContainsKey(sceneInfo.ScenesId) == true)
+            {
+                var localScene = this.dicScenes[sceneInfo.ScenesId];
+                //鍙埛鏂板悕瀛楀拰缁戝畾琛�
+                localScene.Name = sceneInfo.ScenesName;
+                localScene.AdjustTargetList.Clear();
+                localScene.AdjustTargetList.AddRange(sceneInfo.DeviceList);
+                localScene.Save();
+            }
+            else
+            {
+                var newScene = new SceneUI();
+                newScene.Name = sceneInfo.ScenesName;
+                newScene.IconPath = "SceneIcon/0.png";
+                newScene.Id = sceneInfo.ScenesId;
+                newScene.AdjustTargetList.AddRange(sceneInfo.DeviceList);
+                //娣诲姞缂撳瓨
+                newScene.Save();
+                //鍔犲叆缂撳瓨
+                this.dicScenes[newScene.Id] = newScene;
+                //澶囦唤
+                HdlAutoBackupLogic.AddOrEditorFile(newScene.FileName);
+            }
+
+        }
+
+        /// <summary>
+        /// 浠庣綉鍏抽噸鏂板埛鏂板満鏅垪琛�
+        /// </summary>
+        /// <returns></returns>
+        private List<Scene.GetSceneAllInfo> RefreshSceneListFromGateway()
+        {
+            var mainGateway = ZbGateway.MainGateWay;
+            if (mainGateway == null)
+            {
+                //鑾峰彇缃戝叧瀵硅薄澶辫触
+                this.ShowTipMsg(Language.StringByID(R.MyInternationalizationString.uGetGatewayTagartFail));
+                return null;
+            }
+
+            //瓒呮椂鏃堕棿
+            int TimeOut = 0;
+            bool receiptAll = false;
+
+            var listScene = new List<Scene.GetSceneAllInfo>();
+            Action<string, string> action = (topic, message) =>
+            {
+                var gatewayID = topic.Split('/')[0];
+                var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
+
+                if (topic == gatewayID + "/" + "Scene/GetAllInfo_Respon")
+                {
+                    var sceneGetAllInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<Scene.GetSceneAllInfo>(jobject["Data"].ToString());
+                    listScene.Add(sceneGetAllInfo);
+
+                    if (sceneGetAllInfo.ScenesNum == sceneGetAllInfo.ScenesSum)
+                    {
+                        //鎺ユ敹瀹屾垚
+                        receiptAll = true;
+                        TimeOut = 0;
+                    }
+                }
+            };
+            mainGateway.Actions += action;
+
+            var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 807 } };
+            mainGateway.Send(("Scene/GetAllInfo"), System.Text.Encoding.UTF8.GetBytes(jObject.ToString()));
+
+            int waitTime = 20 * 6;
+            while (receiptAll == false && TimeOut < waitTime)
+            {
+                //鍏ㄩ儴鎺ユ敹鎵嶉��鍑�
+                System.Threading.Thread.Sleep(50);
+                TimeOut++;
+            }
+            mainGateway.Actions -= action;
+            action = null;
+            if (receiptAll == false)
+            {
+                //缃戠粶涓嶇ǔ瀹氾紝鍦烘櫙鍒楄〃淇℃伅缂烘崯
+                this.ShowTipMsg(Language.StringByID(R.MyInternationalizationString.uNetworkUnStableAndSceneInfoIsNotFull));
+                return null;
+            }
+
+            return listScene;
+        }
+
         #endregion
 
         #region 鈻� 娣诲姞鍦烘櫙___________________________
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index e4997c7..cace472 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -470,21 +470,25 @@
                 try
                 {
                     var Myform = UserCenterResourse.DicActionForm[UserCenterResourse.NowActionFormID] as EditorCommonForm;
-                    //閲嶇疆宸︽粦浣胯兘
-                    Myform.ScrollEnabled = Myform.ScrollEnabled;
-                    //瑙﹀彂鐣岄潰鍐嶆婵�娲荤殑浜嬩欢
-                    int value = Myform.FormActionAgainEvent();
-                    if (value == 1)
+                    //鐐瑰嚮寰堝揩鏃�,杩欎釜涓滆タ浼氭槸null,浣嗘槸DicActionForm閲岄潰涓嶆槸null,涓嶇煡閬撲负浠�涔�
+                    if (Myform != null)
                     {
-                        //Log鍑哄姏
-                        HdlLogLogic.Current.WriteLog(1, Myform.FormID + " 琚縺娲�");
+                        //閲嶇疆宸︽粦浣胯兘
+                        Myform.ScrollEnabled = Myform.ScrollEnabled;
+                        //瑙﹀彂鐣岄潰鍐嶆婵�娲荤殑浜嬩欢
+                        int value = Myform.FormActionAgainEvent();
+                        if (value == 1)
+                        {
+                            //Log鍑哄姏
+                            HdlLogLogic.Current.WriteLog(1, Myform.FormID + " 琚縺娲�");
+                        }
                     }
                 }
                 catch (Exception ex)
                 {
                     //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
-                    var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
-                    alert.Show();
+                    //var alert = new ShowMsgControl(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
+                    //alert.Show();
 
                     //Log鍑哄姏
                     HdlLogLogic.Current.WriteLog(ex, "鐣岄潰閲嶆柊婵�娲诲紓甯� " + UserCenterResourse.NowActionFormID);
@@ -834,6 +838,7 @@
         {
             //璋冪敤杩欎釜鏂规硶,閮介渶瑕侀噸鏂板埛鏂颁富椤�
             UserView.UserPage.Instance.RefreshForm = true;
+
             //濡傛灉鏄櫄鎷熶綇瀹�
             if (Config.Instance.Home.IsVirtually == true)
             {
@@ -955,6 +960,8 @@
             Common.LocalDevice.Current.ReFreshByLocal();
             //鍒濆鍖栨埧闂�(閮洩鍩庨偅杈逛笉鍋氬鐞�,闇�瑕佽繖閲岀壒娈婃墽琛屼竴姝�)
             HdlRoomLogic.Current.RefreshAllRoomByLocation();
+            //鍒锋柊宸﹁竟鍒锋柊鎴块棿瑙嗗浘鍒楄〃
+            HdlRoomLogic.Current.RefreshRoomListView();
         }
 
         /// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs
index 97a3d37..b5f2c64 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs
@@ -68,6 +68,10 @@
         /// 寰愭鐨勯棬閿佺晫闈㈡槸鍚︽槸鎵撳紑鐨勭姸鎬�
         /// </summary>
         public static bool IsDoorLockPageOpen = false;
+        /// <summary>
+        /// 鏄惁鏄晫闈㈡鍦ㄥ姞杞戒腑(搴曞眰涓撶敤,涓嶉渶瑕佺悊)
+        /// </summary>
+        public static bool IsFormAdding = false;
 #if Android
         /// <summary>
         /// 涓や釜鏂囨湰鎷兼帴鏃�,涓轰簡鐪嬭捣鏉ユ槸姝e父鐨勶紝闇�瑕佸噺鍘诲畠浠箣闂寸殑闂撮殧璇樊
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
index 8f904cd..fefadb2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -481,7 +481,7 @@
                 {
                     //鏂规偊闈㈡澘鐨勫姛鑳介厤缃�
                     var form = new DevicePanel.PanelFangyueFunctionSettionForm();
-                    form.AddForm(device);
+                    form.AddForm(device, deviceEnumInfo);
                 }
                 else
                 {
@@ -789,13 +789,12 @@
             if (localDevice != null)
             {
                 //鍦ㄧ嚎鐘舵�佷竴鏍风殑璇濓紝涓嶉渶瑕佸埛鏂�
-                if (localDevice.IsOnline == device.IsOnline)
+                if (localDevice.IsOnline != device.IsOnline)
                 {
-                    return;
+                    //淇濆瓨鐘舵��
+                    localDevice.IsOnline = device.IsOnline;
+                    localDevice.ReSave();
                 }
-                //淇濆瓨鐘舵��
-                localDevice.IsOnline = device.IsOnline;
-                localDevice.ReSave();
             }
 
             rowInfo.MenuRow.IsOnline = Common.LocalDevice.Current.CheckDeviceIsOnline(device);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index c53372f..94841de 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -736,7 +736,7 @@
                     || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
                 {
                     var form = new DevicePanel.PanelFangyueFunctionSettionForm();
-                    form.AddForm(listNewDevice[0]);
+                    form.AddForm(listNewDevice[0], deviceEnumInfo);
                 }
                 //娌充笢鐨勯潰鏉胯澶�
                 else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘 && deviceEnumInfo.IsHdlDevice == true)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs
index 56fc6ad..80f3eee 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirConditionerZbGatewayDirectionForm.cs
@@ -30,23 +30,22 @@
         {
             //鍥剧墖
             var framePic = new FrameLayout();
-            framePic.Width = this.GetPictrueRealSize(893);
-            framePic.Height = this.GetPictrueRealSize(852);
+            framePic.Width = this.GetPictrueRealSize(842);
+            framePic.Height = this.GetPictrueRealSize(764);
             framePic.Gravity = Gravity.CenterHorizontal;
-            framePic.Y = Application.GetRealHeight(75);
+            framePic.Y = Application.GetRealHeight(78);
             bodyFrameLayout.AddChidren(framePic);
             var btnPic = new PicViewControl(framePic.Width, framePic.Height, false);
             btnPic.UnSelectedImagePath = "Instruct/AirConditionerZbGateway.png";
             framePic.AddChidren(btnPic);
 
-            //缁胯壊鎸囩ず鐏棯鐑�
-            var btnGreanLinght = new NormalViewControl(this.GetPictrueRealSize(475), this.GetPictrueRealSize(45), false);
-            btnGreanLinght.X = this.GetPictrueRealSize(415);
-            btnGreanLinght.Y = this.GetPictrueRealSize(272);
+            //DATA缁胯壊鎸囩ず鐏棯鐑�
+            var btnGreanLinght = new NormalViewControl(this.GetPictrueRealSize(512), this.GetPictrueRealSize(45), false);
+            btnGreanLinght.Y = this.GetPictrueRealSize(352);
             btnGreanLinght.TextAlignment = TextAlignment.Center;
             btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
             btnGreanLinght.TextSize = 10;
-            btnGreanLinght.TextID = R.MyInternationalizationString.uGreanPilotLampLinght;
+            btnGreanLinght.TextID = R.MyInternationalizationString.uDataGreanPilotLampLinght;
             framePic.AddChidren(btnGreanLinght);
 
             //闀挎寜5绉�
@@ -55,17 +54,16 @@
             {
                 textMsg = string.Format(textMsg, "5");
             }
-            var btnSecond = new NormalViewControl(this.GetPictrueRealSize(360), this.GetPictrueRealSize(45), false);
-            btnSecond.X = this.GetPictrueRealSize(573);
-            btnSecond.Y = this.GetPictrueRealSize(718);
+            var btnSecond = new NormalViewControl(this.GetPictrueRealSize(167), this.GetPictrueRealSize(45), false);
+            btnSecond.Y = this.GetPictrueRealSize(629);
             btnSecond.TextColor = UserCenterColor.Current.TextGrayColor3;
             btnSecond.TextSize = 10;
             btnSecond.Text = textMsg;
+            btnSecond.TextAlignment = TextAlignment.Center;
             framePic.AddChidren(btnSecond);
 
-            //闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏�
-            //鍙樼豢闂儊,杩涘叆閰嶇綉鐘舵��
-            //缁跨伅姣�5绉掗棯鐑佷竴娆″垯鍏ョ綉鎴愬姛
+            //闀挎寜缂栫▼鎸夐敭5绉�,DATA缁胯壊LED闂儊,
+            //棰戠巼涓轰寒0.5绉�,鐏�0.5绉�
             string[] msgArry = Language.StringByID(R.MyInternationalizationString.uAddAirConditionerZbGatewayMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
 
             var msg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
@@ -83,15 +81,6 @@
             msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
             msg2.TextAlignment = TextAlignment.Center;
             bodyFrameLayout.AddChidren(msg2);
-            var msg3 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
-            msg3.Y = msg2.Bottom;
-            if (msgArry.Length > 2)
-            {
-                msg3.Text = msgArry[2];
-            }
-            msg3.TextColor = UserCenterColor.Current.TextGrayColor3;
-            msg3.TextAlignment = TextAlignment.Center;
-            bodyFrameLayout.AddChidren(msg3);
         }
 
         #endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
index 12b1007..08f7d8c 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelBackLighWithSensorForm.cs
@@ -7,7 +7,7 @@
 {
     public class PanelBackLighWithSensorForm : EditorCommonForm
     {
-        #region 鈻� 鍙橀噺澹版槑___________________________ 
+        #region 鈻� 鍙橀噺澹版槑___________________________
         /// <summary>
         /// 鍒楄〃鎺т欢
         /// </summary>
@@ -102,7 +102,7 @@
 
         #endregion
 
-        #region 鈻� 鑺傝兘妯″紡琛宊________________________ 
+        #region 鈻� 鑺傝兘妯″紡琛宊________________________
         /// <summary>
         ///  娣诲姞鑺傝兘妯″紡琛�
         /// </summary>
@@ -322,7 +322,7 @@
             int B1 = Convert.ToInt32(this.keyColorData.CloseColorB, 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);
@@ -351,22 +351,45 @@
             frameColor.ButtonClickEvent += (sender, e) =>
             {
                 PanelColor(btnColor, seekBar1, R1, G1, B1);
-            };
+            }; 
             btnColorView.ButtonClickEvent += (sender, e) =>
             {
                 PanelColor(btnColor, seekBar1, R1, G1, B1);
-            };
+            };
             btnColor.ButtonClickEvent += (sender, e) =>
             {
                 PanelColor(btnColor, seekBar1, R1, G1, B1);
-            };
+            };
             btnColorLine.ButtonClickEvent += (sender, e) =>
             {
                 PanelColor(btnColor, seekBar1, R1, G1, B1);
-            };
+            };
             btnRight.ButtonClickEvent += (sender, e) =>
             {
                 PanelColor(btnColor, seekBar1, R1, G1, B1);
+            };
+        }
+
+        /// <summary>
+        /// PanelColorBefore
+        /// </summary>
+        private void PanelColor(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.CloseColorR = Convert.ToString(Rcolor, 16);
+                this.keyColorData.CloseColorG = Convert.ToString(Gcolor, 16);
+                this.keyColorData.CloseColorB = Convert.ToString(Bcolor, 16);
+
+                btnColor.BackgroundColor = this.GetColorByRGB((byte)Rcolor, (byte)Gcolor, (byte)Bcolor);
+                //鍙樻洿婊戝姩鏉$殑棰滆壊
+                seekBar1.ProgressBarColor = btnColor.BackgroundColor;
             };
         }
 
@@ -513,24 +536,24 @@
             frameColor.ButtonClickEvent += (sender, e) =>
             {
                 PanelColor(btnColor, seekBar1, R1, G1, B1);
-            };
+            };
             btnColorView.ButtonClickEvent += (sender, e) =>
             {
                 PanelColor(btnColor, seekBar1, R1, G1, B1);
-            };
+            };
             btnColor.ButtonClickEvent += (sender, e) =>
             {
                 PanelColor(btnColor, seekBar1, R1, G1, B1);
-            };
+            };
             btnColorLine.ButtonClickEvent += (sender, e) =>
             {
                 PanelColor(btnColor, seekBar1, R1, G1, B1);
-            };
+            };
             btnRight.ButtonClickEvent += (sender, e) =>
             {
                 PanelColor(btnColor, seekBar1, R1, G1, B1);
             };
-        }
+        }
         #endregion
 
         #region 鈻� 鑾峰彇鍒濆鏁版嵁_______________________
@@ -627,7 +650,7 @@
 
         #endregion
 
-        #region 鈻� 琛ュ厖瀹瑰櫒___________________________ 
+        #region 鈻� 琛ュ厖瀹瑰櫒___________________________
         /// <summary>
         /// 琛屾暟瓒呰繃瀹瑰櫒鏃讹紝琛ヤ竴涓┖鐧紽rameLayout锛屼娇涔嬭兘婊戝姩
         /// </summary>
@@ -666,6 +689,6 @@
             return (uint)(0xFF000000 + R * 256 * 256 + G * 256 + B);
         }
 
-        #endregion 
+        #endregion
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueButtonSettionForm.cs
index 225a2aa..be3f331 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueButtonSettionForm.cs
@@ -377,9 +377,10 @@
         private NormalViewControl InitDeviceButtonControl(FrameLayout frame, CommonDevice device)
         {
             var btnIcon = new NormalViewControl(this.GetPictrueRealSize(52), this.GetPictrueRealSize(52), false);
-            btnIcon.Text = "Button" + device.DeviceEpoint;
+            btnIcon.Text = "BUTTON" + device.DeviceEpoint;
             btnIcon.TextAlignment = TextAlignment.Center;
             btnIcon.TextColor = UserCenterColor.Current.TextGrayColor1;
+            btnIcon.IsBold = true;
             if (frame is FrameLayoutStatuControl)
             {
                 ((FrameLayoutStatuControl)frame).AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
@@ -447,7 +448,7 @@
         {
             //鎸夐敭1
             var btnButton1 = this.InitDeviceButtonControl(frameBack, listDevice[0]);
-            btnButton1.TextSize = 12;
+            btnButton1.TextSize = 10;
             btnButton1.Height = this.GetPictrueRealSize(175);
             btnButton1.Width = this.GetPictrueRealSize(183);
             btnButton1.X = this.GetPictrueRealSize(34);
@@ -455,7 +456,7 @@
 
             //鎸夐敭2
             var btnButton2 = this.InitDeviceButtonControl(frameBack, listDevice[1]);
-            btnButton2.TextSize = 12;
+            btnButton2.TextSize = 10;
             btnButton2.Height = this.GetPictrueRealSize(175);
             btnButton2.Width = this.GetPictrueRealSize(183);
             btnButton2.X = btnButton1.Right;
@@ -463,7 +464,7 @@
 
             //鎸夐敭3
             var btnButton3 = this.InitDeviceButtonControl(frameBack, listDevice[2]);
-            btnButton3.TextSize = 12;
+            btnButton3.TextSize = 10;
             btnButton3.Height = this.GetPictrueRealSize(175);
             btnButton3.Width = this.GetPictrueRealSize(183);
             btnButton3.X = btnButton1.X;
@@ -471,7 +472,7 @@
 
             //鎸夐敭4
             var btnButton4 = this.InitDeviceButtonControl(frameBack, listDevice[3]);
-            btnButton4.TextSize = 12;
+            btnButton4.TextSize = 10;
             btnButton4.Height = this.GetPictrueRealSize(175);
             btnButton4.Width = this.GetPictrueRealSize(183);
             btnButton4.X = btnButton2.X;
@@ -541,7 +542,7 @@
             frameButton1.Width = this.GetPictrueRealSize(183);
             frameBack.AddChidren(frameButton1);
             var btnButton1 = this.InitDeviceButtonControl(frameButton1, device1);
-            btnButton1.TextSize = 10;
+            btnButton1.TextSize = 8;
             btnButton1.Height = this.GetPictrueRealSize(35);
             btnButton1.Width = this.GetPictrueRealSize(183);
             btnButton1.Y = this.GetPictrueRealSize(37);
@@ -554,7 +555,7 @@
             frameButton2.Y = frameButton1.Bottom;
             frameBack.AddChidren(frameButton2);
             var btnButton2 = this.InitDeviceButtonControl(frameButton2, device2);
-            btnButton2.TextSize = 10;
+            btnButton2.TextSize = 8;
             btnButton2.Height = btnButton1.Height;
             btnButton2.Width = btnButton1.Width;
             btnButton2.Y = this.GetPictrueRealSize(20);
@@ -588,7 +589,7 @@
             nowContr.TextColor = 0xfffb744a;
 
             nowSelectControl = nowContr;
-            nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Text.Replace("Button", string.Empty)));
+            nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Text.Replace("BUTTON", string.Empty)));
 
             //閲嶆柊鍒濆鍖栬彍鍗曡
             this.InitMenuRow();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
index 4a878f5..f6791aa 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
@@ -26,7 +26,7 @@
         }
         #endregion
 
-        #region  鍙橀噺鐢虫槑 
+        #region  鍙橀噺鐢虫槑
         /// <summary>
         /// 褰撳墠鏂伴闈㈡澘銆愭帶鍒惰澶囥��
         /// </summary>
@@ -106,7 +106,7 @@
 
         #endregion
 
-        #region UI璁捐 
+        #region UI璁捐
         /// <summary>
         /// 鐩爣椤垫樉绀�
         /// </summary>
@@ -144,13 +144,13 @@
             BindDownFrameLayout();
             //鏍囬鏍忎笅鐨刄I
             MidFrameLayoutContent();
-            //鍒濆鍖栬澶囨暟鎹� 
+            //鍒濆鍖栬澶囨暟鎹�
             InitData();
         }
 
         /// <summary>
         /// 娣诲姞妤煎眰UI
-        /// </summary> 
+        /// </summary>
         void BindDownFrameLayout()
         {
             var btnAddFrameLayout = new FrameLayout
@@ -658,7 +658,7 @@
                     curControlDev.currentSelectFloorId = curFloorId;
                     btnFloorText.Text = dicFloorList[floorId];
 
-                    //鑾峰彇妤煎眰涓埧闂村垪琛� 
+                    //鑾峰彇妤煎眰涓埧闂村垪琛�
                     supportRoomList = GetFloorRoomList();
                     if (!btnMethodText.IsSelected)
                     {
@@ -727,7 +727,7 @@
                     //鑾峰彇鎵�鏈夋埧闂翠腑鍖归厤鐨勮兘缁戠殑鐩爣
                     currentPanelSupportBindDeviceList = GetAllRoomSupportDeviceList();
 
-                    //鑾峰彇闈㈡澘涓瓨鍦ㄧ殑缁戝畾鐩爣 
+                    //鑾峰彇闈㈡澘涓瓨鍦ㄧ殑缁戝畾鐩爣
                     var panelBindListRes = await this.curControlDev.GetDeviceBindAsync();
                     if (panelBindListRes != null && panelBindListRes.getAllBindResponseData != null)
                     {
@@ -865,7 +865,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)
@@ -1303,7 +1303,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)
@@ -1489,11 +1489,11 @@
             {
                 var device = LocalDevice.Current.GetDevice(de);
                 if (device != null)
-                {
-                    //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
-                    if (device.ZigbeeType != 1)
-                    {
-                        continue;
+                {
+                    //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
+                    if (device.ZigbeeType != 1)
+                    {
+                        continue;
                     }
                     if (device.Type == DeviceType.TemperatureSensor)
                     {
@@ -1530,11 +1530,11 @@
             {
                 var device = LocalDevice.Current.GetDevice(de);
                 if (device != null)
-                {
-                    //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
-                    if (device.ZigbeeType != 1)
-                    {
-                        continue;
+                {
+                    //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
+                    if (device.ZigbeeType != 1)
+                    {
+                        continue;
                     }
                     if (device.Type == DeviceType.TemperatureSensor)
                     {
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFunctionSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFunctionSettionForm.cs
index cdd9f59..5896288 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFunctionSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFunctionSettionForm.cs
@@ -33,6 +33,10 @@
         /// </summary>
         private CommonDevice deviceObj = null;
         /// <summary>
+        /// 璁惧鐨勭被鍨�
+        /// </summary>
+        private DeviceEnumInfo deviceEnum = null;
+        /// <summary>
         /// 璁惧闇�瑕佷繚瀛樼殑璁惧鍚嶅瓧
         /// </summary>
         private Dictionary<int, string> dicDeviceSaveName = new Dictionary<int, string>();
@@ -49,9 +53,11 @@
         /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
         /// </summary>
         /// <param name="i_device">璁惧鐨勬煇涓�鍥炶矾</param>
-        public void ShowForm(CommonDevice i_device)
+        /// <param name="i_deviceEnum">璁惧鐨勭被鍨�</param>
+        public void ShowForm(CommonDevice i_device, DeviceEnumInfo i_deviceEnum)
         {
             this.deviceObj = i_device;
+            this.deviceEnum = i_deviceEnum;
 
             //璁剧疆澶撮儴淇℃伅
             base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uFunctionSettingUp));
@@ -265,9 +271,8 @@
             var listSort = new List<CommonDevice>();
             foreach (var device in listDevice)
             {
-                //濡傛灉鏄户鐢靛櫒鍜岃皟鍏夊櫒鐨勮瘽
-                if (device.Type == DeviceType.OnOffOutput || device.Type == DeviceType.DimmableLight
-                    || device.Type == DeviceType.ColorDimmableLight)
+                //濡傛灉鏄户鐢靛櫒
+                if (device.Type == DeviceType.OnOffOutput)
                 {
                     listSort.Add(device);
                     if (device.DeviceEpoint == deviceObj.DeviceEpoint)
@@ -303,21 +308,21 @@
 
             frameBorder.AddChidren(btnPic);
 
-            if (listSort.Count == 8)
+            if (deviceEnum.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueEight)
             {
-                //鍏寜閿潰鏉�
+                //鍥涘紑鍏帶闈㈡澘
                 btnPic.UnSelectedImagePath = "DeviceItem/PanelFangyueEightButtonTable.png";
                 this.InitEightButtonPanelIcon(frameBorder, listSort);
             }
-            else if (listSort.Count == 4)
+            else if (deviceEnum.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFour)
             {
-                //鍥涙寜閿潰鏉�
+                //鍙屽紑鍥涙帶闈㈡澘
                 btnPic.UnSelectedImagePath = "DeviceItem/PanelFangyueFourButtonTable.png";
                 this.InitFourButtonPanelIcon(frameBorder, listSort);
             }
             else
             {
-                //浜屾寜閿潰鏉�
+                //鍗曞紑鍙屾帶闈㈡澘
                 btnPic.UnSelectedImagePath = "DeviceItem/PanelFangyueTwoButtonTable.png";
                 this.InitTwoButtonPanelIcon(frameBorder, listSort);
             }
@@ -332,9 +337,10 @@
         private NormalViewControl InitDeviceButtonControl(FrameLayout frame, CommonDevice device)
         {
             var btnIcon = new NormalViewControl(this.GetPictrueRealSize(52), this.GetPictrueRealSize(52), false);
-            btnIcon.Text = "Button" + device.DeviceEpoint;
+            btnIcon.Text = "CHANNEL" + device.DeviceEpoint;
             btnIcon.TextAlignment = TextAlignment.Center;
             btnIcon.TextColor = UserCenterColor.Current.TextGrayColor1;
+            btnIcon.IsBold = true;
             if (frame is FrameLayoutStatuControl)
             {
                 ((FrameLayoutStatuControl)frame).AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
@@ -368,7 +374,7 @@
         #region 鈻� 鍒濆鍖栦簩鎸夐敭鍥炬爣___________________
 
         /// <summary>
-        /// 鍒濆鍖栦簩鎸夐敭闈㈡澘鐨勫浘鏍�
+        /// 鍒濆鍖栧崟寮�鍙屾帶闈㈡澘鐨勫浘鏍�
         /// </summary>
         /// <param name="frameBack">瀹瑰櫒</param>
         /// <param name="listDevice">璁惧鍒楄〃</param>
@@ -394,7 +400,7 @@
         #region 鈻� 鍒濆鍖栧洓鎸夐敭鍥炬爣___________________
 
         /// <summary>
-        /// 鍒濆鍖栧洓鎸夐敭闈㈡澘鐨勫浘鏍�
+        /// 鍒濆鍖栧弻寮�鍥涙帶閿潰鏉跨殑鍥炬爣
         /// </summary>
         /// <param name="frameBack">瀹瑰櫒</param>
         /// <param name="listDevice">璁惧鍒楄〃</param>
@@ -402,7 +408,7 @@
         {
             //鎸夐敭1
             var btnButton1 = this.InitDeviceButtonControl(frameBack, listDevice[0]);
-            btnButton1.TextSize = 12;
+            btnButton1.TextSize = 8;
             btnButton1.Height = this.GetPictrueRealSize(175);
             btnButton1.Width = this.GetPictrueRealSize(183);
             btnButton1.X = this.GetPictrueRealSize(34);
@@ -410,7 +416,7 @@
 
             //鎸夐敭2
             var btnButton2 = this.InitDeviceButtonControl(frameBack, listDevice[1]);
-            btnButton2.TextSize = 12;
+            btnButton2.TextSize = 8;
             btnButton2.Height = this.GetPictrueRealSize(175);
             btnButton2.Width = this.GetPictrueRealSize(183);
             btnButton2.X = btnButton1.Right;
@@ -418,7 +424,7 @@
 
             //鎸夐敭3
             var btnButton3 = this.InitDeviceButtonControl(frameBack, listDevice[2]);
-            btnButton3.TextSize = 12;
+            btnButton3.TextSize = 8;
             btnButton3.Height = this.GetPictrueRealSize(175);
             btnButton3.Width = this.GetPictrueRealSize(183);
             btnButton3.X = btnButton1.X;
@@ -426,7 +432,7 @@
 
             //鎸夐敭4
             var btnButton4 = this.InitDeviceButtonControl(frameBack, listDevice[3]);
-            btnButton4.TextSize = 12;
+            btnButton4.TextSize = 8;
             btnButton4.Height = this.GetPictrueRealSize(175);
             btnButton4.Width = this.GetPictrueRealSize(183);
             btnButton4.X = btnButton2.X;
@@ -438,7 +444,7 @@
         #region 鈻� 鍒濆鍖栧叓鎸夐敭鍥炬爣___________________
 
         /// <summary>
-        /// 鍒濆鍖栧叓鎸夐敭闈㈡澘鐨勫浘鏍�
+        /// 鍒濆鍖栧洓寮�鍏帶闈㈡澘鐨勫浘鏍�
         /// </summary>
         /// <param name="frameBack">瀹瑰櫒</param>
         /// <param name="listDevice">璁惧鍒楄〃</param>
@@ -461,24 +467,6 @@
             frame2.Width = frame1.Width;
             frameBack.AddChidren(frame2);
             this.InitEightButtonPanelIcon(frame2, listDevice[2], listDevice[3]);
-
-            //鎸夐敭5锝炴寜閿�6
-            var frame3 = new FrameLayout();
-            frame3.X = frame1.X;
-            frame3.Y = frame1.Bottom + this.GetPictrueRealSize(4);
-            frame3.Height = frame1.Height;
-            frame3.Width = frame1.Width;
-            frameBack.AddChidren(frame3);
-            this.InitEightButtonPanelIcon(frame3, listDevice[4], listDevice[5]);
-
-            //鎸夐敭7锝炴寜閿�8
-            var frame4 = new FrameLayout();
-            frame4.X = frame1.Right;
-            frame4.Y = frame1.Bottom + this.GetPictrueRealSize(4);
-            frame4.Height = frame1.Height;
-            frame4.Width = frame1.Width;
-            frameBack.AddChidren(frame4);
-            this.InitEightButtonPanelIcon(frame4, listDevice[6], listDevice[7]);
         }
 
         /// <summary>
@@ -496,7 +484,7 @@
             frameButton1.Width = this.GetPictrueRealSize(183);
             frameBack.AddChidren(frameButton1);
             var btnButton1 = this.InitDeviceButtonControl(frameButton1, device1);
-            btnButton1.TextSize = 10;
+            btnButton1.TextSize = 8;
             btnButton1.Height = this.GetPictrueRealSize(35);
             btnButton1.Width = this.GetPictrueRealSize(183);
             btnButton1.Y = this.GetPictrueRealSize(37);
@@ -509,7 +497,7 @@
             frameButton2.Y = frameButton1.Bottom;
             frameBack.AddChidren(frameButton2);
             var btnButton2 = this.InitDeviceButtonControl(frameButton2, device2);
-            btnButton2.TextSize = 10;
+            btnButton2.TextSize = 8;
             btnButton2.Height = btnButton1.Height;
             btnButton2.Width = btnButton1.Width;
             btnButton2.Y = this.GetPictrueRealSize(20);
@@ -543,7 +531,7 @@
             nowContr.TextColor = 0xfffb744a;
 
             nowSelectControl = nowContr;
-            nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Text.Replace("Button", string.Empty)));
+            nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Text.Replace("CHANNEL", string.Empty)));
 
             //閲嶆柊鍒濆鍖栬彍鍗曡
             this.InitMenuRow();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
index 70956de..9989e00 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -198,7 +198,7 @@
                     if (haveLogic)
                     {
                         //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
-                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
+                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
                     }
                 }
                 else
@@ -220,7 +220,7 @@
                     if (haveLogic)
                     {
                         //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
-                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
+                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
                     }
 
                     //app閲嶆柊寮�鍚�滃父寮�妯″紡鈥�
@@ -298,7 +298,7 @@
                     if (haveLogic)
                     {
                         //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
-                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
+                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
                     }
                 }
                 else
@@ -347,7 +347,7 @@
                         if (haveLogic)
                         {
                             //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
-                            var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
+                            var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
                         }
                         Application.RunOnMainThread(() =>
                         {
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 3620cae..8e134dc 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -188,7 +188,7 @@
         #endregion
 
         /// <summary>
-        /// UI鏄剧ず 
+        /// UI鏄剧ず
         /// </summary>
         public void Show()
         {
@@ -253,14 +253,14 @@
             this.midFrameLayout.AddChidren(midTopFrameLayout);
 
             //璁惧鍚嶇О
-            btnDoorLockTitle = new NormalViewControl(100, 60, true);
-            btnDoorLockTitle.Y = Application.GetRealHeight(46);
-            btnDoorLockTitle.TextSize = 15;
+            btnDoorLockTitle = new NormalViewControl(100, 60, true);
+            btnDoorLockTitle.Y = Application.GetRealHeight(46);
+            btnDoorLockTitle.TextSize = 15;
             btnDoorLockTitle.IsBold = true;
-            btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
-            btnDoorLockTitle.Width = btnDoorLockTitle.GetRealWidthByText();
-            btnDoorLockTitle.TextAlignment = TextAlignment.Center;
-            btnDoorLockTitle.Gravity = Gravity.CenterHorizontal;
+            btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
+            btnDoorLockTitle.Width = btnDoorLockTitle.GetRealWidthByText();
+            btnDoorLockTitle.TextAlignment = TextAlignment.Center;
+            btnDoorLockTitle.Gravity = Gravity.CenterHorizontal;
             midTopFrameLayout.AddChidren(btnDoorLockTitle);
 
             //璁板綍
@@ -513,7 +513,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
             };
             btnCurrentFrameLayout.AddChidren(btnCurrentRoomName);
-            #endregion 
+            #endregion
         }
 
         #region 闊抽噺寮圭獥
@@ -568,7 +568,7 @@
                 ThumbImagePath = "DoorLock/UnLockButton.png",//杩涘害鏉℃寜閽浘鏍�
                 ThumbImageHeight = Application.GetRealHeight(81),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
                 ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
-                ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏� 
+                ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�
                 SeekBarViewHeight = Application.GetRealHeight(17),//杩涘害鏉$殑瀹藉害
                 Progress = currentVolume,
             };
@@ -694,7 +694,7 @@
                             DoorLockCommonInfo.NormallyOpenModeValue(doorLock, tempRes);
                             Application.RunOnMainThread(async () =>
                             {
-                                var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(2);
+                                var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3,doorLock);
                                 if (resTemp == 1)
                                 {
                                     haveLogicNormallyOpenMode = true;
@@ -718,7 +718,7 @@
                     canVolume = DoorLockCommonInfo.CanVolume(doorLock);
                     if (canVolume)
                     {
-                        //璇诲彇闊抽噺 
+                        //璇诲彇闊抽噺
                         var resultRes = await doorLock.GetVolumeAsync();
                         if (resultRes == null || resultRes.volumeResponseData == null)
                         {
@@ -774,9 +774,9 @@
 
         #endregion
 
-        #region 鍏叡浜嬩欢澶勭悊 
+        #region 鍏叡浜嬩欢澶勭悊
         /// <summary>
-        /// 浜嬩欢澶勭悊 
+        /// 浜嬩欢澶勭悊
         /// </summary>
         public void ClickHandle()
         {
@@ -840,11 +840,11 @@
                 btnCollect.IsSelected = !btnCollect.IsSelected;
                 if (btnCollect.IsSelected)
                 {
-                    HdlRoomLogic.Current.AddLoveDevice(deviceUI);//鏀惰棌 
+                    HdlRoomLogic.Current.AddLoveDevice(deviceUI);//鏀惰棌
                 }
                 else
                 {
-                    HdlRoomLogic.Current.DeleteLoveDevice(deviceUI);//鍙栨秷鏀惰棌 
+                    HdlRoomLogic.Current.DeleteLoveDevice(deviceUI);//鍙栨秷鏀惰棌
                 }
             };
             btnCollectFrameLayout.MouseDownEventHandler += handerCollect;
@@ -967,7 +967,7 @@
         }
         #endregion
 
-        #region 闊抽噺 
+        #region 闊抽噺
         /// <summary>
         /// 鏇存柊闊抽噺
         /// </summary>
@@ -1042,7 +1042,7 @@
         }
         #endregion
 
-        #region 甯稿紑妯″紡  
+        #region 甯稿紑妯″紡
         /// <summary>
         /// 甯稿紑妯″紡澶勭悊
         /// </summary>
@@ -1082,10 +1082,10 @@
                 addLogicPage.Show();
                 addLogicPage.action += (w) =>
                 {
-                    doorLock.IsDoorLockNormallyMode = w;
-                    UpdateNomallyOpenStatus();
+                    doorLock.IsDoorLockNormallyMode = w;
+                    UpdateNomallyOpenStatus();
                     //杩斿洖鎸夐敭娓呯┖褰撳墠閫昏緫瀹氫箟鐨凩ogicAction
-                    UserCenter.DoorLock.DoorLockCommonInfo.LogicAction = null;
+                    UserCenter.DoorLock.DoorLockCommonInfo.LogicAction = null;
                 };
             };
             HdlCheckLogic.Current.CheckSecondarySecurity(action);
@@ -1121,7 +1121,7 @@
             {
                 if (IsFromReport)
                 {
-                    //涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑堬紝app榛樿浜嗏�滃父寮�妯″紡鈥濊鍙栨秷 
+                    //涓婃姤鈥滃父寮�妯″紡鈥濆凡琚彇娑堬紝app榛樿浜嗏�滃父寮�妯″紡鈥濊鍙栨秷
                     DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
                     Application.RunOnMainThread(() =>
                     {
@@ -1131,12 +1131,12 @@
                     if (haveLogicNormallyOpenMode)
                     {
                         //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
-                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
+                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
                     }
                 }
                 else
                 {
-                    //app榛樿鈥滃父寮�妯″紡鈥濊繕鏄紑鍚� 
+                    //app榛樿鈥滃父寮�妯″紡鈥濊繕鏄紑鍚�
                     DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
                     Application.RunOnMainThread(() =>
                     {
@@ -1155,7 +1155,7 @@
                     if (haveLogicNormallyOpenMode)
                     {
                         //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
-                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
+                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
                     }
                     //app閲嶆柊寮�鍚�滃父寮�妯″紡鈥�
                     var result = await doorLock.SetNormallyOpenModeFuncAsync(true);
@@ -1183,14 +1183,14 @@
                     }
                     else
                     {
-                        //淇濇寔鈥滃父寮�鎴愬姛鈥� 
+                        //淇濇寔鈥滃父寮�鎴愬姛鈥�
                         DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
                         Application.RunOnMainThread(() =>
                         {
                             UpdateNomallyOpenStatus();
                         });
 
-                        //鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫 
+                        //鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫
                         var resu = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
                         //if (!resu)
                         //{
@@ -1203,7 +1203,7 @@
                 }
                 else
                 {
-                    //app鎿嶄綔涓嶅彇娑堚�滃父寮�妯″紡鈥� 
+                    //app鎿嶄綔涓嶅彇娑堚�滃父寮�妯″紡鈥�
                     DoorLockCommonInfo.NormallyOpenModeValue(doorLock, true);
                     Application.RunOnMainThread(() =>
                     {
@@ -1216,7 +1216,7 @@
             {
                 if (IsFromReport)
                 {
-                    //涓婃姤闂ㄩ攣鈥滃父寮�妯″紡鈥濆凡缁忓彇娑堬紝鐜板湪app纭鈥滃父寮�妯″紡鈥濆彇娑� 
+                    //涓婃姤闂ㄩ攣鈥滃父寮�妯″紡鈥濆凡缁忓彇娑堬紝鐜板湪app纭鈥滃父寮�妯″紡鈥濆彇娑�
                     DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
                     Application.RunOnMainThread(() =>
                     {
@@ -1226,7 +1226,7 @@
                     if (haveLogicNormallyOpenMode)
                     {
                         //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
-                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
+                        var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
                     }
                 }
                 else
@@ -1251,7 +1251,7 @@
                         //娣诲姞App寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
                         HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(this.doorLock, 9002, string.Empty);
 
-                        //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔� 
+                        //app纭鍙栨秷鈥滃父寮�妯″紡鈥濇垚鍔�
                         DoorLockCommonInfo.NormallyOpenModeValue(doorLock, false);
                         Application.RunOnMainThread(() =>
                         {
@@ -1261,7 +1261,7 @@
                         if (haveLogicNormallyOpenMode)
                         {
                             //姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
-                            var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll();
+                            var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
                         }
                         string msg2 = Language.StringByID(R.MyInternationalizationString.CloseNormallyOpenModeSuccess);
                         this.ShowTipMsg(msg2);
@@ -1282,7 +1282,7 @@
             alertNomallyModeIsTurnOn.Show();
             alertNomallyModeIsTurnOn.MsgControlClickEvent += async () =>
             {
-                //榛樿鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫 
+                //榛樿鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫
                 var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
                 //if (!res)
                 //{
@@ -1310,7 +1310,7 @@
         /// </summary>
         private void NomallyOpenModeInvalidTimeDialog()
         {
-            //澶辨晥璁剧疆 
+            //澶辨晥璁剧疆
             string msgTimeInValidSetting = Language.StringByID(R.MyInternationalizationString.DoorLockOpenAllTheTime);
             var timeConfrim = Language.StringByID(R.MyInternationalizationString.Confrim);
             var alertTimeInValidSetting = new ShowDoorLockMsgControl(ShowDoorLockMsgControl.DoorLockMsgType.InValid, msgTimeInValidSetting, timeConfrim);
@@ -1321,7 +1321,7 @@
                  //甯稿紑妯″紡澶辨晥鏃堕棿璁剧疆鎴愬姛
                  var temp = int.Parse(obj);
                  DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;
-                 //榛樿鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫 
+                 //榛樿鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫
                  var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
                  if (res == 0)
                  {
@@ -1363,7 +1363,7 @@
         }
         #endregion
 
-        #region 寮�閿佸鐞� 
+        #region 寮�閿佸鐞�
         /// <summary>
         /// 寮�閿佸鐞�
         /// </summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
index 28c511f..b6ddfc2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
@@ -424,41 +424,22 @@
                 {
                     return;
                 }
-
-                foreach (var data in report.DeviceStatusReport.AttriBute)
+                var localDevice = Common.LocalDevice.Current.GetDevice(mainKeys);
+                HdlThreadLogic.Current.RunMain(() =>
                 {
-                    if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
+                    if (((ZigBee.Device.TemperatureSensor)localDevice).Temperatrue == 0)
                     {
-                        HdlThreadLogic.Current.RunMain(() =>
-                        {
-                            if (data.AttriButeData == 0)
-                            {
-                                //0鈩�
-                                btnTemper.Text = "0.0鈩�";
-                                this.cloneRoom.Temperatrue = 0;
-                            }
-                            else if (data.AttriButeData > 32767)
-                            {
-                                //璐熸暟(鐗规畩澶勭悊)
-                                string strValue = (data.AttriButeData - 65536).ToString();
-                                //灏忔暟鐐归渶瑕佷竴浣�
-                                strValue = strValue.Substring(0, strValue.Length - 1);
-                                //璁板綍娓╁害
-                                this.cloneRoom.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
-                                btnTemper.Text = this.cloneRoom.Temperatrue.ToString() + "鈩�";
-                            }
-                            else
-                            {
-                                //灏忔暟鐐归渶瑕佷竴浣�
-                                string strValue = data.AttriButeData.ToString();
-                                strValue = strValue.Substring(0, strValue.Length - 1);
-                                //璁板綍娓╁害
-                                this.cloneRoom.Temperatrue = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
-                                btnTemper.Text = this.cloneRoom.Temperatrue.ToString() + "鈩�";
-                            }
-                        });
+                        //0鈩�
+                        btnTemper.Text = "0.0鈩�";
+                        this.cloneRoom.Temperatrue = 0;
                     }
-                }
+                    else
+                    {
+                        //璁板綍娓╁害
+                        this.cloneRoom.Temperatrue = ((ZigBee.Device.TemperatureSensor)localDevice).Temperatrue;
+                        btnTemper.Text = this.cloneRoom.Temperatrue.ToString() + "鈩�";
+                    }
+                }, ShowErrorMode.NO);
             }));
             //鍙戦�佽幏鍙栨俯搴︾殑鍛戒护
             ((ZigBee.Device.TemperatureSensor)device).ReadTemperatureOrHumidity();
@@ -531,30 +512,22 @@
                 {
                     return;
                 }
-                foreach (var data in report.DeviceStatusReport.AttriBute)
+                var localDevice = Common.LocalDevice.Current.GetDevice(mainKeys);
+                HdlThreadLogic.Current.RunMain(() =>
                 {
-                    if (data.AttributeId == (int)ZigBee.Device.AttriButeId.MeasuredValue)
+                    if (((ZigBee.Device.TemperatureSensor)localDevice).Humidity == 0)
                     {
-                        HdlThreadLogic.Current.RunMain(() =>
-                        {
-                            if (data.AttriButeData == 0)
-                            {
-                                //0
-                                btnHumi.Text = "0.0%";
-                                this.cloneRoom.Humidity = 0;
-                            }
-                            else
-                            {
-                                //灏忔暟鐐归渶瑕佷竴浣�(婀垮害娌℃湁璐熸暟)
-                                string strValue = data.AttriButeData.ToString();
-                                strValue = strValue.Substring(0, strValue.Length - 1);
-                                //璁板綍婀垮害
-                                this.cloneRoom.Humidity = Convert.ToDecimal(strValue.Insert(strValue.Length - 1, "."));
-                                btnHumi.Text = this.cloneRoom.Humidity.ToString() + "%";
-                            }
-                        });
+                        //0
+                        btnHumi.Text = "0.0%";
+                        this.cloneRoom.Humidity = 0;
                     }
-                }
+                    else
+                    {
+                        //璁板綍婀垮害
+                        this.cloneRoom.Humidity = ((ZigBee.Device.TemperatureSensor)localDevice).Humidity;
+                        btnHumi.Text = this.cloneRoom.Humidity.ToString() + "%";
+                    }
+                }, ShowErrorMode.NO);
             });
             //鍙戦�佽幏鍙栨箍搴︾殑鍛戒护
             ((ZigBee.Device.TemperatureSensor)device).ReadTemperatureOrHumidity();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
index 69419c8..8dfdc85 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/FloorListRoomForm.cs
@@ -152,11 +152,6 @@
                 //纭鍒犻櫎鎴块棿?
                 this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uDeleteRoomMsg), () =>
                 {
-                    if (HdlRoomLogic.Current.CurrentRoom.Id == room.Id)
-                    {
-                        //濡傛灉鍒犻櫎鐨勬槸褰撳墠鎴块棿鐨勮瘽
-                        HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();
-                    }
                     HdlRoomLogic.Current.RemoveRoom(room.Id);
                     //璋冩暣楂樺害
                     frameRow.RemoveFromParent();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
index 12f4930..91d1c5e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
@@ -384,11 +384,6 @@
                                 listDeleteId.Add(listAllRoom[i].Id);
                             }
                         }
-                        //濡傛灉褰撳墠閫夋嫨鐨勬埧闂存槸鍒犻櫎瀵硅薄鐨勮瘽
-                        if (HdlRoomLogic.Current.CurrentRoom.FloorId == keys)
-                        {
-                            HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();
-                        }
                         //鍒犻櫎鎴块棿
                         foreach (string roomId in listDeleteId)
                         {
@@ -616,11 +611,6 @@
                 //纭鍒犻櫎鎴块棿?
                 this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uDeleteRoomMsg), () =>
                 {
-                    if (HdlRoomLogic.Current.CurrentRoom.Id == room.Id)
-                    {
-                        //濡傛灉鍒犻櫎鐨勬槸褰撳墠鎴块棿鐨勮瘽
-                        HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();
-                    }
                     HdlRoomLogic.Current.RemoveRoom(room.Id);
                     //淇濆瓨椤哄簭
                     this.listRoomSort.Remove(room.Id);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs
index 0087924..1f4abf5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs
@@ -53,8 +53,8 @@
             bodyFrameLayout.AddChidren(frameInput);
 
             //瀛楁暟
-            var btnFild = new NormalViewControl(120, 60, true);
-            btnFild.X = frameInput.Width - ControlCommonResourse.XXLeft - Application.GetRealWidth(120);
+            var btnFild = new NormalViewControl(150, 60, true);
+            btnFild.X = frameInput.Width - ControlCommonResourse.XXLeft - Application.GetRealWidth(150);
             btnFild.Y = Application.GetRealHeight(503);
             btnFild.TextColor = UserCenterColor.Current.TextGrayColor1;
             btnFild.TextSize = 12;
@@ -82,21 +82,30 @@
                 }
 
                 int length = txtvalue.Length;
-                if (length > 500)
-                {
-                    if (btnSubmit.CanClick == true) { btnSubmit.CanClick = false; }
-                    btnFild.Text = "0";
-                    return;
-                }
                 if (length == 0)
                 {
                     if (btnSubmit.CanClick == true) { btnSubmit.CanClick = false; }
                 }
                 else
                 {
-                    if (btnSubmit.CanClick == false) { btnSubmit.CanClick = true; }
+                    if (btnSubmit.CanClick == false) 
+                    {
+                        //鍙樼伆鑹插瓧浣�
+                        btnFild.TextColor = UserCenterColor.Current.TextGrayColor1;
+                        btnSubmit.CanClick = true;
+                    }
                 }
                 btnFild.Text = (500 - length).ToString();
+
+                if (length > 500)
+                {
+                    if (btnSubmit.CanClick == true) 
+                    { 
+                        btnSubmit.CanClick = false;
+                        //鍙樼孩鑹插瓧浣�
+                        btnFild.TextColor = Common.ZigbeeColor.Current.GXCTextRed;
+                    }
+                }
             };
 
             var framType = new FrameLayout();
diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
index 72d0148..4b02bba 100755
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -76,6 +76,22 @@
                             CommonPage.Loading.Hide();
                         });
                     }
+                    else
+                    {
+                        //璁惧畾涓�涓椂闂�
+                        Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);
+                        Config.Instance.Save();
+
+                        UserCenter.HdlThreadLogic.Current.RunMain(() =>
+                        {
+                            CommonPage.Loading.Hide();
+                            CommonPage.Instance.RemoveViewByTag("Login");
+                            //鐧诲綍寮瑰嚭鐧诲綍鐣岄潰
+                            var accountLogin = new Login.AccountLoginForm { };
+                            Shared.Common.CommonPage.Instance.AddChidren(accountLogin);
+                            accountLogin.ShowForm();
+                        });
+                    }
                 });
             }
             else
diff --git a/ZigbeeApp/Shared/Phone/UserView/LoginLoading.cs b/ZigbeeApp/Shared/Phone/UserView/LoginLoading.cs
index a8247ad..0509967 100755
--- a/ZigbeeApp/Shared/Phone/UserView/LoginLoading.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/LoginLoading.cs
@@ -10,6 +10,7 @@
         {
             BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
             Tag = "Login";
+            this.BackgroundImagePath = "Logo/StartBackGroud.png";
         }
 
         /// <summary>
@@ -17,11 +18,33 @@
         /// </summary>
         public void Show()
         {
-            var sceneBtn = new ImageView();
-            sceneBtn.Width = this.Width;
-            sceneBtn.Height = this.Height;
-            sceneBtn.ImagePath = "Logo/2.png";
-            AddChidren(sceneBtn);
+            //Logo鍥炬爣
+            var btnIcon = new Button();
+            btnIcon.Y = Application.GetRealHeight(570);
+            btnIcon.Width = UserCenter.HdlControlLogic.Current.GetPictrueRealSize(184);
+            btnIcon.Height = UserCenter.HdlControlLogic.Current.GetPictrueRealSize(184);
+            btnIcon.UnSelectedImagePath = "Logo/Logo.png";
+            btnIcon.Gravity = Gravity.CenterHorizontal;
+            this.AddChidren(btnIcon);
+
+            //Hdl Home
+            var btnText = new Button();
+            btnText.Height = Application.GetRealHeight(70);
+            btnText.Y = btnIcon.Bottom;
+            btnText.TextAlignment = TextAlignment.Center;
+            btnText.Text = "Hdl Home";
+            btnText.TextColor = UserCenter.UserCenterColor.Current.White;
+            btnText.TextSize = 16;
+            this.AddChidren(btnText);
+
+            //鏅鸿兘鏀瑰彉鐢熸椿 | Enjoy smart life
+            var btnTip = new Button();
+            btnTip.Height = btnIcon.Bottom + Application.GetRealHeight(850);
+            btnTip.Y = btnIcon.Bottom;
+            btnTip.TextAlignment = TextAlignment.Center;
+            btnTip.TextSize = 16;
+            btnTip.TextID = R.MyInternationalizationString.uLogoPageText;
+            this.AddChidren(btnTip);
         }
     }
 }
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
index 04c6a57..ec0ce95 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
@@ -333,7 +333,11 @@
         public static class FindGateWaySocket
         {
             //鏈湴Socket
-            public static System.Net.Sockets.Socket busSocket;
+            public static Socket busSocket;
+            /// <summary>
+            /// 璁℃椂鍣�
+            /// </summary>
+            private static int timeCount = 0;
 
             /// <summary>
             /// 鍚姩Socket鎺ユ敹鍜屽彂閫佸姛鑳�
@@ -379,7 +383,7 @@
             {
                 get
                 {
-                    return null == busSocket ? false : true;
+                    return busSocket == null ? false : true;
                 }
             }
 
@@ -391,12 +395,54 @@
             {
                 try
                 {
+                    //妫�娴嬭繛鎺ョ姸鎬�
+                    CheckConnectiton();
+
                     Start(7624);
                     busSocket.BeginSendTo(bytes, 0, bytes.Length, SocketFlags.None, iPEndPoint, new AsyncCallback(asyncEndSend), null);
                 }
                 catch { }
             }
 
+            /// <summary>
+            /// 妫�娴嬭繛鎺ョ姸鎬�
+            /// </summary>
+            private static void CheckConnectiton()
+            {
+                if (busSocket == null) { return; }
+                timeCount++;
+                if (timeCount < 20)
+                {
+                    //姣�10绉掓娴嬩竴娆�
+                    return;
+                }
+                timeCount = 0;
+
+                bool blockingState = busSocket.Blocking;
+                try
+                {
+                    byte[] tmp = new byte[1];
+
+                    busSocket.Blocking = false;
+                    busSocket.Send(tmp, 0, 0);
+                    //tcp杩樺湪杩炴帴鐫�
+                    busSocket.Blocking = blockingState;
+                }
+                catch (SocketException e)
+                {
+                    // 10035 == WSAEWOULDBLOCK
+                    if (e.NativeErrorCode.Equals(10035))
+                    {
+                        //Still Connected, but the Send would block
+                    }
+                    else
+                    {
+                        //tcp宸茬粡鏂紑浜嗚繛鎺�
+                        Stop();
+                    }
+                }
+            }
+
             /// <summary>
             /// 寮傛鍙戦�佹暟鎹粨鏉�
             /// </summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
index 9e2afc2..8bf4381 100644
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
@@ -300,7 +300,11 @@
             {
                 return Newtonsoft.Json.JsonConvert.DeserializeObject<PMSensor>(strDeviceByte);
             }
-            return null;
+            else { return null; }
+            //鑳藉皯瀛樹竴涓彉閲忓氨灏戝瓨涓�涓�
+            device.Type = (DeviceType)device.DeviceID;
+
+            return device;
         }
 
         /// <summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
index 7c8edec..8a07d57 100644
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
@@ -3229,6 +3229,20 @@
                 //2020.05.11 鍒犻櫎
 
                 #endregion
+
+                #region 璁惧鐘舵�佷笂鎶�
+                if (topic == gatewayID + "/" + "DeviceStatusReport" + "/" + addr + "/" + epoint + "/" + cluID + "/" + attrId)
+                {
+                    var deviceID = jobject.Value<int>("Device_ID");
+                    var deviceAddr = jobject.Value<string>("DeviceAddr");
+                    var tempEpoint = jobject.Value<int>("Epoint");
+                    var dataId = jobject.Value<int>("Data_ID");
+
+                    var tempDevice = new CommonDevice { DeviceID = deviceID, DeviceAddr = deviceAddr, DeviceEpoint = tempEpoint };
+                    tempDevice.DeviceStatusReport = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DeviceStatusReportData>(jobject["Data"].ToString());
+                    UpdateDeviceInfo(tempDevice, "DeviceStatusReport");
+                }
+                #endregion
                 #region 闂ㄩ攣鎿嶄綔浜嬩欢閫氱煡
                 else if (topic == gatewayID + "/" + "DoorLock/DoorLockOperatingEventNotificationCommand")
                 {
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 8d52dc1..f1994c3 100644
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -881,6 +881,7 @@
         public readonly static int addFailed = 5401;
         public readonly static int timeSensitive = 5402;
         public readonly static int executeSone = 5403;
+        public readonly static int hour1 = 5404;
 
 
 
@@ -5794,6 +5795,18 @@
         /// 娓稿浣撻獙
         /// </summary>
         public const int uExperienceAccount = 16116;
+        /// <summary>
+        /// 鏅鸿兘鏀瑰彉鐢熸椿 | Enjoy smart life
+        /// </summary>
+        public const int uLogoPageText = 16117;
+        /// <summary>
+        /// 缃戠粶涓嶇ǔ瀹氾紝鍦烘櫙鍒楄〃淇℃伅缂烘崯
+        /// </summary>
+        public const int uNetworkUnStableAndSceneInfoIsNotFull = 16118;
+        /// <summary>
+        /// DATA缁胯壊鎸囩ず鐏棯鐑�
+        /// </summary>
+        public const int uDataGreanPilotLampLinght = 16119;
 
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
@@ -5994,7 +6007,7 @@
         /// </summary>
         public const int uAddRepeaterZigbeeMsg = 21014;
         /// <summary>
-        /// 绌鸿皟 -> 闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏瘂0}鍙樼豢闂儊,杩涘叆閰嶇綉鐘舵�亄0}缁跨伅姣�5绉掗棯鐑佷竴娆″垯鍏ョ綉鎴愬姛
+        /// 绌鸿皟 -> 闀挎寜缂栫▼鎸夐敭5绉�,DATA缁胯壊LED闂儊,{0}棰戠巼涓轰寒0.5绉�,鐏�0.5绉�
         /// </summary>
         public const int uAddAirConditionerZbGatewayMsg = 21015;
         /// <summary>

--
Gitblit v1.8.0